locations/Cheatmenu_din

@@ -1278,10 +1278,6 @@ $cheatmenu['force_preg'] = {
 }
 
 $cheatmenu['remove_preg'] = {
-	vidage += 1
-	abort += 1
-	abortionbirthdate = daystart
-	money -= 15000
 	pregtime = 0
 	pregtalk = 0
 	preg = 0
@@ -1291,13 +1287,8 @@ $cheatmenu['remove_preg'] = {
 	RecovH = rand(7,70)
 	RecovH += pregchem
 	knowpregloss = 2
-	preg = 0
-	thinkpreg = 0
-	knowpreg = 0
-	pcs_hydra += 20
 	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
 	nextbaby = arrsize('yearkid')
-	if broodcurse > 0: over = 13 & gt'gameover'
 	:poliabortloop
 	!!Changed to check if baby has a birth year instead, if it doesn''t, do abortion
 	if yearkid[nextbaby-1] = 0:
@@ -1313,7 +1304,7 @@ $cheatmenu['remove_preg'] = {
 		KILLVAR 'hairkid',nextbaby-1
 		KILLVAR 'eyeskid',nextbaby-1
 		KILLVAR 'cumarrcon',nextbaby-1
-		KILLVAR '$wombpotfath',nextbaby-1
+		KILLVAR '$wombpotfath'
 		BabyEmbryo -= 1
 	end
 	nextbaby -= 1

locations/artemEv

@@ -21,9 +21,9 @@ gs 'boyStat','A2'
 if $ARGS[0] = 'bj':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/artombj.jpg"></center>'
 	npc_sex[$boy] += 1
-	gs 'dinsex','dinrandbj'
+	gs 'dinSex','dinrandbj'
 	gs 'arousal','bj',5,'sub'
-	gs 'dinsex','dinrandswallow'
+	gs 'dinSex','dinrandswallow'
 	gs 'cum_call','mouth',$boy,1
 	artemBJQW += 1
 	swallow += 1
@@ -179,6 +179,7 @@ if $ARGS[0] = 'learn':
 				gs 'stat'
 
 				act 'Get naked for him':
+					*clr & cla
 					gs 'shortgs','undress'
 					minut += 5
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/anatomy2.jpg"></center>'
@@ -191,6 +192,7 @@ if $ARGS[0] = 'learn':
 					act 'Suck him off': gt 'artemEv','bj'
 				end
 			else
+				*clr & cla
 				'Artem unbuttons his pants and looks at you expectantly: "Our previous deal still stands, <<$pcs_nickname>>. If you want my help, I want your mouth."'
 				gs 'stat'
 
@@ -539,7 +541,7 @@ if $ARGS[0] = 'learn':
 				'You quickly walk back to Artem''s apartment with him, and give yourself an enema in the bathroom.'
 				'When you return to the garage, you get down on your hand and feet on the couch and wiggle your ass at them. You ask Artem: "So, now that I''m clean... do you have something we can use as lubricant? Maybe some petroleum jelly, or vegetable oil?"'
 				'Artem comes back with a jar of Vaseline. You smile at him and say: "That will do just fine. Now put some on your finger and slowly put it in my ass... don''t be stingy, use lots of it. It''ll feel much better for both of us."'
-				gs 'dinsex','boy_wants_anal',$boydesc[1],'lubri'
+				gs 'dinSex','boy_wants_anal',$boydesc[1],'lubri'
 				'He does as you say, and testily slides his finger inside your ass a few times. When he''s satisfied it''s going smooth enough, he adds a second finger and fucks your ass carefully.'
 				'"Very good, Artem... now take some more and smear it all over your cock". When you see he''s using good amounts, you nod: "Alright, now put it in slowly."'
 				'Artem slowly guides his dick into your tight asshole. Once the head is in, he groans: "Wow... it''s so tight, and so warm! I feel like I''m going to cum already!"'
@@ -565,7 +567,7 @@ if $ARGS[0] = 'learn':
 					gs 'shortgs','dress'
 					gs 'stat'
 					'After they take a moment to catch their breath, you tell him: "You see why I had you wait so long to fuck my ass? It''s much more intense back there, for both of us... you had to build up some stamina before you could handle it. I guess that''s it for today."'
-					if pain['asshole'] + (agape * 10) > 40: gs 'dinsex','after_anal','no_plug' else gs 'dinsex', 'after_anal','pc'
+					if pain['asshole'] + (agape * 10) > 40: gs 'dinSex','after_anal','no_plug' else gs 'dinSex', 'after_anal','pc'
 					'The guys definitely liked today''s lesson, and Artem thanks you heartily when he gives you the 1000 <b>₽</b>. The boys are staying around in the garage for a while, talking enthusiastically as they wave you goodbye. You hear your name a lot in their conversation, and you wonder what they could be talking about.'
 
 					artemAndPetja = 14
@@ -625,7 +627,7 @@ if $ARGS[0] = 'learn':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/ap_anatomy6_3.jpg"></center>'
 					'You obediently swallow their sperm, and then drink the glass of urine the guys offered you without even wincing. Artem makes sure he films all of that too.'
-					gs 'dinsex', 'after_anal','boy',$boydesc[1]
+					gs 'dinSex', 'after_anal','boy',$boydesc[1]
 					'Both the boys have an evil grin on their faces, and you slowly realize they had been planning this for some time.'
 					'Artem arrogantly tells you: "So... <<$pcs_nickname>>. As you probably realize, there are going to be some changes now. I won''t have time to help you with your homework any more, next time we will go to the garage immediately after school. We have lots of plans with you. As long as you do what we say, no one will see the video of you getting drilled in all of your holes by the biggest nerds in school."'
 					'You quietly get dressed, and quietly leave the garage, You know this is probably just the beginning.'
@@ -761,13 +763,13 @@ if $ARGS[0] = 'kiss':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/anal.jpg"></center>'
 							'You grin despite yourself... there''s no way he would''ve ever dared to say that, if you hadn''t introduced him to it yourself.'
 							'You smile and tell him: "Alright, you perv... I just need an enema real quick in that case, give me a minute."'
-							gs 'dinsex','enema','You quickly go to the bathroom and give yourself an enema, and walk back to his room.'
+							gs 'dinSex','enema','You quickly go to the bathroom and give yourself an enema, and walk back to his room.'
 							'When you get back, you drop to your knees on the couch and put up your ass without saying another word, simply giving him a lewd wink to let him know you''re ready for him.'
-							gs 'dinsex','boy_wants_anal','lubri'
+							gs 'dinSex','boy_wants_anal','lubri'
 							anala += 1
 							artemanal += 1
-							gs 'dinsex','analsex'
-							if pain['asshole'] + (agape * 10) > 40: gs 'dinsex','after_anal','no_plug' else gs 'dinsex', 'after_anal','pc'
+							gs 'dinSex','analsex'
+							if pain['asshole'] + (agape * 10) > 40: gs 'dinSex','after_anal','no_plug' else gs 'dinSex', 'after_anal','pc'
 							gs 'arousal','end'
 							gs 'stat'
 
@@ -806,14 +808,14 @@ if $ARGS[0] = 'kiss':
 								'You give him your best surprised look, and ask: "My ass, Artem? Really!?"'
 								'When you see him panic, you grin and say: "Just kidding, you pervert... alright, we can try. I''ll need to clean myself first though... do you have anything for that?"'
 								'Artem nods as he hands you something: "I have an enema kit... here."'
-								gs 'dinsex','enema','You quickly go to the bathroom and give yourself an enema.'
+								gs 'dinSex','enema','You quickly go to the bathroom and give yourself an enema.'
 								'When you return to his room, you get down on the couch and offer him your bare ass with a smile.'
 								'You ask him: "We need some lubricant also... do you have any? Maybe some petroleum jelly, or oil? Check the medicine cabinet, there might be something in there."'
-								gs 'dinsex','boy_wants_anal','lubri'
+								gs 'dinSex','boy_wants_anal','lubri'
 								anala += 1
 								artemanal += 1
-								gs 'dinsex','analsex'
-								if pain['asshole'] + (agape * 10) > 40: gs 'dinsex','after_anal','no_plug' else gs 'dinsex', 'after_anal','boy',$boydesc
+								gs 'dinSex','analsex'
+								if pain['asshole'] + (agape * 10) > 40: gs 'dinSex','after_anal','no_plug' else gs 'dinSex', 'after_anal','boy',$boydesc
 								gs 'arousal','end'
 								gs 'stat'
 
@@ -831,9 +833,9 @@ if $ARGS[0] = 'kiss':
 						sexa += 1
 						pose = 0
 						if artemsex >= 1:artemsex += 1
-						gs 'dinsex', 'boy_puts_his_condom'
-						gs 'dinsex','vaginal_sex',10
-						gs 'dinsex','sexcum'
+						gs 'dinSex', 'boy_puts_his_condom'
+						gs 'dinSex','vaginal_sex',10
+						gs 'dinSex','sexcum'
 						gs 'arousal','end'
 						gs 'stat'
 						if artemsex = 0:
@@ -899,7 +901,7 @@ if $ARGS[0] = 'artemSkver':
 	'After a while you end up near the movie theater. When Artem sees it, he suggests: "Hey, let''s go see a movie!"'
 	minut += 15
 	gs 'stat'
-	gs 'dinsex','artemGopSkver'
+	gs 'artemEv','artemGopSkver'
 
 	act '"A movie sounds like fun!"':
 		*clr & cla

locations/bed2

@@ -15,9 +15,9 @@ if $args[0] = 'options':
 			act 'If worn, you will wear your analplug through the night, click to always remove it':bedanal = 0 & gt 'bed2', 'options'
 		end
 	end
-	
-	
-	
+
+
+
 	if vibrator = 1 and cheatVib = 1:
 		if bedvibrator = 0:
 			act 'If worn, you will remove your vibrator at night, click to always leave it in':bedvibrator = 1 & gt 'bed2', 'options'
@@ -49,13 +49,18 @@ if $args[0] = '':
 
 	if pcs_sleep > 80:
 		'You are not tired.'
+		if $clothingworntype = 'nude':
+			$sleep_txt = 'Go to sleep'
+		else
+			$sleep_txt = 'Undress and go to sleep'
+		end
 	elseif succubusQW = 2:
-		act 'Undress and go to sleep':
+		act '<<$sleep_txt>>':
 			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 			gt 'bed2', 'succhoice'
 		end
 	else
-		act 'Undress and go to sleep':
+		act '<<$sleep_txt>>':
 			if disable_autosave = 0:
 				if StoryLine = 0:
 					savegame 'autosave.sav'
@@ -70,12 +75,13 @@ if $args[0] = '':
 				gt 'bed2', 'sleep'
 			end
 		end
+		killvar '$sleep_txt'
 	end
 
 	act 'Options':gt 'bed2', 'options'
 
 !!Braid hair skill
-	
+
 	if canBraidHair = 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800):
 		act 'Spend some time braiding your hair':
 			cls
@@ -85,7 +91,7 @@ if $args[0] = '':
 			act 'Return to bed':gt 'bed2'
 		end
 	end
-	
+
 	if hbraids > 0:
 		act 'Spend some time removing your braids':
 			cls
@@ -95,7 +101,7 @@ if $args[0] = '':
 			act 'Return to bed':gt 'bed2'
 		end
 	end
-	
+
 
 	act 'Get out of bed':gt $loc, $metka
 end
@@ -171,7 +177,7 @@ if $args[0] = 'sleep':
 		pcs_sleep += 15
 		gs 'stat'
 	end
-	
+
 	alarm_now = hour * 60 + minut
 	alarm_time = timer * 60 + timerM
 	alarm_set = alarm_time - rand(1,5)
@@ -212,17 +218,17 @@ if $ARGS[0] = 'wake_horny':
 	elseif $loc = 'bedr' and husband > 0:
 		'Or... you could wake up <<$husName>> and see if your husband can''t help you with that.'
 	end
-	
+
 	act 'Try and go back to sleep':
 		pcs_mood -= 10
 		pcs_sleep -= 5
 		gt 'bed2', 'sleep'
 	end
-	
+
 	act 'Masturbate': gt 'selfplay', 'start'
-	
+
 	act 'Get up': gt $loc, $metka
-		
+
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
 		act 'Wake Anya and see if she''s in the mood': gt 'sistersleep'
 	elseif $loc = 'FedorEv4':
@@ -237,7 +243,7 @@ end
 if $args[0] = 'wake':
 	'<<$waketext>>'
 	gs 'stat'
-	
+
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0 and ntstart = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
 

locations/bedr

@@ -34,7 +34,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 
 if rembedr = 0:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr.jpg"></center>'
-	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.' 
+	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
 	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) stands near the door to the corridor, on top of it there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> you can store some clothes in. The windows are closed with faded, heavy curtains.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
@@ -159,7 +159,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					minut -= 20
 					gs 'arousal', 'end'
 					gs 'stat'
-			
+
 					act 'Finish':gt 'bedr'
 				end
 			end
@@ -182,7 +182,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					minut -= 20
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Finish':gt 'bedr'
 				end
 			end
@@ -242,13 +242,18 @@ gs 'events', 'read_porn'
 gs 'subkid'
 
 if pcs_sleep <= 80:
+	if $clothingworntype = 'nude':
+		$sleep_txt = 'Go to sleep'
+	else
+		$sleep_txt = 'Undress and go to sleep'
+	end
 	if succubusQW = 2:
-		act 'Undress and go to sleep':
+		act '<<$sleep_txt>>':
 			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 			gt 'bed2', 'succhoice'
 		end
 	else
-		act 'Undress and go to sleep':
+		act '<<$sleep_txt>>':
 			if disable_autosave = 0:
 				if StoryLine = 0:
 					savegame 'autosave.sav'
@@ -263,6 +268,7 @@ if pcs_sleep <= 80:
 				gt 'bed2', 'sleep'
 			end
 		end
+		killvar '$sleep_txt'
 	end
 end
 

locations/bedrPar

@@ -24,7 +24,7 @@ if saveparQW = 2:
 	saveparjourQW = 3
 	act 'Continue':gt $loc, $metka
 	exit
-end	
+end
 if sisrelparday + 3 < daystart and saveparQW = 1:
 	cls
 	'When you enter the room you notice <<$namepopu2>>''s cage is open and he is gone.'
@@ -46,7 +46,7 @@ if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
 	'"What is that ?" your sister asks while pointing at <<$namepopu2>> in his cage'
 	'"I went to the shopping center and bought this bird. Isn''t he the cutest ?"'
-	if npc_rel['A33'] > 50: 
+	if npc_rel['A33'] > 50:
 		'"Not really, but I can see this is something you really want. So as long as he doesn''t make too much noise I don''t really care"'
 		sispopconf = 1
 	end
@@ -56,7 +56,7 @@ if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
 		'You go to the window, open it and release the bird'
 		popugai2 = 0
 	end
-	
+
 	act 'Leave':gt $loc, $metka
 	exit
 end
@@ -78,7 +78,7 @@ if popugai2 = 1:
 	if daystart - parbuydate > 40 and daystart - parbuydate <= 50: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
 	if daystart - parbuydate > 50 and daystart - parbuydate <= 55: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
 	if daystart - parbuydate > 55 and saveparQW < 3: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
-	if  saveparQW = 3: 
+	if  saveparQW = 3:
 		parfixrand = rand(0,9)
 		if parfixrand = 0:'When <<$namepopu2>> sees you he starts ''speaking''. He  is saying "<b>What Did You Say To Me?</b>"'
 		if parfixrand = 1:'When <<$namepopu2>> sees you he starts ''speaking''. He  is saying "<b>3.1415926535897932384 ....</b>"'
@@ -91,7 +91,7 @@ if popugai2 = 1:
 		if parfixrand = 8:'When <<$namepopu2>> sees you he starts ''speaking''. He  is saying "<b>That’s What She Said!</b>"'
 		if parfixrand = 9:'When <<$namepopu2>> sees you he starts ''speaking''. He  is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
 	end
-	
+
 	*nl
 end
 if budilnikOn = 0:
@@ -165,7 +165,7 @@ else
 
 	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
 
-	
+
 	if vcard > 0:
 		act 'Look at your deck of vintage porn cards':card_deck = 0 & gt 'card'
 	end
@@ -180,7 +180,7 @@ else
 !			act 'Look at your deck of new porn cards':gt 'card'
 !		elseif card = 1 and card = 2:
 !			act 'Look at your deck of vintage porn cards':gt 'card'
-!			act 'Look at your deck of new porn cards':gt 'card'			
+!			act 'Look at your deck of new porn cards':gt 'card'
 !		end
 !	end
 
@@ -245,13 +245,18 @@ if pcs_sewng >= 80:
 end
 
 if pcs_sleep <= 80:
+	if $clothingworntype = 'nude':
+		$sleep_txt = 'Go to sleep'
+	else
+		$sleep_txt = 'Undress and go to sleep'
+	end
 	if succubusQW = 2:
-		act 'Undress and go to sleep':
+		act '<<$sleep_txt>>':
 			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 			gt 'bed2', 'succhoice'
 		end
 	else
-		act 'Undress and go to sleep':
+		act '<<$sleep_txt>>':
 			if disable_autosave = 0:
 				if StoryLine = 0:
 					savegame 'autosave.sav'
@@ -266,6 +271,7 @@ if pcs_sleep <= 80:
 				gt 'bed2', 'sleep'
 			end
 		end
+		killvar '$sleep_txt'
 	end
 end
 

locations/brothel

@@ -106,6 +106,8 @@ if $ARGS[0] = 'lobby:toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	gs 'din_van', 'pblc_pee'
+	
 	act 'Leave':gt 'brothel', 'lobby'
 end
 
@@ -187,10 +189,10 @@ if $ARGS[0] = 'abducted':
 		'The barman dropped you on the bed face down, stripped you and tied your hands and feet to the corners of the bed.'
 		'You are barely able to resist, giving minimal resistance to your aggressor.'
 		'<font color=#<<$mas_font>>>"Ha slut! Now you will get another drink from me, the freshest one!"</font>'
-		gs 'pain', 1, 'armL', 'bind'
-		gs 'pain', 1, 'armR', 'bind'
-		gs 'pain', 1, 'legL', 'bind'
-		gs 'pain', 1, 'legR', 'bind'
+		gs 'pain', 2, 'armL', 'bind'
+		gs 'pain', 2, 'armR', 'bind'
+		gs 'pain', 2, 'legL', 'bind'
+		gs 'pain', 2, 'legR', 'bind'
 		gs 'stat'
 		stage = 1
 		act 'Continue':gt 'brothel', $this
@@ -204,10 +206,11 @@ if $ARGS[0] = 'abducted':
 		'<font color=#<<$mas_font>>>"What a whore! She''s already wet!"</font>'
 		'He uses the juiced fingers and thrusts them into your anus, once again forcing you back to a living world.'
 		'<font color=#<<$pcs_font>>>"Auuuuuuu!"</font> you wriggle in a cramp, feeling the sharp pain in your anus.'
-		gs 'pain', 3, 'asscheeks', 'pinch'
+		gs 'pain', 3, 'asshole', 'pinch'
 		$orgasm_or = 'no'
 		gs 'arousal', 'vaginal_finger', 5
 		gs 'arousal', 'anal_finger', 5
+		gs 'arousal', 'end'
 		gs 'stat'
 		stage = 2
 		act 'Continue':gt 'brothel', $this
@@ -220,8 +223,9 @@ if $ARGS[0] = 'abducted':
 		'All you can hear in that moment is a popping sound as the bottle plug shoots out.. The barman covers the neck of the bottle with his thumb and shakes it to build up a pressure..'
 		'..and then he forces it into you anus as far as it goes, while the sparkling wine gushes out deep into your intestines.'
 		'<font color=#<<$mas_font>>>"Ayyyieeee!"</font> Again you scream aloud shaking both in surprise and pain.'
-		gs 'pain', 7, 'asshole', 'stretch'
+		gs 'pain', 6, 'asshole', 'stretch'
 		gs 'arousal', 'anal_dildo', 5
+		gs 'arousal', 'end'
 		gs 'stat'
 		stage = 3
 		act 'Continue':gt 'brothel', $this
@@ -236,7 +240,7 @@ if $ARGS[0] = 'abducted':
 		'His dick is not the biggest one, but it is quite thick.'
 		'Your pussy is a first victim of the phallus, and after short while he moves to your anus.'
 		'Another jolt of pain runs through your bottom, but this time you fade away for sure..'
-		gs 'pain', 7, 'asshole', 'stretch'
+		gs 'pain', 6, 'asshole', 'stretch'
 		guy += 4
 		temp = 4
 		sexpartkno = 0
@@ -245,6 +249,7 @@ if $ARGS[0] = 'abducted':
 		gs 'boyStat', $npclastgenerated
 		gs 'arousal', 'vaginal', 5
 		gs 'arousal', 'anal', 10
+		gs 'arousal', 'end'
 		cumarrcon = 0
 		gs 'cum_call', 'anus', 'Rapist', 2
 		temp -= 1
@@ -253,7 +258,6 @@ if $ARGS[0] = 'abducted':
 		end
 		rape += 1
 		gang += 1
-		gs 'arousal', 'end'
 		$orgasm_or = ''
 		gs 'stat'
 		stage = 4
@@ -291,10 +295,10 @@ if $ARGS[0] = 'abducted':
 		'You feel strange fullness in your abdomen and your pussy and anus itch.'
 		'As you try to struggle out of the bounds you realize what has happened.. and what is left as a reminder..'
 		'You desperately try to push the plug out of your ass, but its rim is too wide and it rests well inside you.'
-		gs 'pain', 1, 'armL', 'bind'
-		gs 'pain', 1, 'armR', 'bind'
-		gs 'pain', 1, 'legL', 'bind'
-		gs 'pain', 1, 'legR', 'bind'
+		gs 'pain', 2, 'armL', 'bind'
+		gs 'pain', 2, 'armR', 'bind'
+		gs 'pain', 2, 'legL', 'bind'
+		gs 'pain', 2, 'legR', 'bind'
 		gs 'stat'
 		stage = 5
 		act 'Desperately wait':gt 'brothel', $this
@@ -323,7 +327,7 @@ if $ARGS[0] = 'abducted':
 		'<font color=#<<$pcs_font>>>"What?! No, don''t touch it!"</font>'
 		'<font color=#<<$mas_font>>>"Haha, they say do it swift, it hurts less! Let''s try it!"</font>'
 		'With those words he pulls the plug out, leaving your anus with huge gape..'
-		gs 'pain', 2, 'asshole', 'stretch'
+		gs 'pain', 3, 'asshole', 'stretch'
 		gs 'stat'
 		stage= 7
 		act 'Sob from pain':gt 'brothel', $this
@@ -334,8 +338,8 @@ if $ARGS[0] = 'abducted':
 		'<font color=#<<$mas_font>>>"Now tell me how did you like all of this. Answer me honestly and you will be free to go."</font>'
 		'<font color=#<<$pcs_font>>>"Well..."</font>'
 		stage = 8
-		act 'Admit that you somehow liked it as you fancy to be dominated':abdLike = 1 && gt 'brothel', $this
-		act 'Yell at him that it was horrible':abdLike = 0 && gt 'brothel', $this
+		act 'Admit that you somehow liked it as you fancy to be dominated':abdLike = 1 & gt 'brothel', $this
+		act 'Yell at him that it was horrible':abdLike = 0 & gt 'brothel', $this
 	elseif stage = 8:
 		if abdLike = 1:
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/abusedFace.jpg"></center>'
@@ -463,7 +467,8 @@ if $ARGS[0] = 'brothel:section1:lobby':
 		if $pantyworntype ! 'none': '- remove your panties'
 		if $clothingworntype ! 'nude': '- strip down your clothes'
 	end
-	act 'Go back to reception': gt 'brothel', 'brothel:reception'
+	act 'Go to the girl''s room':gt 'brothel', 'brothel:section1:girlroom'
+	act 'Go to the reception': gt 'brothel', 'brothel:reception'
 end
 
 if $ARGS[0] = 'brothel:section1:girlroom':
@@ -499,43 +504,50 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	act 'Have a snack (0:05)': gs 'food', 'snack'
 	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
-    act 'Have a shower':
+	act 'Have a shower':
 		cls
 		dynamic $showerdin
 		gs 'stat'
 		'<h3>Girl room</h3>'
 		'<h5>Shower</h5>'
-	    '<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
-	    'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
+		''
+		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
 		dynamic $brit
 		dynamic $dryOff
 	end
+	gs 'din_van', 'prvt_pee'
 	if klismaday < daystart:
-        act 'Give yourself an enema (0:05)':
-        	'<h3>Girl room</h3>'
+		act 'Give yourself an enema (0:05)':
+			'<h3>Girl room</h3>'
 			'<h5>Enema</h5>'
-            cla
-            *clr
-            cumspclnt = 7
-            gs 'cum_cleanup'
-            minut += 5
-            klismaday = daystart
-            klismaday1 = 1
-
-            '<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-            *nl
-            'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-
-            act 'Finish':gt 'brothel', $metka
-        end
-    end
-    dynamic $tampon
+			cla
+			*clr
+			cumspclnt = 7
+			gs 'cum_cleanup'
+			minut += 5
+			klismaday = daystart
+			klismaday1 = 1
+
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
+			*nl
+			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
+
+			act 'Finish':gt 'brothel', $metka
+		end
+	end
+	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
-		act 'Take a painkiller': pain['killer'] += 1 && painkiller -= 1 && gt 'brothel', $this
+		act 'Take a painkiller':
+			pain['killer'] += 1
+			painkiller -= 1
+			pcs_hydra += 20
+			gt 'brothel', $this
+		end
 	end
-    act 'Go back to lobby': gt 'brothel', 'brothel:section1:lobby'
+	act 'Go back to lobby': gt 'brothel', 'brothel:section1:lobby'
 end
 
 if $ARGS[0] = 'brothel:section1:lobby:cage':
@@ -851,6 +863,7 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 	if $finType = 'behind:vaginal':
 		custTime += 15
 		gs 'arousal', 'vaginal', 15, 'bound', 'sub', 'prostitution', 'humiliation', 'rough'
+		gs 'arousal', 'end'
 		gs 'stat'
 
 		'<h3>Playroom</h3>'
@@ -890,6 +903,8 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no no take it ouuuut! Maaaster pleaaase!"</font>'
 					'Just as you say that the next pound of Client''s dick pushes out the plug, which falls out down between your bound legs.'
 					analplugIN = 0
+					gs 'pain', 2, 'pussy', 'stretch'
+					gs 'stat'
 				else
 					'<center><video autoplay loop src="images/locations/shared/brothel/insertVaginalFromBehind.mp4"></video></center>'
 				end
@@ -915,6 +930,7 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 	elseif $finType = 'behind:anal':
 		custTime += 15
 		gs 'arousal', 'anal', 15, 'bound', 'sub', 'prostitution', 'humiliation', 'rough'
+		gs 'arousal', 'end'
 		gs 'stat'
 
 		'<h3>Playroom</h3>'
@@ -942,6 +958,8 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 					'Just as you say that the next pound of Client''s dick pushes out the plug, which falls out down between your bound legs.'
 					'The Client seems to disregard that, as he stretches your anus even more with his fallus.. Or maybe he does it on purpose!'
 					analplugIN = 0
+					gs 'pain', 2, 'anus', 'stretch'
+					gs 'stat'
 				else
 					'Both your pussy and your anus are too well on display.. You say to yourself: <font color=#<<$pcs_font>>>(Oh just please just don''t put it in my poor anus!)</font>'
 					'But as if you said your thought aloud, in precisely that moment the Client sticks a warm hard pole right in your ass.. up to his rim!'
@@ -960,6 +978,8 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no no take it ouuuut! Maaaster pleaaase!"</font>'
 					'Just as you say that the next pound of Client''s dick pushes out the plug, which falls out down between your bound legs.'
 					analplugIN = 0
+					gs 'pain', 4, 'anus', 'stretch'
+					gs 'stat'
 				else
 					'<center><video autoplay loop src="images/locations/shared/brothel/fuckAnalFromBehind.mp4"></video></center>'
 				end
@@ -984,6 +1004,8 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 	elseif $finType = 'missionary:vaginal':
 		custTime += 5
 		gs 'arousal', 'vaginal', 5, 'bound', 'sub', 'prostitution', 'humiliation', 'rough'
+		gs 'arousal', 'end'
+		gs 'pain', 2, 'cervix', 'ache'
 		gs 'stat'
 
 		'<h3>Playroom</h3>'
@@ -997,6 +1019,8 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 	elseif $finType = 'missionary:anal':
 		custTime += 5
 		gs 'arousal', 'anal', 5, 'bound', 'sub', 'prostitution', 'humiliation', 'rough'
+		gs 'arousal', 'end'
+		gs 'pain', 1, 'anus', 'stretch'
 		gs 'stat'
 
 		'<h3>Playroom</h3>'
@@ -1010,6 +1034,8 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 	elseif $finType = 'face:mouth':
 		custTime += 5
 		gs 'arousal', 'bj', 5, 'bound', 'sub', 'prostitution', 'humiliation', 'rough'
+		gs 'arousal', 'end'
+		gs 'pain', 2, 'throat', 'stretch'
 		gs 'stat'
 
 		'<h3>Playroom</h3>'
@@ -1042,6 +1068,7 @@ if $ARGS[0] = 'brothel:section1:session:play:finish':
 	elseif $finType = 'face:face':
 		custTime += 15
 		gs 'arousal', 'bj', 15, 'bound', 'sub', 'prostitution', 'humiliation', 'rough'
+		gs 'arousal', 'end'
 		gs 'stat'
 
 		'<h3>Playroom</h3>'
@@ -1091,6 +1118,8 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackFuckMouth':
 	'You choke, saliva everywhere, but it seems he won''t stop until you either suffocate or until he cums!'
 
 	gs 'arousal', 'bj', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'throat', 'stretch'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1117,6 +1146,8 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackFuckAnal':
 	'As it wasn''t enough, he slaps your tits every now and then, making the whole experience even more hopeless.'
 
 	gs 'arousal', 'anal', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'breasts', 'slap'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1143,6 +1174,7 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackFuckVaginal':
 	'As it wasn''t enough, he slaps your tits every now and then, making the whole experience even more hopeless.'
 
 	gs 'arousal', 'vaginal', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1164,7 +1196,9 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackTease':
 	'After a while he seems to be done, likely looking content with his explorations.'
 	'You notice a large bulge rising from his (still worn) pants.'
 
-	gs 'arousal', '', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'nipples', 'stretch'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1193,8 +1227,9 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackFistAnal':
 	'He pushes his hand even more inside, almost the whole elbow is in your intestines now!'
 	'He turns his fist from side to side, making your thin stomach bulge!'
 	gs 'arousal', 'anal_fist', 15, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'asshole', ''
-	gs 'pain', 1, 'tummy', ''
+	gs 'arousal', 'end'
+	gs 'pain', 3, 'asshole', 'stretch'
+	gs 'pain', 2, 'tummy', 'cramp'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1217,10 +1252,11 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackVibroPussy':
 	'Your fears come true in few seconds - he takes out a giant vibration device!'
 	'He puts the top of the device right on your exposed pussy lips, also spreading them to get right onto your clitoris.'
 	'Then he slowly reaches for the button with big red ON.'
-	gs 'pain', 1, 'clitoris', ''
+	gs 'pain', 3, 'clitoris', 'bind'
 	$orgasm_or = 'What comes next is too intesive for you, forcing you into an orgasm mixed with pain and loud screams!'
 	$orgasm_or = 'yes'
 	gs 'arousal', 'vaginal_vibe', 15, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1245,7 +1281,8 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBackWhipPussy':
 	'Then suddenly he starts to punish the most sensitive part of your young body, giving you no mercy.'
 
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'labia', 'spank'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'labia', 'spank'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1264,6 +1301,8 @@ if $ARGS[0] = 'brothel:section1:session:play:tiedOnBack':
 	'He brings some ropes and wooden sticks. <font color=#<<$pcs_font>>>(What does he need those for?)</font>'
 	'Soon you get to know what for - your titties! Not that he ties you, that would be expected, but he secures your tender tits with the wooden sticks, forcing them to get fuller and fuller..'
 	'You end up bound so securely, that all you can do is stare at him in expectation of what is coming next..'
+	gs 'pain', 2, 'breasts', 'bind'
+	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
 
@@ -1304,9 +1343,9 @@ if $ARGS[0] = 'brothel:section1:session:play:nailsandneedlestits':
 		'<font color=#<<$mas_font>>>"Would a bonus to your pay change your mind?"</font>'
 		'<font color=#<<$mas_font>>>"Wh..what bonus?"</font>'
 		'<font color=#<<$mas_font>>>"Ah, let''s say 50% more?"</font>'
-		act 'Say you''ll do it': step = 2 && bonus = 50 && gt 'brothel', $this
-		act 'Say you''ll do it fot 100% more': step = 3 && gt 'brothel', $this
-		act 'No way, you''ll never do that': step = 10 && gt 'brothel', $this
+		act 'Say you''ll do it': step = 2 & bonus = 50 & gt 'brothel', $this
+		act 'Say you''ll do it fot 100% more': step = 3 & gt 'brothel', $this
+		act 'No way, you''ll never do that': step = 10 & gt 'brothel', $this
 	elseif step = 2:
 		'<font color=#<<$mas_font>>>"A whore is a whore I see. Now let us begin!"</font>'
 		step = 4
@@ -1327,7 +1366,7 @@ if $ARGS[0] = 'brothel:section1:session:play:nailsandneedlestits':
 		end
 
 	elseif step = 4:
-		gs 'pain', 1, 'nipples', 'pierce'
+		gs 'pain', 3, 'nipples', 'pierce'
 		gs 'stat'
 		'He comes with a set of needles of various sizes. Judging by the fancy bag he carries them in, he is not doing this to a first girl..'
 		'One by one he takes them out of the bag and slowly penetrates your aearola.'
@@ -1345,7 +1384,7 @@ if $ARGS[0] = 'brothel:section1:session:play:nailsandneedlestits':
 		step = 5
 		act 'Continue': gt 'brothel', $this
 	elseif step = 5:
-		gs 'pain', 2, 'breasts', 'pierce'
+		gs 'pain', 4, 'breasts', 'pierce'
 		gs 'stat'
 		'He pulls out the needles, fast and not caring about the further pain it cuases.'
 		'He let''s you down, lies you on a wooden plank with your tits touching it.'
@@ -1360,6 +1399,8 @@ if $ARGS[0] = 'brothel:section1:session:play:nailsandneedlestits':
 		step = 6
 		act 'Endure': gt 'brothel', $this
 	elseif step = 6:
+		gs 'pain', 5, 'breasts', 'pierce'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/nailedbytitstotheground.jpg"></center>'
 		'At the end of the session, you lie on the wooden ground with your nipples being nailed to it, hanging by your hair and barely staying awake.'
 		'<font color=#<<$mas_font>>>"So slut, how did you like it?"</font>'
@@ -1368,29 +1409,29 @@ if $ARGS[0] = 'brothel:section1:session:play:nailsandneedlestits':
 		*nl
 		'<font color=#<<$mas_font>>>"Now beg me to fuck you!"</font>'
 		step = 0
-		act 'Beg him to fuck you': orgasmMeter = 100 && gt 'brothel', $sessionB
+		act 'Beg him to fuck you': orgasmMeter = 100 & gt 'brothel', $sessionB
 	elseif step = 10:
 		if caneFeetCount >= 3:
 			step = 20
 			gt 'brothel', $this
 		elseif caneFeetCount = 0:
 			caneFeetCount += 1
-			gs 'pain', 1, 'feet', 'spank'
+			gs 'pain', 2, 'feet', 'spank'
 			'<center><video autoplay loop src="images/locations/shared/brothel/canefeet.mp4"></video></center>'
 			'<font color=#<<$mas_font>>>"I think you need more motivation, slut."</font>'
 			'With that he takes your feet and starts to cane your sensitive feet, increasing the pace with every stroke!'
 			'<font color=#<<$pcs_font>>>"Oww! Oww! Oww! Oww! Oww!"</font>'
 			'<font color=#<<$mas_font>>>"So slave, what do you say now? Should I Continue with this, or do you agree with my offer?"</font>'
-			act 'Say you agree': step = 4 && gt 'brothel', $this
+			act 'Say you agree': step = 4 & gt 'brothel', $this
 			act 'Say you still don''t agree': gt 'brothel', $this
 		else
 			caneFeetCount += 1
-			gs 'pain', 1, 'feet', 'spank'
+			gs 'pain', 2, 'feet', 'spank'
 			'<center><video autoplay loop src="images/locations/shared/brothel/canefeet.mp4"></video></center>'
 			'<font color=#<<$mas_font>>>"Think about it slut! Think about your poor feet right now!"</font>'
 			'<font color=#<<$pcs_font>>>"Oww! Oww! Oww! Oww! Oww!"</font>'
 			'<font color=#<<$mas_font>>>"So slave, what do you say now? Should I Continue with this, or do you agree with my offer?"</font>'
-			act 'Say you agree': step = 4 && gt 'brothel', $this
+			act 'Say you agree': step = 4 & gt 'brothel', $this
 			act 'Say you still don''t agree': gt 'brothel', $this
 		end
 	elseif step = 20:
@@ -1411,7 +1452,8 @@ if $ARGS[0] = 'brothel:section1:session:play:whiptits':
 	'As you hang with hands tied, you can just watch as the Client takes a whip and repeatedly punishes your tender tities..'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww! Not.. Any.. More.. Please... Oww.."</font> with each stroke you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'breasts', 'spank'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'breasts', 'slap'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1425,7 +1467,8 @@ if $ARGS[0] = 'brothel:section1:session:play:canetits':
 	'As you hang with hands tied, you can just watch as the Client takes a wooden cane and repeatedly punishes your tender tities..'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww! Not.. Any.. More.. Please... Oww.."</font> with each stroke you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'breasts', 'hit'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'breasts', 'spank'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1440,7 +1483,8 @@ if $ARGS[0] = 'brothel:section1:session:play:pinchtits':
 	'First it is just unpleasenat but the repeated attacks on your tits make it worse with each attempt..'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww!"</font> with each pinch you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'breasts', 'pinch'
+	gs 'arousal', 'end'
+	gs 'pain', 3, 'breasts', 'pinch'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1455,7 +1499,8 @@ if $ARGS[0] = 'brothel:section1:session:play:punchtits':
 	'Your tender tities are but punchbags for as if this was a boxing session!'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww!"</font> with each punch you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'breasts', 'hit'
+	gs 'arousal', 'end'
+	gs 'pain', 3, 'breasts', 'hit'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1472,7 +1517,8 @@ if $ARGS[0] = 'brothel:section1:session:play:bindtits':
 	'<font color=#<<$pcs_font>>>"Not so tight Master please!"</font>'
 	'<font color=#<<$mas_font>>>"Shut up slut!"</font> he obviously wants you to suffer..'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'breasts', 'bind'
+	gs 'arousal', 'end'
+	gs 'pain', 3, 'breasts', 'bind'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1487,7 +1533,8 @@ if $ARGS[0] = 'brothel:section1:session:play:pinchboundtits':
 	'He uses his fingers to pinch your nipples, stretching them as far as they go.'
 	'Your tits are already so full that you feel as they should rupture any second, and by trying to catch the nipples, Client causes you extremely unpleasant sensations!'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'nipples', 'stretch'
+	gs 'arousal', 'end'
+	gs 'pain', 3, 'nipples', 'stretch'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1504,7 +1551,8 @@ if $ARGS[0] = 'brothel:section1:session:play:pullnipples':
 	'<font color=#<<$pcs_font>>>"Owwwwuuch!!!"</font> you gasp both in surprise and pain, trying to endure the continuous pull.'
 	'<font color=#<<$mas_font>>>"Nice! Do you think this will make your nipples longer, slut? Or will those shrink again? Let''s see!"</font>'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
-	gs 'pain', 1, 'nipples', 'stretch'
+	gs 'arousal', 'end'
+	gs 'pain', 2, 'nipples', 'stretch'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1521,6 +1569,7 @@ if $ARGS[0] = 'brothel:section1:session:play:hangbyneck':
 	'The Client comes with another rope, attaching it to already prepared hook hanging from the ceiling.'
 	'To your horror he snaps the rope around your neck as if he''s going to hang you dead!'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1538,6 +1587,8 @@ if $ARGS[0] = 'brothel:section1:session:play:hangbytits':
 	'<font color=#<<$mas_font>>>"NO, it''s not against the rules. They won''t tear off, you''ll see!"</font> with those words he starts to pull the rope up, leveling you from the ground just by your tits.'
 	'<font color=#<<$pcs_font>>>"AYYYEEEEEEEEEEEE!</font> you yell more from horror than actual pain, as you slowly realize..'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
+	gs 'pain', 3, 'breasts', 'bind'
 	gs 'stat'
 	act 'Continue': gt 'brothel', $sessionB
 end
@@ -1551,14 +1602,14 @@ if $ARGS[0] = 'brothel:section1:session:play:asshigh':
 	'<center><video autoplay loop src="images/locations/shared/brothel/asshigh.mp4"></video></center>'
 	'You are bound lying on your chest, Master raises your ass high in the air, forcing you to awkward position with both your holes on display, while tying you so you cannot move at all.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
 	act 'Continue': gt 'brothel', $sessionB
 end
 
 if $ARGS[0] = 'brothel:section1:session:play:buttplug':
 	!stage += 1
 	custTime += 2
-	gs 'pain', 1, 'asshole', 'stretch'
-
+	gs 'pain', 5, 'asshole', 'stretch'
 	'<h3>Playroom</h3>'
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
@@ -1568,6 +1619,7 @@ if $ARGS[0] = 'brothel:section1:session:play:buttplug':
 	'Disregarding your plea, Master says half for himself, obviously entertained <font color=#'+$mas_font+'>"It fits just nice, what a surprise! It looked quite thick!"</font>"'
 	'You can but guess what as you don''t see what happens behind you, however you feel cold, probably metallic plug in your anus.'
 	gs 'arousal', 'anal_dildo', 2, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
 	gs 'stat'
 	analplugIN = 1
 	act 'Continue': gt 'brothel', $sessionB
@@ -1583,6 +1635,7 @@ if $ARGS[0] = 'brothel:section1:session:play:electrodesAss':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/electrodesAss.jpg"></center>'
 	'You feel slightly cold sensation, as if something wet was put on and near your private areas.'
 	gs 'arousal', 'foreplay', 5, 'bound', 'sub', 'prostitution', 'humiliation'
+	gs 'arousal', 'end'
 	gs 'stat'
 	'The sensation fades away in a few seconds, leaving a feeling of something being sticked to your bottom parts.'
 	act 'Continue': gt 'brothel', $sessionB
@@ -1591,8 +1644,8 @@ end
 if $ARGS[0] = 'brothel:section1:session:play:electrocuteAss':
 	!stage += 1
 	custTime += 5
-	gs 'pain', 1, 'asscheeks', 'shock'
-	gs 'pain', 1, 'thighs', 'shock'
+	gs 'pain', 2, 'asscheeks', 'shock'
+	gs 'pain', 2, 'thighs', 'shock'
 
 	'<h3>Playroom</h3>'
 	'<h5>Electricity</h5>'
@@ -1601,6 +1654,7 @@ if $ARGS[0] = 'brothel:section1:session:play:electrocuteAss':
 	'<center><video autoplay loop src="images/locations/shared/brothel/electrocuteAss.mp4"></video></center>'
 	'Your body trembles in cramps as the electric discharge flows through your sensitive parts.'
 	gs 'arousal', 'anal', 5, 'sub', 'rough', 'maso', 'bound'
+	gs 'arousal', 'end'
 	gs 'stat'
 	'<font color=#<<$pcs_font>>>"Owwchhh! It hurts!"</font>'
 	'<font color=#'+$mas_font+'>"That''s the point slut! How do you like it? Tell me now!"</font>'
@@ -1623,6 +1677,7 @@ if $ARGS[0] = 'brothel:section1:session:play:electrocuteAssMore':
 	'Your body trembles in cramps to a limit as the electric discharge set on high settings flows through your sensitive parts.'
 	'You feel as your skin should peel away and your anus would tear apart any second.'
 	gs 'arousal', 'anal', 5, 'sub', 'rough', 'maso', 'bound'
+	gs 'arousal', 'end'
 	gs 'stat'
 	'<font color=#<<$pcs_font>>>"Owwchhh! It hurts so much! STOPP ITT!"</font>'
 	'<font color=#'+$mas_font+'>"You should''ve subdue at the first point, dumb slut. How do you like it now?"</font>'
@@ -1645,6 +1700,7 @@ if $ARGS[0] = 'brothel:section1:session:play:electrocuteAssMax':
 	'Your body trembles in cramps beyond a limit as the electric discharge set on highest settings flows through your sensitive parts and spreads throughout the whole body.'
 	'You feel as your skin should turn upside down and your anus would explode together with the stomach.'
 	gs 'arousal', 'anal', 5, 'sub', 'rough', 'maso', 'bound'
+	gs 'arousal', 'end'
 	gs 'stat'
 	'<font color=#<<$pcs_font>>>"Owwchhh! AAARHHHGHHGHGH!!!"</font> You are unable to even get out a senseless moan anymore..'
 	'<font color=#'+$mas_font+'>"Now this is what I call a barbecue party!"</font>'
@@ -1657,7 +1713,7 @@ if $ARGS[0] = 'brothel:section1:session:play:shockAnus':
 	!stage += 1
 	minut += 5
 	custTime += 5
-	gs 'pain', 1, 'asshole', 'shock'
+	gs 'pain', 3, 'asshole', 'shock'
 	gs 'stat'
 
 	'<h3>Playroom</h3>'
@@ -1678,6 +1734,7 @@ if $ARGS[0] = 'brothel:section1:session:play:pushplugout':
 	minut += 1
 	custTime += 1
 	analplugIN = 0
+	gs 'pain', 3, 'asshole', 'cramp'
 	gs 'stat'
 
 	'<h3>Playroom</h3>'
@@ -1728,6 +1785,8 @@ if $ARGS[0] = 'brothel:section1:session:play:end':
 			'With one hard pull he rips the plug out of your anus, causing your already weared anus additional pain!'
 			'<font color=#<<$pcs_font>>>"Ouuuuchhhhh! You moron, you didn''t even pay for this!"</font>'
 			analplugIN = 0
+			gs 'pain', 3, 'asshole', 'stretch'
+			gs 'stat'
 			act 'Yell at him to untie you': gt 'brothel', $this
 		else
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/receptionistGaze.jpg"></center>'
@@ -1751,6 +1810,8 @@ if $ARGS[0] = 'brothel:section1:session:play:end':
 		'<font color=#<<$pcs_font>>>Oww.. Oww.. Owwwch!</font> with loud wet "plop" the plug finally goes out!'
 		step = 0
 		analplugIN = 0
+		gs 'pain', 4, 'asshole', 'stretch'
+		gs 'stat'
 		act 'Throw it away and leave': gt 'brothel', 'brothel:section1:girlroom'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/sessionend.jpg"></center>'
@@ -1762,6 +1823,8 @@ if $ARGS[0] = 'brothel:section1:session:play:end':
 		*nl
 		'Finally in a few minutes the receptionist enters the playroom.'
 		step = 1
+		gs 'pain', 2, 'asscheeks', 'slap'
+		gs 'stat'
 		act 'Ask him to release you': gt 'brothel', $this
 	end
 end

locations/brother_voyeur

@@ -2319,7 +2319,7 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 	dynamic $showerdin
 	minut += 2
 	gs 'arousal','end'
-	if brotherfuck = 1 and brother_knows_not_virgin = 1:
+	if brotherfuck = 1 and brother_knows_not_virgin >= 1:
 		pcs_horny = 0
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/broshowersex2.jpg"></center>'
@@ -2404,6 +2404,43 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 				'	"Well, uhh, I''m definitely a virgin! I mean, I was until you fucked me for the first time, uhh, today!" you stammer, hoping your furious blush is covered up by the heat of the shower. "You definitely tore my hymen! It, uhh, it really hurt! Maybe you just didn''t notice when you did! I sure noticed! Ahaha, haha, ha..."'
 				'	"Hmm. Well, you <i>were</i> pretty tight. You''re probably right and I just didn''t feel it."'
 				'	You sigh quietly in relief, your hasty lies about your chastity bought by your brother. That was a close one...'
+				act'Finish showering':
+					pcs_horny = 0
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
+					'	Stepping out of the shower, you grab a towel to personally help your brother dry off, paying special attention to his cock and balls. Once finished, you stand back to smirk at him, you yourself still naked and dripping wet.'
+					'	"Well? Did you have fun showering with your sister??"'
+					'	Kolka does nothing but grin at you in response.'
+					*nl
+					act'Ruffle his hair and send him on his way':
+						cla
+						'	"Well, glad you enjoyed yourself," you say, ruffling his hair, smiling when he cringes back in response to the child-like treatment. "See you later bro."'
+						'	He nods back at you, picking up his clothes before peeking into the hallway to make sure no one is there and slipping out the door.'
+						brother_knows_not_virgin = 1
+						brothervirginlie = 0
+						act'Finish drying off':mirror_steam = hour & gt $loc
+					end
+						
+					act'Kiss him goodbye':
+						cla
+						'	You lean in to give your brother an intimate kiss, then stepping back to meet his eyes.'
+						'	"See you later," you whisper.'
+						'	He smiles back at you and picks up his clothes before peeking into the hallway to make sure no one is there and slipping out the door.'
+						brother_knows_not_virgin = 1
+						brothervirginlie = 0
+						act'Finish drying off':mirror_steam = hour & gt $loc
+					end
+					
+					act'Until next time (grab his cock)':
+						cla
+						'	A sly smile on your face, you step forward to grab him by the cock.'
+						'	"Until next time little brother," you murmur into his ear, giving his dick a hard squeeze. Then, you slap his ass and push him towards the door. "Now, shoo! Before someone catches us in here together."'
+						'	Startled, he does as you say, picking up his clothes and peeking into the hallway to make sure no one is there before slipping out the door.'
+						brotherSex += 1
+						brothervirginlie = 0
+						act'Finish drying off':mirror_steam = hour & gt $loc
+					end
+				end
 			end
 		elseif brotherfuck = 1 and brothervirginlie <= 2 and brothervirginlie >= 1:
 			cla
@@ -2452,6 +2489,7 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 						'	"Even if I have a boyfriend," you insist. "After all, my relationship with my brother is special. He took my virginity!"'
 						*nl
 						'	The conversation winding down, the two of you remember that you have to get your brother out of here, lest the rest of your family grow suspicious of his absence. Leaving the shower running, you quickly help him towel off. Afterwards, he collects his clothes, gives you another quick kiss on the cheek, and slips out the door into the hallway. Your brother gone, now there''s nothing left to do but turn off the water and dry yourself off.'
+						brothervirginlie = 0
 						act'Finish drying off':mirror_steam = hour & gt $loc
 					end
 				end
@@ -2490,7 +2528,7 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 					'	A sly smile on your face, you step forward to grab him by the cock.'
 					'	"Until next time little brother," you murmur into his ear, giving his dick a hard squeeze. Then, you slap his ass and push him towards the door. "Now, shoo! Before someone catches us in here together."'
 					'	Startled, he does as you say, picking up his clothes and peeking into the hallway to make sure no one is there before slipping out the door.'
-					brother_knows_not_virgin = 1
+					brotherSex += 1
 					brothervirginlie = 0
 					act'Finish drying off':mirror_steam = hour & gt $loc
 				end

locations/club

@@ -744,11 +744,11 @@ if $ARGS[0] = 'bar':
 		act 'Buy a drink (300 <b>₽</b>)':
 			cla
 			*clr
-			minut += 30
+			minut += 15
 			fat += 1
 			pcs_mood += 10
 			pcs_willpwr += 10
-			alko += 2
+			alko += 3
 			pcs_breath = 0
 			cumspclnt = 2
 			gs 'cum_cleanup'

locations/dolls

@@ -20,9 +20,10 @@ if $ARGS[0] = 'start':
 		bcolor = rgb(255, 255, 255)
 		lcolor = rgb(106, 90, 205)
 	end
-	
+
 	'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-    '<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dolls.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dolls.jpg"></center>'
+	''
 	'The store has a small front on a side street but one glance is all you need to tell this is not your average clothing store. Inside the store, shelves and racks of alternative clothes crammed into every available space - anybody setting out to find an inch of wall would have their work cut out for them. The checkout counter is near the entrance.'
 	if doll_staff_day ! daystart:
 		if rand(0,1) = 0:
@@ -34,27 +35,23 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'shop':
+	act 'Browse clothing':
 		cla
 		*clr
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dollsshop.jpg"></center>'
-		*nl
-		*nl
-		*nl
-		*nl
-		*nl
-		*nl
-		*nl
-		'<center><a href="exec:gt ''dolls'', ''clothing''">Look at the clothing</a></center>'
-		'<center><a href="exec:gt ''dolls'', ''shoes''">Look at the shoes</a></center>'
-		'<center><a href="exec:gt ''dolls'', ''purses''">Look at the purses</a></center>'
-!!		'<center><a href="exec:gt ''dolls'', ''jewelry''">Look at the jewelry</a></center>'
-!!		'<center><a href="exec:gt ''dolls'', ''piecrings''">Look at the piecrings</a></center>'
+		''
+		'The store has a small front on a side street but one glance is all you need to tell this is not your average clothing store. Inside the store, shelves and racks of alternative clothes crammed into every available space - anybody setting out to find an inch of wall would have their work cut out for them. The checkout counter is near the entrance.'
+
+		act 'Clothing':gt 'dolls', 'clothing'
+		act 'Shoes':gt 'dolls', 'shoes'
+		act 'Purses':gt 'dolls', 'purses'
+		!act 'Jewelery':gt 'dolls', 'jewelry'
+		!act 'Piercings':gt 'dolls', 'piecrings'
 
 		act 'Return': gt 'dolls', 'start'
 	end
-!!here should be a list of clothing you can buy. shoes, jewelry, clothing, piecrings, etc. Just a list of things to buy and click it takes you to a page showing all the items for sale. Like how most shops are done. 
+!!here should be a list of clothing you can buy. shoes, jewelry, clothing, piecrings, etc. Just a list of things to buy and click it takes you to a page showing all the items for sale. Like how most shops are done.
 
 	if doll_staff = 0:
 		if know_Savva = 1: 'As you walk in, Savva waves at you and smiles. "Hi <<$pcs_nickname>>, great to see you again! Let me know if I can help you with anything."'
@@ -96,7 +93,7 @@ if $ARGS[0] = 'clothing':
 		if alternative[i] = 0:
 			gs 'clothing_attributes', 'alternative', i
 			gs 'clothing_QV', 'shop_filter'
-				
+
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''dolls'', ''alternative''"><img src="images/pc/clothing/14alternative/<<i>>.jpg" 	height="250" /></a>'
 		end
 		i += 3
@@ -105,7 +102,7 @@ end
 
 if $ARGS[0] = 'alternative':
 	cla
-	
+
 	if alternative[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'dolls', 'clothing'
@@ -167,7 +164,7 @@ if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'dolls',i, 7000
 
 if $ARGS[0] = 'savva':
 	*clr
-	cla	
+	cla
 	'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/savva/savva.jpg"></center>'
 	if know_Savva = 0:

locations/family

@@ -6,6 +6,8 @@ if daystart ! m_day:
 end
 
 indorf = 0
+!brother or father are in the livign room
+ocpd_room = 0
 
 if indorf_month ! month and week ! 7 and week ! 1:
 	!!monthly
@@ -106,53 +108,72 @@ if StoryLine = 1:
 					'Your sister <a href="exec:GT ''sister'', ''gdk''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 				end
 			end
-		end		
+		end
 	end
 
 	if indorf = 0:
 		if $loc = 'bedrPar2':
 			if hour < 6 or hour >= 21:
 				'Your mom and stepfather are sleeping on the bed.'
-
 				if hour = 21:parsexrand = rand(0, 5)
 			end
 		end
 
 		if $loc = 'sitrPar':
 			if hour < 7 or hour >= 21:
+				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the couch.'
 			end
 
 			if week < 6:
 				if father_go = 0:
 					if hour >= 16 and hour < 21:
+						ocpd_room = 1
 						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
 					end
 				end
 
 				if hour >= 18 and hour < 20:
 					if kanikuli > 0:
+						ocpd_room = 1
 						'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
 					else
+						ocpd_room = 1
 						'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
 					end
 				end
 				if hour = 20:
+					ocpd_room = 1
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
 				end
 			end
 
 			if week >= 6:
 				if father_go = 0:
-					if hour >= 7 and hour < 21:'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+					if hour >= 7 and hour < 21:
+						ocpd_room = 1
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+					end
 				else
-					if hour >= 7 and hour < 16:'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+					if hour >= 7 and hour < 16:
+						ocpd_room = 1
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+					end
 				end
 
-				if hour >= 18 and hour <= 20:'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+				if hour >= 18 and hour <= 20:
+					ocpd_room = 1
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+				end
 			end
 		end
 
+		if $loc = 'sitrPar' and ocpd_room = 0:
+			'No one else is here right now, so I''m free to use the room how I like.'
+			act 'Sit on the sofa bed':gt 'sitrPar', 'sofa'
+			gs 'exercise','start'
+		end
+
 		if $loc = 'kuhrPar':
 			gs 'dinmother'
 

locations/food

@@ -1,5 +1,5 @@
 # food
-! Snacks: +20 pcs_energy +10 pcs_hydra,+6 fat
+! Snacks: +20 pcs_energy, +6 fat (most cases has water available separately)
 ! Fast Food: +70 pcs_energy +70 pcs_hydra, +12 fat (hamburgers, fried food, like the downtown diner)
 ! Small Meal: +40 pcs_energy +40 pcs_hydra, +3 fat (soup and sandwiches, cafe light lunches, etc)
 ! Medium Meal and Hotel Food: +60 pcs_energy +60 pcs_hydra, +6 fat (home cooked dinners and room service equivalent)
@@ -457,11 +457,6 @@ if $ARGS[0] = 'snack':
 	pcs_mood += 20
 	fat += 6
 	pcs_energy += 20
-	if pcs_hydra >= 100:
-		pcs_hydra += 10
-	else
-		pcs_hydra += 20
-	end
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0

locations/gkafe

@@ -70,9 +70,7 @@ else
 			if hour >= 6 and hour < 16 and StoryLine > 0:
 				'Your <a href="exec:gt ''mother''">mother</a> is currently working at the cafe bar.'
 			else
-				!!the borislav content is broken at the moment
-				!!'The bar owner <a href="exec:GT ''motherkafeboss''">Borislav</a> is currently taking orders in the bar. Most people call him Slava.'
-				'The bar owner Borislav is currently taking orders in the bar. Most people call him Slava.'
+				'The bar owner <a href="exec:GT ''motherkafeboss''">Borislav</a> is currently taking orders in the bar. Most people call him Slava.'
 			end
 		end
 			

locations/love

@@ -237,6 +237,8 @@ if $ARGS[0] = '2':
 	cla
 	*clr
 	'(Further actions are available.)'
+	!! if some writer would volunteer...
+	loverlove[lover_number] = 2
 
 	act 'To invite':
 		cla

locations/lover_meet

@@ -33,8 +33,6 @@ if $ARGS[0] = 'start':
 	lipsDay = 9
 	titsDay = 12
 	figureDay = 15
-	
-	gs 'lover_love'
 		
 	!! This is the start of the usual talk
 	!!character 0 - soft, 1 -norm 2 - aggressor
@@ -105,7 +103,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	
+	gs 'lover_love'
 	
 	!! QUEST VARIABLES!!! WOOOT ALMOST TIME!
 	didPushAway = 0

locations/metro

@@ -143,16 +143,16 @@ if $ARGS[0] = 'vagon':
 	end
 
 	if metro_busy = 0:
-		'<center><img src="images/locations/city/shared/metro/metroempty.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metroempty.jpg"></center>'
 		'The car is almost completely empty, one or two other passengers are in the car with you. It seems a bit odd and a little creepy seeing the car this empty. You have practically the whole car to yourself and pick the cleanest spot to sit.'
 	elseif metro_busy = 1:
-		'<center><img src="images/locations/city/shared/metro/metro.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro.jpg"></center>'
 		'The car is mostly empty, leaving you a choice of seats. You easily find a place for yourself, leaving you plenty of room to get comfortable. The few other people on the car, mind their own business, leaving you to your own thoughts.'
 	elseif metro_busy = 2:
-		'<center><img src="images/locations/city/shared/metro/metrofull<<rand(1,5)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metrofull<<rand(1,5)>>.jpg"></center>'
 		'The car is full of people, all of the seats are taken, but only a few people are forced to stand. You easily find a place for yourself, at least it is not packed, leaving you plenty of room to get comfortable.'
 	else
-		'<center><img src="images/locations/city/shared/metro/metropacked.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metropacked.jpg"></center>'
 		'The car is packed with people, most of them are forced to stand, as there is not enough seats. It is so tightly packed that people are crammed tight up against each other either in the seats or standing up. You manage to squeeze yourself in among the people, you can feel other bodies pressed up tightly against yours, it is very uncomfortable and hot.'
 	end
 

locations/pavSharedApt

@@ -286,7 +286,7 @@ if $ARGS[0] = 'start':
 		pavIntroStep = 0
 		introDone = 0
 		minut = 5
-		!Need to have some actual story to this with NPC reactions. 
+		!Need to have some actual story to this with NPC reactions.
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
 		'You''ve been kicked out of the apartment due to having children.'
 		pavSharedAptEnabled = 0
@@ -625,7 +625,7 @@ if $ARGS[0] = 'kitchen':
 			pcs_mood += rand(3, 6)
 			'You make a refreshing cup of tea and everything seems a little better.'
 		end
-		
+
 		gs 'stat'
 
 		act 'Get up from the table':gt 'pavSharedApt', 'kitchen'
@@ -824,60 +824,31 @@ if $ARGS[0] = 'pcsRoom':
 	'<center><b><font color="maroon">Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/sharedapt/bedroom/sofabed.jpg"></center>'
 	''
-	'The living room wasn''t in use by the other apartment occupants, so it is now rented to use as a bedroom. It''s sparsly decorated, with, a <a href="exec:gt ''bed'', ''start''">sofabed</a>, against the back wall.'
+	'The living room wasn''t in use by the other apartment occupants, so it is now rented to use as a bedroom. It''s sparsly decorated, with, a <a href="exec:gt ''bed'', ''start''">sofa bed</a>, against the back wall.'
 	''
-	'Beside the sofabed, is an old cabinet, with your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on top.'
+	'Beside the sofa bed, is an old cabinet, with your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on top.'
 	if budilnikOn = 0:
 		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''pavSharedApt'',''pcsRoom''">off</a>.'
 	else
 		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''pavSharedApt'',''pcsRoom''">on</a>.'
-	end 
+	end
 	''
 	if TV = 0:$TV = 'a great place for a TV, if you had one.'
 	if TV = 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
 	'There is an wall unit at the other side of the room, <<$TV>>. Everyone in the household spends their time in their own rooms, so there was never a reason to use the living room for its intended purpose.'
 	''
-	'On the other side of the sofabed are your old <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcases</a>, which you could use to store the clothes you don''t often wear.'
+	'On the other side of the sofa bed are your old <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcases</a>, which you could use to store the clothes you don''t often wear.'
 	''
 	'There is no door to the living room, instead there''s <a href="exec:view''images/shared/sharedapt/bedroom/curtain.jpg''">curtain</a> covering entry to the room, which gives you a modicum of privacy; not much better than the state of the non-existant window curtains'
 
-	act 'Sit on the sofabed':
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/sdivan.jpg"></center>'
-		'<center>A small sofabed, when not unfolded, is just big enough for you to curl up on and take a nap./center>'
-		
-		if pornMagazine > 0:'<br>There is a porn magazine under the sofa cushions'
-		
-		gs 'events', 'read_porn'
-		gs 'events', 'read'
-
-		if pcs_horny >= 50:
-			act 'Masturbate':gt 'selfplay', 'start'
-		end
-
-		act 'Take a nap (1:00)':
-			if pcs_sleep < 90:
-				pcs_sleep += 10
-				pcs_health += 5
-				minut += 60
-				gs 'stat'
-				'You sleep about an hour.'
-			else
-				minut += 5
-				gs 'stat'
-				'You are not tired enough to sleep, even for a short nap.'
-			end
-		end
-	act 'Get up':gt 'pavSharedApt', 'pcsRoom'
-	end
+	act 'Sit on the sofa bed':gt 'pavSharedApt', 'sofabed'
 
 	if obruch > 0: '<br>A hula hoop stands in corner of the room. '
 	if skak > 0: 'A jump rope is on a shelf. '
 	if bookYog > 0: 'A yoga mat is rolled up in a corner. '
 	gs 'exercise', 'start'
 	''
-	
+
 	if komp = 1:'Your <a href="exec:gorodokKomp = 1 & GT ''Komp'',''start''">laptop</a> is sitting on small table.'
 
 	if student > 0 and kursovik < 100:
@@ -891,7 +862,7 @@ if $ARGS[0] = 'pcsRoom':
 
 			pcs_mood -= 10
 			'<center><img <<$set_imgh>> src="images/pc/activities/study.jpg"></center>'
-			'You sit down on the sofabed and do your coursework, you''ve finished <<kursovik>> percent of it.'
+			'You sit down on the sofa bed and do your coursework, you''ve finished <<kursovik>> percent of it.'
 
 			act 'Stand up':gt 'pavSharedApt', 'pcsRoom'
 		end
@@ -972,40 +943,25 @@ if $ARGS[0] = 'pcsRoom':
 	if sewing_kit = 1:
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored on a shelf.'
 	end
-	
+
 	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
 
 	dynamic $wearpan
 	dynamic $removepan
 	!gs 'subkid'
 	if pcs_sleep <= 80:
-		if succubusQW = 2 and $clothingworntype ! 'nude':
-			act 'Undress and go to sleep':
-				gs 'clothing', 'strip'
-				gt 'bed2', 'succhoice'
-			end
-		elseif succubusQW = 2 and $clothingworntype = 'nude':
-			act 'Go to sleep':
+		if $clothingworntype = 'nude':
+			$sleep_txt = 'Go to sleep'
+		else
+			$sleep_txt = 'Undress and go to sleep'
+		end
+		if succubusQW = 2:
+			act '<<$sleep_txt>>':
+				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 				gt 'bed2', 'succhoice'
 			end
-		elseif $clothingworntype ! 'nude':
-			act 'Undress and go to sleep':
-				if disable_autosave = 0:
-					if StoryLine = 0:
-						savegame 'autosave.sav'
-					else
-						savegame 'autosave_alt.sav'
-					end
-				end
-				gs 'clothing', 'strip'
-				if magf2bdo = 2:
-					gt 'bed2', 'magbstchoice'
-				else
-					gt 'bed2', 'sleep'
-				end
-			end
-		elseif $clothingworntype = 'nude':
-			act 'Go to sleep':
+		else
+			act '<<$sleep_txt>>':
 				if disable_autosave = 0:
 					if StoryLine = 0:
 						savegame 'autosave.sav'
@@ -1013,17 +969,52 @@ if $ARGS[0] = 'pcsRoom':
 						savegame 'autosave_alt.sav'
 					end
 				end
+				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 				if magf2bdo = 2:
 					gt 'bed2', 'magbstchoice'
 				else
 					gt 'bed2', 'sleep'
 				end
 			end
+			killvar '$sleep_txt'
 		end
 	end
 	act 'Leave the room':gt 'pavSharedApt', 'start'
 end
 
+if $ARGS[0] = 'sofabed':
+	$loc = 'pavSharedApt'
+	$metka = 'sofabed'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/shared/sharedapt/bedroom/sofabed.jpg"></center>'
+	'<center>A small sofa bed, when not unfolded, is just big enough for you to curl up on and take a nap.</center>'
+
+	if pornMagazine > 0:'<br>There is a porn magazine under the sofa cushions'
+
+	gs 'events', 'read_porn'
+	gs 'events', 'read'
+
+	if pcs_horny >= 50:
+		act 'Masturbate':gt 'selfplay', 'start'
+	end
+
+	act 'Take a nap (1:00)':
+		if pcs_sleep < 90:
+			pcs_sleep += 10
+			pcs_health += 5
+			minut += 60
+			gs 'stat'
+			'You sleep about an hour.'
+		else
+			minut += 5
+			gs 'stat'
+			'You are not tired enough to sleep, even for a short nap.'
+		end
+	end
+	act 'Get up':gt 'pavSharedApt', 'pcsRoom'
+end
+
 if $ARGS[0] = 'ndRoom':
 	$loc = 'pavSharedApt'
 	$metka = 'ndRoom'

locations/poli

@@ -194,7 +194,7 @@ if $ARGS[0] = 'start':
 				KILLVAR 'hairkid',nextbaby-1
 				KILLVAR 'eyeskid',nextbaby-1
 				KILLVAR 'cumarrcon',nextbaby-1
-				KILLVAR '$wombpotfath',nextbaby-1
+				KILLVAR '$wombpotfath'
 				BabyEmbryo -= 1
 			end
 			nextbaby -= 1

locations/sexcontraprio

@@ -1,15 +1,25 @@
 # sexcontraprio
 
 !{Function that when given 2 different contraception types, returns the "higher priority" of the two. In brief, if PC had sex with the same guy twice with any two random contraceptive methods, which one would she think was the reason she got pregnant?}
+
+!0 - No contraception
+!1 - Lied about the pill
+!4 - Condom broke
+!5 - Condom fell off
+!7 - You sabotaged the condom
+!6 - Someone else sabotaged the condom
+!2 - You were on the pill
+!8 - Precum had sperm in it
+
 killvar 'conprio'
-conprio[0] = 0 !{No contraception}
-conprio[1] = 1 !{Lied about the pill}
-conprio[2] = 4 !{Condom broke}
-conprio[3] = 5 !{Condom fell off}
-conprio[4] = 7 !{You sabotaged the condom}
-conprio[5] = 6 !{Someone else sabotaged the condom}
-conprio[6] = 2 !{You were on the pill}
-conprio[7] = 8 !{Precum had sperm in it}
+conprio[0] = 0
+conprio[1] = 1
+conprio[2] = 4
+conprio[3] = 5
+conprio[4] = 7
+conprio[5] = 6
+conprio[6] = 2
+conprio[7] = 8
 i = 0
 :cumarrputecl
 if i < arrsize('conprio'):

locations/sitrPar

@@ -21,7 +21,7 @@ end
 '<center><b><font color="maroon">Living Room</font></b></center>'
 ! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
-'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a sofa, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
+'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a sofa bed, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
 gs 'family'
 gs 'subkid'
 
@@ -70,5 +70,38 @@ elseif month = 1 and day = 1:
 	end
 end
 
+if $ARGS[0]='sofa':
+	$metka = 'sofa'
+	$loc = 'sitrPar'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
+	'<center>A small sofa bed, when not unfolded, is just big enough for you to curl up on and take a nap.</center>'
+
+	if pornMagazine > 0:'<br>There is a porn magazine under the sofa cushions'
+
+	gs 'events', 'read_porn'
+	gs 'events', 'read'
+
+	if pcs_horny >= 50:
+		act 'Masturbate':gt 'selfplay', 'start'
+	end
+
+	act 'Take a nap (1:00)':
+		if pcs_sleep < 90:
+			pcs_sleep += 10
+			pcs_health += 5
+			minut += 60
+			gs 'stat'
+			'You sleep about an hour.'
+		else
+			minut += 5
+			gs 'stat'
+			'You are not tired enough to sleep, even for a short nap.'
+		end
+	end
+	act 'Get up':gt 'sitrPar'
+end
+
 --- sitrPar ---------------------------------
 

locations/stwork

@@ -1,12 +1,11 @@
 # stwork
 if $ARGS[0] = 'start':
-
 	$loc = 'stwork'
 	$metka = 'start'
 	$locM = 'stwork'
 	$metkaM = 'start'
 	$sexloc = 'stwork'
-    $location_type = 'private'
+	$location_type = 'private'
 	clr
 	minut += 5
 	stripMir = 1
@@ -22,10 +21,13 @@ if $ARGS[0] = 'start':
 	end
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/striprazd.jpg"></center>'
-	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
+	''
+	'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.'
-	'Behind the wooden door there''s the <a href="exec:gt ''stwork'', ''toilet''">staff toilet</a>.'
+	'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'
+	'Behind a wooden door there''s the <a href="exec:gt ''stwork'', ''toilet''">staff toilet</a>.'
+	
 	if tatlech > 0:stripKoef = rand(1, 3)
 	if tatback > 0:stripKoef2 = rand(1, 3)
 	if tatblly > 0:stripKoef3 = rand(1, 3)
@@ -44,7 +46,7 @@ if $ARGS[0] = 'start':
 					if pcs_sweat < 20:
 						if pcs_leghair <= 3 and pcs_pubes <= 3:
 							if fingal <= 0:
-								act 'Go on stage':stpredmet = 3 & gt 'stwork2', 'strip'
+								act '<b>Go on stage</b>':stpredmet = 3 & gt 'stwork2', 'strip'
 							else
 								'You aren''t allowed on stage, because of the black eye.'
 							end
@@ -66,6 +68,14 @@ if $ARGS[0] = 'start':
 	else
 		'You''re done for today. Time to head home.'
 	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'
+	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'
+	act 'Use staff toilet':gt 'stwork', 'toilet'
+	act 'Exit the club':gt 'stripclub', 'start'
 end
 
 if $ARGS[0] = 'stripgirl':
@@ -107,15 +117,44 @@ if $ARGS[0] = 'toilet':
 	$metkaM = 'toilet'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
-	'You enter a dirty and smelly toilet that''s probably never been cleaned.'
-
-	dynamic $basin
-
-	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-
-	dynamic $shower
+	''
+	'You enter a dirty and smelly staff bathroom that''s probably never been cleaned.'
+	'There is no mirror, only a grimy shower, toilet, and basin'
+
+	act 'Have a shower':
+		cls
+		dynamic $showerdin
+		'<h3>Staf Toilet</h3>'
+		'<h5>Shower</h5>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
+		''
+		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible for potential customers.'
+		dynamic $brit
+		act 'Get out and dry off':gt $locM, $metkaM
+	end
+	gs 'din_van', 'prvt_pee'
+	if klismaday < daystart:
+		act 'Give yourself an enema (0:05)':
+			'<h3>Toilet</h3>'
+			'<h5>Enema</h5>'
+			cla
+			*clr
+			cumspclnt = 7
+			gs 'cum_cleanup'
+			minut += 5
+			klismaday = daystart
+			klismaday1 = 1
+
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
+			*nl
+			'You give yourself an enema, feeling clean down there, hopefully avoiding any awkward surprises.'
+
+			act 'Continue':gt $locM, $metkaM
+		end
+	end
+	dynamic $tampon
 	dynamic $quickwash
+	dynamic $basin
 
 	act 'Leave the toilet':gt 'stwork', 'start'
 end

locations/worksalon

@@ -40,6 +40,8 @@ if $ARGS[0] = 'start':
 	act 'Have a snack (0:05)':gs 'food', 'snack'
 	
 	act 'Eat a light meal (0:20)':gs 'food', 's_meal'
+	
+	act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
 
 	if masha > 0:
 		act 'Chat with Masha':

locations/young_shop

@@ -41,7 +41,7 @@ if young_shop_work = 0:
 	*nl
 	'As you were entering, you noticed a for hire sign with a note scribbled onto it that reads, "<b>The Manager Mr. Sobulyagin works weekdays from 09:00 to 18:00; Applicants should speak to him weekdays BEFORE 14:30!</b>"'
 	if hour >= 9 and (hour < 15 or (hour = 14 and minut <= 30)) and week < 6:
-		act '<font color="navy">Talk to the manager</font>':
+		act 'Talk to the manager':
 			minut += 1
 			gt 'andrey'
 		end
@@ -49,7 +49,7 @@ if young_shop_work = 0:
 end
 
 if hour >= 9 and hour < 18 and week < 6 and (young_shop_work = 3 or young_shop_work = 2):
-	act '<font color="navy">Talk to the manager, maybe he will hire you again</font>':
+	act 'Talk to the manager, maybe he will hire you again':
 		minut += 1
 		gt 'andrey'
 	end