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

locations/andrey.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = '':
 		gs 'andrey', 'regular'
 	elseif hour >= 20 or (week > 5 and hour >= 16):
 		msg '<center>Andrew M. Sobulyagin says goodbye and leaves. His workday has ended.</center>'
-		gt 'pussykats', 'start'
+		gt 'shop_pussycats', 'start'
 	end
 
 	if young_shop_miss >= 3:
@@ -35,7 +35,7 @@ if $ARGS[0] = 'apply':
 	*nl
 	'You knock on the door, and someone calls you in from the other side, "You can enter." After you enter, you''re greeted by the sight of a sour-faced older man reading papers at his desk. When he sees you, his expression hardens. "Surprised to see an old man managing a clothing store for teenage girls?" he grunts. You didn''t even say anything yet, but he doesn''t seem to care. "Yeah, I get that a lot...," he adds under his breath before sighing and looking back to his papers. "What do you need?"'
 
-	act 'Leave':gt 'pussykats', 'start'
+	act 'Leave':gt 'shop_pussycats', 'start'
 	act 'Mention the for hire sign':
 		minut += 5
 		cla
@@ -48,7 +48,7 @@ if $ARGS[0] = 'apply':
 		*nl
 		'He seems to have found what he was looking for, which is the employment documents, "You''ll need to sign these to start work here." He holds them out to you, "So, are you interested?"'
 
-		act 'Don''t take the job':gt 'pussykats', 'start'
+		act 'Don''t take the job':gt 'shop_pussycats', 'start'
 
 		if ((work = 0 and young_shop_work = 0 and cheatWork = 0) or (young_shop_work = 0 and cheatWork = 1)):
 			*nl
@@ -61,7 +61,7 @@ if $ARGS[0] = 'apply':
 				*nl
 				'You find the conditions suitable, and without batting an eye, you sign the documents.'
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
-				act 'Continue': gt 'pussykats', 'start'
+				act 'Continue': gt 'shop_pussycats', 'start'
 			end
 			act 'Take the weekend job':
 				cla
@@ -70,7 +70,7 @@ if $ARGS[0] = 'apply':
 				*nl
 				'You find the conditions suitable, and without batting an eye, you sign the documents.'
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
-				act 'Continue': gt 'pussykats', 'start'
+				act 'Continue': gt 'shop_pussycats', 'start'
 			end
 !!			act 'Take the full time job':
 !!				cla
@@ -80,7 +80,7 @@ if $ARGS[0] = 'apply':
 !!				*nl
 !!				'You find the conditions suitable and without batting an eye you sign the documents.'
 !!				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 09:00.'
-!!				act 'Continue': gt 'pussykats', 'start'
+!!				act 'Continue': gt 'shop_pussycats', 'start'
 !!			end
 		end
 	end
@@ -116,10 +116,10 @@ if $ARGS[0] = 'regular':
 !! reset money,young_shop_salary,young_shop_bonus to zero for a new week
 			young_shop_salary = 0
 			young_shop_bonus = 0
-			gt 'pussykats', 'start'
+			gt 'shop_pussycats', 'start'
 		end
 	else
-		act 'Leave':gt 'pussykats', 'start'
+		act 'Leave':gt 'shop_pussycats', 'start'
 	end
 
 	act 'Resign':
@@ -136,7 +136,7 @@ if $ARGS[0] = 'regular':
 			*nl
 			'"Actually, I''d like to think about this a bit more..." You say as you''re moving back towards the door. "Sorry for bothering you Mr. Sobulyagin."'
 			'He shakes his head. "It''s fine, but if there''s nothing else, I''m busy right now."'
-			act 'Leave':gt 'pussykats', 'start'
+			act 'Leave':gt 'shop_pussycats', 'start'
 		end
 		act 'Persist':
 			if young_shop_work = 1:young_shop_work = 3
@@ -158,9 +158,9 @@ if $ARGS[0] = 'regular':
 				! reset money,young_shop_salary,young_shop_bonus to zero for a new week
 				young_shop_salary = 0
 				young_shop_bonus = 0
-				gt 'pussykats', 'start'
+				gt 'shop_pussycats', 'start'
 			end
-			act 'Leave':gt 'pussykats', 'start'
+			act 'Leave':gt 'shop_pussycats', 'start'
 		end
 	end
 end
@@ -200,7 +200,7 @@ if $ARGS[0] = 'punish':
 			end
 			act 'Leave':
 				minut += 2
-				gt 'pussykats', 'start'
+				gt 'shop_pussycats', 'start'
 			end
 		end
 		act 'Beg to keep your job':
@@ -223,7 +223,7 @@ if $ARGS[0] = 'punish':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
-					gt 'pussykats', 'start'
+					gt 'shop_pussycats', 'start'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -265,7 +265,7 @@ if $ARGS[0] = 'punish':
 				end
 				act 'Leave':
 					minut += 2
-					gt 'pussykats', 'start'
+					gt 'shop_pussycats', 'start'
 				end
 			end
 		else
@@ -315,7 +315,7 @@ if $ARGS[0] = 'punish':
 				end
 				act 'Leave':
 					minut += 2
-					gt 'pussykats', 'start'
+					gt 'shop_pussycats', 'start'
 				end
 			end
 		else
@@ -327,20 +327,20 @@ if $ARGS[0] = 'punish':
 	if cheatWork = 1:
 		act 'Reset missed days (Cheat)':
 			young_shop_miss = 0
-			gt 'pussykats', 'start'
+			gt 'shop_pussycats', 'start'
 		end
 
 		if cheatWorkKiskis = 0:
 			act 'Disable missed days (Cheat)':
 				cheatWorkKiskis = 1
 				young_shop_miss = 0
-				gt 'pussykats', 'start'
+				gt 'shop_pussycats', 'start'
 			end
 
 		elseif cheatWorkKiskis = 1:
 			act 'Enable missed days (Cheat)':
 				cheatWorkKiskis = 0
-				gt 'pussykats', 'start'
+				gt 'shop_pussycats', 'start'
 			end
 		end
 	end
@@ -380,14 +380,14 @@ if $ARGS[0] = 'beg':
 					'"I know I let you do that when I worked for you before" you tell him, "but I''m not going to start doing that again.'
 				end
 				'"Fine then there''s the door," Mr. Sobulyagin snaps clearly upset with your answer.'
-				act 'Leave':gt 'pussykats', 'start'
+				act 'Leave':gt 'shop_pussycats', 'start'
 			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
 		act 'Agree': gt 'andrey', 'rehired'
 	end
-	act 'Leave':gt 'pussykats', 'start'
+	act 'Leave':gt 'shop_pussycats', 'start'
 end
 
 
@@ -407,17 +407,17 @@ if $ARGS[0] = 'reapply':
 			young_shop_work = 1
 			minut += 5
 			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
-			gt 'pussykats', 'start'
+			gt 'shop_pussycats', 'start'
 		end
 		act 'Accept work during the weekend':
 			young_shop_work1 = 1
 			minut += 5
 			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
-			gt 'pussykats', 'start'
+			gt 'shop_pussycats', 'start'
 		end
-		act 'Leave':gt 'pussykats', 'start'
+		act 'Leave':gt 'shop_pussycats', 'start'
 	end
-	act 'Leave':gt 'pussykats', 'start'
+	act 'Leave':gt 'shop_pussycats', 'start'
 end
 
 if $ARGS[0] = 'fired1':
@@ -476,7 +476,7 @@ if $ARGS[0] = 'fired1':
 						'"You did very well, <<$pcs_nickname>>! You''ve shown me how hard of a worker you are and how badly you want this job, so I''ll give you another chance." As he zips up his pants you look up to see him smiling down at you. "You''ve done enough for today, so you''re free to go home if you want. Just make sure to not miss work anymore!" With these words he walks out of the office leaving you to put yourself in order.'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':gt 'pussykats', 'start'
+						act 'Leave':gt 'shop_pussycats', 'start'
 					end
 				end
 			end
@@ -558,7 +558,7 @@ if $ARGS[0] = 'fired2':
 							'"Thank you very much," You say while trying your hardest to keep a smile on your face.'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':gt 'pussykats', 'start'
+							act 'Leave':gt 'shop_pussycats', 'start'
 						end
 					end
 				end
@@ -641,7 +641,7 @@ if $ARGS[0] = 'rehired':
 							'"Thank you very much," You say trying your hardest to keep a smile on your face.'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':gt 'pussykats', 'start'
+							act 'Leave':gt 'shop_pussycats', 'start'
 						end
 					end
 				end

locations/gschool_cheerleading.qsrc

