Merge remote-tracking branch 'Violet_Kitten/master'

locations/NikoDreams.qsrc

@@ -485,7 +485,7 @@ if $ARGS[0] =  'Classroom Dream':
 			act 'Move closer':	
 				*clr & cla
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/blowjob1.gif"></center>'
+				'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob1.mp4"></video></center>'
 				'As soon as you get close the teacher grabs you then pushes you onto your knees. He pushes his penis against your lips and says, "Open up, for your reward." You open your mouth, allowing his penis to enter. You begin sucking his dick eagerly, for what feels like a few minutes before he grabs your waist then lifts you up, dropping you on top of his desk.' 
 
 				act 'See what he does':	

locations/NikoEv2.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] =  'Lunch Chat':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color=#9b5800><<"Petia Alkaev">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/159.jpg"></center>'
 			'As soon as you enter the locker room, you see Petia Alkaev waiting for you. Niko says, "Here she is." Petia responds, "I heard some things about you <<$pcs_nickname>>. Are they true?" You lower your head then ask, "What have you heard?" Petia replies, "I heard that you are Niko''s whore and that you do anything Niko tells you too. At least that is what Niko said." You look to Niko, who has a wide smile on his face. Niko nods to you, "No need to be shy <<$pcs_nickname>>, tell him." You lower your head again then say, "Yes it''s true." Niko responds, "What''s true?" with a confident smile on his face.' 
 
 			act 'Tell them':	
@@ -606,14 +606,14 @@ if $ARGS[0] =  'Diner 1':
 		act 'Continue':	
 			*clr & cla
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
 			'The biker responds, "Of course I''m not interested because I''m not a fucking faggot!" Niko pauses for a second then bursts into laughter. "Oh  no. i didn''t mean....I meant my girl here, will take care of you...for a price of course." The biker chuckles for a few seconds before responding. "I see now. I thought you were hitting on me, kid. You''re lucky you weren''t, but let me take a look at her."'
 			
 			act 'Let the biker examine you':	
 				*clr & cla
 				minut += 5
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
 				'You step forward then wait to see what the biker will do. The biker begins looking you up and down then asks Niko, "Can I touch her a bit? I just want to make sure that she isn''t hiding anything down there." The biker points toward your vagina. Niko chuckles, "Fine, make it quick." The biker begins rubbing on your vagina, for a few seconds before saying, "I''m interested. How much?" Niko responds, "2000 <b>₽</b>" the biker scratches his beard as he replies, "She better be real good, for that price."' 
 				*nl
 				'Niko replies, "She certainly is." the biker responds, "So you say, but what guarantee do I have that you are telling the truth? She could be a breathing blow up doll, for all I know." Niko responds, "How about this, For this time only, you can use her now then pay me afterward? Doesn''t that sound fair?" The biker nods, "You have yourself a deal. Come on girl, we''re doing this in the bathroom." The man grabs you by your arm then leads you to the restroom, where he takes off his pants then points to his dick as he says, "Alright girl, get to work."'
@@ -640,7 +640,7 @@ if $ARGS[0] =  'Diner 1':
 							*clr & cla
 							minut += 5
 							gs'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
 							'You see the biker shake hands with Niko then give him the money. Niko counts the money then gives the biker an approving nod before the biker takes his seat again. Niko turns to you and says, "Good job <<$pcs_nickname>>. We are making some good progre..."' 
 							
 							act 'Turn around':	

locations/NikoSlut.qsrc

@@ -1434,33 +1434,32 @@ if $ARGS[0] = 'Wash':
 end
 
 if $ARGS[0] = 'Diner Exit':
-	*clr & cla
+	cls
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/interior2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/Interior2.jpg"></center>'
 	'You look around the diner and notice that everyone has left. Niko turns to you then says, "I guess we''re done for the day. Great work." Niko then leads you out of the diner.'
 
 	if NikoEv = 19:
 		act 'Leave Diner':gt 'NikoEv2', 'Diner Exit 2'
-	else
+	else	
 		act 'Leave Diner':
-			*clr & cla
+			cls
 			minut += 15
 			if NikoSlut = 2:NikoSlut = 1
 			if NikoSlut < 3:
 				money += NikoProfit * 400
 			else
 				money += NikoProfit * 1000
-			end
+			end	
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/payment.jpg"></center>'
-			'Once you both leave the diner, Niko gives you a kiss on the cheek then says, "You have done some great work today, keep it up." Niko hands you your cut of the profit. He takes your hand in his and starts to walk you home.'
-			act 'Walk home':
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
-				'As you walk back home, the two of you chat about various topics. When you reach your apartment build, he opens the door for you and then walks you up the stairs. Once at your door, Niko gives you a soft passionate kiss then he turns around and walks away. You watch him until he is out of sight walking down the stairs and then go into your apartment.'
-				act 'Wave goodbye':NikoProfit = 0 & gt 'korrPar'
-			end
+			'Once you both leave the diner, Niko gives you a kiss on the cheek then says, "You have done some great work today. Keep it up." Niko hands you your cut of the profit then walks you back home while chatting with you about various topics. When you reach your apartment, Niko gives you a soft kiss then he turns around and walks away.'	
+			*nl
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.gif"></center>'
+			
+			act 'Wave goodbye':NikoProfit = 0 & gt 'korrPar'
 		end
-	end
+	end	
 end
 
 --- NikoSlut ---------------------------------

locations/NikoWhore.qsrc

@@ -180,6 +180,8 @@ if $ARGS[0] = 'Locker Room':
 																*clr & cla
 																inhib_exp += 2
 																gs'stat'
+																'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+																*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'										
 																'Your heart is pounding and you can feel tears streaming down your eyes. <font color=#FF00FF>I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!</font> You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
 																*nl
 																if fedorkozlovQW > 1 or fedorKozlovQW < -10:

locations/gschool_lunch.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'cafeteria':
 		elseif NikoVolkovQW = 10 and NikoEv = 13 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat'
-		elseif NikoVolkovQW = 10 and NikoEv = 14 and NikoDate_Day ! daystart:
+		elseif NikoVolkovQW = 10 and NikoEv = 15 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat 2'
 		elseif NikoVolkovQW = 10 and NikoEv = 21 and NikoDate_Day ! daystart: