Merge branch 'master' of yanchi/glife into master

locations/gschool_break.qsrc

@@ -21,12 +21,12 @@ if $ARGS[0] = 'watercooler':
 		'You stop at the water cooler to get a drink, but no one else is around.'
 	end
 	gs 'stat'
-	
-	act 'Leave': 
+
+	act 'Leave':
 		if $breaktype = 'long':
 			gt 'gschool_lunch', 'break'
 		elseif $breaktype = 'first':
-			gt 'gschool_lessons', 'morning'	
+			gt 'gschool_lessons', 'morning'
 		else
 			gt 'gschool_lessons', 'short_break'
 		end
@@ -46,11 +46,11 @@ if $ARGS[0] = 'watercooler':
 		cumspclnt = 2
 		gs 'cum_cleanup'
 		'<br>You drink some water.'
-		act 'Leave': 
+		act 'Leave':
 			if $breaktype = 'long':
 				gt 'gschool_lunch', 'break'
 			elseif $breaktype = 'first':
-				gt 'gschool_lessons', 'morning'	
+				gt 'gschool_lessons', 'morning'
 			else
 				gt 'gschool_lessons', 'short_break'
 			end
@@ -64,12 +64,12 @@ if $ARGS[0] = 'boys_restroom':
 	$loc_arg = 'boys_restroom'
 	$locM_arg = 'boys_restroom'
 	menu_off = 0
-	gs 'stat'	
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 	'The restroom is empty.'
-	
+
 	gs 'gschool_break', 'restroom_actions'
-	
+
 	if rand(0,2) = 2: gt 'gschool_break', 'boys_restroom_events'
 end
 
@@ -82,21 +82,21 @@ if $ARGS[0] = 'girls_restroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 	'The restroom is empty.'
-	
+
 	gs 'gschool_break', 'restroom_actions'
-	
+
 	if rand(0,2) = 2: gt 'gschool_break', 'girls_restroom_events'
 end
 
 if $ARGS[0] = 'restroom_actions':
 	$location_type = 'bathroom'
 	$locclass = 'school_bathroom'
-	act 'Leave the restroom': 
+	act 'Leave the restroom':
 		minut += 5
 		if $breaktype = 'long':
 			gt 'gschool_lunch', 'break'
 		elseif $breaktype = 'first':
-			gt 'gschool_lessons', 'morning'	
+			gt 'gschool_lessons', 'morning'
 		else
 			gt 'gschool_lessons', 'short_break'
 		end
@@ -104,12 +104,12 @@ if $ARGS[0] = 'restroom_actions':
 	gs 'din_van', 'pblc_pee'
 	act 'Use the mirrors': gt 'mirror', 'start'
 	if siga > 0: act 'Smoke': gt 'gschool_break', 'smoke1'
-	
+
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $publicpan
-end	
+end
 
 if $ARGS[0] = 'girls_restroom_events':
 	*clr & cla
@@ -162,9 +162,9 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 4 and npc_rel['A14'] >= 60 and npc_rel['A15'] >= 60 and (katjaQW['QWstage'] > 0 or mey_vika['mey_vika_qw'] > 0):
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sisters.jpg"></center>'
-		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."' 
+		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."'
 		'She pulls you in close on her right side and wraps one of her legs halfway around you as you hold it. Vicky wraps an arm and almost a leg around Katja from the left. The three of you do your best to strike several sexy poses as Lizaveta takes your picture. After several such pictures, the Meynold sisters each kiss you on the cheek before hurrying out. Lizaveta is a bit slower, and gives you a knowing smile before leaving as well. You wonder just what Lizaveta knows and, being the gossip that she is, who else knows as you finish your business.'
-		
+
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand <= 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsgossip'+rand(1,2)+'.jpg"></center>'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'girls_restroom_events':
 							gs 'stat'
 							act 'Continue':
 								*clr & cla
-								gs 'boyStat', 'D2' 
+								gs 'boyStat', 'D2'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully2.jpg"></center>'
 								'Several of the girls hold you down while Lera puts on one of the strapon harnesses with a rather large looking dildo attached. As she sits between your legs and scoots closer, she spits on your pussy and rubs the saliva around, grinning at you. "Some lubrication for you, slut." She then pushes the head of the dildo against your slit and shoves the <<dick>>cm <<$dick_girth>> dildo inside of you before she grabs you by the thighs and pulls herself closer. As she fucks you with the dildo, the other girls make rude comments about how much you love it.'
 								gs 'arousal', 'vaginal_strap', 2, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -358,7 +358,7 @@ if $ARGS[0] = 'girls_restroom_events':
 									gs 'stat'
 									act 'Continue':
 										*clr & cla