@@ -637,7 +637,7 @@ if $ARGS[0] = 'shower':
 					'You are kneeling between Christina''s legs, desperately looking for a way out. "Nobody is coming to help you bitch, so you might as well just get this over with!" Christina barks when she notices your reluctance. Growing impatient, she grabs you by the hair and is about to force your head into her crotch when the door slams open and Albina storms in.
 					"Just what the FUCK do you think you''re doing!!!?" she screams. "I thought I told you this little game of yours was supposed to stop?" Christina just laughs. "You''re like a chihuahua when you get angry, you know that? Just ''yap yap yap.''" she says while making a mocking motion with her hand. "Am I not allowed to have a little fun? What''s the harm in initiating the new girl?"'
 
-					'Albina scoffs. "A LITTLE FUN?! I was late to practice when Karine joined and you convinced her she needed to tit fuck the coach to be allowed on the squad! Now you''re wanting <<$pcs_nickanme>> to go down on you?!" She kneels down next to you and stares straight at Christina. "I know why you volunteered to go with Karine. You wouldn''t want to lose your chance at the championships if the principal were to find out now would you?"
+					'Albina scoffs. "A LITTLE FUN?! I was late to practice when Karine joined and you convinced her she needed to tit fuck the coach to be allowed on the squad! Now you''re wanting <<$pcs_nickname>> to go down on you?!" She kneels down next to you and stares straight at Christina. "I know why you volunteered to go with Karine. You wouldn''t want to lose your chance at the championships if the principal were to find out now would you?"
 					Christina laughs back in Albina''s face. "Nobody would believe you. Why are you even here anyway? Shouldn''t you be having your Starlets give the ''star'' treatment?" she says with a wide grin.
 					Albina clenches her fists hard. "GET THE FUCK OUT OF MY FACE!!" Christina smirks and stands. "I''ve got better things to do anyways." she quips.
 					Christina again just laughs as she gets up and starts getting dressed. Albina sits on the bench between the two of you, staring daggers at Christina to the point you think things might actually get violent between them. Thankfully, Christina finishes dressing, but mocks you before she leaves. "Welcome to the squad <<$pcs_firstname>>. Watch out for this little chihuahua though. She bites." she says with more than a hint of contempt in her voice. Once she''s gone, Albina turns to you.
@@ -672,7 +672,7 @@ if $ARGS[0] = 'shower':
 					'You are kneeling between Christina''s legs, desperately looking for a way out. "Nobody is coming to help you bitch, so you might as well just get this over with!" Christina barks when she notices your reluctance. Growing impatient, she grabs you by the hair and is about to force your head into her crotch when the door slams open and Albina storms in.
 					"Just what the FUCK do you think you''re doing!!!?" she screams. "I thought I told you this little game of yours was supposed to stop?" Christina just laughs. "You''re like a chihuahua when you get angry, you know that? Just ''yap yap yap.''" she says while making a mocking motion with her hand. "Am I not allowed to have a little fun? What''s the harm in initiating the new girl?"'
 
-					'Albina scoffs. "A LITTLE FUN?! I was late to practice when Karine joined and you convinced her she needed to tit fuck the coach to be allowed on the squad! Now you''re wanting <<$pcs_nickanme>> to go down on you?!" She kneels down next to you and stares straight at Christina. "I know why you volunteered to go with Karine. You wouldn''t want to lose your chance at the championships if the principal were to find out now would you?"
+					'Albina scoffs. "A LITTLE FUN?! I was late to practice when Karine joined and you convinced her she needed to tit fuck the coach to be allowed on the squad! Now you''re wanting <<$pcs_nickname>> to go down on you?!" She kneels down next to you and stares straight at Christina. "I know why you volunteered to go with Karine. You wouldn''t want to lose your chance at the championships if the principal were to find out now would you?"
 					Christina laughs back in Albina''s face. "Nobody would believe you. Why are you even here anyway? Shouldn''t you be having your Starlets give the ''star'' treatment?" she says with a wide grin.
 					Albina clenches her fists hard. "GET THE FUCK OUT OF MY FACE!!" Christina smirks and stands. "I''ve got better things to do anyways." she quips.
 					Christina again just laughs as she gets up and starts getting dressed. Albina sits on the bench between the two of you, staring daggers at Christina to the point you think things might actually get violent between them. Thankfully, Christina finishes dressing, but mocks you before she leaves. "Welcome to the squad <<$pcs_firstname>>. Watch out for this little chihuahua though. She bites." she says with more than a hint of contempt in her voice. Once she''s gone, Albina turns to you.
@@ -717,7 +717,7 @@ if $ARGS[0] = 'shower':
 					*clr & cla
 					npc_sex[$boy] += 1 & if npc_sex[$boy] = 1: boy += 1
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome1.mp4"></video></center>'
-					'Lazar then stands. "Time to get fucked girls." he says. Albina gets on all fours on the bench. "Get up there beside her <<pcs_nickname>>! I want to see both those asses high in the air!" Lazar orders. You obidiently climb onto the bench next to Albina, who playfully wiggles her ass at Lazar. He gives her ass cheek a good slap in response before pushing his cock into her awaiting pussy. You gasp when his fingers plunge inside your pussy and he starts fingering you. He starts thrusting into Albina and fucks for a few minutes while also fingering you before he pulls out of you both and moves in behind you.' 
+					'Lazar then stands. "Time to get fucked girls." he says. Albina gets on all fours on the bench. "Get up there beside her <<$pcs_nickname>>! I want to see both those asses high in the air!" Lazar orders. You obidiently climb onto the bench next to Albina, who playfully wiggles her ass at Lazar. He gives her ass cheek a good slap in response before pushing his cock into her awaiting pussy. You gasp when his fingers plunge inside your pussy and he starts fingering you. He starts thrusting into Albina and fucks for a few minutes while also fingering you before he pulls out of you both and moves in behind you.' 
 					'You feel the tip of his cock push against your pussy and it slides into your hole. He grabs your hips and starts thrusting in and out of you as Albina leans over and starts kissing you. You spend the next few minutes having Lazar alternate between fucking the two of you while your tongues remain locked together.'
 					gs 'arousal', 'vaginal', 5
 					minut += 5
@@ -807,7 +807,7 @@ if $ARGS[0] = 'shower':
 						*clr & cla
 						npc_sex['$boy'] += 1
 						'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome1.mp4"></video></center>'
-						'Lazar then stands. "Time to get fucked girls." he says. Albina gets on all fours on the bench. "Get up there beside her <<pcs_nickname>>! I want to see both those asses high in the air!" Lazar orders. You obidiently climb onto the bench next to Albina, who playfully wiggles her ass at Lazar. He gives her ass cheek a good slap in response before pushing his cock into her awaiting pussy. You gasp when his fingers plunge inside your pussy and he starts fingering you. He starts thrusting into Albina and fucks for a few minutes while also fingering you before he pulls out of you both and moves in behind you.' 
+						'Lazar then stands. "Time to get fucked girls." he says. Albina gets on all fours on the bench. "Get up there beside her <<$pcs_nickname>>! I want to see both those asses high in the air!" Lazar orders. You obidiently climb onto the bench next to Albina, who playfully wiggles her ass at Lazar. He gives her ass cheek a good slap in response before pushing his cock into her awaiting pussy. You gasp when his fingers plunge inside your pussy and he starts fingering you. He starts thrusting into Albina and fucks for a few minutes while also fingering you before he pulls out of you both and moves in behind you.' 
 						'You feel the tip of his cock push against your pussy and it slides into your hole. He grabs your hips and starts thrusting in and out of you as Albina leans over and starts kissing you. You spend the next few minutes having Lazar alternate between fucking the two of you while your tongues remain locked together.'
 						gs 'arousal', 'vaginal', 5
 						minut += 5

locations/preNT.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] =  '':
 								'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
 								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
 
-								act 'Accept Albert''s offer':gt 'preNT ', 'Ride'
+								act 'Accept Albert''s offer':gt 'preNT', 'Ride'
 
 								act 'Decline Albert''s offer':
 									*clr & cla

locations/torgcentr.qsrc

@@ -12,7 +12,7 @@ $menu_arg = ''
 menu_off = 0
 
 if hour >= 8 and hour <= 20:
-	*p '<center><a href="exec: minut += 3 & gt ''shop_pussykats'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
+	*p '<center><a href="exec: minut += 3 & gt ''shop_pussycats'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
 !! Pussy-Kats - Youth clothing shop
 		*p '   '
 	*p'<a href="exec: minut += 3 & gt ''moncheri'', ''start''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a>'
@@ -76,7 +76,7 @@ else
 end
 
 !!{Old menu
-	*p '<center><a href="exec:gt ''pussykats''">Pussy-Cats</a>'
+	*p '<center><a href="exec:gt ''shop_pussycats''">Pussy-Cats</a>'
 		*p ' - '
 	*p '<a href="exec:gt ''sportShop'', ''start''">Sporting goods store</a>'
 		*p ' - '