Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/NikoDates.qsrc

@@ -341,7 +341,7 @@ if $ARGS[0] =  'Date 2':
 						gs'stat'
 						'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-						'You shake your head as you respond, "No way. I''m not that kind of girl. I told you that." Niko get noticeably angry. "Come on <<$pcs_firstname>>. I''m not asking you to donate one of your kidneys. Just give a quick.." You cut him off. "I SAID NO!" Niko grabs your head then begins pushing it toward his crotch, as he says, "Come on <<pcs_nickname>>, it won''t take long.". You quickly pull away then slap him across his face, causing him to pause for a second before he raises his hand then smacks you across the face, as he shouts, "YOU FUCKING UNGRATEFUL BITCH! I have done so much for you, and you toss it in my face. Get the fuck out and swim!" Niko grabs you by the neck, and pushes you off the boat then begins angrily paddling away, as you do your best to swim back to the shore. You arrive at the shore completely drenched, so you hang your clothes on a nearby tree, and wait for it to dry. You take a few seconds to think to yourself, <font color=#FF00FF>What the fuck was his problem!? What a nutjob!</font>'
+						'You shake your head as you respond, "No way. I''m not that kind of girl. I told you that." Niko get noticeably angry. "Come on <<$pcs_firstname>>. I''m not asking you to donate one of your kidneys. Just give a quick.." You cut him off. "I SAID NO!" Niko grabs your head then begins pushing it toward his crotch, as he says, "Come on <<$pcs_nickname>>, it won''t take long.". You quickly pull away then slap him across his face, causing him to pause for a second before he raises his hand then smacks you across the face, as he shouts, "YOU FUCKING UNGRATEFUL BITCH! I have done so much for you, and you toss it in my face. Get the fuck out and swim!" Niko grabs you by the neck, and pushes you off the boat then begins angrily paddling away, as you do your best to swim back to the shore. You arrive at the shore completely drenched, so you hang your clothes on a nearby tree, and wait for it to dry. You take a few seconds to think to yourself, <font color=#FF00FF>What the fuck was his problem!? What a nutjob!</font>'
 						*nl
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/grab.jpg"></center>'
 

locations/anushka.qsrc

@@ -697,7 +697,7 @@ if $ARGS[0] = 'chatWhileWaiting':
 			'You listen and don''t hear anything at all. "No I don''t hear anything."'
 			'She grins at you. "Yeah means the janitor has moved on, so we can head out. Come on lets go." She gets up and heads for the door, she opens it slowly and then looks out both ways checking to see if it is clear. Then she steps out and hurries down the hall, with you just behind her.'
 			*nl
-			'The two of you quickly make your way back to the library, sneaking back in the way you left. Heading back to where you stashed your clothes the two of you start to get dressed again. Just as the two of you get your clothes back on, the bell that signals detention is over starts ringing. She looks at you and smiles. "Perfect timing, as always. See you later <<pcs_nickname>>, unless you want to come over?"'
+			'The two of you quickly make your way back to the library, sneaking back in the way you left. Heading back to where you stashed your clothes the two of you start to get dressed again. Just as the two of you get your clothes back on, the bell that signals detention is over starts ringing. She looks at you and smiles. "Perfect timing, as always. See you later <<$pcs_nickname>>, unless you want to come over?"'
 			'With that the two of you leave school.'
 			act 'Go with Anushka':
 				cla

locations/gschool_lessons.qsrc

@@ -1598,7 +1598,7 @@ if $ARGS[0] = 'biology':
 		if RAND(1,4) = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			'Today''s lessons don''t particularly interest you, and you find yourself drifting off constantly. After a while you notice Miss Orlov has stopped teaching and is looking at you intently, asking you to pay attention. Apparently this is already the third time she asked; you missed the first two completely while you was lost in your own thoughts. The whole class is looking at you now.'
-			'"<<pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
+			'"<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass':
 				*clr & cla
 				demerit +=5
@@ -1646,7 +1646,7 @@ if $ARGS[0] = 'biology':
 				'You''re far too tired to pay attention in class today. You don''t even know what the lesson is about, sense you keep dozing off.'
 				'You''re snapped back to consciousness when you hear Miss Orlov call your name. Everyone is looking at you expectantly, realizing that you were just asked a question about the topic.'
 				*nl
