Merge remote-tracking branch 'Anjuna/master'

# Conflicts:
#	locations/artem_katja_sex.qsrc
#	locations/nyp_school.qsrc

locations/artem_katja_sex.qsrc

@@ -9,7 +9,7 @@
 !! artemQW['confidence'] = 20 - Artem is turning into a true lover boy, flirting freely with girls he just met. Better be careful it doesn''t go to his head!
 
 if $ARGS[0] = 'going_home_together':
-	menu_off = 1	
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 	'You walk across the school courtyard to meet up with Artem, who gives you a friendly nod as you approach. "You ready to go?"'
 	'You smile. "Let''s go study!"'
@@ -21,7 +21,7 @@ if $ARGS[0] = 'going_home_together':
 		'Artem turns to you. "Is that true, <<$pcs_nickname>>?"'
 		'He''s avoiding eye contact with Katja, who winks at you to signal that she''s ready to put your plan into motion.'
 	end
-	act 'Continue with the plan': 
+	act 'Continue with the plan':
 		*clr & cla
 		minut +=2
 		gs 'npc_relationship', 'modify', 'A2', 'like'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'going_home_together':
 				'Katja responds in kind, flirting overtly with him. You''re almost afraid that she''ll drag him into the bushes to jump him immediately.'
 			else
 				'Katja appreciates the attention and responds well to his advances.'
-			end			
+			end
 		end
 		act 'Start doing your homework': gt 'artem_katja_sex', 'first_time_start'
 	end
@@ -201,37 +201,37 @@ if $ARGS[0] = 'first_time_seduction':
 			if artemQW['confidence'] < 10:
 				'Artem looks completely out of it and has no idea how to react. He looks like he''s on the verge of panicking, so you to try to calm him down.'
 				'"It''s okay, Artem! Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
-				'He seems to calm down a little and '+iif( katjaQW['QWstage'] = 5, ' you tell Katja to unzip his pants.', 'Katja smiles. "Why don''t I take your nice cock out and give it some attention?"') 
+				'He seems to calm down a little and '+iif( katjaQW['QWstage'] = 5, ' you tell Katja to unzip his pants.', 'Katja smiles. "Why don''t I take your nice cock out and give it some attention?"')
 			elseif artemQW['confidence'] < 15:
 				'Artem doesn''t seem to know how to react to the situation, so he looks at you for an explanation.'
 				'"It''s okay, Artem! Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
-				'He stammers "Yes. I do like what I see..." '+iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+				'He stammers "Yes. I do like what I see..." '+iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment. Why don''t I reward it by taking your nice cock out and giving it some attention?"')
 			elseif artemQW['confidence'] < 20:
 				'Artem looks at you to see your reaction, and when you smile back seductively, he grins. "I do like what I see, but are you sure about this, <<pcs_nickname>>?"'
 				'"Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
-				iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment, Artem. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+				iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment, Artem. Why don''t I reward it by taking your nice cock out and giving it some attention?"')
 			else
 				'Artem briefly looks at you to see your reaction, and when you just smiles back seductively, he grins. "I very much like what I see. This is a great view and I''m sure that things can only get better, but I''m a little surprised that <<pcs_nickname>> wants to share me with you."'
 				'"Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. How could her deny her that?" you answer.'
-				'"Why don''t you get my cock out and play with it?" Artem continues. '+iif( katjaQW['QWstage'] = 5, 'Katja looks a little surprised by his assertiveness. "Yes, it''s time to give it some attention."', 'Katja smiles. "Your cock definitely deserves some attention for that nice compliment."') 
+				'"Why don''t you get my cock out and play with it?" Artem continues. '+iif( katjaQW['QWstage'] = 5, 'Katja looks a little surprised by his assertiveness. "Yes, it''s time to give it some attention."', 'Katja smiles. "Your cock definitely deserves some attention for that nice compliment."')
 			end
 		else
 			if artemQW['confidence'] < 10:
 				'Artem looks very embarrassed and doesn''t seem to have any idea how to react, so you decide to try to calm him down.'
 				'"It''s okay, Artem! Katja is my friend and as you know I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
-				'He seems to calm down a little and '+iif( katjaQW['QWstage'] = 5, ' you turn to Katja. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Why don''t I take your nice cock out and give it some attention?"') 
+				'He seems to calm down a little and '+iif( katjaQW['QWstage'] = 5, ' you turn to Katja. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Why don''t I take your nice cock out and give it some attention?"')
 			elseif artemQW['confidence'] < 15:
 				'Artem is still not confident enough to take control of the situation, so he looks at you to see what to do.'
 				'"It''s okay, Artem. Katja is my friend and you know I like to share with my friends. I told her how amazing you are in bed, and she wanted to also experience that. So just relax and enjoy the experience."'
-				'He looks back down at Katja. "Yes. I do like what I see." '+iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+				'He looks back down at Katja. "Yes. I do like what I see." '+iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment. Why don''t I reward it by taking your nice cock out and giving it some attention?"')
 			elseif artemQW['confidence'] < 20:
 				'Artem looks at you to see your reaction, and when you smile back seductively, he grins. "I do like what I see. Are you are you going to share all your friends with me, <<pcs_nickname>>?"'
 				'"I like to share," you shrug. "I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
-				iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment, Artem. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+				iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment, Artem. Why don''t I reward it by taking your nice cock out and giving it some attention?"')
 			else
 				'Artem briefly looks at you to see your reaction, and when you smile back seductively, he grins. "I very much like what I see. This is a great view and I''m sure that things can only get better. I look forward to you sharing me with the rest of your friends, <<pcs_nickname>>."'
 				'"I like to share," you shrug. "I told her how amazing you are in bed, and she wanted to experience that. How could her deny her that?" you reply.'
-				'"Why don''t you get my cock out and play with it, Katja?" he continues. '+iif( katjaQW['QWstage'] = 5, 'Katja looks a little surprised by his assertiveness. "Yes, it''s time to give it some attention."', 'Katja smiles. "Your cock definitely deserves some attention for that nice compliment."') 
+				'"Why don''t you get my cock out and play with it, Katja?" he continues. '+iif( katjaQW['QWstage'] = 5, 'Katja looks a little surprised by his assertiveness. "Yes, it''s time to give it some attention."', 'Katja smiles. "Your cock definitely deserves some attention for that nice compliment."')
 			end
 		end
 		'While Katja opens his pants and slowly pulls out his cock, you sit up on the table with your legs spread so that your naked pussy is in from of Artem''s face.'
@@ -245,10 +245,10 @@ if $ARGS[0] = 'first_time_seduction':
 				'Katja pulls Artem''s semi-hard cock out of his pants and takes it in her hands. "Wow, so this is what a real cock feels like. So warm, but somewhat soft. Oh!" Katja suddenly stops what she''s saying as Artem''s cock becomes rock hard in her hands.'
 				'She then starts to stroke it a little, clearly showing her lack of experience. "Why don''t you try to lick it?" '+iif(artemQW['confidence'] < 15, ' you say.', 'Artem says.')
 				'"Okay..." Katja responds and sticks out her tongue to start licking Artem''s shaft. "It doesn''t taste bad," she says. "Time to see if I can take everything..."'
-				if 2*npc_throat['A14'] < dick: 
+				if 2*npc_throat['A14'] < dick:
 					npc_throat['A14'] += 1
 					'Katja tries to get Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but can''t manage to get much more than the head inside before she starts sucking on it.'
-				elseif npc_throat['A14'] < dick: 
+				elseif npc_throat['A14'] < dick:
 					npc_throat['A14'] += 1
 					'Katja tries to get all of Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but is clearly having problems with her gag reflex when it hits her throat. However, she quickly gets into a rhythm that matches what she can take, only occasionally having to stop when she tries to take too much.'
 					if artemQW['confidence'] > 14:
@@ -267,10 +267,10 @@ if $ARGS[0] = 'first_time_seduction':
 			else
 				'Katja pulls Artem''s semi-hard cock out of his pants and takes it in her hands. "This is a nice cock you have. I''m looking forward to playing with it. I can see that it''s also looking forward to be played with..." Katja says seductively as Artem''s cock becomes rock hard in her grasp.'
 				'She gives it a few strokes before slowly running her tongue up the shaft. "Tastes great! Time to see if I can take everything..."'
-				if npc_throat['A14'] < 2*dick: 
+				if npc_throat['A14'] < 2*dick:
 					npc_throat['A14'] += 1
 					'Katja tries to get Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but can''t manage to get much more than the head inside before she starts sucking on it.'
-				elseif npc_throat['A14'] < dick: 
+				elseif npc_throat['A14'] < dick:
 					npc_throat['A14'] += 1
 					'Katja tries to get all of Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but is clearly having problems with her gag reflex when it hits her throat. However, she quickly gets into a rhythm that matches what she can take, only occasionally having to stop when she tries to take too much.'
 				else
@@ -289,7 +289,7 @@ if $ARGS[0] = 'first_time_seduction':
 				*clr & cla
 				gs 'arousal', 'bj', 2
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_5.jpg"></center>'				
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_5.jpg"></center>'
 				'After a few minutes, Artem''s licking becomes less enthusiastic, and you notice the awkward position he''s in. "Okay, time for me to taste that cock."'
 				'Both Artem and Katja stop and you get off the table. "Sit back and relax," you tell Artem as you get down on your knees next to Katja.'
 				'The two of you then take turns licking his extremely hard dick.'
@@ -340,12 +340,12 @@ if $ARGS[0] = 'first_time_pussy':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_6.jpg"></center>'
 	'You get up from the floor and move to a chair, placing both knees on it and sticking your ass in the air while supporting yourself on the table.'
 	'"Come on, Artem! Show Katja how you take me doggystyle!" you grin and he quickly moves in behind you.'
-	'Katja moves close and starts licking your breasts as Artem starts pounding you from behind.' 
+	'Katja moves close and starts licking your breasts as Artem starts pounding you from behind.'
 	gs 'arousal', 'vaginal', 3
 	gs 'arousal', 'foreplay', -2
 	gs 'stat'
 	if katjaQW['QWstage'] = 5:
-		act 'Katja tries her first cock':	
+		act 'Katja tries her first cock':
 			*clr & cla
 			gs 'arousal', 'foreplay_give', 3
 			gs 'stat'
@@ -447,7 +447,7 @@ if $ARGS[0] = 'first_time_pussy':
 					end
 				end
 			else
-				'Artem pulls out of you. "Come and take <<$pcs_nickname>>''s place, Katja. I''ll show you a great first time". You get down on the floor next to the chair to give Katja some space.' 
+				'Artem pulls out of you. "Come and take <<$pcs_nickname>>''s place, Katja. I''ll show you a great first time". You get down on the floor next to the chair to give Katja some space.'
 				'She does as she''s told, but clearly looking  '+iif(npc_vag['A14'] = 0, 'very', 'a little')+' nervous.'
 				'"Don''t worry, Katja. Artem will be very careful, won''t you?" you say while looking at Artem.'
 				'"You''re in good hands, Katja!" he quickly replies. I''ll do anything so that it feels pleasant and not painful."'
@@ -461,7 +461,7 @@ if $ARGS[0] = 'first_time_pussy':
 						'"Sorry, it''s just stupid tough talk that guys do. I shouldn''t have said it," Artem replies.'
 						*nl
 						'"Okay. Apology accepted. You can go ahead," Katja smiles.'
-						'He slowly pushes his cock into her and stops when he hits her hymen. "I''m going to push though your hymen now. It might cause a little pain. Are you ready"' 
+						'He slowly pushes his cock into her and stops when he hits her hymen. "I''m going to push though your hymen now. It might cause a little pain. Are you ready"'
 						'Katja looks at you and steels herself. "I''m ready..."'
 						'Artem then pushes his cock as far in as he can in one smooth move and Katja lets out a small shriek of pain.'
 						*nl
@@ -497,7 +497,7 @@ if $ARGS[0] = 'first_time_pussy':
 						katjaQW['slut'] -= 5
 						'"Please be careful Artem, I''ve never had anything bigger than a finger in there," Katja says nervously.'
 						'"I promise I''ll be as gentle as I can. I probably can''t avoid causing you a little pain, but I''ll try to make it as quick as possible," Artem answers.'
-						'He slowly pushes his cock into her and stops when he hits her hymen. After a moment he says "I''m going to push though your hymen now. It might cause a little pain. Are you ready" Artem asks.' 
+						'He slowly pushes his cock into her and stops when he hits her hymen. After a moment he says "I''m going to push though your hymen now. It might cause a little pain. Are you ready" Artem asks.'
 						'Katja looks at you and steels herself. "I''m ready."'
 						'Artem pushes his cock as far in as he can in one smooth move and Katja lets out a small shriek of pain.'
 						'"I''ll stay still for now so you can get used to it. Let me know when you''re ready for me to move," Artem says.'
@@ -600,14 +600,14 @@ if $ARGS[0] = 'first_time_pussy':
 				end
 			else
 				'Artem pulls out of you. "Come and take <<$pcs_nickname>>''s place, Katja. I want to try your tight pussy."'
