Merge remote-tracking branch 'upstream/master'

locations/NikoWhore.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'Exposed':
 				'"Yeah, I''ve seen better looking bitches skulking around in the city allyways." Valentin adds.'
 			end
 		end
-		'"Enough gawking. I''m gonna fuck this bitch!" Arkadi syas while approaching you.'
+		'"Enough gawking. I''m gonna fuck this bitch!" Arkadi says while approaching you.'
 		'"Now that''s what I like to hear." Roman adds.'
 		gs 'arousal', 'flash', 2, 'sub', 'humiliation', 'exhibitionism'
 		gs 'stat'

locations/anushaptbr.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'brotherroom':
 						'Maksim''s voices cracks. "I''m sorry."'
 						'The door closes before you can hear any more, leaving you unable to make out anything beyond muffled sounds.'
 					end
-					act 'Go to Anushka''s room':AnushkaLoc=2&gt'anushapt','anushroom'
+					act 'Go to Anushka''s room':AnushkaLoc=2&gt'anush_bedroom','anushroom'
 				end	
 			end
 		end
@@ -387,7 +387,7 @@ if $ARGS[0] = 'rematch':
 					'Instantly, Anushka eases up, and her anger seems to melt away. "Some other time squirt." she says to him with a smile and ruffles his hair, much to his annoyance.'
 					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
 				end
-				act 'Go to Anushka''s room':AnushkaLoc=2&gt'anushapt','anushroom'
+				act 'Go to Anushka''s room':AnushkaLoc=2&gt'anush_bedroom','anushroom'
 			end	
 		end
 	else
@@ -441,7 +441,7 @@ if $ARGS[0] = 'rematch':
 					'Instantly, Anushka eases up, and her anger seems to melt away. "Some other time squirt." she says to him with a smile and ruffles his hair, much to his annoyance.'
 					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
 				end
-				act 'Go to Anushka''s room':AnushkaLoc=2&gt'anushapt','anushroom'
+				act 'Go to Anushka''s room':AnushkaLoc=2&gt'anush_bedroom','anushroom'
 			end
 		end
 	end

locations/bbgameout.qsrc

@@ -520,7 +520,7 @@ if $ARGS[0] = 'mixed':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/146.jpg"></center>'
 			'Marcus ponders for a second before smiling. "Okay, I''m in. So who am I playing with?"'
 			'"With <<$rand_girl>> and I," you respond.'
-			'"Cool, let''s win this." he syas with a confident smile and walks over.'
+			'"Cool, let''s win this." he says with a confident smile and walks over.'
 			
 			act 'Give it your best':
 				*clr & cla

locations/booty_call_shower.qsrc

@@ -680,7 +680,7 @@ if $ARGS[0] = 'after_shower_together':
 						*nl
 						'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 					else
-						'You look at him and your expression syas everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
+						'You look at him and your expression says everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 					end
 					act'Fuck':gt'booty_call_shower', 'after_shower_sex1'
 				end

locations/city_center.qsrc

@@ -98,8 +98,8 @@ gs 'music_actions', 'music_icon'
 
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-act 'Walk to the central park (035)': minut += 35 & gt 'city_park', 'start'
-act 'Walk to the train station (005)': minut += 5 & gt 'city_train', 'start'
+act 'Walk to the central park (0:35)': minut += 35 & gt 'city_park', 'start'
+act 'Walk to the train station (0:05)': minut += 5 & gt 'city_train', 'start'
 if hour = 4 and hour = 23:
 	act 'Walk to the Metro':  minut += 5 & gt 'metro', 'start'
 end

locations/hunter_favors.qsrc

@@ -717,7 +717,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 								gs 'stat'
 
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/nighttime_entertainment/buk_1.jpg"></center>'
-								'It does not take long before Andrei reaches his climax, ejaculating all over your face and hair.'
+								'It''s not long before Andrei climaxes, ejaculating over your face and hair.'
 								gs	'cum_call', 'face', 'A172', 1
 
 								act 'Continue':

locations/lezbsex.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'startloverhome':
 	minut += 15
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/lezbsexhome.jpg"></center>'
 
-	'You spend some time with <<$loverdesc[lover_number]>> in the kitchen when she begins to get impatient and starts caressing you.'
+	'You spend some time with <<$loverdesc[lover_number]>> in the kitchen when she gets impatient and caresses you.'
 	act 'Kiss her back and take her to the bedroom':
 		loverrelation[lover_number] += 2
 		gt 'lezbsex', 'start'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'ukuni':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/ukuni<<picrand>>.jpg"></center>'
-	'You begin by kissing her breasts, moving gradually down her body, lower and lower until you are facing her pussy. You start by gently caressing her swollen lips with up and down tongue lapping, up and down the swollen mound and moist slit, and getting ready to focus the tip of your tongue directly on her clitoris.  You part her outer lips with your fingers, spreading her pouty inner lips giving you full access to her puffy pink clitoris.'
+	'You begin by kissing her breasts, moving gradually down her body, lower and lower, until you are facing her pussy. You start by gently caressing her swollen lips with up and down tongue lapping, up and down the swollen mound and moist slit, and getting ready to focus the tip of your tongue directly on her clitoris. Next, you part her outer lips with your fingers, spreading her pouty inner lips, giving you full access to her puffy pink clitoris.'
 
 	gs 'arousal', 'cuni_give', 5, 'lesbian'
 	gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'anuli':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/anuli<<picrand>>.jpg"></center>'
-	'She kisses your buttocks in ever decreasing circles, eventually getting to the center where your puckered anus is waiting.  Reaching her goal, she licks all around the tender star to get it plenty moist, then firmly pushes her tongue forward, penetrating your ass with just the tip.  She retracts it, again licking all around your anus, and repeats her tongue invasion into that most private entrance.'
+	'She kisses your buttocks in ever-decreasing circles, eventually reaching the centre where your puckered anus is waiting. Reaching her goal, she licks all around the tender star to get it plenty moist, then firmly pushes her tongue forward, penetrating your ass with just the tip. Finally, she retracts it, again licking all around your anus, and repeats her tongue invasion into that most private entrance.'
 
 	gs 'arousal', 'rimming', 5, 'lesbian'
 	gs 'stat'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'uanuli':
 	*clr
 	
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli<<picrand>>.jpg"></center>'
-	'You kiss her buttocks in ever decreasing circles, eventually getting to the center where her puckered anus is waiting.  Reaching your goal, you lick all around the tender star to get it plenty moist, then firmly push your tongue forward, penetrating her ass with just the tip.  You retract it, again licking all around her anus, and repeating your tongue invasion into that most private entrance.'
+	'You kiss her buttocks in ever-decreasing circles, eventually reaching the centre where her puckered anus is waiting. Reaching your goal, you lick all around the tender star to get it plenty moist, then firmly push your tongue forward, penetrating her ass with just the tip. Finally, you retract it, again licking all around her anus and repeating your tongue invasion into that most private entrance.'
 
 	gs 'arousal', 'rimming_give', 5, 'lesbian'
 	gs 'stat'
@@ -120,7 +120,7 @@ if $ARGS[0] = 'svag':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/svag<<picrand>>.jpg"></center>'
-	'You put on the strap-on, adjusting it to your hips and centering it, and then insert it slowly into her pussy.  She moans and grinds back at you while you fuck her with it.'
+	'You put on the strap-on, adjusting it to your hips and centring it, and then insert it slowly into her pussy.  She moans and grinds back at you while you fuck her with it.'
 
 	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'sanal':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/sanal<<picrand>>.jpg"></center>'
-	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into <<$lezbsexname>>''s anus, pressing into her slowly at first, and as she adjusts to the backdoor invasion you push in and out, faster and faster.'
+	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into <<$lezbsexname>>''s anus, pressing into her slowly at first. Then, as she adjusts to the backdoor invasion, you push in and out, faster and faster.'
 
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'usvag':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usvag<<picrand>>.jpg"></center>'
-	'You watch as she puts on the strap-on, adjusting it to her hips and centering the fake cock, and then she moves to you and inserts it slowly into your pussy.  You moan and grind back at her while she fucks you with it.'
+	'You watch as she puts on the strap-on, adjusting it to her hips and centring the fake cock, and then she moves to you and inserts it slowly into your pussy.  You moan and grind back at her while she fucks you with it.'
 
 	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
@@ -176,7 +176,7 @@ if $ARGS[0] = 'dvag':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/dvag<<picrand>>.jpg"></center>'
-	'You take a dildo and poke her wet pussy with it.  She pulls your face to hers and kisses you while you are driving one shaft into her cunny with one hand and caressing her breasts with a second dildo.'
+	'You take a dildo and poke her wet pussy with it.  She pulls your face to hers and kisses you while you drive one shaft into her cunny with one hand and caress her breasts with a second dildo.'
 
 	gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian', 'sub'
 	gs 'stat'
@@ -190,7 +190,7 @@ if $ARGS[0] = 'danal':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/danal<<picrand>>.jpg"></center>'
-	'You take a dildo, making sure she''s watching you as you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into <<$lezbsexname>>''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
+	'You take a dildo, ensuring that she''s watching you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into  <<$lezbsexname>>''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
 
 	gs 'arousal', 'anal_dildo_give', 5, 'lesbian', 'sub'
 	gs 'stat'
@@ -202,11 +202,12 @@ end
 if $ARGS[0] = 'udvag':
 	cla
 	*clr
-	minut += 5
-	pcs_horny += 10
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udvag<<picrand>>.jpg"></center>'
-	'<<$lezbsexname>> inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible with it.'
+	'<<$lezbsexname>> inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible.'
+	
+	gs 'arousal', 'vaginal_dildo', 5, 'lesbian', 'sub'
+	gs 'stat'
 
 	act 'Continue': xgt 'lezbsex', 'var'
 	act 'Finish': gt 'lezbsex', 'end'
@@ -218,7 +219,7 @@ if $ARGS[0] = 'udanal':
 	*clr
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udanal<<picrand>>.jpg"></center>'
-	'<<$lezbsexname>> spits in the crack of your ass, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole at it pushes farther and farther inside, bringing you that unique back-door pleasure.'
+	'<<$lezbsexname>> spits in your asscrack, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole as it pushes farther inside, bringing you that unique back-door pleasure.'
 
 	gs 'arousal', 'anal_dildo', 5, 'lesbian', 'sub'
 	gs 'stat'
@@ -230,7 +231,7 @@ end
 if $ARGS[0] = 'end':
 	cla
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/lezbsexstart.jpg"></center>'
-	'When you have finished playing, <<$lezbsexname>> thanks you for the good time and leaves.'
+	'When you have finished playing, <<$lezbsexname>> thanks you for the excellent time and leaves.'
 	act 'Leave':
 		if gfsex = 1:
 			killvar 'gfsex'

locations/tatiana_lab.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'Tatiana':
 		$LipTab =		func('tatiana_lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',		 'pcs_lip',	'lip',	'')
 		$BreastTab =	 func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','nbsize',		'breasts','magicf2b=0')
 
-		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',100,'clear','Skin','chest',''"">Clear Skin</a>"
+		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',1000,'clear','Skin','chest',''"">Clear Skin</a>"
 		$VirginTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,120,'pcs_vag',0,'renewed','Virginity','vaginal',''"">Renew Virginity</a>"
 		$SiliconeTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'fillimplant',0,'natural again','Boobs','breasts','brSurTemp = 0 & stringimplant = 0'"">Remove Silicone</a>"
 

locations/taxi.qsrc

@@ -97,6 +97,7 @@ end
 if $ARGS[0] = 'ride':
 	cls
 	stat['taxi_sex_pay'] += 1
+	gs 'fame', 'city', 'prostitute', 2
 	gs 'stat'
 	gs 'npcgeneratec', 0, 'Taxi Driver', rand(30,46)
 	gs 'boyStat', $npclastgenerated
@@ -141,6 +142,7 @@ if $ARGS[0] = 'vag1':
 	'He half pulls you out of the taxi and starts pulling your clothes off just enough to give him a clear path to your pussy. He rubs the tip of his <<dick>>cm <<$dick_girth>> cock against your pussy lips.'
 	'Without even checking to see if you''re wet, he shoves his dick in, driving himself balls deep into you. At first, it hurts as he begins to furiously fuck your unprepared pussy, obviously not caring if you are enjoying it or not, but luckily, you find yourself getting turned on from being used, and your pussy becomes soaking wet. You begin to moan in pleasure.'
 	gs 'arousal', 'vaginal', 10, 'sub', 'unknown', 'rough'
+	gs 'fame', 'city', 'prostitute', 3
 	gs 'stat'
 	gs 'willpower', 'cum_inside', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -228,6 +230,7 @@ if $ARGS[0] = 'bj':
 	'He moans and leans back to give you more room to work. Some time later, he grabs your hair with his hand and forces you head down, ramming his <<dick>>cm <<$dick_girth>> cock down your throat. "That''s a good little slut." This makes your eyes water, and you gag. He doesn''t seem to care, as this causes you to get almost uncontrollably slobbery.'
 	'Several minutes later, your throat begins to feel raw. He suddenly stops and holds your head still, his cock still in your mouth. "I''m cumming, and you better swallow every drop of it, bitch." His body spasms. Almost at once you feel the spurts of cum blasting into your mouth. Once he is done cumming, he jerks your head away and pushes you away. You swallow his sperm like he told you as he puts his dick away.'
 	'Looking at you with irritation, he barks "What the fuck are you still sitting there for, get in the fucking back." You quickly do as he says, and he asks you where you need to go.'
+	gs 'fame', 'city', 'prostitute', 3
 	gs 'arousal', 'bj', 5, 'sub', 'unknown', 'rough', 'deepthroat'
 	gs 'arousal', 'end'
 	gs 'cum_call', 'mouth_swallow', $boy
@@ -248,7 +251,7 @@ if $ARGS[0] = 'anal':
 	'With a grunt, he shoves his <<dick>>cm <<$dick_girth>> cock up your ass, pushing it balls deep. You grunt in pain and bite your lip nearly hard enough to draw blood as he begins to furiously fuck you, obviously not caring if you are enjoying it or not.'
 	'As your asshole begins to loosen a bit and the ministrations of your fingers on your clit turn you on, it begins to hurt less and feel better, and a slight moan of pleasure escapes your lips. For several minutes, he pounds your ass, until he finally stops, cock buried balls deep. He grunts as you feel the spurts of cum shooting deep into you.'
 	'With a final moan and spurt, he stands up. Pushing you back inside, he slams the door and gets back in the driver''s seat, starting the taxi up and then asking you where you need to go.'
-	pcs_acp_known += 1
+	gs 'fame', 'city', 'prostitute', 3
 	gs 'arousal', 'anal', 5, 'sub', 'unknown', 'rough'
 	gs 'arousal', 'end'
 	gs 'cum_call', 'anus', 'Taxi Driver'

locations/therapist.qsrc

@@ -1805,7 +1805,7 @@ if $ARGS[0] = 'hypnoRandom':
 			gt 'therapist', 'hypnoEnd'
 		end
 		!! Forced Clothing, Steva will want to wear exhibitionist clothing, failing that only clothing she finds "daring" or have a cost of willpower
-	elseif hypnoPanty = 1 & hypnoBra = 1:
+	elseif hypnoPanty = 1 and hypnoBra = 1:
 		hypnoClothes = 1
 		cla
 		*clr
@@ -1814,7 +1814,7 @@ if $ARGS[0] = 'hypnoRandom':
 
 		'<br><font color="<<$hypnocolour>>">"Okay, cunt. "He begins, setting up a new command;'
 
-		'"The only clothing you will be allowed to wear from now on are see-throught items. If you do not already have any in your closet, you will need to buy some. My daughter works in promotions for a store in town. You can usually find her in the park whenever she is out." '
+		'"The only clothing you will be allowed to wear from now on are see-through items. If you do not already have any in your closet, you will need to buy some. My daughter works in promotions for a store in town. You can usually find her in the park whenever she is out." '
 
 		'He adjusts his shirt, then adds...'