-										gs 'boyStat', 'D3' 
+										gs 'boyStat', 'D3'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully4.jpg"></center>'
 										'Lena puts on one of the large strapons and pushes Lera out of the way. "Let me show you how it''s done." With that, she shoves the <<dick>>cm <<$dick_girth>> dildo into your pussy and, like Lera before her, starts hammering away at you. Unable to do anything, you just have to endure what the other girls are doing to you. After a while your cries start to get too loud, so someone covers your mouth to silence you.'
 										gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -430,7 +430,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		gt $loc, $loc_arg
 	end
 end
-		
+
 if $ARGS[0] = 'boys_restroom_events':
 	*clr & cla
 	$menu_arg = 'boys_restroom'
@@ -449,7 +449,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			'You blush slightly, not knowing what to say, before you turn around and rush out.'
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
-		
+
 		act 'Stay':
 			cla & *nl
 			'You glance at him as you walk to the sinks. "Shut up, I just need to use a mirror. It''s not like it''s hurting you." you tell him as you take a look at yourself in the mirror, checking your hair and makeup.'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'boys_restroom_events':
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				end
 			end
-			
+
 			act 'Greet them':
 				*clr & cla
 				npc_rel['A25'] += 3
@@ -569,7 +569,7 @@ if $ARGS[0] = 'boys_restroom_events':
 					act 'Continue your break': gt 'gschool_lessons', 'short_break'
 				end
 			end
-			
+
 			act 'Greet them':
 				*clr & cla
 				npc_rel['A25'] += 3
@@ -803,7 +803,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			'You peek through the partially open stall door and see Lavrenti standing to the side of the toilet while Alyona is sitting on the toilet with her legs apart and back against the other stall wall, sucking Lavrenti''s dick. Neither of them have noticed you yet.'
 			gs 'arousal', 'voyeur_sex', 1, 'unknown'
 			gs 'stat'
-			act 'Sneak away and leave':	gs 'arousal', 'end' & gt 'gschool_lessons', 'short_break'
+			act 'Sneak away and leave': gs 'arousal', 'end' & gt 'gschool_lessons', 'short_break'
 
 			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost < pcs_willpwr:
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'join_alylav':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'smoke1':
 	*clr & cla
 	menu_off = 1
@@ -1029,7 +1029,7 @@ if $ARGS[0] = 'smoke1':
 	'You pull out your pack of cigarettes and fish one out. Placing it between your lips, you light the cigarette and take a long slow drag of it. You spend a few minutes smoking the cigarette before dropping the bud into the toilet.'
 	act 'Continue your break': gt $loc, $loc_arg
 end
-	
+
 if $ARGS[0] = 'smoke2':
 	*clr & cla
 	menu_off = 1
@@ -1096,7 +1096,7 @@ if $ARGS[0] = 'smoke2':
 										gs 'pain', 1, 'asscheeks', 'spank'
 										gs 'arousal', 'foreplay', 2, 'sub'
 										gs 'stat'
-										
+
 										gs 'willpower', 'misc', 'resist', 'medium'
 										if will_cost < pcs_willpwr:
 											act 'No (<<will_cost>> Willpower)':
@@ -1190,7 +1190,7 @@ if $ARGS[0] = 'smoke2':
 										else
 											act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
-										
+
 										act 'Yes':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
@@ -1206,14 +1206,14 @@ if $ARGS[0] = 'smoke2':
 						end
 					end
 				end
-			end	
+			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo1.jpg"></center>'
 		'You pull out your pack of cigarettes and fish one out. Placing it between you lips, you light the cigarette and take a long slow drag of it. You spend a few minutes smoking the cigarette before dropping the bud into the toilet.'
 		gs 'drugs', 'smoke'
 		gs 'stat'
-		
+
 		act 'Continue your break': gt $loc, $loc_arg
 	end
 end
@@ -1261,13 +1261,13 @@ if $ARGS[0] = 'lena_gop':
 		end
 		act 'Agree to take turns':
 			*clr & cla
-			gs 'boyStat', 'D2' 
+			gs 'boyStat', 'D2'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena4.jpg"></center>'
 			'You nod your head. "Sounds good to me. Do you want to go first or should I?" you ask.'
 			'She starts pulling on the harness. "I''ll fuck you first, then you can fuck me."'
 			'A few seconds later, she has the strapon tightly in place. "Okay, turn around and lift your leg up for me." You turn so your back is facing her and bend slightly forward before you lift up your right leg to give her easy access to your pussy. You feel the tip of the dildo press against your pussy before it slides inside you.'
 			*nl
-			'Once she has it as deep as it will go, she grabs onto your hips and starts to fuck you hard and fast. She seems to be really getting off on fucking you, alhough you can barely think about it as you feel your arousal rising like water against a dam. She fucks you really good and seems to have had more than a bit of practice at wearing one of these.'
+			'Once she has it as deep as it will go, she grabs onto your hips and starts to fuck you hard and fast. She seems to be really getting off on fucking you, although you can barely think about it as you feel your arousal rising like water against a dam. She fucks you really good and seems to have had more than a bit of practice at wearing one of these.'
 			gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 			gs 'stat'
 			'She abruptly stops fucking you, grabs you by the hair and pulls you around before bringing your face down to the strapon. "Suck my dick clean, bitch!"'
@@ -1295,7 +1295,7 @@ if $ARGS[0] = 'lena_gop':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'lena_dom':
 	*clr & cla
 	menu_off = 1
@@ -1310,7 +1310,7 @@ if $ARGS[0] = 'lena_dom':
 		gs 'fame', 'pav', 'sex', 2
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena2.jpg"></center>'
 		'As she gets more turned on, she pulls herself up on the sink until she is sitting on it and spreads her legs wide. You follow her as she moves, your face staying in her crotch and eating her pussy. As she gets louder, she starts to hump her pussy against your face, smearing your face with her pussy juices. Your face and her crotch are soon completely covered in her pussy cum as she trembles and rocks against you, orgasming hard.'
-		'Once the trembling stops, she sighs ofor a moment, then says. "Lick me clean, slut!"'
+		'Once the trembling stops, she sighs for a moment, then says, "Lick me clean, slut!"'
 		*nl
 		'You obey her and start licking all her smeared juices off her. After you get her as clean as you can, she pushes you away, gets off the sink and starts to get dressed. As she finishes up, she turns to you. "I''ll make sure to let the other girls know what an obedient little lesbian slut you are." she says with a laugh before walking out.'
 		gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
@@ -1318,8 +1318,8 @@ if $ARGS[0] = 'lena_dom':
 		gs 'stat'
 		act 'Continue your break': gt $loc, $loc_arg
 	end
-end	
-		
+end
+
 if $ARGS[0] = 'naked_bathroom':
 	*clr & cla
 	menu_off = 1
@@ -1330,7 +1330,7 @@ if $ARGS[0] = 'naked_bathroom':
 	act 'Go see the head mistress':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
-		'You decide it would be better to go see the headmistress than run half way across Pavlovsk naked. You peek out one last time, and when you see no one present,  you step out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it to the office.'
+		'You decide it would be better to go see the headmistress than run half way across Pavlovsk naked. You peek out one last time, and when you see no one present,	 you step out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it to the office.'
 		gs 'stat'
 		act 'Enter her office':
 			*clr & cla
@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'naked_bathroom':
 						money -= 200
 						'"I already have a spare one at home. Is it OK if I return the uniform tomorrow?" you ask and she nods. "However, you will have to pay 200 <b>₽</b> to get it professionally cleaned."'
 						'"Sure, that''s not a problem." you say and hand over the money.'
-					end						
+					end
 				else
 					'She sighs and gives you a minute to tell the truth. When you finish, she gets up and opens up a closet, looks around in it for a minute before she pulls out a cheap very conservative school uniform and hands it over to you. "Here is a replacement one, your parents will be sent a bill for it. Now get dressed and be on your way."'
 					'You take the uniform and get dressed, thanking her for helping you out. Once fully dressed, you leave the office and head out.'
@@ -1371,7 +1371,7 @@ if $ARGS[0] = 'naked_bathroom':
 					gm_school_b[25] = pcs_hips
 				end
 				gs 'clothing', 'wear', 'gm_school', 25
-				act 'Leave her office': 
+				act 'Leave her office':
 					if hour >= 14:
 						gt 'gschool_grounds', 'main'
 					else
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'naked_bathroom':
 							money -= 200
 							'"I already have a spare one at home. Is it OK if I return the uniform tomorrow?" you ask and she nods. "However, you have to pay 200 <b>₽</b> to get it professionally cleaned."'
 							'"Sure, that''s not a  problem." you say and hand over the money.'
-						end						
+						end
 					else
 						'She sighs and gets up. She walks over to and opens up a closet, looks around in it for minute and pulls out a cheap, conservative school looking uniform and hands it over to you. "Here is a replacement one, your parents will be sent a bill for it. Now get dressed and be on your way."'
 						'You take the uniform and get dressed, thanking her for helping you out. Once fully dressed, you leave the office and head out.'
@@ -1412,7 +1412,7 @@ if $ARGS[0] = 'naked_bathroom':
 						gm_school_b[25] = pcs_hips
 					end
 					gs 'clothing', 'wear', 'gm_school', 25
-					act 'Leave her office': 
+					act 'Leave her office':
 						if hour >= 14:
 							gt 'gschool_grounds', 'main'
 						else
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'naked_bathroom':
 			gs 'stat'
 			act 'Continue': gt 'pav_aptcourtev', 'naked_aptcomplex'
 		end
-		
+
 		act 'Sneak home':
 			*clr & cla
 			gs 'fame', 'pav', 'sex', 2
@@ -1455,4 +1455,3 @@ if $ARGS[0] = 'naked_bathroom':
 end
 
 --- gschool_break ---------------------------------
-