-				'You get down on the floor next to the chair to give Katja space.' 
+				'You get down on the floor next to the chair to give Katja space.'
 				'"Great. '+iif( katjaQW['slut']  > 80 , 'My extremely wet pussy need to be filled by something hard,', 'Let''s get to it,')+'" she says and takes your place on the chair.'
 				if artemQW['artem_dom'] > 4:
 					'Artem moves behind Katja and places his cock at the entrance of her pussy. "Okay bitch, get ready to be pounded like a cheap whore!" he says, sounding like he''s in a bad porn movie, and Katja reacts very harshly.'
 					'"What the fuck, Artem?! Why the hell do you think that any girl wants to fuck a pig that says things like that?! What cave did you crawl out of?" she asks in a sharp voice. Artem is clearly taken aback by her outburst and freezes.'
 					if artemQW['nush3some'] >= 3:
 						'"He didn''t mean anything by it, Katja. It''s just stupid talk that goes around in the boys world. Isn''t it, Artem?" you quickly chime in to try and defuse the tension.'
-						'"Sorry Katja, I thought you might like it." He pauses a moment before continuing. "It''s just that Nush likes it when I talk like that. so I thought you would too. Sorry..."' 
+						'"Sorry Katja, I thought you might like it." He pauses a moment before continuing. "It''s just that Nush likes it when I talk like that. so I thought you would too. Sorry..."'
 						'Katja still looks annoyed, but also very horny. "Just because a girl that opens her legs for everybody thinks it''s fine to look down on women doesn''t make it so."'
 						*nl
 						'Artem starts to reply, but Katja quickly cuts in. "Just stop talking and fuck me already."'
@@ -646,7 +646,7 @@ if $ARGS[0] = 'first_time_pussy':
 	end
 end
 
-if $ARGS[0] =  'first_time_next':
+if $ARGS[0] = 'first_time_next':
 	if artemQW['confidence'] < 10:
 		if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 			gt 'artem_katja_sex', 'first_time_katja_titjob'
@@ -675,7 +675,7 @@ if $ARGS[0] = 'first_time_on_table':
 		'She nods and Artem pulls out of you, allowing Katja to take your place. He starts to fuck her again, this time completely aware of how to treat her so she only feels pleasure.'
 		'Not wanting to be left out, you start to suck on Katja''s breast.'
 		gs 'arousal', 'foreplay', 3
-		gs 'stat'	
+		gs 'stat'
 		act 'Change position again':
 			if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 				gt 'artem_katja_sex', 'first_time_katja_titjob'
@@ -733,7 +733,7 @@ if $ARGS[0] = 'first_time_ride':
 	if $ARGS[1] = 1:
 		'"You go first," Katja says and you climb onto his still extremely hard cock.'
 	else
-		'"Let''s change position," Katja says, "Great, because I''m getting tired!" Artem answers with a smile.' 
+		'"Let''s change position," Katja says, "Great, because I''m getting tired!" Artem answers with a smile.'
 		'"Why don''t you lie down and we''ll take care of you?" you suggest.'
 		'He pulls out of Katja and lies on his back on the floor before you climb onto his still extremely hard cock.'
 	end
@@ -742,7 +742,7 @@ if $ARGS[0] = 'first_time_ride':
 	gs 'arousal', 'vaginal', 3
 	gs 'stat'
 	'After a short while, Artem stops you. "I want to fuck Katja''s tight little pussy one more time before I cum."'
-	act 'Katja''s turn to ride Artem': 	
+	act 'Katja''s turn to ride Artem':
 		*clr & cla
 		gs 'arousal', 'foreplay_give', 3
 		gs 'stat'
@@ -753,7 +753,7 @@ if $ARGS[0] = 'first_time_ride':
 		if katjaQW['horny'] >= 100:
 			katjaQW['horny'] = 0
 			if katjaQW['QWstage'] = 5:
-				katjaQW['simultanous_boys'] = 1	
+				katjaQW['simultanous_boys'] = 1
 				if npc_vag['A14'] = 0:
 					katjaQW['slut'] += 10
 					if artemQW['confidence'] < 7:
@@ -761,25 +761,25 @@ if $ARGS[0] = 'first_time_ride':
 					elseif artemQW['confidence'] < 12:
 						artemQW['confidence'] += 3
 					elseif artemQW['confidence'] < 19:
-						artemQW['confidence'] += 2			
+						artemQW['confidence'] += 2
 					end
 				else
 					katjaQW['slut'] += 7
 					if artemQW['confidence'] < 14:
 						artemQW['confidence'] += 2
 					elseif artemQW['confidence'] < 20:
-						artemQW['confidence'] += 1			
-					end					
+						artemQW['confidence'] += 1
+					end
 				end
 			else
 				katjaQW['slut'] += 5
 				if artemQW['confidence'] < 9:
-					artemQW['confidence'] += 2 
+					artemQW['confidence'] += 2
 				elseif artemQW['confidence'] < 20:
-					artemQW['confidence'] += 1 			
-				end	
+					artemQW['confidence'] += 1
+				end
 			end
-			'Katja''s moans get louder and louder, and after riding him for a few minutes she lets out a huge scream which leaves no doubt that she had an orgasm.' 
+			'Katja''s moans get louder and louder, and after riding him for a few minutes she lets out a huge scream which leaves no doubt that she had an orgasm.'
 			'"I''m cumming!" Artems cries out and she quickly climbs off of him.'
 		else
 			if katjaQW['horny'] = 0: katjaQW['horny'] = 30
@@ -790,19 +790,19 @@ if $ARGS[0] = 'first_time_ride':
 					if artemQW['confidence'] < 9:
 						artemQW['confidence'] += 2
 					elseif artemQW['confidence'] < 15:
-						artemQW['confidence'] += 1			
+						artemQW['confidence'] += 1
 					end
 				else
 					katjaQW['slut'] += 3
 					if artemQW['confidence'] < 10:
 						artemQW['confidence'] += 1
-					end					
+					end
 				end
 			else
 				katjaQW['slut'] += 2
 				if artemQW['confidence'] < 10:
 					artemQW['confidence'] += 1
-				end		
+				end
 			end
 			'Katja''s moans get louder and louder, but after riding him for a few minutes, Artem cries out that he''s about to cum and she quickly climbs off of him.'
 		end
@@ -836,7 +836,7 @@ if $ARGS[0] = 'first_time_ride':
 			else
 				'"It was good..." Katja says, but you can see that she''s not completely satisfied. You choose not to bring it up.'
 			end
-			'You finish getting dressed up and collect your homework before you and Artem say goodbye to Katja and head home.' 
+			'You finish getting dressed up and collect your homework before you and Artem say goodbye to Katja and head home.'
 			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 			if 2*npc_vag['A14'] < dick: npc_vag['A14'] += 1
 			act 'Walk home': minut +=10 & gt 'artem_katja_sex', 'first_time_walking_home'
@@ -880,5 +880,5 @@ if $ARGS[0] = 'first_time_walking_home':
 	act 'Alone': gt 'pod_ezd', 'etaj_1'
 end
 
---- artem_katja_sex ---------------------------------
 
+--- artem_katja_sex ---------------------------------

locations/nyp_school.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 		pl '<a href="exec: music_on = 1 & gt ''nyp_school'', ''start''">Play music</a>'
 	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
-	'You notice what you think are all your classmates from school here, or at least the majority of them. Most of them are milling about at several tables with tea and sweets laid out. It doesn''t take long before most of them drift off into their individual cliques, with the gopniks staking claim to the bleachers, sitting and laying about on them, the cool kids and jocks mingling around the tables and the nerds hovering around the edges. The outcasts do their best to stay out of sight, leaning against one of the walls far from the gopniks.' 
+	'You notice what you think are all your classmates from school here, or at least the majority of them. Most of them are milling about at several tables with tea and sweets laid out. It doesn''t take long before most of them drift off into their individual cliques, with the gopniks staking claim to the bleachers, sitting and laying about on them, the cool kids and jocks mingling around the tables and the nerds hovering around the edges. The outcasts do their best to stay out of sight, leaning against one of the walls far from the gopniks.'
 	'Some of the teachers are also here, although they don''t seem to be paying much attention to the students and seem a lot more interested in socializing with each other.'
 	act 'Have tea and buns':
 		*clr & cla
@@ -41,8 +41,8 @@ if $ARGS[0] = 'start':
 		end
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/picture.jpg"></center>'
 		'Within half an hour all the tea has been drank and the buns devoured. After everyone has finished, a teacher takes out a music player and places it on the table. Music starts blasting from the speakers and he contently returns to join the other two teachers, who pay less and less attention to what''s going on. A few couples and some of the girls get up to dance, but most of your fellow students further separate into their respective cliques.'
-		'Another of the teachers, who seems to be the only one interested in this ''party'', approaches with a camera. "Happy New Year, guys! Time for some pictures!"' 
-		'He takes several pictures, with one of the whole class, another of just the boys and then one of just the girls. He then takes pictues of groups of friends or mostly, whether he knows it or not, of social groups.' 
+		'Another of the teachers, who seems to be the only one interested in this ''party'', approaches with a camera. "Happy New Year, guys! Time for some pictures!"'
+		'He takes several pictures, with one of the whole class, another of just the boys and then one of just the girls. He then takes pictues of groups of friends or mostly, whether he knows it or not, of social groups.'
 		'The next half hour passes by very slowly before the teachers walk over. "Happy New Year guys, but we need to go home. How about you guys help us clean up?" one of them asks.'
 		act 'Help clear the table':
 			*clr & cla
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 
 				act 'I came for cock':
 					cla
-					'You smile at him. "I was hoping to find some cock to suck, you know where I might find one?"' 
+					'You smile at him. "I was hoping to find some cock to suck, you know where I might find one?"'
 					'He blinks, apparently taking a second to process what you just said before he smiles and grabs you by the arm, dragging you off towards the boys locker room. "Then come on, slut! I''ll give you all the cock you can handle!"'
 					act 'Go to the locker room': gt 'nyp_school', 'slut'
 				end
@@ -74,9 +74,9 @@ if $ARGS[0] = 'start':
 						'Vasily has already let go of you and bravely - or stupidly - lunged for Albina. "What did you call me, you buttslut whore!? You want me to fuck you instead!?"'
 						'Albina, with lightning-fast reflexes, delivers a swift yet brutal kick to his crotch, causing the howling Vasily to fall to the floor. Albina then squats down beside him as he rolls back and forth in pain. "Leave <<$pcs_nickname>> alone or you''ll do more than regret getting on my bad side."'
 						*nl
-						'Vasily curls into a ball on the floor, nursing the pain in his crotch. Either he didn''t hear her or he doesn''t know when to stop, because the next thing he utters between incoherent moans of pain is clearly "Fuck you, you dirty anal-loving whore!"' 
+						'Vasily curls into a ball on the floor, nursing the pain in his crotch. Either he didn''t hear her or he doesn''t know when to stop, because the next thing he utters between incoherent moans of pain is clearly "Fuck you, you dirty anal-loving whore!"'
 						'Albina stands up and proceeds to viciously stomp on his crotch before painfully twisting her heel into him. "You''re testing my patience! Do you want me to burst your little balls in front of everyone?"'
-						'Vasily squeals pathetically in pain. "No! I''m sorry, I''m sorry! Just please, stop!"' 
+						'Vasily squeals pathetically in pain. "No! I''m sorry, I''m sorry! Just please, stop!"'
 						*nl
 						'Albina looks at you. "You better leave before somebody sees you, <<$pcs_nickname>>. With what people already think of you, you really don''t want them to think you did this."'
 						'Several of the other students are howling in laughter at Vasily''s humiliating misfortune, but more than a few take another look at you and seem to see you a little differently thanks to Albina coming to your aid. Seeing that you''re not going to be left alone, you safely slip out while everyone is distracted by Vasily and Albina.'
@@ -117,7 +117,7 @@ if $ARGS[0] = 'start':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/forceddrink.jpg"></center>'
 							'You shake your head. "No thanks."'
-							'"I don''t think you understand, <<$pcs_nickname>>," Dan replies. "We <i>weren''t</i> asking."' 
+							'"I don''t think you understand, <<$pcs_nickname>>," Dan replies. "We <i>weren''t</i> asking."'
 							'You feel someone grab your hair and pull your head back while Dan grabs your chin and forces your mouth open. Someone then pours vodka into your mouth. You try to spit some out, but once your mouth is full, Dan forces your mouth closed. He then covers your mouth with his hand and pinches your nose closed, forcing you to swallow or drown. After repeating this several times, you''re so drunk that you can barely stand.'
 							minut += 10
 							gs 'drugs', 'alcohol', 'vodka', 1
@@ -127,7 +127,7 @@ if $ARGS[0] = 'start':
 						end
 					else
 						act 'Refuse the drink (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end	
+					end
 				end
 			else
 				act 'Drink some juice':
@@ -169,7 +169,7 @@ if $ARGS[0] = 'cool jocks':
 		pl '<a href="exec: music_on = 1 & gt ''nyp_school'', ''cool jocks''">Play music</a>'
 	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'
-	'The next half hour passes by very slowly and is uneventful. The boys gather in a group together and talk about whatever it is boys talk about, most likely the girls. The girls mill around in a group and discuss the problems with makeup and skin care. Everyone grabs a drink just to feel a little buzz, with no one wanting to get too drunk.' 
+	'The next half hour passes by very slowly and is uneventful. The boys gather in a group together and talk about whatever it is boys talk about, most likely the girls. The girls mill around in a group and discuss the problems with makeup and skin care. Everyone grabs a drink just to feel a little buzz, with no one wanting to get too drunk.'
 	'Andrey and Stasya spend the whole time dancing together while some of the other girls occasionally agree to dance with one of the boys or often dance in a group.'
 	if fedorKozlovQW >= 10:
 		'As you''re hanging out and chatting with the girls, Fedor walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
@@ -177,21 +177,21 @@ if $ARGS[0] = 'cool jocks':
 		act 'Don''t dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
-			'You slightly lower your head. "I''d love to, but I''m really tired and just want to chat with my friends. Maybe next time?"' 
-			'Fedor looks at the floor. "Alright, I didn''t mean to interrupt your chat. I''ll just go..."' 
-			'Feeling bad, you give him a smile and plant a soft kiss on his cheek. "Awww, don''t give me that sad puppy face. How about a kiss instead?"' 
+			'You slightly lower your head. "I''d love to, but I''m really tired and just want to chat with my friends. Maybe next time?"'
+			'Fedor looks at the floor. "Alright, I didn''t mean to interrupt your chat. I''ll just go..."'
+			'Feeling bad, you give him a smile and plant a soft kiss on his cheek. "Awww, don''t give me that sad puppy face. How about a kiss instead?"'
 			'He chuckles before nodding and giving you a passionate kiss. "Alright <<$pcs_nickname>>, have a good time and I''ll see you later." You wave at him as he walks away.'
 			act 'Hang out until the party ends': gt 'nyp_school', 'end'
 		end
 
 		act 'Dance with him':
-			cla & *clr 
+			cla & *clr
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></center>'
-			'You place your hand on top of Fedor''s. "I''d love to dance with you."' 
+			'You place your hand on top of Fedor''s. "I''d love to dance with you."'
 			'Fedor gives your hand a light kiss as he wraps his arm around your waist and pulls you toward him. You give him a smile as you both start swaying to the music, feeling Fedor''s strong arm around your waist keeping your sway in sync with his as you both stare into each other''s eyes.'
 			'You lean forward and give him a gentle, loving kiss, enjoying the warmth of his lips pressed against yours as he firmly holds you close to him. The kiss lasts for what feels like a minute before you slowly break it off and continue dancing slowly to the music while staring directly into Fedor''s eyes.'
 			act 'Dance until the party ends':
-				cla & *clr 
+				cla & *clr
 				minut += 30
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
@@ -219,7 +219,7 @@ if $ARGS[0] = 'cool jocks':
 		act 'Dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/igordance.jpg"></center>'
-			'"Of course," you smile. "I''d love to dance with you."' 
+			'"Of course," you smile. "I''d love to dance with you."'
 			'He takes you by the hand and leads you out onto the dance floor. Some songs are fast and get you both really moving around while others are slow, in which case you slow dance together. You really enjoying dancing in front of everyone with your boyfriend.'
 
 			act 'Dance until the party ends':
@@ -251,7 +251,7 @@ if $ARGS[0] = 'cool jocks':
 		act 'Dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/marcusdance.jpg"></center>'
-			'"Of course," you smile. "I''d love to dance with you."' 
+			'"Of course," you smile. "I''d love to dance with you."'
 			'He takes you by the hand and leads you out onto the dance floor. Some songs are fast and get you both really moving around while others are slow, in which case you slow dance together. You really enjoying dancing in front of everyone.'
 
 			act 'Dance until the party ends':
@@ -286,7 +286,7 @@ if $ARGS[0] = 'cool jocks':
 		act 'Dance with her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/katjadance.jpg"></center>'
-			'"Of course," you smile. "I''d love to dance!"' 
+			'"Of course," you smile. "I''d love to dance!"'
 			'She takes you by the hand and leads you out onto the dance floor. Before long, Vicky and Vanya join you, Vanya even taking turns dancing with all three of you. Some songs are slower and in those cases you slow dance with Katja, which gets some of the guys hooting and hollering and telling you to make out. You really enjoy dancing in front of everyone with Katja.'
 			act 'Dance until the party ends':
 				*clr & cla
@@ -300,13 +300,13 @@ if $ARGS[0] = 'cool jocks':
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
-			
+
 				act 'Leave': gt 'gschool_grounds', 'main'
 			end
 		end
 	elseif AlbinaQW['Friends'] = 2:
 		'As you''re hanging out and chatting with the girls, Albina strikes up a conversation with you. After a few seconds, she grabs your hand and starts pulling you along. "Come and dance with me, <<$pcs_nickname>>!"'
