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

locations/andrey.qsrc

@@ -199,7 +199,7 @@ if $ARGS[0] = 'punish':
 		act 'Beg to keep your job':
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\trears1.jpg"></center>'
+			'<center><img src="images/pc/tears1.jpg"></center>'
 			'"Please, I can''t lose the job! I really need the money, please don''t fire me! I promise to do better." As you say this, tears begin rolling down your cheeks.'
 			*nl
 			'Mr. Sobulyagin scoffs at you, obviously not swayed so easily by tears. He looks at you in silence, his dark eyes roaming over your body slowly as he licks his lips. "Listen, I''m not a bad guy," he says as he stands from his chair and walks to the door. "I''m willing to give you another chance, but you need to <i>show me</i> how important this job really is to you..." He cups his balls through his slacks and gives them a light squeeze.'

locations/brothel.qsrc

@@ -471,7 +471,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any.'
+	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $metka">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $metka">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
@@ -501,7 +501,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 		''
 		'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 $dryOff
-		dynamic $brit
+		if stanok > 0: dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $toymanage
@@ -510,7 +510,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $removepan
-	dynamic $brit
+	if stanok > 0: dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':
 			pain['killer'] += 1

locations/cikl.qsrc

@@ -1023,10 +1023,14 @@ end
 
 if day = 25:
 	!! meynold payment
-	if mey_vika_qw >= 35 and mey_tamara_help_count >= 10 and mey_tamara_qw_end = 0:
-		money += 5000
-		'<b><font color=green>For your efforts aunt Tamara gave you 5,000 rubles</font></b>'
-		mey_tamara_help_count = 0
+	if  mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
+		karta += 10000
+		'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
+		mey_tamara['help_count'] = 0
+	elseif mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] >= 10 and mey_tamara['qw_end'] = 0:
+		karta += 15000
+		'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+		mey_tamara['help_count'] = 0
 	end
 
 	if PersSecWork = 1 and PersSecWorkTimes > 0 and paydaybistrosec = 0:

locations/gschool_boys_bathroom.qsrc

@@ -315,7 +315,7 @@ if $ARGS[0] = 'boy3_kiss':
 			'He doesn''t stop his movements, though; with how excited he must be, it''d probably be close to impossible for him to do that. He has adjusted the depth and speed of his penetration but doesn''t say a word, beyond his adjustments, shows no sign of noticing what he did. Still, it helps, and after a while, the pain recedes and you can feel pleasure taking the upper hand again. He chooses that moment to pull out of you; Lazar quickly lifts you off your feet and lays you on your back, across the sink. He spreads your legs and steps between them where he slips his <<dick>>cm <<$dick_girth>> cock back into your ass. This time, you can appreciate the feeling of him entering your backdoor and moan in satisfaction. Your lover takes advantage of the new position and occasionally squeezes your boobs; you follow his example and rub your clit, making this steamy encounter even more enjoyable for you. Minutes go by and he keeps speeding up, eventually fucking your little asshole as fast as he can, the shockwaves traveling to your clit and up your spine, adding to the building orgasm. That''s when you notice that his panting changes and he has a look of intense concentration on his face - he is obviously about to shoot his load.'
 			gs 'arousal', 'anal', 6
 			gs 'stat'
-			act 'You do your math homework?':
+			act 'Continue':
 				*clr & cla
 				gs 'cum_call', 'labia', $boy, 1, '', '', 20
 				gs 'cum_call', 'anus', $boy, 1, '', '', 20
@@ -329,16 +329,22 @@ if $ARGS[0] = 'boy3_kiss':
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of hot sperm lands on your inner thigh, another lands on your pubic area, a third hitting your wet cunt and fingers. He shudders a bit and finally stops spurting cum as your own shivers subside. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was good", he comments and you are inclined to agree.'
 				*nl
-				'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that postcoital high. As you get cleaned up in the sink he gets dressed, when you start to get dressed you see him grab your panties. You expect him to give them to you but instead he sticks them in his pocket instead. "Um Lazar I think those are mine." You say indicating the pocket he just stuck your panties in.'
-				act 'You do your math homework?':
+				'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that postcoital high.'
+				
+				!!Should probably also remove svetas panties
+				if $pantyworntype ! 'none': 'As you get cleaned up in the sink he gets dressed, when you start to get dressed you see him grab your panties. You expect him to give them to you but instead he sticks them in his pocket instead. "Um Lazar I think those are mine." You say indicating the pocket he just stuck your panties in.'
+				
+				act 'Continue':
 					*clr
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-					'He grins at you. "Not anymore." seeing the look on your face he adds. "Hey I play for trophies, the more gratifying the challenge the more I deserve a trophy and fucking you is very gratifying. So I think I earned these."'
-					'"Yeah well this isn''t a game we shared something intimate."'
-					'He laughs slightly. "Everything in life is just a game and trust me, every guy in school wishes he had been me a few minutes ago. Yet it was me so I earned them."'
-					'You roll your eyes at that but give up, if he wants them that bad, well that was great and maybe he did earn them. So instead of saying more you just shake your head and finish getting dressed.'
-					*nl
+					if $pantyworntype ! 'none':
+						'He grins at you. "Not anymore." seeing the look on your face he adds. "Hey I play for trophies, the more gratifying the challenge the more I deserve a trophy and fucking you is very gratifying. So I think I earned these."'
+						'"Yeah well this isn''t a game we shared something intimate."'
+						'He laughs slightly. "Everything in life is just a game and trust me, every guy in school wishes he had been me a few minutes ago. Yet it was me so I earned them."'
+						'You roll your eyes at that but give up, if he wants them that bad, well that was great and maybe he did earn them. So instead of saying more you just shake your head and finish getting dressed.'
+						*nl
+					end
 					'Suddenly, Lazar asks: "Hey <<$pcs_nickname>>, did you do the math homework?" You are a bit taken off-guard by the unexpected question - it just doesn''t seem to fit in with everything that''s just happened - and it takes you a moment to reply. "Yeah, why?"'
 					*nl
 					'"Mind if I borrow it and fill in mine real quick? I was busy with practice and didn''t have time." First taking each of your holes and now your homework, too? The thought crosses your mind and makes you grin but you nod anyway - what''s a little homework cheating between friends after you just let him fuck you up the ass in the boys room? It sure as hell beat going to class, though, and the two of you spend the rest of the period talking while he copies your homework.'

locations/gschool_grounds.qsrc

@@ -318,15 +318,24 @@ if $ARGS[0] = 'sports':
 	end
 
 	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
+		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
-
-		act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
+		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+			act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
+		else 
+			'You need to wear exercise clothes to participate.'
+		end
 	end
 
 	if week = 6 and schoolSorev = 1 and hour = 10 and SchoolBlock = 0:
+		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
-		act 'Participate in the 400m sprint race':gt 'gschool_grounds', 'SchoolRun'
+		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+			act 'Participate in the 400m sprint race':gt 'gschool_grounds', 'SchoolRun'
+		else
+			'You need to wear exercise clothes to participate.'
+		end
 	end
 
 	gs 'family'

locations/mey_home.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 			gt 'mey_tamara_events', 'party0'
 		end
 		! check appearance before going to corporate
-		if (hour = 17 or hour = 18) and mey_vika['mey_vika_qw'] = 41:
+		if week = 7 and (hour = 17 or hour = 18) and mey_vika['mey_vika_qw'] = 41:
 			'<br><a href="exec: gt''mey_tamara_events'',''check_look''">Tamara Mikhailovna.</a> is waiting for you in the lobby.'
 
 			exit

locations/obj_din.qsrc

@@ -748,7 +748,7 @@ if $ARGS[0] = 'stats':
 	'Prostitution preference: <<prostitution[''pref'']>>'
 	'Prostituted yourself: <<prostitution[''exp'']>>'
 	'Bondage preference: <<bound[''pref'']>>'
-	'Bondage ay: <<bound[''exp'']>>'
+	'Bondage play: <<bound[''exp'']>>'
 	'Masochism preference: <<maso[''pref'']>>'
 	'Masochism experiences: <<maso[''exp'']>>'
 	'Bestiality encounters: <<beast[''pref'']>>'
@@ -1198,7 +1198,7 @@ if $ARGS[0] = 'stats_fetish':
 	'Prostitution preference: <<prostitution[''pref'']>>'
 	'Prostituted yourself: <<prostitution[''exp'']>>'
 	'Bondage preference: <<bound[''pref'']>>'
-	'Bondage ay: <<bound[''exp'']>>'
+	'Bondage play: <<bound[''exp'']>>'
 	'Masochism preference: <<maso[''pref'']>>'
 	'Masochism experiences: <<maso[''exp'']>>'
 	'Bestiality encounters: <<beast[''pref'']>>'

locations/police_station.qsrc

@@ -24,24 +24,40 @@ if $ARGS[0] = 'entrance':
 	!first time offender, event where Sveta gets caught stealing
 	!need to add a variable to store that Sveta has been brought into the police station
 	if shplft_booked + prst_booked = 0:
-		gt 'police_station', 'first'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'first', 'shplft'
+		else
+			gs 'police_station', 'first', 'prst'
+		end
 	elseif shplft_booked + prst_booked < 6:
-		gt 'police_station', 'repeat'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'repeat', 'shplft'
+		else
+			gs 'police_station', 'repeat', 'prst'
+		end
 	elseif shplft_booked + prst_booked < 11:
-		gt 'police_station', 'multiple'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'multiple', 'shplft'
+		else
+			gs 'police_station', 'multiple', 'prst'
+		end
 	else
-		gt 'police_station', 'regular'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'regular', 'shplft'
+		else
+			gs 'police_station', 'regular', 'prst'
+		end 
 	end
 end
 
 if $ARGS[0] = 'first':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
 
 		if toldonguard = 2:
 			!! if had sex with the security guard but still got arrested
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -55,7 +71,7 @@ if $ARGS[0] = 'first':
 
 		elseif grupTipe = 4:
 			!else if gopnik
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -70,7 +86,7 @@ if $ARGS[0] = 'first':
 
 		elseif hotcat > 7:
 			!else if beautiful
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -84,7 +100,7 @@ if $ARGS[0] = 'first':
 
 		elseif hotcat < 3:
 			!else if ugly
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -98,7 +114,7 @@ if $ARGS[0] = 'first':
 
 		else
 			!if plain looking
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -110,14 +126,14 @@ if $ARGS[0] = 'first':
 
 			act 'Continue further in':gt 'police_station', 'booking'
 		end
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 
 		if hotcat < 3:
 			!Prostitute event, this will be an continuation to the prostitute events that happened earlier
 			!if ugly
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -128,7 +144,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if plain
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -139,7 +155,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if beautiful
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -153,7 +169,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if ugly and bribed the officer with money
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -164,7 +180,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if plain and bribed the officer with money
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -175,7 +191,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if beautiful and bribed the officer with money
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -186,7 +202,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if ugly and bribed the officer with sex
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -198,7 +214,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if plain and bribed the officer with sex
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -210,7 +226,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if beautiful and bribed the officer with sex
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -226,10 +242,10 @@ end
 
 
 if $ARGS[0] = 'repeat':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 	end
@@ -290,10 +306,10 @@ if $ARGS[0] = 'repeat':
 end
 
 if $ARGS[0] = 'multiple':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 	end
@@ -352,10 +368,10 @@ if $ARGS[0] = 'multiple':
 end
 
 if $ARGS[0] = 'regular':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 	end
@@ -1136,6 +1152,7 @@ if $ARGS[0] = 'shplft_easy':
 	*clr & cla
 	minut += 20
 	picrand = rand(1, 2)
+	$detec_type = 'easy'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
 	'He takes a seat at the table opposite of you, "So caught stealing, eh?" he asks.'
@@ -1173,6 +1190,7 @@ if $ARGS[0] = 'shplft_norm':
 	*clr & cla
 	minut += 20
 	picrand = rand(1, 2)
+	$detec_type = 'norm'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
 	'He takes a seat opposite of you, "So caught stealing, eh?" he asks.'
@@ -1210,6 +1228,7 @@ if $ARGS[0] = 'shplft_hard':
 	*clr & cla
 	minut += 20
 	picrand = rand(1, 2)
+	$detec_type = 'hard'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
 	'He takes a seat opposite of you, "So caught stealing, eh?" he asks.'
@@ -1246,6 +1265,7 @@ if $ARGS[0] = 'prst_easy':
 	!easy going detective
 	*clr & cla
 	minut += 20
+	$detec_type = 'easy'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
 	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
@@ -1289,6 +1309,7 @@ if $ARGS[0] = 'prst_norm':
 !normal detective
 	*clr & cla
 	minut += 20
+	$detec_type = 'norm'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
 	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
@@ -1336,6 +1357,7 @@ if $ARGS[0] = 'prst_hard':
 !rough detective
 	*clr & cla
 	minut += 20
+	$detec_type = 'hard'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
 	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
@@ -1434,6 +1456,7 @@ if $ARGS[0] = 'returncell':
 				'"Go on before they change their mind," she smiles.'
 				'You say good bye to each other and the officer leads you towards the entrance and as the police station doors open you can feel the fresh wind breeze against your face.'
 
+				Sentence_date = daystart + 7
 				act 'Walk outside':gt 'down'
 
 			end
@@ -1450,6 +1473,7 @@ if $ARGS[0] = 'returncell':
 		'Some time passes by and the cell door opens, "<<$pcs_lastname>>, it''s your time to get released."'
 		'You quickly jump up and hurry out from the holding cell. The officer leads you towards the entrance and as the police station doors open you can feel the fresh wind breeze against your face.'
 
+		Sentence_date = daystart + 7
 		act 'Walk outside':gt 'down'
 	end
 end

locations/sauna.qsrc

@@ -93,9 +93,9 @@ if $ARGS[0] = 'saunaroom':
 	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
 
 	if budilnikOn = 0:
-		'<br>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 ''<<$loc>>''">off</a>.'
+		'<br>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 ''sauna'', ''saunaroom''">off</a>.'
 	else
-		'<br>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 ''<<$loc>>''">on</a>.'
+		'<br>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 ''sauna'', ''saunaroom''">on</a>.'
 	end
 
 	if SaunaWhore > 0 and money > 0 and workDolg > 0:

locations/saunawhore.qsrc

@@ -228,10 +228,10 @@ end
 
 if $ARGS[0] = 'blowjob':
 	minut += 5
-	'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
-
+	
 	if $moodType = 'fairly normal':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
+		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He pulls out his <<$dick_girth>> dick and brings it to your <<$liptalk>>.'
 		'You start kissing the tip, licking it all around and putting it a bit inside your mouth and sucking the head.'
 		gs 'arousal', 'bj', 5, 'prostitution'
@@ -240,12 +240,14 @@ if $ARGS[0] = 'blowjob':
 		act 'Suck it':gt 'saunawhore', 'blowjobGate'
 	elseif $moodType = 'good':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
+		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He comes close to you, fondles your hair and face and takes you gently by your arm, raising you up from the floor.'
 		'He directs you to the bed, undresses and both of you lie down.'
 
 		act 'Embrace him':gt 'saunawhore', 'fuckGate'
 	elseif $moodType = 'bad':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/slapface'+rand(1, 1)+'.mp4"></video></center>'
+		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He comes close to you and suddenly slaps your face hard.'
 		'You are caught by surprise and tears well up in your eyes.'
 		'He seems very angry and even aroused by your misfortune.'
@@ -914,13 +916,13 @@ if $ARGS[0] = 'saunawork':
 				else
 					if rand(0, 100) >= 40:saunaWorkKlient = 1
 				end
-				
+
 				if saunaWorkKlient = 1:
 					cls
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunawhore.jpg"></center>'
 					'A client has arrived at the sauna, and the girls line up so that the customer can choose his favorite.'
-					
+
 					if rand(0, 120) < pcs_apprnc:
 						'Client jabs a finger at you, "This one."'
 						act 'Go to the sauna with client':
@@ -1019,14 +1021,14 @@ if $ARGS[0] = 'bathroom':
 	$locM = 'saunawhore'
 	$metkaM = 'bathroom'
 	$location_type = 'bathroom'
-	
+
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
 	''
 	'You enter the staff bathroom, which is usually cleaned by the girls that have only just started work here, voluntary or otherwise.'
 	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet, and basin.'
-		
+
 	act 'Return to foyer': minut += 1 & gt 'saunawhore', 'saunawork'
 
 	act 'Take a shower (0:15)':
@@ -1038,24 +1040,29 @@ if $ARGS[0] = 'bathroom':
 		'<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.'
-		act 'Get out and dry off':gt $locM, $metkaM
 		if workDolg > 0:
-			gs 'saunawhore', 'saunabrit'
-		else
+			if stanok <= 0: stanok = 5
+			dynamic $brit
+		elseif workDolg = 0 and stanok > 0:
 			dynamic $brit
 		end
+		dynamic $dryOff
 	end
 
 	if workDolg > 0:
-		gs 'saunawhore', 'saunabrit'
+		*nl
+		'There are a handful of cheap razors you can use, enough for <<stanok>> shaves. At least they don''t make you pay for them, but only because they don''t know who has used which blades. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+		if stanok <= 0: stanok = 5
+		dynamic $brit
 	elseif workDolg = 0 and stanok > 0:
+		*nl
+		'Your currnet pack of razors will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
 	elseif workDolg = 0 and stanok = 0:
-		'Your razor blade looks in good enough shape for <b><<stanok>></b> more shaves.'	
+		*nl
+		'You have <<stanok>> razors left. You should to go to the store and buy more razors. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	end
 	gs 'din_van', 'prvt_pee'
-
-	dynamic $toymanage
 	dynamic $enema
 
 	if workdolg > 0:
@@ -1067,31 +1074,24 @@ if $ARGS[0] = 'bathroom':
 				minut += 5
 				pcs_mood -= 5
 				workDolg += 10
-	
+
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
 				'You use a tampon, it will add another 10 <b>₽</b> to your debt, but the alternative is unpleasant.'
-	
+
 				act 'Finish':gt $locM, $metkaM
 			end
 		end
 	elseif workdolg = 0:
 		dynamic $tampon
 	end
-	
+
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
-	dynamic $removepan
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump' :gt 'lact_lib', 'bp_milking'
 	end
 end
 
-if $ARGS[0] = 'saunabrit':
-	'There are a handful of cheap razors you can use. At least they don''t make you pay for them, but only because they don''t know who has used which blades.'
-	dynamic $brit
-	act 'Get out and dry off':gt $locM, $metkaM
-end
-
 --- saunaWhore ---------------------------------