-				'You take your best guess at what they might be asking. Some of the other kids snicker when you say something that''s obviously wrong. Miss Orlov tells you the correct answer. "<<pcs_nickname>> you''re a smart girl, I know you know this stuff. You only have to apply yourself and the sky is the limit for you. So please pay attention." She says trying to encourage you.'
+				'You take your best guess at what they might be asking. Some of the other kids snicker when you say something that''s obviously wrong. Miss Orlov tells you the correct answer. "<<$pcs_nickname>> you''re a smart girl, I know you know this stuff. You only have to apply yourself and the sky is the limit for you. So please pay attention." She says trying to encourage you.'
 				'It was an embarrassing experience having everyone staring at you, but the sudden adrenaline surge helps you to stay awake during the rest of the period.'
 			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'biology':
 		if RAND(1,4) = 1:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
-			'You hear a feminine throat clearing, you look up and see Miss Orlov looking at you. "Please put your phone away <<pcs_nickname>> and pay attention."'
+			'You hear a feminine throat clearing, you look up and see Miss Orlov looking at you. "Please put your phone away <<$pcs_nickname>> and pay attention."'
 			act 'Put your phone away':
 				*clr & cla
 				grupvalue[4] -=3
@@ -1693,10 +1693,10 @@ if $ARGS[0] = 'biology':
 					pcs_horny += 10
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 					'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Miss Orlov walking towards your desk.'
-					'When Miss Orlov arrives at your desk, she tells you, "Please give me your phone <<pcs_nickname>>, this is important you need to pay attention."'
+					'When Miss Orlov arrives at your desk, she tells you, "Please give me your phone <<$pcs_nickname>>, this is important you need to pay attention."'
 					'You hand over your phone, the screen still on, with the last picture you took still on the screen of the phone.'
 					*nl
-					'Miss Orlov looks at what''s on the screen and she blushes deep red, quickly turning your phone off. She walks back to the head of class and takes a moment to compose herself. She then continues the lesson telling you, "I''m holding onto your phone for now, <<pcs_nickname>>. You can have it back after class."'
+					'Miss Orlov looks at what''s on the screen and she blushes deep red, quickly turning your phone off. She walks back to the head of class and takes a moment to compose herself. She then continues the lesson telling you, "I''m holding onto your phone for now, <<$pcs_nickname>>. You can have it back after class."'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 				end
 				act 'Put the phone between your boobs':
@@ -1922,7 +1922,7 @@ if $ARGS[0] = 'science':
 		if RAND(1,4) = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			'Today''s lessons don''t particularly interest you, and you find yourself drifting off constantly. After a while you notice Miss Orlov has stopped teaching and is looking at you intently, asking you to pay attention. Apparently this is already the third time she asked; you missed the first two completely while you was lost in your own thoughts. The whole class is looking at you now.'
-			'"<<pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
+			'"<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass.':
 				*clr & cla
 				demerit +=5
@@ -1970,7 +1970,7 @@ if $ARGS[0] = 'science':
 				'You''re far too tired to pay attention in class today. You don''t even know what the lesson is about, sense you keep dozing off.'
 				'You''re snapped back to consciousness when you hear Miss Orlov call your name. Everyone is looking at you expectantly, realizing that you were just asked a question about the topic.'
 				*nl
-				'You take your best guess at what they might be asking. Some of the other kids snicker when you say something that''s obviously wrong. Miss Orlov tells you the correct answer. "<<pcs_nickname>> you''re a smart girl, I know you know this stuff. You only have to apply yourself and the sky is the limit for you. So please pay attention." She says trying to encourage you.'
+				'You take your best guess at what they might be asking. Some of the other kids snicker when you say something that''s obviously wrong. Miss Orlov tells you the correct answer. "<<$pcs_nickname>> you''re a smart girl, I know you know this stuff. You only have to apply yourself and the sky is the limit for you. So please pay attention." She says trying to encourage you.'
 				'It was an embarrassing experience having everyone staring at you, but the sudden adrenaline surge helps you to stay awake during the rest of the period.'
 			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
@@ -1997,7 +1997,7 @@ if $ARGS[0] = 'science':
 		if RAND(1,4) = 1:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
-			'You hear a feminine throat clearing, you look up and see Miss Orlov looking at you. "Please put your phone away <<pcs_nickname>> and pay attention."'
+			'You hear a feminine throat clearing, you look up and see Miss Orlov looking at you. "Please put your phone away <<$pcs_nickname>> and pay attention."'
 			act 'Put your phone away':
 				*clr & cla
 				grupvalue[4] -=3
@@ -2017,10 +2017,10 @@ if $ARGS[0] = 'science':
 					pcs_horny += 10
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 					'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Miss Orlov walking towards your desk.'
-					'When Miss Orlov arrives at your desk, she tells you, "Please give me your phone <<pcs_nickname>>, this is important you need to pay attention."'
+					'When Miss Orlov arrives at your desk, she tells you, "Please give me your phone <<$pcs_nickname>>, this is important you need to pay attention."'
 					'You hand over your phone, the screen still on, with the last picture you took still on the screen of the phone.'
 					*nl
-					'Miss Orlov looks at what''s on the screen and she blushes deep red, quickly turning your phone off. She walks back to the head of class and takes a moment to compose herself. She then continues the lesson telling you, "I''m holding onto your phone for now, <<pcs_nickname>>. You can have it back after class."'
+					'Miss Orlov looks at what''s on the screen and she blushes deep red, quickly turning your phone off. She walks back to the head of class and takes a moment to compose herself. She then continues the lesson telling you, "I''m holding onto your phone for now, <<$pcs_nickname>>. You can have it back after class."'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end
 				act 'Put the phone between your boobs':

locations/nyp_school.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'start':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/forceddrink.jpg"></center>'
 						'You shake your head no. "No thinks guys."'
-						'One of them snorts, while Dan says. "I don''t think you understand <<pcs_nickname>> we wasn''t asking." You feel someone grab your hair and pull your head back. While Dan grabs your chin and forces your mouth open, while someone pours vodka into your mouth. You try to spit some out, but once your mouth is full, Dan forces your mouth closed. Then covers your mouth with his hand and pinches your nose closed, forcing you to swallow or drown. After several times of this, you are so drunk you can barely stand.'
+						'One of them snorts, while Dan says. "I don''t think you understand <<$pcs_nickname>> we wasn''t asking." You feel someone grab your hair and pull your head back. While Dan grabs your chin and forces your mouth open, while someone pours vodka into your mouth. You try to spit some out, but once your mouth is full, Dan forces your mouth closed. Then covers your mouth with his hand and pinches your nose closed, forcing you to swallow or drown. After several times of this, you are so drunk you can barely stand.'
 						minut += 10
 						alko += 5
 						gs 'stat'

locations/pavComplex.qsrc

@@ -381,7 +381,7 @@ if $ARGS[0] = 'garages':
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/val6.jpg"></center>'
 													'He starts grunting as he fucks your ass and suddenly pulls out of you. He stands up and pulls you up to your knees, turning to face him. As you do, he is already jerking off and within moments warm cum starts spurting out of his dick and covering your tits in sperm. After a couple of more spurts of cum, the spray stops and he moans a sigh of relief.'
 													*nl
-													'He grins down at your cum covered tits grinning at his handy work. Then he cleans himself up and gets dressed as you do the same. Once you are both fully dressed again, he turns to you. "Thanks <<pcs_nickname>> I needed that, but I should get back to work on my bike. Talk to you tomorrow at school kay." Then he starts working on his bike again. You take one last look around to make sure you didn''t forget anything and leave.'
+													'He grins down at your cum covered tits grinning at his handy work. Then he cleans himself up and gets dressed as you do the same. Once you are both fully dressed again, he turns to you. "Thanks <<$pcs_nickname>> I needed that, but I should get back to work on my bike. Talk to you tomorrow at school kay." Then he starts working on his bike again. You take one last look around to make sure you didn''t forget anything and leave.'
 													gs 'arousal', 'foreplay', 10, 'unknown'
 													gs 'cum_call', 'breasts', $boy, 1
 													gs 'arousal', 'end'

locations/qwBarEncounters.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = '':
 			*nl
 			'You watch in silence as the three of them exchange a few more insults before the two older guys gather their things and finally leave. Jaska grabs his glass and finishes off the last bit of alcohol before making his way over to you. He leans against the pool table and looks you up and down. He’s close enough that you can smell a mixture of alcohol, cigarette and a hint of musk.'
 			'"I don’t think I’ve seen you around here before," he says after a moment, "What’s your name?"'
-			'"<<pcs_nickname>>," you tell him.'
+			'"<<$pcs_nickname>>," you tell him.'
 			'"Right. Well, I’m Jaska, if you didn’t already know." He laughs ruefully, "So, you ever play pool?" You shake your head and Jaska’s face lights up a bit. "Then how about I teach you," he suggests, not really asking as much as telling you.'
 
 			if pcs_billiard < 10: