Merge remote-tracking branch 'spectre1viper/master'

# Conflicts:
#	locations/succubus.qsrc

locations/cityTrain.qsrc

@@ -38,10 +38,10 @@ if $ARGS[0] = 'inside':
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
 	'The grand old station is even more impressive on the inside and has a number of shops and bars as well as all the platforms and trains. '
 	*nl
-	act 'Leave the station': minut += 1 & gt 'cityTrain', 'start'
+	act 'Leave the train station': minut += 1 & gt 'cityTrain', 'start'
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to platforms': gt 'cityTrain', 'platform'
+		act 'Go to the platforms': gt 'cityTrain', 'platform'
 	else
 		act 'Go to the ticket office': gt 'cityTrain', 'tickets'
 	end

locations/din_van.qsrc

@@ -530,8 +530,6 @@ $basin = {
 			menu_off = 1
 			*clr & cla
 			pcs_makeup = 1
-			cumspclnt = 2
-			gs 'cum_cleanup'
 			cumspclnt = 9
 			gs 'cum_cleanup'
 			cumspclnt = 11
@@ -569,7 +567,7 @@ $basin = {
 			pcs_makeup = 1
 			cumspclnt = 9
 			gs 'cum_cleanup'
-			cumspclnt = 13
+			cumspclnt = 11
 			gs 'cum_cleanup'
 			pcs_hairbsh = 0
 			if pcs_sweat > 19 : pcs_sweat -= 5

locations/fit.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'dressing room':
 		'"You can at least tell me your name, maniac, seeing as you did not even have the decency to do so before you raped me." The girl says, catching her breath.'
 		'"I am <<$pcs_nickname>>, and how can I rape someone so keen?" You ask trying to find your panties.'
 		'"Looking for this?" asks the girl twirling your panties on her finger. "I''m Tanya, and you seduced me, I have never been with a girl before, and with very good reason. I live here with my parents, if you want to come for a visit."'
-		'"Okay that would be nice, can I have my briefs?" you say holding out your hand.'
+		'"Okay that would be nice, can I have my panties back?" you ask, while holding out your hand.'
 		'"Nope, no return, there must be something of a momento from my first girl." With these words, Tanya slips your panties in her pocket and leaves.'
 
 		act 'Further':gt 'fit', 'dressing room'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'dressing room':
 				gt 'danceclass'
 			end
 
-			act 'Go to a crossfit workout':
+			act 'Go do a crossfit workout':
 				cla
 				gt 'crossfit_north_box', 'box'
 			end

locations/gdktoilet.qsrc

@@ -506,7 +506,7 @@ if $ARGS[0] = 'mensglory':
 							*clr & cla
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,1.mp4"></video></center>'
 							'You pull away right before he cums. You start to stroke his dick and you open your mouth. His hot load fills your mouth, it tastes salty and warm.'
-							act 'swallow':
+							act 'Swallow':
 								minut +=5
 								swallow += 1
 								spafinloc = 12
@@ -517,7 +517,7 @@ if $ARGS[0] = 'mensglory':
 								'You decide to swallow his cum. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
 							end
-							act 'spit':
+							act 'Spit':
 								minut +=5
 								spafinloc = 10
 								gs 'cum_manage'

locations/kafeM.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'dance':
 	'You go with <<$loverdesc[lover_number]>> to the dance floor. He puts his arms around you and you start to dance.'
 
 	if haraklover[lover_number] = 0:
-		'<<$loverdesc[lover_number]>> is very reserved in his dance. He holds you a bit awkwardly and apologises.'
+		'<<$loverdesc[lover_number]>> is very reserved in his dance. He holds you a bit awkwardly and apologizes.'
 
 		act 'Finish the dance':
 			cla

locations/kikbox.qsrc

@@ -31,9 +31,9 @@ if $ARGS[0] = 'start':
 		if minround = 5:'<b>Time in round 2:00</b>'
 		if minround = 6:'<b>Time in round 2:30</b>'
 		'<b><<$boydesc>></b> Life <b><font color="red"><<healthV>></font></b>, Endurance <b><font color="green"><<staminaV>></font></b>'
-		'Your life <b><font color="red"><<pcs_health>></font></b>, Endurance <b><font color="green"><<stamina>></font></b>'
+		'Your life <b><font color="red"><<pcs_health>></font></b>, Endurance <b><font color="green"><<pcs_stam>></font></b>'
 		'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
-		'Your points <<pointKik>>Points opponent <<pointKikV>>'
+		'Your points <<pointKik>>  Points opponent <<pointKikV>>'
 		'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
 		gs 'initKik'
 
@@ -141,7 +141,7 @@ if $ARGS[0] = 'sta':
 	if minround = 6:'<b>Time in round 3:00</b>'
 	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
 	'<b><<$boydesc>></b> Life <b><font color="red"><<healthV>></font></b>, Endurance <b><font color="green"><<staminaV>></font></b>'
-	'Your life <b><font color="red"><<pcs_health>></font></b>, Endurance <b><font color="green"><<stamina>></font></b>'
+	'Your life <b><font color="red"><<pcs_health>></font></b>, Endurance <b><font color="green"><<pcs_stam>></font></b>'
 	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
 
 	act 'Further':gt 'kikbox', 'start'

locations/mother.qsrc

@@ -592,7 +592,7 @@ if $ARGS[0] = '':
 
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
-			'Your mother notices the sperm you''re wearing on your face, and looks at you with a tinge of concern.'
+			'Your mother notices the sperm you''re wearing on you, and looks at you with a tinge of concern.'
 			'"<<$pcs_nickname>>, I can certainly understand that you want to keep your man happy. Believe me, I do, but you should at least clean up his mess after he finishes on your face, before you go out the door. Quickly, go wash up in the bathroom, hopefully no one has seen you like this!'
 			'Your face turns beet red, and you quietly nod and mumble an apology as you head for the bathroom.'
 

locations/pavtrain.qsrc

@@ -159,7 +159,7 @@ gs 'family'
 
 act 'Walk to the commerical area':minut += 15 & gt 'pavCommercial'
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
-act 'Enter the train station': gt 'pavtrainhall'
+act 'Enter the station building': gt 'pavtrainhall'
 
 --- pavtrain ---------------------------------
 

locations/pavtrainhall.qsrc

@@ -129,7 +129,7 @@ if $ARGS[0] = 'platform':
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 	'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between 11:00 and 11:30, and between 18:00 and 18:30 when the long-distance trains are ready for boarding.'
 
-	act 'Return to the train station': gt'pavtrainhall'
+	act 'Enter the station building': gt'pavtrainhall'
 
 	if Trainpass_day > daystart:
 		act 'Take a train to the old town': gt 'pavtrainhall', 'oldtown'

locations/porn_view_strings.qsrc

@@ -216,7 +216,7 @@ You silently bare both the chest and focus on the sensations, looking at the sta
 <font color="navy"><i>— What?</i></font>
 <font color="maroon"><i>— You`re cool!</i></font>
 <font color="navy"><i>— The truth?</i></font>
-<font color="maroon"><i>— Yeah... You got Boobs cool!</i></font>
+<font color="maroon"><i>— Yeah... You''ve got Boobs, cool!</i></font>
 You lifted and squeezed her Breasts.
 <font color="navy"><i>- Like?</i></font>
 <font color="maroon"><i>— Very!</i></font>
@@ -224,8 +224,8 @@ You silly giggled a bit and turned a little in front of the boys, showing Breast
 Looks like you came to like this attention. You enjoyed his youthful beauty and the effect that had your body on these boys.'
 
 if $args[0] = 'view_12': $result = 'The screen flashed footage of regular porn, but the guys a little more look at you.
-You`re standing in front of them and slowly lowered the top of the garment, exposing the chest. 
-<font color="navy"><i>Do you like my boobies?</i></font> — you ask, while making a slight movement, whereby the chest slightly swinging.
+You`re standing in front of them and slowly lowered the top of the garment, exposing your chest. 
+<font color="navy"><i>Do you like my boobies?</i></font> — you ask, while making a slight movement, making your chest slightly swing.
 The guys off his pants and accepted for their trunks.
 <font color="maroon"><i>— Yes, <<$pcs_nickname>>, they are cool...</i></font> — meet the guys vigorously nadrachivaya.
 You turn to the guys side and bare ass.

locations/succubus.qsrc

@@ -809,7 +809,10 @@ if $args[0] = 'sucwalkinggo':
 		'You wake up and realize that you''re not in your bed...'
 		if pcs_hairbsh = 1 and pcs_makeup > 1: $scwrdtmp = ', your hair is brushed, and you''re wearing makeup.'
 		'Instead, you are fully dressed<<$scwrdtmp>>'
-		if scwalkmon > 0: 'You find <<scwalkmon>> <b>₽</b> stuffed in your cleavage (which you place in your wallet)'
+		if scwalkmon > 0:
+			'You find <<scwalkmon>> <b>₽</b> stuffed in your cleavage (which you place in your wallet)'
+			money += scwalkmon
+		end
 		'And you feel absolutely <i>bursting</i> with energy.'
 		''
 		'After a moment, you start wondering where you are...'