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

# Conflicts:
#	locations/foto.qsrc

locations/abduction.qsrc

@@ -678,7 +678,7 @@ if $ARGS[0] = 'abdRape':
 		act 'Continue':gt 'abduction', 'abdRoom'
 	elseif rapeType = 3:
 		pain['asshole'] += 10
-		gs 'cum_call', 'anal', 'torturer'
+		gs 'cum_call', 'anus', 'torturer'
 		gifornot = rand (1, 100)
 		if gifornot > 50:
 			'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/fucktiedanal'+rand(1,4)+'.jpg"></center>'

locations/brothel.qsrc

@@ -232,7 +232,6 @@ if $ARGS[0] = 'abducted':
 		:abdrapeloop
 		gs 'npcgeneratec', 0, 'Rapist', rand(35,50)
 		gs 'boyStat', $npclastgenerated
-		gs 'arousal', 'vaginal', 5
 		gs 'arousal', 'anal', 10
 		gs 'arousal', 'end'
 		cumarrcon = 0

locations/cikl.qsrc

@@ -1134,7 +1134,7 @@ if day = 25:
 	end
 
 	! Utilities for all apartments.
-	if electroday = 0:
+	if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 2) and electroday = 0:
 		gs 'housing', 'util'
 		if bankAccount = 1 and karta >= elektro:
 			'<b><font color="yellow"> <<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'

locations/foto.qsrc

@@ -429,8 +429,7 @@ if $ARGS[0] = 'interview':
 				gs'foto','interview'
 			end
 		end
-	end
-	if howoldareyou > 0:
+	elseif howoldareyou > 0:
 		if howoldareyou = 1:
 			howoldareyou = 2
 			if age_truth = 1 or age >= 18:

locations/gadmarket.qsrc

@@ -21,10 +21,12 @@ $gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 450, 'compm
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 450, 'biomag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 450, 'cookmag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 450, 'knitmag', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 5, 'condoms', 600, 'prezikcount', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 200, 'buterbrod', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of wine', 700, 'wine', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 10, 'Razors', 1000, 'stanok', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a handbag')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a handbag')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a handbag')
 $gadmarkettab += '</table></center>'
 *pl $gadmarkettab
 killvar '$gadmarkettab'

locations/saunawhore.qsrc

@@ -817,7 +817,6 @@ if $ARGS[0] = 'saunawork':
 		'You go up to her and she demands your bared arm. You present your arm as required and she takes out a syringe filled with drugs. "Sit still, I''ll give you a shot now and it will make you feel like normal again."'
 
 		act 'Leave':StrongNarkota += 25 & SNarkTimes += 1 & minut += 10 & gt 'saunawhore', 'saunawork'
-
 		exit
 	end
 	if workDolg <= 0 and pcs_mood <= 50 and SaunaWhore > 0 and money >= 1000:
@@ -827,8 +826,14 @@ if $ARGS[0] = 'saunawork':
 			'You are beckoned by the nurse. "OK, come here."'
 			'You go up to her and she asks for your bared arm. You present your arm and she takes out a syringe filled with drugs. "Sit still, I''ll give you a shot now and it will make you feel like normal again."'
 
-			act 'Leave':StrongNarkota += 25 & SNarkTimes += 1 & minut += 10 & gt 'saunawhore', 'saunawork'
-
+			act 'Leave':
+				StrongNarkota += 25
+				SNarkTimes += 1
+				minut += 10
+				money -= 1000
+				gs 'stat'
+				gt 'saunawhore', 'saunawork'
+			end
 			exit
 		end
 	end

locations/shop.qsrc

@@ -240,11 +240,9 @@ if $shoplocation = 'grocery':
 	*P FUNC ('$stock_item', 1, 'Diet food', 300, 'edaD', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Diet food', 3000, 'edaD', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Tea biscuits', 400, 'pranik', $CURLOC)
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC), '<tr><td></td><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 <b>₽</b></td></tr>')
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '<tr><td></td><td>Sandwich</td><td colspan=2>You need a handbag</td><td>for 100 <b>₽</b></td></tr>')
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
-	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Average Bottle of wine', 500, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
-	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Quality Bottle of wine', 1000, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
+	*P FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*P '</table></center>'
 	gs 'stat'
 	if night_mode = 1:
@@ -585,7 +583,7 @@ if $shoplocation = 'tech':
 	*P FUNC ('$single_stock_item', 1, 'Washing machine', 30000, 'stiralka', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
 	*P FUNC ('$single_stock_item', 1, 'Camera', 20000, 'zenit', $CURLOC)
 	*P FUNC ('$single_stock_item', 1, 'Mini camera disguised as a cigarette pack', 100000, 'minifoto', $CURLOC)
-	*P FUNC ('$single_stock_item', 1, 'Webcam', 2000, 'webcamera', $CURLOC, '', iif((npc_rel['A11']>=30 and webcamera = 0) or (camwhore = 1 and webcamera = 0), 0, 1), 'You have no use this')
+	*P FUNC ('$single_stock_item', 1, 'Webcam', 2000, 'webcamera', $CURLOC, '', iif((npc_rel['A11']>=30 and webcamera = 0) or (camwhore = 1 and webcamera = 0), 0, 1), 'You have no use for this')
 	*P '</table></center>'
 	gs 'stat'
 	if night_mode = 1:

locations/stwork.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'
 	'To the side there''s a <a href="exec:stripMir = 0 & gt ''stripclub'', ''start''">steel door</a> which overlooks the back yard and the staff uses as an entrance, to save them from meeting scummy customers. Standing by this entrance, there''s always <a href="exec:gt ''stwork'', ''guard''">security</a> keeping the talent safe.'
-	'Near the exit door is a vending machine selling <a href="exec:stripMir = 0 & gt ''food'', ''snack''">snacks</a>, and a <a href="exec:stripMir = 0 & gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
+	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
 	'Behind a wooden door there''s the <a href="exec:gt ''stwork'', ''toilet''">staff toilet</a>.'
 	
 	if tatlech > 0:stripKoef = rand(1, 3)
@@ -70,7 +70,9 @@ if $ARGS[0] = 'start':
 	end
 	
 	act 'Have a cup of water (0:05)':gs 'beverage', 'bev_wat'
-	act 'Have a snack (0:05) (100 <b>₽</b>)': money -= 100 & gs 'food', 'snack'
+	if money >= 100:
+		act 'Have a snack (0:05) (100 <b>₽</b>)': money -= 100 & gs 'food', 'snack'
+	end
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	act 'Change your clothes':gt 'wardrobe', 'start'

locations/telefon.qsrc

@@ -666,6 +666,7 @@ if $ARGS[0] = 'Phone_notebook':
 	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></center>'
 	pl'<center><<year>>-<<$month>>-<<day>>, <<$week[week]>><br></center>'
 	rent1 = -1
+	rent4 = -1
 	if home_owned[1] > 0 and ArendHouseSL > 0:rent1 = ArendHouseSL
 	if home_owned[4] > 0 and ArendHouseSL4 > 0:rent4 = ArendHouseSL4
 	preg1 = pregtime

locations/train.qsrc

@@ -480,23 +480,23 @@ if $ARGS[0] = 'weed':
 	train_event = 1
 	*clr & cla
 	gs 'stat'
-    '<center><h4>Pavlovsk Station</h4></center>'
-    '<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-    'After you bought your ticket, they told you that you had just missed the train. A little miffed at this, you take a seat on one of the benches on the platform to wait for the next train to the city to one to arrive.'   
-    act 'A man approaches you with an offer':
+	'<center><h4>Pavlovsk Station</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
+	'After you bought your ticket, they told you that you had just missed the train. A little miffed at this, you take a seat on one of the benches on the platform to wait for the next train to the city to one to arrive.'	
+	act 'A man approaches you with an offer':
 		*clr
 		cla
-        '<center><h4>Pavlovsk Station</h4></center>'
-        '<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weed.jpg" ></center>'
+		'<center><h4>Pavlovsk Station</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weed.jpg" ></center>'
 		'Only a few minutes have passed when you hear someone walk up behind you and stop. You know they must be mere inches away, so you turn to look. Standing there is a young man, smiling at you, holding up a self-rolled cigarette... that looks suspiciously like a joint. The guy doesn''t seem too concerned about somebody catching him with that in public, though, and focuses entirely on you:'
-        *nl		
+		*nl		
 		'"Hey beautiful, I couldn''t help but notice you sitting here all by yourself. Guess you missed the train, too, huh?" He looks around, as if he only just noticed that he was walking around a public place with a joint in his hand, then leans down and whispers conspiratorially: "How about we blaze one while we wait?"'
 
-        act 'Refuse':
+		act 'Refuse':
 			*clr
 			cla
-            '<center><h4>Pavlovsk Station</h4></center>'
-            '<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
+			'<center><h4>Pavlovsk Station</h4></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 			'You have no idea what could be in it and have no intention of being caught out in the open with marijuana either, so you shake your head. "No, thanks."'
 			'He shrugs and steps away. "Alright, just trying to be friendly. It''s your loss."'
 			*nl
@@ -505,17 +505,17 @@ if $ARGS[0] = 'weed':
 			'You can see them talk a little and even from where you''re sitting you can tell that the woman is giving him wanton looks. Before long, the two of them sneak off across the tracks and disappear; just as the train arrives, they come rushing back, clothes out of place and hair disheveled.'
 			'It isn''t hard to guess what they were doing to kill time.'
 
-            act 'Board the train to the city':
-                *clr & cla
-                minut += 40
-                gs 'stat'
-                '<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
+			act 'Board the train to the city':
+				*clr & cla
+				minut += 40
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 				'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 				act 'Get off the train':
 					if rand(1, 100) <= 5: gt 'train_incidental', 'end'
 					gt 'vokzalperG'
 				end
-            end
+			end
 		end
 		act 'Smoke with him':
 			*clr & cla
@@ -527,20 +527,20 @@ if $ARGS[0] = 'weed':
 			'You smile and nod, taking the joint from him - you only live once and it''s as good a pastime as any. He lights it as you take a long slow drag off it and hold it in, feeling it in your lungs... until you start coughing, causing him to chuckle. You feel the relaxing effect almost at once, your head feeling both lighter and heavier, your mind slowing down... but you notice a slightly odd taste to the smoke that you can''t place - maybe that''s just what this variety tastes like. You pace it back and forth with him, chatting idly as you smoke, and as you do, you are starting to feel aroused: Your nipples harden, your pussy is getting soaking wet and you feel so wound up that you have to actively keep your hands in check to prevent yourself from masturbating out in the open.'
 			'One thing you know for sure, even in your current state: Marijuana isn''t supposed to have this effect. You look at your smoking buddy. "What else was in this joint?"'
 			'"XTC", he responds with hesitation, a lazy smile on his face. "It feels great, right?" He grabs you by the hand and pulls you up along with him. "Come on, let''s go have some fun before the train arrives. I know you''re just as horny as I am."'
-			'If you were simply horny, you might not have accompanied him, but the XTC had fully taken effect by now, your mind was in a rush and you felt like you could trust the guy who just drugged you, so you went with him, looking forward to some ''fun''.'       
+			'If you were simply horny, you might not have accompanied him, but the XTC had fully taken effect by now, your mind was in a rush and you felt like you could trust the guy who just drugged you, so you went with him, looking forward to some ''fun''.'		
 
 			act 'Refuse':
 				*clr
 				cla
-	            '<center><h4>Pavlovsk Station</h4></center>'
-	            '<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-			    'You still have enough presence of mind to know this would be a bad idea, so you shake your head. "No, thanks."'
-			    'He shrugs and steps away. "Alright, just trying to be friendly. It''s your loss."'
-			    *nl
-			    'He wanders around for a bit. Eventually another young woman comes down to the platform. You watch him go over, and you are sure he''s making her the same offer, but unlike you, she nods and they smoke the joint together. You briefly consider going to the bathrooms to masturbate but you don''t want to miss the train again.'
-			    *nl
-			    'You can see them talk a little and even from where you''re sitting you can tell that the woman is giving him wanton looks. Before long, the two of them sneak off across the tracks and disappear; just as the train arrives, they come rushing back, clothes out of place and hair disheveled.'
-			    'It isn''t hard to guess what they were doing to kill time. A part of you wishes you had taken him up on the offer.'
+				'<center><h4>Pavlovsk Station</h4></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
+				'You still have enough presence of mind to know this would be a bad idea, so you shake your head. "No, thanks."'
+				'He shrugs and steps away. "Alright, just trying to be friendly. It''s your loss."'
+				*nl
+				'He wanders around for a bit. Eventually another young woman comes down to the platform. You watch him go over, and you are sure he''s making her the same offer, but unlike you, she nods and they smoke the joint together. You briefly consider going to the bathrooms to masturbate but you don''t want to miss the train again.'
+				*nl
+				'You can see them talk a little and even from where you''re sitting you can tell that the woman is giving him wanton looks. Before long, the two of them sneak off across the tracks and disappear; just as the train arrives, they come rushing back, clothes out of place and hair disheveled.'
+				'It isn''t hard to guess what they were doing to kill time. A part of you wishes you had taken him up on the offer.'
 				act 'Board the train to the city':
 					*clr & cla
 					minut += 40
@@ -574,20 +574,20 @@ if $ARGS[0] = 'weed':
 					gs 'arousal', 'bj', 5, 'deepthroat', 'unknown'
 					act 'Fuck him':
 						*clr & cla
-                        '<center><h4>Pavlovsk Station</h4></center>'
-                        '<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedvag.jpg" ></center>'
+						'<center><h4>Pavlovsk Station</h4></center>'
+						'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedvag.jpg" ></center>'
 						'He is having the time of his life, but all your blowjob does is making you hornier, and you can''t take it any longer: You start removing your clothes bit for bit while you keep blowing him, until every item below your waist is removed. Once your pussy and ass are bare, you pull him down and get him to lay down on his back.'
 						*nl
 						'He has barely even touched the ground when you have already straddled him, facing his legs, and lowering yourself down until you feel his <<dick>>cm <<$dick_girth>> cock stretch out your wet cunt. You moan out loud as you impale yourself on his shaft, going all the way down on the first stroke. You lift yourself up again and, again, take his entire length, faster this time. Then again, and again, riding him harder and faster with every stroke, his cock feeling as big as that of a prized stallion.'
-                        gs 'arousal', 'vaginal', 5, 'dom', 'unknown'
+						gs 'arousal', 'vaginal', 5, 'dom', 'unknown'
 						act 'Take his cum':
 							*clr & cla
-                            spafinloc = 12
-                            gs 'cum_manage'
-                            spafinloc = 11
-                            gs 'cum_manage'
-                            '<center><h4>Pavlovsk Station</h4></center>'
-                            '<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedcum.jpg" ></center>'
+							spafinloc = 12
+							gs 'cum_manage'
+							spafinloc = 11
+							gs 'cum_manage'
+							'<center><h4>Pavlovsk Station</h4></center>'
+							'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedcum.jpg" ></center>'
 							'You give him the fuck of a lifetime, feeling your orgasm approaching fast, so close, so very close... but he lifts you off and quickly stands up. "I''m about to cum!"'
 							*nl
 							'You have half a mind to say the same but you are too turned on to speak. You squat down in front of him again, and start jerking him off as you open your mouth and stick out your tongue. It only takes a few strokes before he shoots most of his load into your mouth, with a few stray squirts landing on your chin.'
@@ -595,26 +595,26 @@ if $ARGS[0] = 'weed':
 							'With your mouth still open, you show him his sperm on your tongue before you swallow it down, then start sucking his cock again. He was getting soft, but you feel him getting hard again in your mouth and you are already looking forward to another go so you can have your own orgasm.' 
 							*nl
 							'That''s when you hear the train coming. "The train''s here; we have to stop", he states, with a hint of regret, as he pulls his cock out of your mouth. Without another look at you, he quickly pulls up his pants and rushes over to the train as it comes to a stop. You hurriedly get dressed as well and then rush after him to get on the train. You make it just in time - the doors close almost as soon as you are in.'
-                            gs 'arousal', 'end'
+							gs 'arousal', 'end'
 							gs 'stat'
-                            act 'Board the train to the city':
-                                *clr & cla
-                                minut += 5
-                                gs 'stat'
-                                '<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg"></center>'
-                                'Once on the train, you look around but you don''t see the young man. Perhaps he got on a different car? You go looking for him, passing through a few different sections, hoping to continue what you started and deal with your overwhelming horniness, but after checking the entire train without seeing a hint of him, you give up and find a seat.'
+							act 'Board the train to the city':
+								*clr & cla
+								minut += 5
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg"></center>'
+								'Once on the train, you look around but you don''t see the young man. Perhaps he got on a different car? You go looking for him, passing through a few different sections, hoping to continue what you started and deal with your overwhelming horniness, but after checking the entire train without seeing a hint of him, you give up and find a seat.'
 								'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 								act 'Get off the train':
 									if rand(1, 100) <= 5: gt 'train_incidental', 'end'
 									gt 'vokzalperG'
 								end
-                            end
-                        end
-                    end
-                end
-            end
-        end
-    end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
 end
 
 !!events starting on the train. Only one act will show up depending which one triggered but they all start the same.
@@ -624,12 +624,12 @@ if $ARGS[0] = 'private':
 	minut -= 35
 	train_event = 1
 	gs 'stat'
-    '<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
 	'You board the train and walk past several of the private compartments on your way to the general seating on the car you are on.'
 	act 'You walk past the private compartments':
 		*clr
 		cla
-	    '<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
 		'After the first stop you are walking past the open door of one of the private compartments, you hear a man''s voice call out to you: "Hello there, young lady! Would you care to join me?"'
 		'You stop and look inside, finding a clean-shaved man sitting there with a select few wrinkles that accentuate his angular features; you estimate that he''s in his late thirties or early forties. The expensive suit he''s wearing and the hints of cologne tickling your nose speak volumes of his wealth and his self-confident, even smug expression tells the rest of the story. He motions for you to sit with him. "It''s alright, there''s plenty of room in here. Why don''t you come in and close the door?"'
 		*nl
@@ -638,7 +638,7 @@ if $ARGS[0] = 'private':
 			*clr
 			cla
 			minut += 35
-	        '<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 			'You shake your head indignantly. "Fuck you, I''m no whore! Who do you think you are?!" You don''t give him time to respond but simply walk away and take a seat in the general seating area.' 
 			*nl
 			'You spend some time talking to some of your fellow passengers and share the story with a couple of them. They seem shocked that a man would make such an offer to a nice young lady like you right on this train and speculate that only a crook would be insolent enough to try something like that.'
@@ -674,7 +674,7 @@ if $ARGS[0] = 'private':
 
 				act 'Second stop':
 					*clr & cla
-				    '<center><img <<$set_imgh>> src="images/locations/shared/train/sex/rideanal.jpg" ></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/rideanal.jpg" ></center>'
 					'Once he has you laying on your back, bedded on dusty seat cushions and your nether parts fully exposed to him and anybody who might enter, he moves up and slips his <<dick>>cm <<$dick_girth>> cock into your ass without warning. It enters surprisingly easily and even though you are unprepared, you manage to relax enough to avoid any pain. It certainly helps that he is taking it slow, giving your plenty of time to adjust to his cock while your mind is racing, running hot as it tries to comprehend how a simple train ride ended up with you having anal sex, on the train, with a complete stranger!' 
 					*nl
 					'Honestly, it makes relaxing difficult because your muscles are twitching around him in excitement and you can barely contain your moans. He goes a little deeper and a little faster, but your ass is too much for him and he can''t last much longer. You feel the first spurt of sperm deposited in your ass a second later and, as he continues to cum, he pulls out of you.'
@@ -686,20 +686,20 @@ if $ARGS[0] = 'private':
 						money += 500
 						gs 'cum_call','anus',$boy, 0,'','',20
 						gs 'cum_call','butt',$boy, 0,'','',20
-	                    '<center><img <<$set_imgh>> src="images/locations/shared/train/sex/ridecum.jpg" ></center>'
+						'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/ridecum.jpg" ></center>'
 						'As he does, several spurts shoot all over your ass and you can feel more of his spunk leaking out of your gaping anus. With a final grunt and spurt, he sits down opposite you, giving you and the state he left you in an appreciative look before he puts his cock away and hands you the 500<b>₽</b>... And then, he simply pulls out a newspaper and starts reading it. The switch from ravaging your asshole to perusal is so sudden that you are confused for a moment. You soon realize, however, that he is really no longer paying attention to you and you are laying around with cum dripping out of your backdoor, so you quickly get up and get yourself cleaned up.'
 						
 						act 'Your stop':
 							*clr & cla
-						    '<center><video autoplay loop src="images/locations/shared/train/pantyup.mp4" ></video></center>'
+							'<center><video autoplay loop src="images/locations/shared/train/pantyup.mp4" ></video></center>'
 							'Once you are dressed again and have removed most off the sperm, you sit down and quietly study the man you had sex with who seems content to spend the rest of the ride in silence and feigned obliviousness to your presence. After a bit, you pull out your phone and amuse yourself with it until the train finally reaches your destination. "Well, this is my stop", you tell him.'
-						    *nl
-						    'He looks up from his newspaper for the first time since he came. "I wish you a safe trip. And thank you for making this ride a bit less dull." he adds with a wink before returning to the headlines. You leave the compartment, the strange and naughty events fresh on your mind, and make your way to the closest exit.'
-						    gs 'arousal', 'end'
-						    gs 'stat'
+							*nl
+							'He looks up from his newspaper for the first time since he came. "I wish you a safe trip. And thank you for making this ride a bit less dull." he adds with a wink before returning to the headlines. You leave the compartment, the strange and naughty events fresh on your mind, and make your way to the closest exit.'
+							gs 'arousal', 'end'
+							gs 'stat'
 
 							act 'Get off the train':gt $loc, $metka
-				        end
+						end
 					end
 				end
 			end
@@ -1014,7 +1014,15 @@ if $ARGS[0] = 'Gopnik':
 				'Well, that, and the hard cock you''re sucking with passion.'
 				gs 'arousal', 'bj', 10, 'exhibitionism', 'unknown'
 				gs 'stat'
-
+				
+				act '"Um... No"':
+					*clr
+					cla
+					'Even as he''s pulling down his pants, you are already shaking your head and laughing. "Do you think I''m a slut or something? I''m not gonna do something with you after a couple of compliments, especially not out in the open like this!" You turn and walk off, calling over your shoulder: "I thought you were a nice guy, but I guess I was wrong."' 
+					*nl
+					'The gopnik seems anything but pleased by your response. He tries to pull his pants back up and yells: "You fucking tease! Get back here!" You don''t; on the contrary, you exploit his current distraction with his pants to run back down the stairs to the platform and into the station before he can follow.'
+					act 'Return to the station': gt $loc, $metka
+				end
 				act 'Let him fuck you':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnikvag.jpg" ></center>'

locations/vokzalGin.qsrc

@@ -21,7 +21,6 @@ if $ARGS[0] = '':
 		lcolor = rgb(106, 90, 205)
 	end
 
-
 	'<center><h4>Pavlovsk train station interior</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 	'The center of the station building is a large waiting room, where passengers can wait until their train arrives. Opposite to that you can find the <a href="exec:dynamic $din_vokzalg_kabinet">station manager''s office</a>, and the <a href="exec:minut += 1 & gt ''vokmantoiev'', ''start''">toilets</a> on the other end of the building.'
@@ -54,64 +53,18 @@ if $ARGS[0] = '':
 
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:
-			act 'Work':
-				cla
-				if cleZalDay ! daystart:
-					act 'Mop the waiting room floor (1:00)':
-						cls
-						cleZalDay = daystart
-						gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
-						pcs_mood -= 6
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
-						'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and wash the floor in the waiting room.'
-
-						act 'Continue':minut += 1 & gt 'vokzalGin'
-					end
-				end
-
-				if cleMTDay ! daystart:
-					act 'Clean the men''s restroom (0:30)':
-						cls
-						cleMTDay = daystart
-						gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
-						pcs_mood -= 6
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
-						'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and go to the men''s room.'
-						gs 'vokmantoiev', 'toilet_event'
-						!!'You began to wash the floor in the men''s room, and then began to scrub toilets.'
-
-						act 'Leave':minut += 1 & gt 'vokzalGin'
-					end
-				end
-
-				if cleWTDay ! daystart:
-					act 'Clean the women''s restroom (0:30)':
-						cls
-						cleWTDay = daystart
-						gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
-						pcs_mood -= 6
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
-						'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and scrub the toilets in the ladies'' room before mopping the floor.'
-						gs 'vokdinvera'
-
-						act 'Leave':minut += 1 & gt 'vokzalGin'
-					end
-				end
-				act 'Return': gt 'vokzalGin'
-			end
+			act 'Work': gt 'vokzalGin', 'work'
 		elseif cleZarplatDay ! daystart:
 			act 'Collect your salary':
-				cls
+				*clr & cla
+				'<center><h4>Pavlovsk train station interior</h4></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 				cleZarplatDay = daystart
 				vokzalVork += 1
 				money += 130
 				minut += 3
 				gs 'stat'
 				'When you are done cleaning all the places you were told to clean, you go to the cashier and collect your well-earned salary.'
-
 				act 'Continue':minut += 1 & gt 'vokzalGin'
 			end
 		end
@@ -158,7 +111,57 @@ if $ARGS[0] = '':
 
 		act 'Take a look at the clock':gt 'vokzalGin'
 	end
+end
+
+if $ARGS[0] = 'work':
+	*clr & cla
+	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+	if cleZalDay ! daystart:
+		act 'Mop the waiting room floor (1:00)':
+			cls
+			cleZalDay = daystart
+			gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
+			pcs_mood -= 6
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
+			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and wash the floor in the waiting room.'
+
+			act 'Continue':minut += 1 & gt 'vokzalGin', 'work'
+		end
+	end
 
+	if cleMTDay ! daystart:
+		act 'Clean the men''s restroom (0:30)':
+			cls
+			cleMTDay = daystart
+			gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
+			pcs_mood -= 6
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
+			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and go to the men''s room.'
+			gs 'vokmantoiev', 'toilet_event'
+			!!'You began to wash the floor in the men''s room, and then began to scrub toilets.'
+
+			act 'Leave restroom':minut += 1 & gt 'vokzalGin', 'work'
+		end
+	end
+
+	if cleWTDay ! daystart:
+		act 'Clean the women''s restroom (0:30)':
+			cls
+			cleWTDay = daystart
+			gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
+			pcs_mood -= 6
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
+			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and scrub the toilets in the ladies'' room before mopping the floor.'
+			gs 'vokdinvera'
+
+			act 'Leave restroom':minut += 1 & gt 'vokzalGin', 'work'
+		end
+	end
+	act 'Return': gt 'vokzalGin'
 end
 
 if $ARGS[0] = 'ticket':