-		
+
 		act 'Don''t dance with her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -317,7 +317,7 @@ if $ARGS[0] = 'cool jocks':
 
 			act 'Hang out until the party ends': gt 'nyp_school', 'end'
 		end
-		
+
 		act 'Dance with her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa6.jpg"></center>'
@@ -336,11 +336,11 @@ if $ARGS[0] = 'cool jocks':
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
-			
+
 				act 'Leave': gt 'gschool_grounds', 'main'
 			end
 		end
-			
+
 		!!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
 	else
 		*clr
@@ -435,7 +435,7 @@ if $ARGS[0] = 'nerds':
 				'Feofan, who you assume is the leader, tries his hardest to avoid looking you in the eyes while the others try to avoid making any sound at all.'
 				*nl
 				'You''re a little annoyed by the silent response. "What? Before I arrived, you guys wouldn''t shut up and now you won''t talk. What''s so unreasonable about what she wants?"'
-				'Feofan sighs and takes a deep breath. "S-Sorry <<$pcs_nickname>>, b-but this game is really immersive and we enjoy it quite a lot. It''s not that we don''t want to talk about the other stuff, it''s just... Who cares?"' 
+				'Feofan sighs and takes a deep breath. "S-Sorry <<$pcs_nickname>>, b-but this game is really immersive and we enjoy it quite a lot. It''s not that we don''t want to talk about the other stuff, it''s just... Who cares?"'
 				'You give him a silent look over and keep staring at him until he continues. "Anyway, we''re just passionate and get caught up in the moment is all."'
 				minut += 5
 				gs 'stat'
@@ -710,7 +710,7 @@ if $ARGS[0] = 'gopniks':
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	act 'Get high':
 		cla & *clr
@@ -793,7 +793,7 @@ if $ARGS[0] = 'gopniks':
 					end
 				else
 					act 'Have second thoughts (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 			end
 		end
 		gs 'willpower', 'drugs', 'resist'
@@ -812,7 +812,7 @@ if $ARGS[0] = 'gopniks':
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	act 'Pick on someone':
 		cla & *clr
@@ -869,7 +869,7 @@ if $ARGS[0] = 'gopniks':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/pack.jpg"></center>'
 							'"Drop your pants! Let''s see that tiny cock of yours!" Vitek yells out. "You have a hard-on for my sister? Haven''t you heard what I do to people that mess around with her?" Vitek presses on.'
 							'Petia tries to reason with Vitek. "B-But I didn''t do anything! It was her that came on to me!"'
-							'"Are you calling my sister a liar?!" he angrily asks.' 
+							'"Are you calling my sister a liar?!" he angrily asks.'
 							'"Let me at him!" you hear Roman yell out from behind.'
 							'Lena pats her brother on the back. "That''s enough, he''s probably pissed himself already. Maybe I should touch him down there just to check if it''s wet?"'
 							'They keep picking on him, threatening to beat his ass as you walk away. You can hear Petia sobbing over the threats, having greatly enjoyed yourself.'
@@ -971,7 +971,7 @@ if $ARGS[0] = 'outcast':
 					end
 				else
 					act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 			end
 		end
 	else
@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'outcast':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 					'You try to reason with Vitek and Lena. "Please, just let me go! You''ve made your point!"'
-					'Vitek sighs and lets go of you. "I thought you would put a bigger fight. It''s more fun when you try to squirm away."' 
+					'Vitek sighs and lets go of you. "I thought you would put a bigger fight. It''s more fun when you try to squirm away."'
 					'Lena starts laughing. "Don''t believe her lies! She''s just trying to get away." She walks up to you. "How about you show a little skin for the group?" she says as she grabs hold of your clothes and tries to expose your body.'
 					'You try your hardest to keep Lena at a distance and after a few seconds, she gives up and angirly walks away, pushing away some people standing in the crowd.'
 					'"That''s it! The show is over!" Vitek yells. "Until next time, <<$pcs_nickname>>," he winks.'
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'drink more':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/punch.jpg"></center>'
 	'You refill your cup with some of the spiked juice. Again, it isn''t too bad and tastes slightly better with each swig. You''re starting to feel the effects of the vodka though.'
 	minut += 5
-	alko += 5 
+	alko += 5
 	gs 'stat'
 	if grupTipe = 5:
 		act 'Go stand against the wall alone': gt 'nyp_school', 'outcast'
@@ -1151,4 +1151,3 @@ end
 
 
 --- nyp_school ---------------------------------
-