glife.qproj

@@ -995,7 +995,6 @@
 		<Location name="$menu_obnovit"/>
 		<Location name="$menu_bloknot"/>
 		<Location name="$menu_avariya"/>
-		<Location name="$menu_addoldmenu"/>
 		<Location name="$menu_autosave"/>
 		<Location name="$menu_cheat"/>
 	</Folder>

locations/Gadbana.qsrc

@@ -98,6 +98,7 @@ if mira = 0:
 	gs 'din_van', 'prvt_pee'
 	dynamic $tampon
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if painkiller > 0:
@@ -161,71 +162,8 @@ if mira = 0:
 			gt 'lact_lib', 'bp_milking'
 		end
 	end
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
 
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
-
-			if pcs_vag < 30:pcs_vag += 2
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
+	dynamic $toymanage
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -239,20 +177,6 @@ if mira = 0:
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	if (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			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>'
-			'You use Baba''s enema to clean yourself out down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'Gadbana'
-		end
-	end
 else
 	!125st
 	act 'Undress':

locations/Gadsarai.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = '':
 			act 'Push off': minut += 1 & gt 'Gaddvor'
 		else
 			act 'Submit':
-				cls
+				*clr & cla
 				banditknow = RAND(0,1)
 				npc_horny['A66'] = 0
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/predoggy.jpg"></center>'
@@ -28,7 +28,7 @@ if $ARGS[0] = '':
 				if banditknow = 1:
 					if pcs_vag = 0:
 						act 'Wait':
-							cls
+							*clr & cla
 							if npc_QW['A66'] < 30:npc_QW['A66'] += 5
 							pcs_vag = 5
 							vgape = 3
@@ -46,11 +46,11 @@ if $ARGS[0] = '':
 							act 'So I more or girl':gt 'Gadsarai'
 						end
 					else
-						cls
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/beast/bandit/piratvag.jpg"></center>'
 						act 'Wait':
 							if pcs_vag < 10:
-								cls
+								*clr & cla
 								pcs_vag += 5
 								vgape = 3
 								pcs_horny = 0
@@ -67,7 +67,7 @@ if $ARGS[0] = '':
 								gs 'stat'
 								act 'Close':gt 'Gadsarai'
 							elseif pcs_vag >= 10 and pcs_vag < 25:
-								cls
+								*clr & cla
 								pcs_vag += 4
 								vgape = 2
 								gs 'boyStat', 'A66'
@@ -75,7 +75,7 @@ if $ARGS[0] = '':
 								gs 'cum_manage'
 								gs 'stat'
 								if pcs_horny >= 100:
-									cls
+									*clr & cla
 									pcs_mood = 100
 									if pirsG = 1:
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcumpirs.jpg"></center>'
@@ -102,14 +102,14 @@ if $ARGS[0] = '':
 								end
 								act 'Close':gt 'Gadsarai'
 							elseif pcs_vag >= 25 and pcs_vag < 35:
-								cls
+								*clr & cla
 								pcs_vag += 3
 								gs 'boyStat', 'A66'
 								sexvolume = rand(20,590)
 								gs 'cum_manage'
 								gs 'stat'
 								if pcs_horny >= 100:
-									cls
+									*clr & cla
 									pcs_mood = 100
 									if pirsG = 1:
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcumpirs.jpg"></center>'
@@ -134,14 +134,14 @@ if $ARGS[0] = '':
 								end
 								act 'Close':gt 'Gadsarai'
 							elseif pcs_vag >= 35:
-								cls
+								*clr & cla
 								pcs_vag += 1
 								gs 'boyStat', 'A66'
 								sexvolume = rand(20,590)
 								gs 'cum_manage'
 								gs 'stat'
 								if pcs_horny >= 100:
-									cls
+									*clr & cla
 									pcs_mood = 100
 									if pirsG = 1:
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcumpirs.jpg"></center>'
@@ -166,7 +166,7 @@ if $ARGS[0] = '':
 					end
 				else
 					act 'Wait':
-						cls
+						*clr & cla
 						minut += 2
 						pcs_mood = 50
 						sub += RAND(0,1)
@@ -211,7 +211,7 @@ if $ARGS[0] = '':
 							gs 'cum_manage'
 							gs 'stat'
 							if pcs_horny >= 100:
-								cls
+								*clr & cla
 								pcs_mood = 100
 								'<center><img <<$set_imgh>> src="images/beast/bandit/analknotcum.jpg"></center>'
 								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is a little pain, but your starting to moan louder with pleasure as Bandit forces his hard cock into you.'
@@ -239,7 +239,7 @@ if $ARGS[0] = '':
 							gs 'cum_manage'
 							gs 'stat'
 							if pcs_horny >= 100:
-								cls
+								*clr & cla
 								pcs_mood = 100
 								'<center><img <<$set_imgh>> src="images/beast/bandit/analcum.jpg"></center>'
 								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is almost no pain, and your starting to moan louder with animal lust and pleasure as Bandit forces his hard cock into you. You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him.'
@@ -320,11 +320,11 @@ if $ARGS[0] = '':
 
 		act 'Poke around in the barn':
 			if grigoryEV > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
-			cls
+			*clr & cla
 			minut += 15
 			gs 'stat'
 			if vcard = 0:
-				cls
+				*clr & cla
 				if RAND(0,5) >= 4:
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
@@ -333,11 +333,11 @@ if $ARGS[0] = '':
 					observ_exp += 3
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-					'In the barn you find many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			elseif findvel = 0:
-				cls
+				*clr & cla
 				if RAND(0,8) >= 7:
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
@@ -346,11 +346,11 @@ if $ARGS[0] = '':
 					observ_exp += 3
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			elseif findbag = 0 and bag = 0:
-				cls
+				*clr & cla
 				if RAND(0,10) > 9:
 					findbag = 1
 					observ_exp += 3
@@ -361,16 +361,14 @@ if $ARGS[0] = '':
 					$currentpursetype = 'cheap'
 					currentpursenumber = 5
 					bag = 1
-					if menu_option = 1:gs 'obj_din', 'old'
-					if menu_option = 0:gs 'obj_din', 'new'
 					'You can use this cool looking bag as a handbag.'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay'
+					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			elseif findbraclet = 0:
-				cls
+				*clr & cla
 				if RAND(0,15) >= 14:
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
@@ -379,11 +377,11 @@ if $ARGS[0] = '':
 					observ_exp += 3
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			elseif findbraclet > 0 and findneck = 0:
-				cls
+				*clr & cla
 				if RAND(0,20) >= 19:
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
@@ -395,15 +393,15 @@ if $ARGS[0] = '':
 					findneck = 1
 					observ_exp += 3
 				else
-					cls
+					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			end
 		end
@@ -433,7 +431,7 @@ end
 
 !125s
 if $ARGS[0] = 'boar':
-	cls
+	*clr & cla
 	minut += 1
 	gs 'stat'
 
@@ -461,7 +459,7 @@ if $ARGS[0] = 'boar':
 end
 
 if $ARGS[0] = 'cow':
-	cls
+	*clr & cla
 	minut += 1
 	gs 'stat'
 
@@ -523,7 +521,7 @@ if $ARGS[0] = 'cow':
 end
 
 if $ARGS[0] = 'horse':
-	cls
+	*clr & cla
 	minut += 1
 	gs 'stat'
 
@@ -600,7 +598,7 @@ if $ARGS[0] = 'horse':
 end
 
 if $ARGS[0] = 'mira_dog':
-	cls
+	*clr & cla
 	minut += 5
 	gs 'stat'
 
@@ -629,7 +627,7 @@ end
 ! this is in memory of the untimely deceased Bandit(((
 !{
 if know_no_bandit = 0:
-	cls
+	*clr & cla
 	minut += 60
 	know_no_bandit = 1
 	gs'stat'

locations/HanterLoveSex.qsrc

@@ -3463,7 +3463,7 @@ if $ARGS[0] = 'din_hanters_bj10':
 	pcs_throat += 1
 	hanters_bj_times += 1
 	'<center><H4>Hut</H4></center>'
-	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/kotovbj10'+rand(0,3)+'.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj1'+rand(0,3)+'.mp4"></video></center>'
 	*pl
 	h = rand(1,3)
 	'You obey him and fully relax your throat. <<$boydesc>>  begins to move his cock, plunging deeper into your asophagus. You choke and barely keep yourself from vomiting all over his meaty schlong. You can feel the head of his cock resting at the back of your mouth and you do your best to swallow it down, squeezing it with the muscles in your throat.'

locations/Komp.qsrc

@@ -42,8 +42,11 @@ if $ARGS[0] = 'brows':
 		'<center><b>Browser</b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/eror.jpg"></center>'
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
+		if camwhore = 1:
+			'Since MyFreeCams will cover the cost, you can still log on to do a cam show.'
+			act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
+		end
 	else
-
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/komp.jpg"></center>'
 		'You go to your favourite start page, while you try to decide on what you want to see right now.'
 
@@ -459,7 +462,7 @@ if $ARGS[0] = 'rabota':
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore1.jpg"></center>'
 				'You click the button and get taken to the full job description.'
 				'<i>For this job, you will have to expose your body in front of customers, fulfilling their wishes. Payment is completely based on a tip system: customers on the website can buy tokens, which they can use to tip girls they enjoy watching.'
-				'How much money you make is up to you: the better you are at attracting viewers, and the more you are willing to do to please them, the more likely they will be to tip you.'
+				'The website will cover all costs during your shows. But how much money you make is up to you: the better you are at attracting viewers, and the more you are willing to do to please them, the more likely they will be to tip you.'
 				'After a quick verification, you usually get paid immediately after a session ends. The tokens you earn will be converted to rubles, and paid to your bank account right away.'
 				'The website hides your stream for viewers from your region, so the chance of being recognized by someone you know in real life is very low.'
 				'If you''re interested in becoming a webcam girl, please fill in this questionnaire below.</i>'
@@ -648,7 +651,7 @@ if $ARGS[0] = 'startpagemfc':
 		gs 'stat'
 		'While you sit in your chair, you can''t help but wince every time you move. You want to put up a show, but it hurts too much. And besides... you doubt your viewers would want to see you in your current state! You should heal up a bit before trying again.'
 		act 'Collect your earnings and leave':
-			karta += tokens/2
+			karta += tokens * 2
 			gt 'Komp','mfc'
 		end
 	else
@@ -658,13 +661,14 @@ if $ARGS[0] = 'startpagemfc':
 		'You casually chat with the <<camclients>> visitors currently in your chatroom. Once you turn on your webcam, things will probably get busier.'
 		act 'Turn on your webcam':gt 'komp','waitclients'
 		act 'Collect your earnings and leave':
-			karta += tokens/2
+			karta += tokens * 2
 			gt 'Komp','mfc'
 		end
 	end
 end
 
 if $ARGS[0] = 'waitclients':
+	gs'family'
 	cls
 	minut += RAND(1,4)
 	if mfccum > 0: mfcdaycum = daystart

locations/LOCA.qsrc

@@ -1,6 +1,6 @@
 # LOCA
 
-if Enable_settingmode!2: killvar '$cheatmenu'
+if settingmode!0: killvar '$cheatmenu'
 
 if mod_list > 0:
 	mod_i=1

locations/MartinSex2.qsrc

@@ -843,7 +843,7 @@ end
 
 if $ARGS[0] = 'PainalDyn':
 	cls
-	'<center><video src="images/locations/city/industrial/bar/martin/anal/painal1.mp4"></center>'
+	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal1.mp4"></center>'
 	'Feeling as brave and well-lubricated as spit can ever make you, you grab Martin''s cock, hold it against your anus and push against it.'
 	*nl
 	'Unfortunately, anal with Martin is not as easy as slipping his dick inside your pussy. The more you try to put his dick in, the more it hurts. Your ass is obviously a little too tight and Martin must realize that too when more than one attempt at penetration results in you pulling away again.'
@@ -854,7 +854,7 @@ if $ARGS[0] = 'PainalDyn':
 			
 	act 'Force his dick inside your ass':
 		cls
-		'<center><video src="images/locations/city/industrial/bar/martin/anal/painal2.mp4"></center>'
+		'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal2.mp4"></center>'
 		if $martinpos = 'rev_cowgirl':
 			'No, you don''t want to quit, not now. Maybe it''s because of the position you''re in, just a bad angle for penetration, right? You climb off Martin and bend over in front of him. When you look back at him to give him an inviting look, you do feel a little intimidated by his size, though...'
 			'Maybe this wasn''t such a good idea after all?'
@@ -881,7 +881,7 @@ if $ARGS[0] = 'PainalDyn':
 			
 			act 'Continue':
 				cls
-				'<center><video src="images/locations/city/industrial/bar/martin/anal/painal3.mp4"></center>'
+				'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal3.mp4"></center>'
 				'But as patient as Martin has proven so far, you eventually push him too far, your <<$pcdesc_anusrandom>> asshole too snug and arousing around him for him to stay idle.'
 				*nl
 				'Your lover starts moving on his own. At first, he is gentle, careful, only adding a tiny bit of extra sensation to your mutual experience, but with ever stroke, he loses his inhibitions and turns more and more into an animal, possessed by the need to destroy your ass and fill it with cum.'
@@ -964,7 +964,7 @@ end
 if $ARGS[0] = 'MartinCumshot_Mouth':
 	cls
 	gs 'boyStat', 'A216'
-	'<center><video src="images/locations/city/industrial/bar/martin/cumshot/cum_mouth.mp4"></center>'
+	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_mouth.mp4"></center>'
 	if $martinpos ! 'MartinBlowjob_dressed' or $martinpos ! 'MartinBlowjob_undressed': 'You quickly move off Martin''s cock and get on your knees in front of him, taking his dick into your mouth and savoring the taste of yourself on your man as you get him off.'
 	'For a moment, you think about saying something dirty, like verbally asking him to cum in your mouth, but by the time this thought has manifested, Martin has already pulled out and complied with it, shooting his hot sperm into your open, waiting mouth.'
 	'You wait like this for the second and third spurt, but then you take him right back into your mouth, sucking and licking him through his orgasm.'
@@ -982,7 +982,7 @@ end
 if $ARGS[0] = 'MartinCumshot_Face':
 	cls
 	gs 'boyStat', 'A216'
-	'<center><video src="images/locations/city/industrial/bar/martin/cumshot/cum_facial.mp4"></center>'
+	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_facial.mp4"></center>'
 	
 	!Variation for pic and text sticking out your tongue for the cumshot
 	if $martinpos ! 'MartinBlowjob_dressed' or $martinpos ! 'MartinBlowjob_undressed': 'You quickly move off Martin''s cock and get on your knees in front of him, taking his dick into your mouth and savoring the taste of yourself on your man as you help him finish.'
@@ -999,7 +999,7 @@ end
 if $ARGS[0] = 'MartinCumshot_Tits':
 	cls
 	gs 'boyStat', 'A216'
-	'<center><video src="images/locations/city/industrial/bar/martin/cumshot/cum_tits.mp4"></center>'
+	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_tits.mp4"></center>'
 	if $martinpos ! 'MartinBlowjob_dressed' or $martinpos ! 'MartinBlowjob_undressed': 'You quickly move off Martin''s cock and get on your knees in front of him, stroking his dick as you point it at your bust and savoring the expression of bliss on your man''s face.'
 	'"Go ahead", you whisper in your sultriest voice, "Cum all over my tits, baby."'
 	'That''s all the invitation Martin needs: With a final moan, the first hot jet of cum hits your breasts, soon followed by another, and another. By the time his cock stops twitching, your breast and chin are covered in sperm. Cleaning up is gonna take a while, but with a single look at Martin and the satisfied boyish grin the sight of you puts on his face, you know that it''s worth it.'

locations/NPCChanger.qsrc

@@ -7,9 +7,11 @@ if $ARGS[0] = 'Start':
 end
 
 if $ARGS[0] = 'NPCLoop':
-	*clr
-	clr
-	cla
+	*clr & cla
+	gs 'obj_din', 'cheattabs'
+	'<center><h2>Cheat Menu - NPC Editor</h2></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td width="400" cellspacing="0" cellpadding="20" valign="top">'
 	'*** THIS IS A WORK IN PROGRESS ***'
 	if n = 0:
 	n = 1
@@ -34,7 +36,7 @@ if $ARGS[0] = 'NPCLoop':
 	*nl
 	*p '<a href="exec:gt ''NPCChanger'', ''selection'' ">Select an NPC to modify</a>'
 	*nl '*** THIS IS A WORK IN PROGRESS ***'
-	act 'Done':gt $loc
+	'</td></tr></table></center>'
 end
 if $ARGS[0] = 'next10':
 	o += 10

locations/NikoEv.qsrc

@@ -290,7 +290,7 @@ end
 if $ARGS[0] = 'Niko Dates':
 	if fedorkozlovQW >= 10 and NikoVsFedor = 0:
 		gt 'NikoEv', 'Fyodor'
-	elseif KotovloveQW >= 10 and NikoVsVitek = 0:
+	elseif KotovloveQW > 0 and NikoVsVitek = 0:
 		gt 'NikoEv', 'Viktor'
 	elseif dimafilm = 1 and DimaRudeBlock = 0 and NikoVsDimka = 0:
 		gt 'NikoEv', 'Dimka'

locations/SergeiHanter.qsrc

@@ -81,7 +81,7 @@ if hantersSergeiQw >= 10:
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
                             '"<<$pcs_nickname>>, I want to make love to you," he says, when he finally pulls back. You answer Sergey with a kiss every bit as passionate as the one that started this. You''re making your way back towards his room as you do so.'
 
-                            act 'Go':gt'HanterLoveSex'
+                            act 'Go': gt'HanterLoveSex', 'Sergei'
                         end
                     else
                         act'Continue':

locations/_body_image.qsrc

@@ -27,7 +27,6 @@ if $ARGS[0] = 'body':
 end
 
 if $ARGS[0] = 'coat':
-	clr
 	if defaultcoat = 0:
 		$RESULT = ''
 		$body_image_msg += 'You have no default coat set.'
@@ -70,7 +69,7 @@ if $ARGS[0] = 'clothes':
 		else
 			$body_image_msg += FUNC('$clothing_name', $clothingworntype, clothingwornnumber)
 		end
-		nl
+		*nl
 		if $clothingworntype = 'uniform':
 			if PCloStyle2 = 1:
 				$body_image_msg += '<br>This outfit is considered to be a maid uniform.'

locations/_menu_addoldmenu.qsrc

@@ -1,7 +0,0 @@
-# $menu_addoldmenu
-
-menu_option = 1
-gs 'obj_din', 'old'
-
---- $menu_addoldmenu ---------------------------------
-

locations/_menu_avariya.qsrc

@@ -1,5 +1,5 @@
 # $menu_avariya
-gs 'obj_din', 'exit'
+gs 'obj_din', 'emergency'
 
 --- $menu_avariya ---------------------------------
 

locations/_menu_body.qsrc

@@ -1,5 +1,5 @@
 # $menu_body
-gs 'obj_din', 'menubody'
+gs 'obj_din', 'body'
 
 --- $menu_body ---------------------------------
 

locations/_menu_descrip.qsrc

@@ -1,5 +1,5 @@
 # $menu_descrip
-gs 'obj_din', 'descrip'
+gs 'obj_din', 'description'
 
 --- $menu_descrip ---------------------------------
 

locations/_menu_face.qsrc

@@ -1,5 +1,5 @@
 # $menu_face
-gs 'obj_din', 'menuface'
+gs 'obj_din', 'face'
 
 --- $menu_face ---------------------------------
 

locations/_menu_setting.qsrc

@@ -1,8 +1,7 @@
 # $menu_setting
 
 gs 'Cheatmenu_din'
-Enable_settingmode = 1
-dynamic $cheatmenu['display']
+dynamic $cheatmenu['setting']
 
 --- $menu_setting ---------------------------------
 

locations/_stock_item_info.qsrc

@@ -18,7 +18,10 @@ $item_info['lubri'] = '<center><b>Lubricant</b></center><br>A specialized gel us
 $item_info['painkiller'] = '<center><b>Painkillers</b></center><br>A pack of pills containing drugs used to relieve pain. Some are taken recreationally for their mind-altering effects. Can be addictive.'
 $item_info['tampon'] = '<center><b>Tampons</b></center><br>A pack of cyliner-shape cotton swabs with a string that is capable absorb menstrual fluids during your period.'
 $item_info['sanpad'] = '<center><b>Sanitary napkins</b></center><br>A pack of absorbent towels that provide protection during your period. They attach to the inside of panties to avoid any leakage onto your clothes'
-$item_info['breastpump'] = '<center><b>Breast Pump</b></center><br>A breast pump is a mechanical device that lactating women use to extract milk from their breasts.'
+$item_info['breastpump'] = '<center><b>Breast Pump</b></center><br>A breast pump is a mechanical device that lactating women use to extract milk from their breasts. This is a manual model and comes with one bottle.'
+$item_info['bpbottles'] = '<center><b>Breastmilk Bottle S</b></center><br>Used to collect breastmilk with a breast pump. This set contains three 150ml bottles.'
+$item_info['bpbottlem'] = '<center><b>Breastmilk Bottle M</b></center><br>Used to collect breastmilk with a breast pump. This set contains two 250ml bottles.'
+$item_info['bpnipplebalm'] = '<center><b>Nipplebalm</b></center><br>Nipplebalm is used to ease sore nipples after and before breastfeeding or while using a breast pump. One tube lasts for 20 uses.'
 $item_info['fairy'] = '<center><b>Dishwashing detergent</b></center><br>A liquid dishwashing soap with a light almond scent. It claims to cut through grease and grime with ease AND leave your hands feeling soft and moisturized.'
 $item_info['poroshok'] = '<center><b>Clothing detergent</b></center><br>A box of powdered clothing detergent with a light flowery scent that leaves your clothes smelling fresh and clean.'
 $item_info['cltarelka'] = '<center><b>Plates</b></center><br>A set of five plain white dinner plates.'

locations/abduction.qsrc

@@ -74,6 +74,8 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 end
 
 if $ARGS[0] = 'abdRoom':
+	$loc = 'abduction'
+	$metka = 'abdRoom'
 	*clr
 	cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/basement1.jpg"></center>'

locations/arturend.qsrc

@@ -38,8 +38,6 @@ act 'Brush up':
 		$currentpursetype = 'cheap'
 		currentpursenumber = 13
 		bag = 1
-		if menu_option = 1:gs 'obj_din', 'old'
-		if menu_option = 0:gs 'obj_din', 'new'
 		'Arthur gives you a quality handbag. You take it, feeling a mixture of joy and guilt welling up inside you. "Did I really just sleep with a stranger for a purse? Does this make me a whore, or a slut?" You think to yourself'
 	end
 

locations/begin.qsrc

@@ -3,10 +3,7 @@
 if $ARGS[0] = 'start':
 	$metka = 'start'
 	$loc = 'begin'
-	gs 'Cheatmenu_din'
 	showstat 1
-	Enable_settingmode = 2
-	dynamic $cheatmenu['display']
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
 	'<b>Transgendered Start:</b>'
@@ -22,7 +19,7 @@ if $ARGS[0] = 'start':
 	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time you can make your own decisions and mistakes. No magic.'
 	
 	act '<center><b>Transgendered start</b></center>':
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		cla
 		act '<center>Show intro (recommended)</center>':
@@ -36,7 +33,7 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>School Girl Start</b></center>':
 		cla
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		MagikDostup = 1
 		gt 'preSYS', 'SGStart'
@@ -45,7 +42,7 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>Cursed Schoolgirl Start</b></center>':
 		cla
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		altQS = 1
 		gt 'preSYS', 'SGStart'
@@ -53,11 +50,12 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>New in Town Start</b></center>':
 		cla
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		MagikDostup = 1
 		gt 'preSYS', 'TGStart'
 	end
+	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'
 end
 
 if $ARGS[0] = 'real_character':

locations/body.qsrc

@@ -806,10 +806,10 @@ else
 end
 
 if avatar_hair = 1:
-   $hair = $av_hair
-   !! I do not really understand how the avatar system works in terms of hair growth and such, so these descriptors will just have to do
-   $pcdesc_hairlength = 'normal length'
-   $pcdesc_hairlengthwordy = 'normal length'
+	$hair = $av_hair
+	!! I do not really understand how the avatar system works in terms of hair growth and such, so these descriptors will just have to do
+	$pcdesc_hairlength = 'normal length'
+	$pcdesc_hairlengthwordy = 'normal length'
 else
 	if pcs_hairlng <= 30:
 		$hair = 'You have very short <<$pcs_haircol>> hair. It doesn''t cover your ears, and looks a little masculine. Nevertheless, some people like this style as it''s easy to take care of.'
@@ -1575,51 +1575,49 @@ if lashair = 0:
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'roughly-stubbled'
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 15 and pcs_bush = 1:
+	elseif pcs_pubes <= 15:
 		lobkoef = 0
-		$pcs_pubes = 'You have stubble growing at the edges of your <a href="exec:view''images/pc/body/pussy/bpussy.jpg''">trimmed pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a tidy patch of hair growing above your '+iif(pubestyle >= 2 and pubestyle <=7,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
-		if rand_pubes = 0:$pcdesc_pubesrandom = 'trimmed-back'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'mostly well-kept'
+		if rand_pubes = 0:$pcdesc_pubesrandom = 'almost bare'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'barely-haired'
+		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 20 and pcs_bush = 1:
-		lobkoef = 3 
-		$pcs_pubes = 'You have a small neat bush of hair at the top of your <a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
-		rand_pubes = rand(0,2)
-		if rand_pubes = 0:$pcdesc_pubesrandom = 'neatly-trimmed'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
-		$pcdesc_pubes = 'neatly-trimmed'
-		$pcdesc_pubeswordy = 'trimmed, well-kept'
 	elseif pcs_pubes <= 20:
 		lobkoef = 0
-		$pcs_pubes = 'You have neatly trimmed triangle of hair around your <a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have neatly trimmed section of hair around your '+iif(pubestyle = 8,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,3)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'wispy-haired'
 		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'trimmed'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
+		if rand_pubes = 3:$pcdesc_pubesrandom = 'mostly well-kept'
 		$pcdesc_pubes = 'neatly-trimmed'
 		$pcdesc_pubeswordy = 'trimmed, well-kept'
-	elseif pcs_pubes <= 30:
-		pcs_bush = 0
+	elseif pcs_pubes <= 25:
 		lobkoef = 0
 		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
+		if rand_pubes = 0:$pcdesc_pubesrandom = 'mildly-furred'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'slightly-bushy'
+		if rand_pubes = 2:$pcdesc_pubesrandom = 'well-maintained'
+		$pcdesc_pubes = 'bushy'
+		$pcdesc_pubeswordy = 'bushy, thick'
+	elseif pcs_pubes <= 30:
+		lobkoef = 0
+		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/shave/h_bush1.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		rand_pubes = rand(0,2)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'furred'
 		if rand_pubes = 1:$pcdesc_pubesrandom = 'bushy'
-		if rand_pubes = 2:$pcdesc_pubesrandom = 'well-maintained'
+		if rand_pubes = 2:$pcdesc_pubesrandom = 'partially-maintained'
 		$pcdesc_pubes = 'bushy'
 		$pcdesc_pubeswordy = 'bushy, thick'
-	else
-		pcs_bush = 0
+	elseif pcs_pubes >= 31
 		lobkoef = 0
 		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''images/pc/body/pussy/hrypussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'thickly-furred'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'hairy'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'very hairy'
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'ill-maintained'
 		$pcdesc_pubes = 'hairy'
 		$pcdesc_pubeswordy = 'hairy, wild-maned'

locations/brothel.qsrc

@@ -504,93 +504,11 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 		dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		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
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. This should help with some anal stretching before today''s activities.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, especially in a place like this. You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
-
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
-
-			if pcs_vag < 30:pcs_vag += 2
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, hoping the added arrousal will aid with today''s activities.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
+	dynamic $toymanage
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 	dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

locations/brother.qsrc

@@ -227,6 +227,7 @@ if $ARGS[0] = 'start':
 					cls
 					picrand = RAND(1,2)
 					minut += 60
+					gs 'stat'
 					if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 						'<center><b><font color = maroon>School - football field</font></b></center>'
 					if month=1 or month=2 or month=12:

locations/brother_voyeur.qsrc

@@ -748,18 +748,14 @@ if $ARGS[0] = 'brother_wash':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	if pcs_leghair > 3 or pcs_pubes > 3 or pcs_bush > 0:
+	if pcs_leghair > 3 or pcs_pubes > 3:
 		*nl
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs and <<$pcdesc_pubes>> pussy.'
-		elseif pcs_leghair > 3 and pcs_bush > 0:
-			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs and the stubble growing around the patch of hair above your pussy.'
 		elseif pcs_leghair > 3 and pcs_pubes < 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs.'
 		elseif pcs_leghair < 3 and pcs_pubes > 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_pubes>> pussy.'
-		elseif pcs_leghair < 3 and pcs_bush > 0:
-			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_pubes>> pussy.'
 		end
 		'	"Aren''t you going to shave?"'
 		if stanok = 0:
@@ -986,7 +982,7 @@ if $ARGS[0] = 'brother_shower_shave':
 			*nl
 			if pcs_pubes > 3:
 				if pcs_pubes <= 20:'	Kolka frowns. "You''re not going to shave your pussy?"'
-				if pcs_pubes >= 21 or pcs_bush > 0:'	Kolka frowns. "You''re not going to shave that bush?"'
+				if pcs_pubes >= 21:'	Kolka frowns. "You''re not going to shave that bush?"'
 				if stanok = 0:
 					act'"I can''t. Razor''s gone dull"':
 						cla

locations/butoilet.qsrc

@@ -30,6 +30,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
+dynamic $removepan
 
 --- butoilet ---------------------------------
 

locations/club.qsrc

@@ -253,6 +253,7 @@ if $ARGS[0] = 'tou':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'dance':

locations/cum_arrcheat.qsrc

@@ -1,5 +1,7 @@
 # cum_arrcheat
 
+*clr & cla
+'<center><h2>Cheat Menu - OOX Debug</h2></center>'
 if cycle = 0:
 	$cycletemp[1] = 'menstruating with <<mesec>> hours remaining'
 elseif cycle = 1:
@@ -51,7 +53,6 @@ else
 	$cycletemp[8] = ''
 end
 
-*clr
 'You are currently <<$cycletemp[1]>><<$cycletemp[2]>><<$cycletemp[4]>><<$cycletemp[8]>>. Your womb damage is at <<sterilewb>> and your Ovary damage is at <<sterileov>><<$cycletemp[2]>>. You have been cummed on or inside yourself <<stat[''cum_count'']>> times.'
 
 cycletemp[4] = arrsize('$wombpotfath')
@@ -258,13 +259,6 @@ else
 	'No Pregnancies registered.'
 end
 killvar '$cycletemp'
-if $loc ! '' and $metka ! '':
-	act 'Leave':gt $loc, $metka
-elseif $loc ! '':
-	act 'Leave':gt $loc
-elseif $curloc ! '':
-	act 'Leave':gt $curloc
-end
-
+act 'Return to cheat index': dynamic $cheatmenu
 --- cum_arrcheat ---------------------------------
 

locations/dimaHome.qsrc

@@ -154,41 +154,66 @@ if $ARGS[0] = 'bathroom2':
 	gs 'stat'
 	$location_type = 'bathroom'
 	'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
-	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/bathroom.jpg"></center>'
+	'<center><img src="images/locations/pavlovsk/resident/dimkahome/bathroom.jpg"></center>'
 	'This restroom has a large sink area and tile floors. The toilet sits along the far wall. You also notice a walk-in shower and large bathtub. You imagine how luxurious it must feel to bathe in here.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
-    if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-	act 'Take a shower':
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	
+	act 'Take a shower (0:15)':
 		cls
-		minut += 10
-		dynamic $showerdin
+		minut += 15
+		!!dynamic $showerdin
 		gs 'stat'
-		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-		'<center><img  src="images/characters/pavlovsk/school/boy/igor/mitsa.gif"></center>'
-		'You decide to take advantage of the luxury have a shower. As the warm water flows over your entire body from the massive shower head, you feel your whole body relax in the comforting stream.'
-		act 'Get out of the shower': 
-			'You get out of the shower and dry off.' 
-			act 'Get dressed': gt 'dimaHome','bathroom2'
-		end
+		'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></center>'
+		'You decide to take advantage of the luxury shower. As the warm water flows over your entire body from the massive shower head, you feel your whole body relax in the comforting stream.'
+		
+		act 'Get out and dry off': gt 'dimaHome','bathroom2'
 	end
-	act 'You smile to yourself as you draw a bath in the impressive tub. You relish the feeling as you slowly glide into steamy water and relax':
+	
+	act 'Soak in the bath (0:30)':
 		cls
-		minut += 20
-		dynamic $bath
+		minut += 30
+		pcs_sweat = 7 + rand(0,4)
+		pcs_mood += 20
+		pcs_skin += 1
+		if frost > 0:frost = 0
+		pcs_horny += rand(0,2)
+		!!dynamic $bath
 		gs 'stat'
-		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-		'<center><img  src="images/shared/home/bathroom/wash4.jpg"></center>'
-		'You take a quick bath.'
-		act 'Get out of the bath': 
-			'You get out of the bath and dry off.' 
-			act 'Get dressed': gt 'dimaHome','bathroom2'
+		'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
+		'<center><img src="images/shared/home/bathroom/wash4.jpg"></center>'
+		'You smile to yourself as you draw a bath in the impressive tub. You relish the feeling as you slowly glide into steamy water and relax.'
+		'Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
+		
+		act '"Wash" your pussy':
+			cla
+			*clr
+			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
+			minut += 10
+
+			'<center><video src="images/shared/home/bathroom/wash7.mp4"></center>'
+			*nl
+			'You turn on the faucet, lift your legs and scoot your ass over to align your pussy with the jet of warm water. It feels really good and soon a warmth begins to grow in your abdomen.'
+
+			if pcs_inhib < 30:inhib_exp += rand(1,3)
+			pcs_mood += 15
+			pcs_willpwr += 15
+			$orgasm_or = 'yes'
+			gs 'arousal', 'masturbate', 10
+			gs 'arousal', 'end'
+
+			act 'Get out and dry off': gt 'dimaHome','bathroom2'
 		end
+
+		act 'Get out and dry off': gt 'dimaHome','bathroom2'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $bteeth
-    dynamic $tampon
-    dynamic $basin
+	dynamic $tampon
+	dynamic $basin
+	dynamic $removepan
 	act 'Leave the bathroom': gt 'dimaHome','hallway2'
 end
 

locations/din_bad.qsrc

@@ -9,19 +9,19 @@ $mobile_check = {
 			$caller = 'Vladimir'
 			$callerid = 'images/characters/city/vladimir/001.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		elseif vladimirQW = 25 and week = 6:
 			'<b><font color="red">Your phone is ringing</font></b>'
 			$caller = 'Vladimir'
 			$callerid = 'images/characters/city/vladimir/001.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		elseif vladimirQW = 35 and week = 6:
 			'<b><font color="red">Your phone is ringing</font></b>'
 			$caller = 'Vladimir'
 			$callerid = 'images/characters/city/vladimir/001.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		end
 	end
 
@@ -30,7 +30,7 @@ $mobile_check = {
 		$caller = 'Leonid Vostov'
 		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
 		gs 'telefon','phone_ring'
-		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:leonidSlaveDay = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 	end
 
 	if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
@@ -48,7 +48,7 @@ $mobile_check = {
 		pl''
 		pl''
 		pl''
-		pl'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			  <a href="exec:qwdogiventday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+		'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 	end
 
 	!! iterating all lovers
@@ -70,113 +70,122 @@ $mobile_check = {
 			$caller = '<<$loverdesc[lover_number]>>'
 			$callerid = 'images/characters/shared/'+lover_picture[lover_number]+'.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			  <a href="exec:gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		end
 	end
 	lover_number += 1
 	if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
-	
+
 	killvar 'lover_number'
 }
 
 
 $d_salf = {
-	clr
-	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe your face and hands</b></a>'
-	if cumloc[14] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 14  & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your belly</b></a>'
-	if cumloc[15] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your breasts</b></a>'
-	if cumloc[1] > 0 or cumloc[4] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your ass and pussy</b></a>'
-	if cumloc[10] > 0 or cumloc[9] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your arms and legs</b></a>'
-	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat''"><b>Clean up clothing</b></a>'
-	if pcs_makeup ! 1:pl '<a href="exec:salfetka -= 1 & pcs_makeup = 1 & gs ''stat''"><b>Wipe cosmetics</b></a>'
-	pl '<a href="exec:gs ''stat''"><br><b>Not using tissue</b></a>'
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe your face and hands</b></a>'
+	if cumloc[14] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your belly</b></a>'
+	if cumloc[15] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your breasts</b></a>'
+	if cumloc[1] > 0 or cumloc[4] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your ass and pussy</b></a>'
+	if cumloc[10] > 0 or cumloc[9] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your arms and legs</b></a>'
+	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Clean up clothing</b></a>'
+	if pcs_makeup ! 1: '<a href="exec:salfetka -= 1 & pcs_makeup = 1 & dynamic $d_bag"><b>Wipe cosmetics</b></a>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag"><br><b>Put tissues away</b></a>'
 }
 
 $d_kosmetitka = {
-	clr
-	pl '<a href="exec:gs ''stat''"><b>Close makeup bag</b></a>'
+	*clr & cla
+	gs 'stat'
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 
-	if kosmetitka >= 1:pl '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gs ''stat''"><b>Light make-up</b></a>'
-	if kosmetitka >= 2:pl '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gs ''stat''"><b>Natural make-up</b></a>'
-	if kosmetitka >= 3:pl '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gs ''stat''"><b>Heavy make-up</b></a>'
+	if kosmetitka >= 1: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gs ''stat'' & dynamic $d_bag"><b>Light make-up</b></a>'
+	if kosmetitka >= 2: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gs ''stat'' & dynamic $d_bag"><b>Natural make-up</b></a>'
+	if kosmetitka >= 3: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gs ''stat'' & dynamic $d_bag"><b>Heavy make-up</b></a>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag"><b>Close makeup bag</b></a>'
 }
 
 $d_mouthwash = {
-	clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	pcs_breath = 1
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	mouthwash -= 1
-	pl 'Your breath smells minty fresh.'
-	pl ''
-	pl '<a href="exec:gs ''stat''"><b>Done</b></a>'
-}	
+	gs 'stat'
+	'Your breath smells minty fresh.'
+	''
+	'<a href="exec:gs ''stat'' & dynamic $d_bag"><b>Done</b></a>'
+}
 
 $d_bag = {
-	clr
-	pl '<center><img src="<<FUNC(''$purse_image'',  $currentpursetype, currentpursenumber)>>"	height="300"></center>'
-	if salfetka > 0:pl 'You have <<salfetka>> wet wipes left in your purse. <a href="exec:dynamic $d_salf"><b>Use a tissue</b></a>'
-	if pain_timer > totminut - 242 and painkiller > 0:pl 'Take a <a href="exec:pain[''killer''] = 1 & painkiller -= 1 & pain_timer = totminut & dynamic $d_bag">painkiller</a>. <<painkiller>> painkillers left in your purse.'
-	if kosmetitka > 0 and pcs_makeup = 1:pl 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left. <a href="exec:dynamic $d_kosmetitka"><b>Put on makeup</b></a>'
-	if kosmetitka > 0 and pcs_makeup ! 1:pl 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left.'
-	if mouthwash > 0 and pcs_breath = 0:pl 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining. <a href="exec:dynamic $d_mouthwash"><b>Use mouthwash</b></a>'
-	if mouthwash > 0 and pcs_breath = 1:pl 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining.'
-	if greben > 0 and pcs_hairbsh = 0:pl 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat''"><b>Brush your hair</b></a>'
-	if greben > 0 and pcs_hairbsh = 1:pl 'There''s a hairbrush in your purse.'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	*nl
+	if salfetka > 0: 'You have <<salfetka>> wet wipes left in your purse. <a href="exec:dynamic $d_salf"><b>Use a tissue</b></a>'
+	if pain_timer > totminut - 242 and painkiller > 0: 'Take a <a href="exec:pain[''killer''] = 1 & painkiller -= 1 & pain_timer = totminut & dynamic $d_bag">painkiller</a>. <<painkiller>> painkillers left in your purse.'
+	if kosmetitka > 0 and pcs_makeup = 1: 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left. <a href="exec:dynamic $d_kosmetitka"><b>Put on makeup</b></a>'
+	if kosmetitka > 0 and pcs_makeup ! 1: 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left.'
+	if mouthwash > 0 and pcs_breath = 0: 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining. <a href="exec:dynamic $d_mouthwash"><b>Use mouthwash</b></a>'
+	if mouthwash > 0 and pcs_breath = 1: 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining.'
+	if greben > 0 and pcs_hairbsh = 0: 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat''"><b>Brush your hair</b></a>'
+	if greben > 0 and pcs_hairbsh = 1: 'There''s a hairbrush in your purse.'
 	if prezik + prezikcount + preziksabo > 0:
 		if preziktype = 2 or preziksabo > 0:
-			pl 'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal condoms left, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
+			'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal condoms left, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
 		elseif preziktype < 2 and preziksabo = 0:
-			pl 'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
+			'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
 		end
 		*nl
 	else
-		pl 'You are out of condoms.'
+		'You are out of condoms.'
 	end
 	if amphetamine > 0 :
-		pl 'You have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
+		'You have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
 	end
 	if tabletki > 0 and pillsleft[ptype] > 0:
-		pl 'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
 	elseif tabletki	= 0 and pillsleft[ptype] > 0:
-		pl 'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left in your purse.</b>'
+		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left in your purse.</b>'
 	elseif tabletki > 0 and pillsleft[ptype] = 0:
-		pl 'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> in your purse.'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> in your purse.'
 	else
-		pl 'You are out of birth control pills.'
+		'You are out of birth control pills.'
 	end
 	if mentats_have > 0:
-		pl'<a href="exec:dynamic $use_mentats & dynamic $d_bag"><b>Use a neurobooster pill in your purse.</b></a> There are <<mentats_have>> pills left. The warning label says not to take more than one per day.'
+		'<a href="exec:dynamic $use_mentats & dynamic $d_bag"><b>Use a neurobooster pill in your purse.</b></a> There are <<mentats_have>> pills left. The warning label says not to take more than one per day.'
 	end
 	if steroid_have > 0:
-		pl'<a href="exec:dynamic $use_steroids & dynamic $d_bag"><b>Use steroids.</b></a> You have <<steroid_have>> steroids left in your purse.'
+		'<a href="exec:dynamic $use_steroids & dynamic $d_bag"><b>Use steroids.</b></a> You have <<steroid_have>> steroids left in your purse.'
 	end
 	if bcream_have > 0:
-		pl'<a href="exec:dynamic $use_bcream & dynamic $d_bag"><b>Apply breast cream.</b></a> You have <<bcream_have>> cream left in your purse.'
+		'<a href="exec:dynamic $use_bcream & dynamic $d_bag"><b>Apply breast cream.</b></a> You have <<bcream_have>> cream left in your purse.'
 	end
 	if aphrodisiac_have > 0:
-		pl'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> You have <<aphrodisiac_have>> gum left in your purse.'
-	end
-	
-	if lubri > 0:pl'There''s a tube of lubricant in your purse, enough for <<lubri>> applications.'
-	if bottle > 0:pl 'There''s a bottle of water in your purse. <a href="exec:bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><b>Drink</b></a>'
-	if buterbrod > 0:pl 'There''s a sandwich in your purse. <a href="exec:buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><b>Eat</b></a>'
-	if wine = 1 and alkowine = 0:pl'There''s a bottle of <a href="exec:dynamic $dinalkowin1">wine</a> in your purse.'
-	if wine = 1 and alkowine = 1:pl'There''s a half-bottle of <a href="exec:dynamic $dinalkowin2">wine</a> in your purse.'
-	if foto = 1:pl'Your purse contains a strange photo'
+		'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> You have <<aphrodisiac_have>> gum left in your purse.'
+	end
+
+	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <<lubri>> applications.'
+	if bottle > 0: 'There''s a bottle of water in your purse. <a href="exec:bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Drink</b></a>'
+	if buterbrod > 0: 'There''s a sandwich in your purse. <a href="exec:buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat'' & dynamic $d_bag"><b>Eat</b></a>'
+	if wine = 1 and alkowine = 0:'There''s a bottle of <a href="exec:dynamic $dinalkowin1">wine</a> in your purse.'
+	if wine = 1 and alkowine = 1:'There''s a half-bottle of <a href="exec:dynamic $dinalkowin2">wine</a> in your purse.'
+	if foto = 1:'Your purse contains a strange photo'
 	if pattest > 0:
 		if pattest > 1:$tt = 's' else $tt = ''
-		pl'You have <<pattest>> unused paternity test<<$tt>> in your purse.'
+		'You have <<pattest>> unused paternity test<<$tt>> in your purse.'
 	end
 	if used_pattest > 0:
 		if used_pattest > 1:$tt = 's' else $tt = ''
-		pl'You have <<used_pattest>> <a href="exec:dynamic $test_purse">used</a> paternity test<<$tt>> in your purse.'
+		'You have <<used_pattest>> <a href="exec:dynamic $test_purse">used</a> paternity test<<$tt>> in your purse.'
 	end
-	pl'<br><center><a href="exec:gs''stat''"><img src="images/system/icon/back.png"></a></center>'
 	killvar 'tt'
+
+	act 'Return':gt $loc, $metka
+	end
 }
 
 $dinalkowin1 = {
+	*clr & cla
 	alkowine = 1
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -186,14 +195,16 @@ $dinalkowin1 = {
 	if pcs_intel  > 5 : intel_deg -= 1
 	alko += 5
 	cumspclnt = 2
-	gs 'cum_cleanup' 
+	gs 'cum_cleanup'
 	pcs_breath = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
 	'You take the wine bottle out of your purse and slowly drink half of it. You struggle quite a lot to put the cork back before being able to make it.'
+	act 'Continue':dynamic $d_bag
 }
 
 $dinalkowin2 = {
+	*clr & cla
 	alkowine = 0
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -209,35 +220,38 @@ $dinalkowin2 = {
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
 	'You take out the remaining half wine bottle out of your purse, slowly drinking the rest of it. As you finish you throw the empty bottle away.'
+	act 'Continue':dynamic $d_bag
 }
 
 $din_Switch_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
-	clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	i = 0
-	pl 'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
+	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
 	*nl
 	if preziktype > 0:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
 	end
 	if preziktype ! 1:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 2">Stop using condoms</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 2">Stop using condoms</a>.'
 	end
 	if preziktype ! 2:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 3">Switch to using sabotaged condoms</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 3">Switch to using sabotaged condoms</a>.'
 	end
 	if prezikcount > 0 or preziktype = 0:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
-	pl '<a href="exec:gs ''stat''">Return</a>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag">Return</a>'
 }
 
 $din_Table_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
-	*clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	i = 1
-	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and  <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
+	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and	<<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
 	*nl
 	if preziktype > 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
@@ -257,8 +271,9 @@ $din_Table_Condom_Menu = {
 
 $din_Do_Condom_Counts = {
 	!{set condom count and type}
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	if ARGS[0] = 1:
-		clr
 		'Offer a condom the next time you have sex.'
 		if preziktype = 2: preziksabo = prezik
 		prezik = prezikcount
@@ -295,7 +310,7 @@ $din_Do_Condom_Counts = {
 		dynamic $din_Table_Condom_Menu
 	end
 }
-   
+
 $din_Update_Condom_Counts = {
 	if prezik + prezikcount + preziksabo > 0: prezikmsg = 1
 	if preziktype = 0:
@@ -335,17 +350,18 @@ $din_Update_Condom_Counts = {
 }
 
 $d_tabletkied = {
-	clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	tabloc = 0
-	if tabletkiday < daystart: pl '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
+	if tabletkiday < daystart:  '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
 	if tabletkicheck = 0:
-		pl '<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</b></a>'
+		'<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</b></a>'
 	elseif tabletkicheck = 1:
-		pl '<a href="exec:dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</b></a>'
+		'<a href="exec:dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</b></a>'
 	end
-	pl '<a href="exec:dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
-	if tabletkioddk = 1: pl '<a href="exec:dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
-	pl '<a href="exec:gs ''stat''">Return</a>'
+	'<a href="exec:dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
+	if tabletkioddk = 1:  '<a href="exec:dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag">Return</a>'
 }
 
 $d_tabletkiedt = {
@@ -357,7 +373,7 @@ $d_tabletkiedt = {
 		'<a href="exec:*clr & dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</b></a>'
 	end
 	'<a href="exec:*clr & dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
-	if tabletkioddk = 1: pl '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
+	if tabletkioddk = 1:  '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
 	'<a href="exec:gt ''stol'', ''bc''">Return</a>'
 }
 
@@ -395,11 +411,11 @@ $d_tabletkiedA = {
 			if ptype = 3: $pillprob = 'that the pills are discolored and there is no expiry date.'
 			if ptype = 4: $pillprob = 'that the pills are all the same color.'
 			if ptype = 5: $pillprob = 'that the pills seem to be smaller than normal.'
-		
+
 			'Upon taking a closer look at your birth control pills, you notice <<$pillprob>>'
-			
+
 			if ptype > 0: tabletkioddk = 1
-			gs 'stat'	
+			gs 'stat'
 			if tabloc = 0:
 				dynamic $d_tabletkied
 			else
@@ -413,7 +429,7 @@ $d_tabletkiedA = {
 		tabletkioddp = 0
 		gs 'stat'
 	end
-	
+
 	if tabloc = 0:
 		dynamic $d_tabletkied
 	else
@@ -422,37 +438,37 @@ $d_tabletkiedA = {
 }
 
 $d_cycreport_choice = {
-	clr
+	*clr & cla
 	dynamic $d_cycreport_update
-	pl 'Current Status: <<$cycreport_txt>>.'
+	'Current Status: <<$cycreport_txt>>.'
 	if $cycreport_txt ! 'In labour':
 		*nl
-		pl 'Change Status because:'
+		'Change Status because:'
 		if thinkpreg = 0:
 			if knowpreg = 1:
-				pl '<a href="exec: dynamic $d_cycreport_actor, 2">I''m pregnant.</a>'
-			else 
-				pl '<a href="exec: dynamic $d_cycreport_actor, 2">I think I''m pregnant.</a>'
+				'<a href="exec: dynamic $d_cycreport_actor, 2">I''m pregnant.</a>'
+			else
+				'<a href="exec: dynamic $d_cycreport_actor, 2">I think I''m pregnant.</a>'
 			end
 		elseif thinkpreg = 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 1">I''m not pregnant.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 1">I''m not pregnant.</a>'
 		end
 		if mesec > 0 and thinkpreg ! 1 and knowpreg ! 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 3">I''m menstruating.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 3">I''m menstruating.</a>'
 		elseif thinkpreg ! 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 4">I just recently menstruated.</a>'
-			pl '<a href="exec: dynamic $d_cycreport_actor, 5">I think my menstrual cycle has stopped.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 4">I just recently menstruated.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 5">I think my menstrual cycle has stopped.</a>'
 		end
 		if thinkpreg = 1 or knowpreg = 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 6">I think my due date is...</a>'
-			pl '<a href="exec: dynamic $d_cycreport_actor, 7">I think the father is...</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 6">I think my due date is...</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 7">I think the father is...</a>'
 		end
 	elseif cycle = 5:
-		pl 'Broken water and contractions, it''s pretty clear what is going on. You need to get to a hospital ASAP.'
+		'Broken water and contractions, it''s pretty clear what is going on. You need to get to a hospital ASAP.'
 	else
 		dynamic $d_cycreport_actor, 10
 	end
-	pl '<a href="exec:gs ''stat''">Return</a>'
+	'<a href="exec:gs ''stat'' & gt $loc, $metka">Return</a>'
 }
 
 $d_cycreport_actor = {
@@ -482,9 +498,9 @@ $d_cycreport_actor = {
 		thinkpreg = 0
 		denypreg = 0
 		clr
-		pl 'How many days ago was it you had your last period?'
-		pl 'Currently: <<pertemp>>'
-		pl '<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 4">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 4">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 4">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 4">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
+		'How many days ago was it you had your last period?'
+		'Currently: <<pertemp>>'
+		'<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 4">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 4">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 4">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 4">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
 	elseif ARGS[0] = 5:
 		thinkpreg = 0
 		denypreg = 0
@@ -492,9 +508,9 @@ $d_cycreport_actor = {
 		gs 'stat'
 	elseif ARGS[0] = 6:
 		clr
-		pl 'How many days ago was it you had your last period?'
-		pl 'Currently: <<pertemp>>'
-		pl '<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 6">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 6">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 6">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 6">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
+		'How many days ago was it you had your last period?'
+		'Currently: <<pertemp>>'
+		'<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 6">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 6">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 6">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 6">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
 	elseif ARGS[0] = 7:
 		clr
 		tempmax = arrsize('$cumfthname')-1
@@ -503,19 +519,19 @@ $d_cycreport_actor = {
 		*nl
 		:potfathloop
 			if cumtime[tempcurr] > 1:$cum = 'cumshots' else $cum = 'cumshot'
-			if cumtime[tempcurr] > 0:pl '<<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>) - <<cumtime[tempcurr]>> <<$cum>>' & sumcum += cumtime[tempcurr]
+			if cumtime[tempcurr] > 0: '<<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>) - <<cumtime[tempcurr]>> <<$cum>>' & sumcum += cumtime[tempcurr]
 		if tempcurr < tempmax:tempcurr += 1 & jump 'potfathloop'
 		if sumcum > 1:$cum = 's' else $cum = ''
-		pl '<br>You think you have had <<sumcum>> load<<$cum>> of cum shot<<$cum>> in your womb altogether that could have gotten you pregnant.'
-		pl 'You suspect the father being: <<$wombthfath>><br>'
+		'<br>You think you have had <<sumcum>> load<<$cum>> of cum shot<<$cum>> in your womb altogether that could have gotten you pregnant.'
+		'You suspect the father being: <<$wombthfath>><br>'
 		*nl
 		tempcurr = 0
 		:pickfathloop
 			if cumtime[tempcurr] > 0:
 				if $npc_usedname[$cumfthname[tempcurr]] <> '':
-					pl ' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7"><<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>)</a>'
+					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7"><<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>)</a>'
 				else
-					pl ' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7">Unknown (-)</a>'
+					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7">Unknown (-)</a>'
 				end
 			end
 		if tempcurr < tempmax:tempcurr += 1 & jump 'pickfathloop'
@@ -523,7 +539,7 @@ $d_cycreport_actor = {
 		killvar 'cum'
 		killvar 'tempmax'
 		killvar 'tempcurr'
-		pl '<br>  <a href="exec:dynamic $d_cycreport_choice">Accept</a>'
+		'<br>  <a href="exec:dynamic $d_cycreport_choice">Accept</a>'
 	elseif ARGS[0] = 10:
 		temp = arrsize('Babyptype')
 		temp -= 1

locations/din_van.qsrc

@@ -206,146 +206,32 @@ $bath = {
 }
 
 $brit = {
-	if pcs_leghair > 3 and stanok > 1:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle > 1 or pubestyle = 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
+	if shave_menu = 1  and stanok > 1:
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (pubestyle >= 2 and pubestyle <=7 and pcs_pubes > 11) or (pubestyle = 8 and pcs_pubes > 11) or (pubestyle = 9 and pcs_pubes > 20) or (pubestyle = 10 and pcs_pubes > 26):
+			if pubestyle > 0:
+				act 'Shave yourself (0:15)':
+					*clr & cla
 					minut += 15
 					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
+					if pubestyle = 1 and pcs_pubes > 3:
 						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
+					elseif (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11:
 						pcs_pubes = 11
+					elseif pubestyle = 8 and pcs_pubes > 11:
+						pcs_pubes = 16
+					elseif pubestyle = 9 and pcs_pubes > 20:
+						pcs_pubes = 20
+					elseif pubestyle = 10 and pcs_pubes > 26:
+						pcs_pubes = 26
 					end
 					pcs_horny += 5
 					stanok -= 2
-
 					if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
-
 					if $loc ='Gadbana':
 						'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					end
-
-					*nl
-					if daystart < 10 and StoryLine = 0 and ntstart = 0:
-						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
-						pcs_mood += 10
-						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					elseif pubestyle = 2:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small bush tidy as well.'
-					elseif pubestyle = 3:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neat patch of pussy hair as well.'
-					elseif pubestyle >= 4:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your bush as well.'
-					else
-						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-					end
-
-					dynamic $dryOff
-				end
-			end
-		end
-	end
-	
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			if daystart < 10 and StoryLine = 0 and ntstart = 0:
-				'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-				'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-			elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
-				pcs_mood += 10
-				'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-			else
-				'You lather up your legs and then start carefully shaving them. Once you''re finished you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-			end
-
-			dynamic $dryOff
-		end
-	end
-
-	if pcs_pubes > 3 and stanok > 0:
-		if pubestyle = 2 or pubestyle = 0:
-			act 'Shave your pussy (0:10)':
-				cla
-				*clr
-				minut += 10
-				pcs_pubes = 0
-				pcs_bush = 0
-				pcs_horny += 5
-				stanok -= 1
-				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-				if $loc ='Gadbana':
-					'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-				end
-
-				*nl
-				'You lather your crotch with some soapy water and carefully shave your pubic region. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
-				dynamic $dryOff
-			end
-			
-		elseif pubestyle = 2 and pcs_pubes > 15:
-			act 'Trim your pussy (0:10)':
-				cla
-				*clr
-				minut += 10
-				pcs_pubes = 11
-				pcs_horny += 5
-				stanok -= 1
-				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-				*nl
-				'You spend some time trimming back your bush, not shaving it away completely but careful to make it neat and tidy.'
-				dynamic $dryOff
-			end
-		end
-	end
-	
-	if pcs_leghair > 3 and stanok > 1:
-		if pubestyle > 1 or pubestyle = 0:
-			if pcs_pubes > 3 or pcs_bush > 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
-						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
-						pcs_pubes = 11
-					elseif pubestyle = 5 and pcs_pubes > 24:
-						pcs_pubes = 21
-					end
-					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					*nl
 					if daystart < 10 and StoryLine = 0 and ntstart = 0:
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -353,79 +239,58 @@ $brit = {
 					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 						pcs_mood += 10
 						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					
-					elseif pubestyle >= 3:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your pubes as well.'
-					else
+					elseif pubestyle = 1:
 						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
+					elseif pubestyle >= 2 and pubestyle <=7:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neatly trimed and styled patch of pussy hair as well.'
+					elseif pubestyle = 8:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small patch of hair tidy as well.'
+					elseif pubestyle >= 9:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
+					elseif pubestyle >= 10:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your  bush as well.'
 					end
-
 					dynamic $dryOff
 				end
 			end
 		end
-	end
-
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
-
-			dynamic $dryOff
-		end
-	end
-
-	if stanok > 0:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle = 2 or pubestyle = 0:
+	elseif shave_menu = 2 and stanok > 0:
+		if pcs_pubes > 3:
+			if pubestyle = 1:
 				act 'Shave your pussy (0:10)':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					pcs_pubes = 0
-					pcs_bush = 0
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					*nl
 					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
 					dynamic $dryOff
 				end
-			elseif pubestyle = 3 and pcs_pubes > 15:
+			elseif (pubestyle >= 2 and pubestyle <= 7) and pcs_pubes > 15:
 				act 'Trim your pussy (0:10)':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
 					if pcs_pubes >= 20:
-						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neat bush left at the top.'
+						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neatly styled bush left at the top.'
 					else
-						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neat bush you have at the top.'
+						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neatly styled bush you have at the top.'
 					end
 					minut += 10
 					pcs_pubes = 11
-					pcs_bush = 1
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 4 and pcs_pubes > 15:
-				act 'Trim your bush (0:10)':
-					cla
-					*clr
+			elseif pubestyle = 8 and pcs_pubes > 19:
+				act 'Trim your pubic hair (0:10)':
+					*clr & cla
 					minut += 10
-					pcs_pubes = 11
+					pcs_pubes = 19
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
@@ -434,10 +299,9 @@ $brit = {
 					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 5 and pcs_pubes >= 25:
-				act 'Trim back your bush (0:10)':
-					cla
-					*clr
+			elseif pubestyle = 9 and pcs_pubes >= 25:
+				act 'Trim your bush (0:10)':
+					*clr & cla
 					minut += 10
 					pcs_pubes = 21
 					pcs_horny += 5
@@ -445,12 +309,47 @@ $brit = {
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
+					'You spend some time trimming back your light bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
+					dynamic $dryOff
+				end
+			elseif pubestyle = 10 and pcs_pubes >= 30:
+				act 'Trim back your bush (0:10)':
+					*clr & cla
+					minut += 10
+					pcs_pubes = 26
+					pcs_horny += 5
+					stanok -= 1
+					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
+					*nl
 					'You spend some time trimming back your thick bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
 					dynamic $dryOff
 				end
 			end
 		end
-		act 'Shave options': gt 'din_van', 'shave_options'
+	elseif shave_menu = 3 and stanok > 0:
+		if pcs_leghair > 3:
+			act 'Shave your legs (0:05)':
+				*clr & cla
+				minut += 5
+				pcs_leghair = 0
+				pcs_horny += 5
+				stanok -= 1
+				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
+				*nl
+				if daystart < 10 and StoryLine = 0 and ntstart = 0:
+					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
+					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
+				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+					pcs_mood += 10
+					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+				else
+					'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
+				end
+				dynamic $dryOff
+			end
+		end
 	end
 }
 
@@ -512,31 +411,45 @@ $quickwash = {
 
 $wearpan = {
 	if $pantyworntype = 'none':
-		act 'Wear panties': gt 'panties', 'view_panty_list', 'bathroom'
+		act 'Wear panties (0:02)': 
+			minut += 2
+			gs 'stat'
+			gt 'panties', 'view_panty_list', 'bathroom'
+		end
 	end
 
 	if $braworntype = 'none':
-		act 'Wear a bra': gt 'bras', 'view_bra_list', 'bathroom'
+		act 'Wear a bra (0:02)': 
+			minut += 2
+			gs 'stat'
+			gt 'bras', 'view_bra_list', 'bathroom'
+		end
 	end
 }
 
 $removepan = {
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
-		act 'Remove underwear':
+		act 'Remove underwear (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'underwear', 'remove'
 			gt $loc, $metka
 		end
 	end
 
 	if $pantyworntype ! 'none':
-		act 'Remove panties':
+		act 'Remove panties (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'panties', 'remove'
 			gt $loc, $metka
 		end
 	end
 
 	if $braworntype ! 'none':
-		act 'Remove bra':
+		act 'Remove bra (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'bras', 'remove'
 			gt $loc, $metka
 		end
@@ -563,7 +476,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
 			cla
@@ -595,7 +508,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if pcs_makeup ! 1:
 		act 'Wash off cosmetics (0:10)':
 			cla
@@ -629,15 +542,13 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	dynamic $removepan
 }
 
 $pir_title = {
 	cla
 	*clr
 	'<center><b>Available piercings - select one by clicking the image</b></center>'
-	*nl	
+	*nl
 }
 $pirTongue = {
 	dynamic $pir_title
@@ -790,227 +701,7 @@ $pirManage = {
 	act'<b>Back</b>':gt $loc, $metka
 }
 
-if $ARGS[0] = 'private':
-	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings.'
-	
-	'Pubic Shaving Style:'
-	if pubestyle = 0:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <u>None</u>'
-	if pubestyle = 1:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <u>Never Shave</u> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 2:'<u>Clean Shave</u> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 3:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <u>Small Bush</u> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 4:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <u>Trimmed</u> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 5:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <u>Full Bush</u> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	
-	!WD: heal chafe
-	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
-
-	if tampon = 0 and sanpad = 0:
-		'<b><font color="red">You have no tampons left.</font></b>'
-	elseif tampon = 1:
-		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
-	else
-		'You have <b><<tampon>></b> tampons.'
-	end
-	if sanpad = 0 and tampon = 0:
-		'<b><font color="red">You have no pads left.</font></b>'
-	elseif sanpad = 1:
-		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
-	else
-		'You have <b><<sanpad>></b> pads.'
-	end
-
-	if shampoo > 0 or $loc = 'vanrPar':
-		if $loc = 'vanrPar':
-			if shampoo < 1:shampoo = 1
-			'You are using your parents'' shampoo.'
-		else
-			'You have enough shampoo for <b><<shampoo>></b> uses.'
-		end
-		dynamic $shower
-		dynamic $bath
-	elseif shampoo = 0 and $loc = 'tanvanr':
-		shampoo = 1
-		'You can use Tanyas shampoo.'
-		gs 'din_van', 'prvt_pee'
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
-		gs 'din_van', 'prvt_pee'
-	end
-
-	if painkiller > 0:
-		$pluralS = 's'
-		if painkiller = 1:$pluralS = ''
-		'You have <b><<painkiller>></b> painkiller<<$pluralS>>.'
-		if pain['total'] > 0 and pain['killer'] = 0:
-			act 'Take a painkiller':
-				cla
-				pain['killer'] += 1
-				painkiller -= 1
-				pcs_hydra += 20
-				gs 'stat'
-
-				*nl
-				'You take a painkiller and gulp it down with a glass of water.'
-
-				act 'Finish':gt $loc, $metka
-			end
-		end
-	end
-
-	if bcream_have > 0:
-		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
-	end
-
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
-
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
-
-	dynamic $bteeth
-
-	dynamic $tampon
-
-	dynamic $wearpan
-	act 'Check weight on the scales':
-		cla
-		*clr
-		msg 'Your body fat is = (<<salo>>)'
-		gt $loc, $metka
-	end
-	gs 'din_van', 'prvt_pee'
-
-	dynamic $basin
-
-	if pcs_leghair > 3 and stanok > 1:
-		if pubestyle > 1 or pubestyle = 0:
-			if pcs_pubes > 3 or pcs_bush > 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
-						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
-						pcs_pubes = 11
-					elseif pubestyle = 5 and pcs_pubes > 24:
-						pcs_pubes = 21
-					end
-					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					if daystart < 10 and StoryLine = 0 and ntstart = 0:
-						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
-						pcs_mood += 10
-						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					
-					elseif pubestyle = 2:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your pubes as well.'
-					else
-						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-					end
-
-					act 'Finish':gt $loc, $metka
-				end
-			end
-		end
-	end
-
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-
-	if stanok > 0:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle = 2 or pubestyle = 0:
-				act 'Shave your pussy (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 0
-					pcs_bush = 0
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 3 and pcs_pubes > 15:
-				act 'Trim your pussy (0:10)':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					if pcs_pubes > 20:
-						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neat bush left at the top.'
-					else
-						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neat bush you have at the top.'
-					end
-					minut += 10
-					pcs_pubes = 11
-					pcs_bush = 1
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 4 and pcs_pubes > 15:
-				act 'Trim your bush (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 11
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 5 and pcs_pubes >= 25:
-				act 'Trim back your bush (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 21
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time trimming back your thick bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
-					act 'Finish':gt $loc, $metka
-				end
-			end
-		end
-		act 'Shave options': gt 'din_van', 'shave_options'
-	end
-
+$toymanage = {
 	if analplug = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
 			cla
@@ -1095,6 +786,118 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
+}
+
+if $ARGS[0] = 'private':
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+
+	!WD: heal chafe
+	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
+
+	if tampon = 0 and sanpad = 0:
+		'<b><font color="red">You have no tampons left.</font></b>'
+	elseif tampon = 1:
+		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
+	else
+		'You have <b><<tampon>></b> tampons.'
+	end
+	if sanpad = 0 and tampon = 0:
+		'<b><font color="red">You have no pads left.</font></b>'
+	elseif sanpad = 1:
+		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
+	else
+		'You have <b><<sanpad>></b> pads.'
+	end
+
+	if shampoo > 0 or $loc = 'vanrPar':
+		if $loc = 'vanrPar':
+			if shampoo < 1:shampoo = 1
+			'You are using your parents'' shampoo.'
+		else
+			'You have enough shampoo for <b><<shampoo>></b> uses.'
+		end
+		dynamic $shower
+		dynamic $bath
+	elseif shampoo = 0 and $loc = 'tanvanr':
+		shampoo = 1
+		'You can use Tanyas shampoo.'
+		gs 'din_van', 'prvt_pee'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+		gs 'din_van', 'prvt_pee'
+	end
+
+	if painkiller > 0:
+		$pluralS = 's'
+		if painkiller = 1:$pluralS = ''
+		'You have <b><<painkiller>></b> painkiller<<$pluralS>>.'
+		if pain['total'] > 0 and pain['killer'] = 0:
+			act 'Take a painkiller':
+				cla
+				pain['killer'] += 1
+				painkiller -= 1
+				pcs_hydra += 20
+				gs 'stat'
+
+				*nl
+				'You take a painkiller and gulp it down with a glass of water.'
+
+				act 'Finish':gt $loc, $metka
+			end
+		end
+	end
+
+	if bcream_have > 0:
+		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	end
+
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
+
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
+	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
+
+	dynamic $bteeth
+
+	dynamic $tampon
+
+	act 'Change clothes and toys':
+		cla
+		dynamic $wearpan
+		dynamic $removepan
+
+		if $curloc = 'vanrPar' and $clothingworntype = 'nude':
+			act 'Wear clothes (0:05)':
+				*clr & cla
+				minut = 5
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+				'You get dressed'
+				gs 'clothing', 'wear_last_worn'
+				gs 'stat'
+				act 'Return': gt $loc, $metka
+			end
+		elseif $curloc = 'vanrPar' and $clothingworntype ! 'nude':
+			act 'Remove clothes (0:05)':
+				*clr & cla
+				minut = 5
+				'<center><video autoplay loop src="images/shared/Accessories/computer/webcam/undress1.mp4"></video></center>'
+				'You remove your clothing'
+				gs 'clothing', 'strip'
+				gs 'stat'
+				act 'Return': gt $loc, $metka
+			end
+		end
+		dynamic $toymanage
+
+		act 'Return':gt $loc, $metka
+	end
+
+	'<a href="exec:msg ''Your body fat is = (<<salo>>)''">Check weight on the scales</a>'
+
+	gs 'din_van', 'prvt_pee'
+
+	dynamic $basin
+
+	dynamic $brit
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -1147,8 +950,8 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	!!breast pump is now in the menue, not on the screen
+
+	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
@@ -1523,54 +1326,124 @@ if $ARGS[0] = 'pblc_pee_end':
 end
 
 if $ARGS[0] = 'shave_options':
-	*clr
-	if shave_img_hgt = 0:shave_img_hgt = 250
-
+	*clr & cla
+	if shave_img_hgt = 0:shave_img_hgt = 100
+	!if pubestyle = 0 = never shave (uses $pcs_pubes)
+	!if pubestyle = 1: $pubeimage = 'images/pc/body/pussy/pussy.jpg' (uses $pcs_pubes)
+	if pubestyle = 2: $pubeimage = 'images/pc/body/pussy/shave/v1.jpg'
+	if pubestyle = 3: $pubeimage = 'images/pc/body/pussy/shave/triangle1.jpg'
+	if pubestyle = 4: $pubeimage = 'images/pc/body/pussy/shave/landing1.jpg'
+	if pubestyle = 5: $pubeimage = 'images/pc/body/pussy/shave/heart1.jpg'
+	if pubestyle = 6: $pubeimage = 'images/pc/body/pussy/shave/flame1.jpg'
+	if pubestyle = 7: $pubeimage = 'images/pc/body/pussy/shave/cross1.jpg'
+	if pubestyle = 8: $pubeimage = 'images/pc/body/pussy/shave/s_bush1.jpg'
+	!if pubestyle = 9: $pubeimage = 'images/pc/body/pussy/spussy.jpg'  (uses $pcs_pubes)
+	!if pubestyle = 10: $pubeimage = 'images/pc/body/pussy/hpussy.jpg' (uses $pcs_pubes)
 	'<h3><center><b><font color="maroon">Shaving optons</b></h3><br><center><font color="maroon">Here you can choose your style for pubic hair and which body parts you wish to shave.</font></center>'
 	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:pubestyle = 2 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD><TD><center><a href="exec:pubestyle = 3 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/v1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/v1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
 	'<TR><TD><center>'
-	if pubestyle ! 2:
-		'<a href="exec:pubestyle = 2 & gt ''din_van'', ''shave_options''">Clean Shave</a>'
+	if pubestyle ! 1:
+		'<a href="exec:pubestyle = 1 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
 	else
 		'Clean Shave'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 3:
-		'<a href="exec:pubestyle = 3 & gt ''din_van'', ''shave_options''">Small Bush</a>'
+	if pubestyle ! 2 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 2 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
 	else
-		'Small Bush'
+		'V-shaped'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 3 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 3 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
+	else
+		'Triangle-shaped'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 4 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 4 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
+	else
+		'Landing-strip'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 5 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 5 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
+	else
+		'Heart-shaped'
 	end
 	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:pubestyle = 1 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD><TD><center><a href="exec:pubestyle = 4 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/shave/flame1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/flame1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/cross1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/cross1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/s_bush1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/s_bush1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/spussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/spussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hpussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hpussy.jpg"></a></center></TD>'
 	'<TR><TD><center>'
-	if pubestyle ! 1:
-		'<a href="exec:pubestyle = 1 & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	if pubestyle ! 6 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 6 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
 	else
-		'Full Bush'
+		'Flame-shaped'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 7 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 7 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
+	else
+		'Cross-Shaped'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 4:
-		'<a href="exec:pubestyle = 4 & gt ''din_van'', ''shave_options''">Trimmed</a>'
+	if pubestyle ! 8 and pcs_pubes > 20:
+		'<a href="exec:pubestyle = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
 	else
 		'Trimmed'
 	end
-	'</center></TD>
-	<TR><center>'
+	'</center></TD><TD><center>'
+	if pubestyle ! 9 and pcs_pubes > 25:
+		'<a href="exec:pubestyle = 9 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
+	else
+		'Small Bush'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 10 and pcs_pubes > 30:
+		'<a href="exec:pubestyle = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	else
+		'Full Bush'
+	end
+	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
-	'</center>'
+	*nl
+	'<center><b>Change your shaving routine:</b></center>'
+	'<center><font color="grey">Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.<br> You can only choose a style if you currently have enough hair to support it.</font></center>'
+	*nl
+	!if shave_menu = 0:nothing
+	!if shave_menu = 1:legs and pussy
+	!if shave_menu = 2:pussy only
+	!if shave_menu = 3:legs only
+	if shave_menu = 0:
+		$shave_chosen = 'doesn''t include any shaving options.'
+		$shave_time = ''
+		'Never shave | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+	elseif shave_menu = 1:
+		$shave_chosen = 'involves shaving your legs and maintaining your current pubic style.'
+		$shave_time = 'It takes 15 minutes to complete this routine.'
+		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | Everything | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+	elseif shave_menu = 2:
+		$shave_chosen = 'involves not shaving your legs and maintaining your current pubic style.'
+		$shave_time = 'It takes 10 minutes to complete this routine.'
+		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | Pussy only | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+	elseif shave_menu = 3:
+		$shave_chosen = 'involves shaving your legs and not maintaining any chosen pubic style.'
+		$shave_time = 'It takes 5 minutes to complete this routine.'
+		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | Legs only'
+	end
+	*nl
+	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-	
+
 	act 'Set image height for this view':
-		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 250, min 100, max 500)")
-		if shave_img_hgt < 100:
-			shave_img_hgt = 250
+		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")
+		if shave_img_hgt < 50:
+			shave_img_hgt = 50
 		elseif shave_img_hgt > 500:
 			shave_img_hgt = 500
 		end
 		gt 'din_van', 'shave_options'
 	end
-	if pubestyle > 0: act 'Disable shave styles': pubestyle = 0 & gt 'din_van', 'shave_options'
 	act 'Return':gt $loc, $metka
 end
 

locations/femcyc.qsrc

@@ -211,11 +211,16 @@ if $ARGS[0] = '':
 	if lactate = 0 and milkoverdemand >= 0 and prolactinlvl >= 0:
 		if milkgrowday < daystart:
 			temp_var = milkoverdemand/200
+			if temp_var >= 10 and pregtimes <= 0: temp_var = 10
+			if temp_var >= 50 and pregtimes > 0: temp_var = 50
 			if temp_var <= 0 and milkoverdemand >0:
 				prolactinlvl += 1
 			else
-				prolactinlvl += milkoverdemand/200
+				prolactinlvl += temp_var
 			end
+			!!	if sveta had no kid, milk induction will take a while as her breasts need to change alot.
+			if prolactinlvl >= 150 and kid <= 0 and pregtimes <= 0:milkinduceday += 1
+			if prolactinlvl >= 100 and kid <= 0 and pregtimes <= 0 and pain['breasts'] <= 20: pain['breasts'] = 20
 			!! as long as your tits are not over 11 growth will happen to them. If you do not pump or no pregnancy happens, no growth will happen.
 			if milkoverdemand = 0 and pregchem = 0 and tits < 11:
 				temp_var = prolactinlvl - 10
@@ -223,7 +228,7 @@ if $ARGS[0] = '':
 					prolactinlvl = 0
 				end
 				!! if prolactinlvl is sinking too much, the aveoli will deflate and thus the breasts growth is reverted. This only counts for induced lactation. If natural lactation occurs breasts will shrink a bit too, but stay bigger in total.
-				if prolactinlvl < 75 and total_milkinduce_growth > 0:
+				if prolactinlvl < 100 and total_milkinduce_growth > 0:
 					nbsize -= total_milkinduce_growth
 					total_milkinduce_growth = 0
 					if prolactinlvl > 10:
@@ -242,7 +247,7 @@ if $ARGS[0] = '':
 				milkgrowday = daystart
 			elseif milkoverdemand > 0 and pregchem = 0 and tits < 11:
 				!! inducing without ever being pregnant
-				if prolactinlvl > 75 and kid <= 0:
+				if prolactinlvl > 100 and kid <= 0:
 					if total_milkinduce_growth < 8:
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -251,7 +256,7 @@ if $ARGS[0] = '':
 						pumpinggrowth = 0
 					end
 				!! inducing after being pregnant
-				elseif prolactinlvl > 75 and kid > 0:
+				elseif prolactinlvl > 100 and kid > 0:
 					if total_milkinduce_growth < (total_preg_growth/2):
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -260,7 +265,7 @@ if $ARGS[0] = '':
 				end
 				milkoverdemand = 0
 			elseif milkoverdemand >= 0 and pregchem > 0 and tits < 11:
-				if prolactinlvl > 75 and pregchem < 3000 and kid <= 0:
+				if prolactinlvl > 100 and pregchem < 3000 and kid <= 0:
 					if total_milkinduce_growth < 8:
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -269,14 +274,14 @@ if $ARGS[0] = '':
 						pumpinggrowth = 0
 					end
 				!! first breast growth with first pregnancy
-				elseif prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
+				elseif prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
 					if rand(0,100) > 55:
 						first_preg_growth += 1
 						total_preg_growth += 1
 						if total_preg_growth > total_milkinduce_growth: nbsize += 1
 					end
 				!! there is little chance your breast grow additional sizes if you have more kids.
-				elseif prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid > 0:
+				elseif prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid > 0:
 					if first_preg_growth > total_preg_growth:
 						total_preg_growth += 1
 						if total_preg_growth > total_milkinduce_growth: nbsize += 1
@@ -287,7 +292,7 @@ if $ARGS[0] = '':
 						end
 					end
 				!! inducing after being pregnant
-				elseif prolactinlvl > 75 and pregchem =< 3000 and kid > 0:
+				elseif prolactinlvl > 100 and pregchem =< 3000 and kid > 0:
 					if total_milkinduce_growth < (total_preg_growth/2):
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -307,7 +312,7 @@ if $ARGS[0] = '':
 		if lactateinduced > 0 and kid <= 0:
 			if milkgrowday < daystart:
 				!! first breast growth with first pregnancy
-				if prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
+				if prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
 					if rand(0,100) > 55:
 						first_preg_growth += 1
 						total_preg_growth += 1
@@ -351,6 +356,7 @@ if $ARGS[0] = '':
 						lactate = 0
 						lactateinduced = 0
 						nbsize -= total_milkinduce_growth
+						milkinduceday = 0
 						'You notice that you stopped lactating.'
 					elseif lactaterate = 0 and pregchem >= 1000:
 						lactaterate = 1
@@ -364,7 +370,13 @@ if $ARGS[0] = '':
 			else
 				milkgrowday = daystart
 				if lactatemm >= lactatemv and salo > 11:
-					lactatemv += lactaterate
+					if lactaterate > lactaterate_use:
+						temp_lactaterate = lactaterate_use
+					else
+						temp_lactaterate = lactaterate
+					end
+					lactatemv += temp_lactaterate
+					lactaterate_use = lactaterate
 					if lactatemv > lactatemm:
 						lactatemv = lactatemm
 						lact_engorgement += 1
@@ -432,7 +444,13 @@ if $ARGS[0] = '':
 			else
 				milkgrowday = daystart
 				if lactatemm >= lactatemv and salo > 11:
-					lactatemv += lactaterate
+					if lactaterate > lactaterate_use:
+						temp_lactaterate = lactaterate_use
+					else
+						temp_lactaterate = lactaterate
+					end
+					lactatemv += temp_lactaterate
+					lactaterate_use = lactaterate
 					if lactatemv > lactatemm:
 						lactatemv = lactatemm
 						lact_engorgement += 1

locations/gaptek.qsrc

@@ -56,7 +56,14 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 	*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $CURLOC, $ARGS[0])
 	*P FUNC ('$single_stock_item', 1, 'enema kit', 1250, 'klisma', $CURLOC, $ARGS[0], StoryLine, 'You should be stealthy')
-	*P FUNC ('$single_stock_item', 1, 'breast pump', 2200, 'breastpump', $CURLOC, $ARGS[0])
+	*P FUNC ('$single_stock_item', 1, 'breast pump', 2500, 'breastpump', $CURLOC, $ARGS[0])
+	if pcs_knowsmilkbottles > 0:
+		*P FUNC ('$stock_item', 3, 'Breastmilk Bottle S', 930, 'bpbottles', $CURLOC, $ARGS[0])
+		*P FUNC ('$stock_item', 2, 'Breastmilk Bottle M', 930, 'bpbottlem', $CURLOC, $ARGS[0])
+	end
+	if pcs_knows_nipplecream > 0:
+		*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $CURLOC, $ARGS[0])
+	end
 	*P '</table></center>'
 	!! for original start we can just use stockitem, for alt start there are other plot elements involved
 	!strip polt-related item, other use new system

locations/gdktoilet.qsrc

@@ -30,11 +30,11 @@ if $ARGS[0] = 'start':
 			$track_loop = 'sound/komb.mp3'
 			volume = 50
 			music_loop = 1
-			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
+			pl '<a href="exec: music_on = 0 & gt $loc, $metka">Turn off the music</a>'
 		else
 			music_loop = 0
 			close all
-			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
+			pl '<a href="exec: music_on = 1 & gt $loc, $metka">Play music</a>'
 		end
 		if gdkin_in = daystart:
 			act 'Return to the dance':gt 'gdkin'
@@ -338,6 +338,7 @@ if $ARGS[0] = 'mens':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'mensmast':

locations/gpoli.qsrc

@@ -20,6 +20,10 @@ if $ARGS[0] = '':
 	if prcptn_lvl > 40 and pcs_know_mward <= 0:
 		'<br><br>You see a sign that reads <a href="exec: minut += 5 & gt ''gpoli'', ''maternity_ward''">"Maternity ward"</a>.'
 	end
+	
+	if pcs_ask_mward_help >= 1 and pcs_know_mward <= 0:
+		'<br><br><a href="exec: minut += 5 & gt ''gpoli'', ''reception''">Ask</a> at the reception for help with your breasts.'
+	end
 
 	act 'Leave':minut += 5 & gt 'pavCommercial'
 
@@ -1271,393 +1275,504 @@ if $ARGS[0] = 'maternity_ward':
 	cla
 	gs 'stat'
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/mward.jpg"></center>'
-	'<center>You are at the maternity ward. There are alot of babies and nurses taking care of them.</center>'
-	if lactate > 0 and pcs_gpolimilkdonation = 3:
-		act 'Talk to the nurse (0:05)':
-			gs 'stat'
-			*clr
-			cla
-			minut += 5
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
-			'Nurse: Hello <<$pcs_firstname>>, how can I help you?'
-			act 'Donate your breast milk (0:15)':
+	if hour >= 6 and hour <= 20:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/mward.jpg"></center>'
+		'<center>You are at the maternity ward. There are alot of babies and nurses taking care of them.</center>'
+		if lactate > 0 and pcs_gpolimilkdonation = 3:
+			act 'Talk to the nurse (0:05)':
+				gs 'stat'
 				*clr
 				cla
-				milkedvolume = 0
-				pcs_gpoli_donationsessioncount = 0
-				!!if rand(0,100) = 95 and orphanfeed = 0:
-				!!	orphanfeed = 1
-				!!end
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
-				'You talk to the old nurse and she leads you into the quiet room.'
-				!!if orphanfeed = 1:
-				!!	'It seems like there is a crib with a baby inside in this room, too.'
-				!!end
-				act 'have your breasts pumped':
+				minute += 5
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
+				'Nurse: Hello <<$pcs_firstname>>, how can I help you?'
+				act 'Donate your breast milk (0:15)':
 					*clr
 					cla
+					milkedvolume = 0
+					pcs_gpoli_donationsessioncount = 0
+					!!if rand(0,100) = 95 and orphanfeed = 0:
+					!!	orphanfeed = 1
+					!!end
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
-					'You sit down and take off your top.'
-					if lactatemv > lactatemm*8/10:
-						'The nurse looks surprised at your engorged breasts'
-						'Nurse: Oh dear! These look painfully full. I hope the pumping will make you feel better.'
-					end					
-					if pain['nipples'] >= 60:
-						'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
-						'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit more of the yellowish cream from the tin.'
-						'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
-						pain['nipples'] -= 20
-					else
-						'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+					'You talk to the old nurse and she leads you into the quiet room.'
+					!!if orphanfeed = 1:
+					!!	'It seems like there is a crib with a baby inside in this room, too.'
+					!!end
+					act 'have your breasts pumped':
+						*clr
+						cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+						'You sit down and take off your top.'
+						if lactatemv > lactatemm*8/10:
+							'The nurse looks surprised at your engorged breasts'
+							'Nurse: Oh dear! These look painfully full. I hope the pumping will make you feel better.'
+						end					
+						if pain['nipples'] >= 60:
+							'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+							'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit more of the yellowish cream from the tin.'
+							'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+							pain['nipples'] -= 20
+						else
+							'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+						end
+						nipple_cream = 1
+						act 'continue':	gt 'gpoli', 'maternity_ward_donation'
 					end
-					nipple_cream = 1
-					act 'continue':	gt 'gpoli', 'maternity_ward_donation'
 				end
-			end
-			act 'Check your file (0:05)':
-				*clr
-				cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/formular.jpg"></center>'
-				'The nurse hands you a file on how much you have donated so far.'
-				'<br>----------------------------------------'
-				'Analyzed milksample measurements'
-				'Volume in ml: <<mward_donatesv/10>>ml'
-				'Fat in %: <<mward_donatesf/10>>.<<mward_donatesf mod 10>>%'
-				'Lactose in %: <<mward_donatess/10>>.<<mward_donatess mod 10>>%'
-				'<br>----------------------------------------'
-				if pcs_gpoli_totalmilkdonation_count > 0:
-					'Total breast milk donation statistics'
-					if pcs_gpoli_totalmilkdonation < 100:
-						'Donated milk volume in liter: <<pcs_gpoli_totalmilkdonation/1000>>.0<<pcs_gpoli_totalmilkdonation mod 1000>>l'
-					else
-						'Donated milk volume in liter: <<pcs_gpoli_totalmilkdonation/1000>>.<<pcs_gpoli_totalmilkdonation mod 1000>>l'
-					end
-					'Donation count: <<pcs_gpoli_totalmilkdonation_count>>'
-					'Average milk volume per donation in ml: <<pcs_gpoli_totalmilkdonation/pcs_gpoli_totalmilkdonation_count>>'
-					'Paid money: <<(((pcs_gpoli_totalmilkdonation*10)/3)*75)/100>><b>₽</b>'
+				act 'Check your file (0:05)':
+					*clr
+					cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/formular.jpg"></center>'
+					'The nurse hands you a file on how much you have donated so far.'
+					'<br>----------------------------------------'
+					'Analyzed milksample measurements'
+					'Volume in ml: <<mward_donatesv/10>>ml'
+					'Fat in %: <<mward_donatesf/10>>.<<mward_donatesf mod 10>>%'
+					'Lactose in %: <<mward_donatess/10>>.<<mward_donatess mod 10>>%'
 					'<br>----------------------------------------'
+					if pcs_gpoli_totalmilkdonation_count > 0:
+						'Total breast milk donation statistics'
+						if pcs_gpoli_totalmilkdonation < 100:
+							'Donated milk volume in liter: <<pcs_gpoli_totalmilkdonation/1000>>.0<<pcs_gpoli_totalmilkdonation mod 1000>>l'
+						else
+							'Donated milk volume in liter: <<pcs_gpoli_totalmilkdonation/1000>>.<<pcs_gpoli_totalmilkdonation mod 1000>>l'
+						end
+						'Donation count: <<pcs_gpoli_totalmilkdonation_count>>'
+						'Average milk volume per donation in ml: <<pcs_gpoli_totalmilkdonation/pcs_gpoli_totalmilkdonation_count>>'
+						'Paid money: <<(((pcs_gpoli_totalmilkdonation*10)/3)*75)/100>><b>₽</b>'
+						'<br>----------------------------------------'
+					end
+					act 'Leave': gt 'gpoli', 'maternity_ward'
 				end
-				act 'Leave': gt 'gpoli', 'maternity_ward'
+				!!act 'Mammography (1:00)':
+				!!	
+				!!end
+				act 'Leave': gt 'gpoli', 'maternity_ward'			
 			end
-			!!act 'Mammography (1:00)':
-			!!	
-			!!end
-			act 'Leave': gt 'gpoli', 'maternity_ward'			
 		end
-	end
-	if lactate > 0 and lactatemv > lactatemm/8 and pcs_gpolimilkdonation <= 2:
-		'<br><br><center>One of the nurses looks at you suspiciously.<center>'
-		act 'Talk to the nurse (0:05)':
-			*clr
-			cla
-			minut += 5
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
-			if preg >= 0 and pregtimes > 0 and pcs_gpolimilkdonation <= 0:
-				'You walk up to the nurse'
-				'You: Uhm, Hello...'
-				'Nurse: Which one is yours?'
-				'You: Mine? I don''t understand...'
-				'The nurse looks at your face then down at your breast and than back at your face.'
-				'Nurse: Well, you are obviously lactating, so you came here to breastfeed your offspring?'
-				'She concludes on you, giving you a rised eyebrow.'
-			elseif preg = 0 and pregtimes = 0 and pcs_gpolimilkdonation <= 0:
-				'You walk up to the nurse'
-				'You: Uhm, Hello...'
-				'The nurse looks you up and down, rising an eyebrow on you.'
-				'Nurse: You don''t look like you ever had a child, how come you are lactating?'
-				'You are surprised by the sudden and precise analysis of the nurse.'
-				'You: How... how do you know?'
-				'Nurse: I''ve been working here for ages. Trust me ... I can tell by the smell. Now why are you lactating?'
-			elseif pcs_gpolimilkdonation <= 0:
-				'You walk up to the nurse'
-				'You: Uhm, Hello...'
-				'Nurse: Which one is yours?'
-				'You: Mine? I don''t understand...'
-				'The nurse looks at your face then down at your breast and than back at your face.'
-				'Nurse: Well, you are obviously lactating, so you came here to breastfeed your offspring?'
-				'She concludes on you, giving you a rised eyebrow.'
-			else
-				'You walk up to the nurse'
-				'You: Hello...'
-				'Nurse: Ah, it is you again...'
-				'She looks you up and down'
-				if pcs_gpolimilkdonation = 1 and preg = 0 and pregtimes = 0:
-					'Nurse: So, why are you lactating again?'
-				elseif pcs_gpolimilkdonation = 2:
-					'Nurse: Did you change your mind and want donate your breast milk?'
+		if lactate > 0 and lactatemv > lactatemm/8 and pcs_gpolimilkdonation <= 2:
+			'<br><br><center>One of the nurses looks at you suspiciously.<center>'
+			act 'Talk to the nurse (0:05)':
+				*clr
+				cla
+				minut += 5
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
+				if preg >= 0 and pregtimes > 0 and pcs_gpolimilkdonation <= 0:
+					'You walk up to the nurse'
+					'You: Uhm, Hello...'
+					'Nurse: Which one is yours?'
+					'You: Mine? I don''t understand...'
+					'The nurse looks at your face then down at your breast and than back at your face.'
+					'Nurse: Well, you are obviously lactating, so you came here to breastfeed your offspring?'
+					'She concludes on you, giving you a rised eyebrow.'
+				elseif preg = 0 and pregtimes = 0 and pcs_gpolimilkdonation <= 0:
+					'You walk up to the nurse'
+					'You: Uhm, Hello...'
+					'The nurse looks you up and down, rising an eyebrow on you.'
+					'Nurse: You don''t look like you ever had a child, how come you are lactating?'
+					'You are surprised by the sudden and precise analysis of the nurse.'
+					'You: How... how do you know?'
+					'Nurse: I''ve been working here for ages. Trust me ... I can tell by the smell. Now why are you lactating?'
+				elseif pcs_gpolimilkdonation <= 0:
+					'You walk up to the nurse'
+					'You: Uhm, Hello...'
+					'Nurse: Which one is yours?'
+					'You: Mine? I don''t understand...'
+					'The nurse looks at your face then down at your breast and than back at your face.'
+					'Nurse: Well, you are obviously lactating, so you came here to breastfeed your offspring?'
+					'She concludes on you, giving you a rised eyebrow.'
 				else
-					'Nurse: What do you want?'
+					'You walk up to the nurse'
+					'You: Hello...'
+					'Nurse: Ah, it is you again...'
+					'She looks you up and down'
+					if pcs_gpolimilkdonation = 1 and preg = 0 and pregtimes = 0:
+						'Nurse: So, why are you lactating again?'
+					elseif pcs_gpolimilkdonation = 2:
+						'Nurse: Did you change your mind and want donate your breast milk?'
+					else
+						'Nurse: What do you want?'
+					end
 				end
-			end
-			if pcs_gpolimilkdonation < 1: pcs_gpolimilkdonation = 1
-			if pcs_gpolimilkdonation < 2:
-				act 'explain yourself':
-					*clr
-					cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
-					if preg = 0 and pregtimes = 0:
-						pcs_gpolimilkdonation = 2
-						if lactateinduced = 1:
-							'You: Erm ... I used a breast pump on myself...'
-							'You blush a bit from embarresment, while telling it to her.'
-						else
-							'You: I don''t really now... it just started some day.'
-							'You explain, blushing from embarresment.'
-						end
-						'The nurse nods at you professionally, then pulls some paper together, while she looks really thoughful. She then looks up at you and starts to speak.'
-						'Nurse: Have you ever thought of donating your breast milk?'
-						'You: Donating?'
-						'Nurse: Yes, donating. We would pump your breasts and collect the milk. We can use the milk for the mothers that are not able to breastfeed yet. We also offer a bit of money for your donated breast milk.'
-						'You look at her with wide eyes.'
-						'Nurse: So, what do you think?'
-						pcs_gpolimilkdonation = 2
-						act 'give it a try (0:15)':
-							*clr
-							cla
-							minut += 15
-							pcs_gpolimilkdonation = 3
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
-							'The nurse leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
-							'You sit down and the nurse invites you to take off your top.'
-							if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
-								'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
-								'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
-								'You: What is that?'
-								'The nurse looks up at you.'
-								'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
-								'You nod your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
-								pain['nipples'] -= 20
-								'You: Where do I get this stuff?'
-								'Nurse: You can buy it in the pharmacy...'
-								pcs_knows_nipplecream = 1
-								'The nurse finishes rubbing you nipples with the nipple balm.'
-							elseif pain['nipples'] >= 60:
-								'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
-								'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
-								'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
-								pain['nipples'] -= 20
+				if pcs_gpolimilkdonation < 1: pcs_gpolimilkdonation = 1
+				if pcs_gpolimilkdonation < 2:
+					act 'explain yourself':
+						*clr
+						cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
+						if preg = 0 and pregtimes = 0:
+							pcs_gpolimilkdonation = 2
+							if lactateinduced = 1:
+								'You: Erm ... I used a breast pump on myself...'
+								'You blush a bit from embarresment, while telling it to her.'
 							else
-								'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+								'You: I don''t really now... it just started some day.'
+								'You explain, blushing from embarresment.'
 							end
-							nipple_cream = 1
-							'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough. So this time you won''t get paid for your milk.'
-							'You nod and pull up your shirt. The nurse takes the pumps and puts them on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
-							milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
-							breastpumped += 4
-							pcs_orphanfeed = 0
-							if milkedvolume >= 1000:
-								'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
-								'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
-							elseif milkedvolume >= 500 and milkedvolume < 1000:
-								'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
-								'Nurse: Okay... it seems you are able to make enough milk for a 50ml donation, but you could have trouble to breastfeed a baby properly.'
-							else
-								'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
-								'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation.'
+							'The nurse nods at you professionally, then pulls some paper together, while she looks really thoughful. She then looks up at you and starts to speak.'
+							'Nurse: Have you ever thought of donating your breast milk?'
+							'You: Donating?'
+							'Nurse: Yes, donating. We would pump your breasts and collect the milk. We can use the milk for the mothers that are not able to breastfeed yet. We also offer a bit of money for your donated breast milk.'
+							'You look at her with wide eyes.'
+							'Nurse: So, what do you think?'
+							pcs_gpolimilkdonation = 2
+							act 'give it a try (0:15)':
+								*clr
+								cla
+								minut += 15
+								pcs_gpolimilkdonation = 3
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+								'The nurse leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
+								'You sit down and the nurse invites you to take off your top.'
+								if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
+									'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+									'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+									'You: What is that?'
+									'The nurse looks up at you.'
+									'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
+									'You nod your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
+									pain['nipples'] -= 20
+									'You: Where do I get this stuff?'
+									'Nurse: You can buy it in the pharmacy...'
+									pcs_knows_nipplecream = 1
+									'The nurse finishes rubbing you nipples with the nipple balm.'
+								elseif pain['nipples'] >= 60:
+									'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+									'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+									'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+									pain['nipples'] -= 20
+								else
+									'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+								end
+								nipple_cream = 1
+								'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough. So this time you won''t get paid for your milk.'
+								'You nod and pull up your shirt. The nurse takes the pumps and puts them on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+								milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
+								breastpumped += 4
+								pcs_orphanfeed = 0
+								if milkedvolume >= 1000:
+									'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
+									'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
+								elseif milkedvolume >= 500 and milkedvolume < 1000:
+									'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
+									'Nurse: Okay... it seems you are able to make enough milk for a 50ml donation, but you could have trouble to breastfeed a baby properly.'
+								else
+									'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
+									'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation.'
+								end
+								'The nurse detaches the pump and allows you to dress up again.'
+								if milkedvolume > 500:
+									mward_donatesv = 500
+								else
+									mward_donatesv = milkedvolume
+								end
+								if salo > 40:
+									mward_donatesf = 60
+								elseif salo > 20:
+									mward_donatesf = 45
+								elseif salo > 15:
+									mward_donatesf = 20
+								else
+									mward_donatesf = 10
+								end
+								if pcs_energy > 30:
+									mward_donatess = rand(69, 80)
+								elseif sick > 1:
+									mward_donatess = rand(0,45)
+								else
+									mward_donatess = rand(45, 69)
+								end
+								act 'Leave':gt 'gpoli'								
 							end
-							'The nurse detaches the pump and allows you to dress up again.'
-							if milkedvolume > 500:
-								mward_donatesv = 500
-							else
-								mward_donatesv = milkedvolume
+							act 'deny to donate':
+								*clr
+								cla
+								'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
+								act 'Leave':gt 'gpoli'							
 							end
-							if salo > 40:
-								mward_donatesf = 60
-							elseif salo > 20:
-								mward_donatesf = 45
-							elseif salo > 15:
-								mward_donatesf = 20
-							else
-								mward_donatesf = 10
+						else
+							pcs_gpolimilkdonation = 2
+							'You: Well ... I don''t have a kid here... I was just looking around for a bit'
+							'You look a bit awkward at the nurse as you try to explain yourself.'
+							'The nurse nods at you professionally, then pulls some paper together, while she looks really thoughful. She then looks up at you and starts to speak.'
+							'Nurse: Have you ever thought of donating your breast milk?'
+							'You: Donating?'
+							'Nurse: Yes, donating. We would pump your breasts and collect the milk. We can use the milk for the mothers that are not able to breastfeed yet. We also offer a bit of money for your donated breast milk.'
+							'You look at her with wide eyes.'
+							'Nurse: So, what do you think?'
+							pcs_gpolimilkdonation = 2
+							act 'give it a try (0:15)':
+								*clr
+								cla
+								minut += 15
+								pcs_gpolimilkdonation = 3
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+								'The nurse leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
+								'You sit down and the nurse invites you to take off your top.'
+								if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
+									'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+									'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+									'You: What is that?'
+									'The nurse looks up at you.'
+									'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
+									'You nod your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
+									pain['nipples'] -= 20
+									'You: Where do I get this stuff?'
+									'Nurse: You can buy it in the pharmacy...'
+									pcs_knows_nipplecream = 1
+									'The nurse finishes rubbing you nipples with the nipple balm.'
+								elseif pain['nipples'] >= 60:
+									'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+									'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+									'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+									pain['nipples'] -= 20
+								else
+									'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+								end
+								nipple_cream = 1
+								'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough. So this time you won''t get paid for your milk.'
+								'You nod and pull up your shirt. The nurse takes the pumps and puts them on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+								milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
+								breastpumped += 4
+								pcs_orphanfeed = 0
+								if milkedvolume >= 1000:
+									'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
+									'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
+								elseif milkedvolume >= 500 and milkedvolume < 1000:
+									'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
+									'Nurse: Okay... it seems you are able to make enough milk for a 50ml donation, but you could have trouble to breastfeed a baby properly.'
+								else
+									'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
+									'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation.'
+								end
+								'The nurse detaches the pump and allows you to dress up again.'
+								if milkedvolume > 500:
+									mward_donatesv = 500
+								else
+									mward_donatesv = milkedvolume
+								end
+								if salo > 40:
+									mward_donatesf = 60
+								elseif salo > 20:
+									mward_donatesf = 45
+								elseif salo > 15:
+									mward_donatesf = 20
+								else
+									mward_donatesf = 10
+								end
+								if pcs_energy > 30:
+									mward_donatess = rand(69, 80)
+								elseif sick > 1:
+									mward_donatess = rand(0,45)
+								else
+									mward_donatess = rand(45, 69)
+								end
+								act 'Leave':gt 'gpoli'								
 							end
-							if pcs_energy > 30:
-								mward_donatess = rand(69, 80)
-							elseif sick > 1:
-								mward_donatess = rand(0,45)
-							else
-								mward_donatess = rand(45, 69)
+							act 'deny to donate':
+								*clr
+								cla
+								'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
+								act 'Leave':gt 'gpoli'							
 							end
-							act 'Leave':gt 'gpoli'								
+						end						
+					end
+				elseif pcs_gpolimilkdonation = 2:
+					act 'Offer to donate your breast milk (0:15)':
+					*clr
+						cla
+						minut += 15
+						pcs_gpolimilkdonation = 3
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+						'The nurse smiles and gets up, then she leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
+						'You sit down and the nurse invites you to take off your top.'
+						if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
+							'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+							'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+							'You: What is that?'
+							'The nurse looks up at you.'
+							'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
+							'You shake your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
+							pain['nipples'] -= 20
+							'You: Where do I get this stuff?'
+							'Nurse: You can buy it in the pharmacy...'
+							pcs_knows_nipplecream = 1
+							'The nurse finishes rubbing you nipples with the nipple balm.'
+						elseif  pain['nipples'] >= 60:
+							'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+							'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+							'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+							pain['nipples'] -= 20
+						elseif pcs_knows_nipplecream <= 0:
+							'The nurse grabs a small tin and takes a bit of yellowish cream from it.'
+							'You: What is that?'
+							'The nurse looks up at you.'
+							'Nurse: This is nipple balm. It helps during pumping and prevents nipple soreness. Don''t you now this?'
+							'You shake your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples.'
+							'You: Where do I get this stuff?'
+							'Nurse: You can buy it in the pharmacy...'
+							pcs_knows_nipplecream = 1
+							'The nurse finishes rubbing you nipples with the nipple balm.'
+						else
+							'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
 						end
-						act 'deny to donate':
-							*clr
-							cla
-							'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
-							act 'Leave':gt 'gpoli'							
+						nipple_cream = 1
+						'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough.'
+						'You nod and pull up your shirt. The nurse takes the pumps and puts it on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+						milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
+						breastpumped += 4
+						pcs_orphanfeed = 0
+						if milkedvolume >= 1000:
+							'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
+							'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
+						elseif milkedvolume >= 50 and milkedvolume < 1000:
+							'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
+							'Nurse: Okay... it seems you are able to make enough milk for a donation, but you could have trouble to breastfeed a baby properly.'
+						else
+							'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
+							'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come and be pumped, but we need at least 50ml for a valid donation.'
 						end
-					end						
-				end
-			elseif pcs_gpolimilkdonation = 2:
-				act 'Offer to donate your breast milk (0:15)':
-				*clr
-					cla
-					minut += 15
-					pcs_gpolimilkdonation = 3
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
-					'The nurse smiles and gets up, then she leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
-					'You sit down and the nurse invites you to take off your top.'
-					if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
-						'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
-						'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
-						'You: What is that?'
-						'The nurse looks up at you.'
-						'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
-						'You shake your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
-						pain['nipples'] -= 20
-						'You: Where do I get this stuff?'
-						'Nurse: You can buy it in the pharmacy...'
-						pcs_knows_nipplecream = 1
-						'The nurse finishes rubbing you nipples with the nipple balm.'
-					elseif  pain['nipples'] >= 60:
-						'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
-						'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
-						'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
-						pain['nipples'] -= 20
-					elseif pcs_knows_nipplecream <= 0:
-						'The nurse grabs a small tin and takes a bit of yellowish cream from it.'
-						'You: What is that?'
-						'The nurse looks up at you.'
-						'Nurse: This is nipple balm. It helps during pumping and prevents nipple soreness. Don''t you now this?'
-						'You shake your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples.'
-						'You: Where do I get this stuff?'
-						'Nurse: You can buy it in the pharmacy...'
-						pcs_knows_nipplecream = 1
-						'The nurse finishes rubbing you nipples with the nipple balm.'
-					else
-						'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
-					end
-					nipple_cream = 1
-					'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough.'
-					'You nod and pull up your shirt. The nurse takes the pumps and puts it on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
-					milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
-					breastpumped += 4
-					pcs_orphanfeed = 0
-					if milkedvolume >= 1000:
-						'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
-						'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
-					elseif milkedvolume >= 50 and milkedvolume < 1000:
-						'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
-						'Nurse: Okay... it seems you are able to make enough milk for a donation, but you could have trouble to breastfeed a baby properly.'
-					else
-						'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
-						'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come and be pumped, but we need at least 50ml for a valid donation.'
-					end
-					'The nurse detaches the pump and allows you to dress up again.'
-					if milkedvolume > 500:
-						mward_donatesv = 500
-					else
-						mward_donatesv = milkedvolume
-					end
-					if salo > 40:
-						mward_donatesf = 60
-					elseif salo > 20:
-						mward_donatesf = 45
-					elseif salo > 15:
-						mward_donatesf = 20
-					else
-						mward_donatesf = 10
+						'The nurse detaches the pump and allows you to dress up again.'
+						if milkedvolume > 500:
+							mward_donatesv = 500
+						else
+							mward_donatesv = milkedvolume
+						end
+						if salo > 40:
+							mward_donatesf = 60
+						elseif salo > 20:
+							mward_donatesf = 45
+						elseif salo > 15:
+							mward_donatesf = 20
+						else
+							mward_donatesf = 10
+						end
+						if pcs_energy > 30:
+							mward_donatess = rand(69, 80)
+						elseif sick > 1:
+							mward_donatess = rand(0,45)
+						else
+							mward_donatess = rand(45, 69)
+						end							
+						act 'Leave':gt 'gpoli'				
 					end
-					if pcs_energy > 30:
-						mward_donatess = rand(69, 80)
-					elseif sick > 1:
-						mward_donatess = rand(0,45)
-					else
-						mward_donatess = rand(45, 69)
-					end							
-					act 'Leave':gt 'gpoli'				
 				end
+				act 'Leave':gt 'gpoli'
 			end
-			act 'Leave':gt 'gpoli'
 		end
+		act 'leave':gt 'gpoli'
+	else
+		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		act 'Leave':minut += 5 & gt 'pavCommercial'
 	end
-	act 'Leave':gt 'gpoli'
+end
+
+if $ARGS[0] = 'reception':
+	*clr
+	cla
+	minut += 2
+	gs 'stat'
+	'You walk up to the reception and ask for help with your problem'
+	'The receptionist looks you up and down and tells you to visit the maternity ward. Someone over there would be able to help you.'
+	pcs_know_mward = 1
+	act 'Go to maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
+	act 'Leave': gt 'gpoli'
 end
 
 if $ARGS[0] = 'maternity_ward_donation':	
 	*clr
 	cla
 	gs 'stat'
-	nipple_cream = 1
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
-	'The nurse attaches the pumps and switches them on.'
-	if lactatemv >= 0:
-		'Your nipples are worked by the pumps, pumping your milk out, first draining at your collected milk resevoir. You feel the pressure in your breasts easing down.'
-	else
-		'Your nipples are worked by the pumps, pumping your milk out, you feel the pressure in your breasts easing down. Then your breasts tingle from the milk production as the pump demands more of your milk.'
-	end
-	act 'continue':
-		*clr
-		cla
-		milkedvolume += func('lact_lib','$get_breastmilk', 4, 15)
-		breastpumped += 4
-		'After 15 minutes, the nurse detaches the pumps from your breasts.'
-		if milkedvolume > 500:
-			temp_var = milkedvolume/500
-			!!'milkedvolume: <<milkedvolume>> - temp var test: <<temp_var>>'
-			pcs_gpoli_donationsessioncount += temp_var
-			pcs_gpoli_totalmilkdonation_count += 1
-			pcs_gpoli_totalmilkdonation += temp_var*50
-			if temp_var < 2:
-				'She looks satisfied at you as she puts away one bottle with 50ml of your breast milk.'
-			elseif temp_var => 4:
-				'She looks satisfied at you as she puts away the <<temp_var>> bottles containing <<temp_var*50>>ml of your breast milk.'
-				'Nurse: This is a good amount of milk.'
-			elseif temp_var => 8:
-				'She looks surprised at the at the amount of milk you made as she stores away the <<temp_var>> bottles that contain <<temp_var*50>>ml of your breast milk.'
-				'Nurse: Dear, that is much milk...'
-			else
-				'She looks satisfied at you as she puts away <<temp_var>> bottles with <<temp_var*50>>ml of your breast milk inside.'
-			end
-		else
-			'She looks at you a bit disappointed.'
-			'Nurse: Mhmm... I am sorry, but this isn''t enough milk for a valid donation. You only made <<milkedvolume/10>>ml of breast milk.'
-		end
-		if pcs_gpoli_donationsessioncount > 0:
-			mward_donatemoney = (((pcs_gpoli_donationsessioncount*500)/3)*75)/100
+	if hour >= 6 and hour <= 20:
+		nipple_cream = 1
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+		'The nurse attaches the pumps and switches them on.'
+		if lactatemv >= 0:
+			'Your nipples are worked by the pumps, pumping your milk out, first draining at your collected milk resevoir. You feel the pressure in your breasts easing down.'
 		else
-			mward_donatemoney = 0
+			'Your nipples are worked by the pumps, pumping your milk out, you feel the pressure in your breasts easing down. Then your breasts tingle from the milk production as the pump demands more of your milk.'
 		end
-		money += mward_donatemoney
-		minut += 15
-		nipple_cream = 0
-		if lactatemv > lactatemm/2:
-			'The nurse looks at your breasts'
-			'Nurse: Looks like you could go for a another pumping...shall we?'
-			act 'have your breasts pumped again': gt 'gpoli', 'maternity_ward_donation'
-			act 'enough for today':
-				*clr
-				cla
-				gs 'stat'
-				if pcs_gpoli_donationsessioncount > 0:
-					'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+		act 'continue':
+			*clr
+			cla
+			milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
+			breastpumped += 4
+			'After 15 minutes, the nurse detaches the pumps from your breasts.'
+			if milkedvolume > 500:
+				temp_var = milkedvolume/500
+				pcs_gpoli_donationsessioncount += temp_var
+				pcs_gpoli_totalmilkdonation_count += 1
+				pcs_gpoli_totalmilkdonation += temp_var*50
+				if temp_var < 2:
+					'She looks satisfied at you as she puts away one bottle with 50ml of your breast milk.'
+				elseif temp_var => 4:
+					'She looks satisfied at you as she puts away the <<temp_var>> bottles containing <<temp_var*50>>ml of your breast milk.'
+					'Nurse: This is a good amount of milk.'
+				elseif temp_var => 8:
+					'She looks surprised at the at the amount of milk you made as she stores away the <<temp_var>> bottles that contain <<temp_var*50>>ml of your breast milk.'
+					'Nurse: Dear, that is much milk...'
 				else
-					'You put on your top'
-				end
-				act 'Leave':
-					milkedvolume = 0
-					gt 'gpoli', 'maternity_ward'
+					'She looks satisfied at you as she puts away <<temp_var>> bottles with <<temp_var*50>>ml of your breast milk inside.'
 				end
+			else
+				'She looks at you a bit disappointed.'
+				'Nurse: Mhmm... I am sorry, but this isn''t enough milk for a valid donation. You only made <<milkedvolume/10>>ml of breast milk.'
 			end
-		else
-			act 'ask to donate more': gt 'gpoli', 'maternity_ward_donation'
-			act 'enough for today':
-				*clr
-				cla
-				gs 'stat'
-				if pcs_gpoli_donationsessioncount > 0:
-					'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
-				else
-					'You put on your top'
+			if pcs_gpoli_donationsessioncount > 0:
+				mward_donatemoney = (((pcs_gpoli_donationsessioncount*500)/3)*75)/100
+			else
+				mward_donatemoney = 0
+			end
+			money += mward_donatemoney
+			minut += 15
+			nipple_cream = 0
+			if lactatemv > lactatemm/2:
+				'The nurse looks at your breasts'
+				'Nurse: Looks like you could go for a another pumping...shall we?'
+				act 'have your breasts pumped again': gt 'gpoli', 'maternity_ward_donation'
+				act 'enough for today':
+					*clr
+					cla
+					gs 'stat'
+					if pcs_gpoli_donationsessioncount > 0:
+						'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+					else
+						'You put on your top'
+					end
+					act 'leave':
+						milkedvolume = 0
+						gt 'gpoli', 'maternity_ward'
+					end
 				end
-				act 'Leave':
-					milkedvolume = 0
-					gt 'gpoli', 'maternity_ward'
+			else
+				act 'ask to donate more': gt 'gpoli', 'maternity_ward_donation'
+				act 'enough for today':
+					*clr
+					cla
+					gs 'stat'
+					if pcs_gpoli_donationsessioncount > 0:
+						'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+					else
+						'You put on your top'
+					end
+					act 'leave':
+						milkedvolume = 0
+						gt 'gpoli', 'maternity_ward'
+					end
 				end
 			end
 		end
+	elseif pcs_gpoli_donationsessioncount > 0:
+		'Sorry <<$pcs_firstname>>, we are closing now.'
+		'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+		act 'Leave':minut += 5 & gt 'pavCommercial'
+	else
+		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		act 'Leave':minut += 5 & gt 'pavCommercial'
 	end
 end
 --- gpoli ---------------------------------

locations/gschool_events.qsrc

@@ -481,6 +481,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			'He''s kind of cute. You''re so horny right now, you decide to tease him and see if you can push him into doing more. You put your finger in your mouth and quietly ask him in a lewd voice, "Come on <<$rand_boy>>, is that all you have for me?"'
 			'His friends heard your question, and are now daring him to take you to the men''s room. He doesn''t seem so sure.'
 			act 'Tease him':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
 				'You can see him starting to get turned on and sure this is going to turn out good for him. Then you lean in real close and whisper in his ear, but loud enough for others to hear. "Because this is what I have for you." You start sliding your skirt slowly up your thighs, now all the boys are watching and just before it gets high enough to show anything you let it go and it drops back in place. "Which is nothing." You say with a giggle and laugh off, you hear one of the boys saying to his friend. "God so close. She is such a tease."'
 				act 'Continue': gt 'gschool_lessons', 'short_break'

locations/gschool_grounds.qsrc

@@ -628,6 +628,7 @@ if $ARGS[0] = 'change_room':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 

locations/gschool_sex.qsrc

@@ -322,6 +322,8 @@ if $ARGS[0] = 'Anush_private2':
 			'As Anushka takes a swig Valentin adds in "Fuck yeah you will, soon you''ll be putting them away like this bitch, now this bitch knows how to party." He says as he gropes Anushka''s tit as she drink and wraps another arm around her giving her a quick hug. Afterwards she passes the bottle back to the boys who start to take a drink, while she turns towards you and leans in close. She kisses you softly then a bit passionately on your lips.'
 			gs 'arousal', 'foreplay', 2, 'lesbian'
 			act 'Push her away':
+				*clr
+				cla
 				npc_rel['A144'] -= 5
 				npc_rel['A158'] -= 5
 				npc_rel['A156'] -= 5

locations/gskver.qsrc

@@ -113,17 +113,24 @@ if $ARGS[0] = 'start':
 
 	act 'Go for a walk (0:15)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
-		cla
-		*clr
-		minut += 15
-		place = 1
-		Frend_num = 0
+		
+		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] = 0 and rand(1,4) = 1:
+			gs 'mey_vika_events', 'park_meet'
+			gs 'stat'
+			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
+		else
+			cla
+			*clr
+			minut += 15
+			place = 1
+			Frend_num = 0
 			if MagikDostup ! 1:
 				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
 					gt 'MagEncounterFairy'
 				end
 			end
-		gt 'placer'
+			gt 'placer'
+		end		
 	end
 
 	if hour >= 8 and hour < 22:

locations/igorhome.qsrc

@@ -32,9 +32,9 @@ if $ARGS[0] = 'entrance':
 	elseif IgorLove <= 0:
 		IgorLoverQW = -1
 		if month > 8 or month < 4:
-			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_homew'+ rand(1,2) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew'+ rand(1,2) +'.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
 		end
 		'As you walk towards Igor''s house, he starts having second thoughts "<<$pcs_firstname>>, you know I love you very much, but we don''t know each other well enough, so I''m wondering if we should let it be."'
 		act 'Leave': gt 'pavResidential'
@@ -46,7 +46,7 @@ if $ARGS[0] = 'entrance':
 !!			cls
 !!			minut += 15
 !!			gs 'stat'
-!!			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
 !!			'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
 !!			act 'Walk around his home': gt 'igorhome','hallway'
 !!			act 'Go to his room': gt 'igorhome', 'igorroom'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'hallway':
 	killvar '$locclass'
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
 	'This is the entrance hall to Igor''s house, it is tastefully decorated. It leads to all the other rooms in the house.'
 	act 'Igor''s Room': gt 'igorhome','igorroom'
 	act 'Bathroom': gt 'igorhome','bathroom'
@@ -83,12 +83,12 @@ if $ARGS[0] = 'bathroom':
 	gs 'stat'
 	$location_type = 'bathroom'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
 	'The bathroom has a large sink area and tile floors. The toilet sits along the far wall. There is also a walk-in shower and bath tub. It all looks very nice.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 
-    if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 
 	act 'Take a shower':
 		cls
@@ -103,8 +103,9 @@ if $ARGS[0] = 'bathroom':
 	dynamic $bath
 	gs 'din_van', 'prvt_pee'
 	dynamic $bteeth
-    dynamic $tampon
-    dynamic $basin
+	dynamic $tampon
+	dynamic $basin
+	dynamic $removepan
 
 	act 'Leave the bathroom': gt 'igorhome','hallway'
 end
@@ -115,7 +116,7 @@ if $ARGS[0] = 'igorroom':
 	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
 	'The room is surprisingly clean and organized for a boys room. It is fairly tastefully decorated. In the center of the room against one wall is a single narrow bed. Against the opposite wall is a desk and a chair, with a computer sitting on the desk. Next to the desk is a book shelf with a fairly large collection of books, just below the shelves leaning against the wall rests a guitar.'
 !!This one I think is if he is dating Dima, not sure.
 	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'
@@ -128,7 +129,7 @@ if $ARGS[0] = 'igorroom':
 		if IgorloverQW = 1:
 			*clr & cla
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			'Igor looks at his watch. "If you stay any later, my mom will come in and make a fuss and talk about how unseemly it is for a boy to have a girl in his room this late."'
 			'You nod to him. "I understand, then I guess I will see you later."'
 			act 'Say goodbye and go home': gt 'pavResidential'
@@ -140,7 +141,7 @@ if $ARGS[0] = 'igorroom':
 		else
 			cls
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			'You look at the clock saying that it''s really late and that you need to go home.'
 			act 'Say goodbye and go home': gt 'pavResidential'
 		end
@@ -148,9 +149,9 @@ if $ARGS[0] = 'igorroom':
 		cls
 		'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 		if IgorloverQW = 1:
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 		end
 		if week = 5 or week = 6:
 			'Igor looks at his watch and asks you "I want to have fun tonight. Let''s go to the disco!"'
@@ -161,7 +162,7 @@ if $ARGS[0] = 'igorroom':
 			'Igor tells you its getting late, you could take the hint and leave or maybe chat just a little longer.'
 			act 'Take the hint and go home': gt 'pavResidential'
 			act 'Chat just a little longer':gt 'igorhome','Chat'
-		end			
+		end
 	end
 	act 'Leave Igor''s room': gt 'igorhome','hallway'
 end
@@ -172,9 +173,9 @@ if $ARGS[0] = 'Chat':
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	if IgorloverQW = 1:
-		'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 	end
 	if npcrel['A4'] > 50:
 		i = rand(0,10)
@@ -228,9 +229,9 @@ if $ARGS[0] = 'Chat':
 			cla
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 			if IgorloverQW = 1:
-				'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			end
 			'Igor asks you, "<<$pcs_nickname>> lets go see a movie, my treat."'
 			act 'Agree': gt 'IgorEv', 'Movies'
@@ -239,9 +240,9 @@ if $ARGS[0] = 'Chat':
 				cla
 				'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 				if IgorloverQW = 1:
-					'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 				else
-					'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 				end
 				'You shake your head no. "I would rather just stay here." He nods and smiles.'
 				act 'Continue': gt 'IgorHome', 'Chat'
@@ -269,7 +270,7 @@ if $ARGS[0] = 'study':
 	cls
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
 	'You sit down next to Igor and he pulls out his history book and notes. He starts tutoring you in history, he is very good tutor and your learn a lot.'
 	act 'Study More':gt 'igorhome','study'
 	act 'Chat':gt 'igorhome','Chat'
@@ -727,13 +728,13 @@ if $ARGS[0] = 'livingroom4':
 end
 
 if $ARGS[0] = 'kitchen':
-    *clr & cla
-    minut += 1
+	*clr & cla
+	minut += 1
 	$locclass = 'kitr'
-    gs 'stat'
-    '<center><b><font color = maroon>Kitchen</font></b></center>'
-    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
-    'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
+	gs 'stat'
+	'<center><b><font color = maroon>Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
+	'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
 !!this is a elseif, if it is 06:00 to 07:00 igors mother is here, or if it is 18:00 to 23:00 she is here during the week. On weekends she is here from 08:00 to 23:00
 	if (week <=5 and (hour = 6 or (hour >= 18 and hour < 23))) or (week > 5 and hour >= 8 and hour < 23):
 		'You see Igor''s mother Inga is in the kitchen drinking tea. She is very neatly dressed, you don''t think she has noticed you yet.'
@@ -1129,7 +1130,7 @@ end
 
 !!new scene for going to Igors house with out following him from school.
 if $ARGS[0] = 'home':
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
 	'You walk up to the front door and knock.'
 !!This will have a lot of if's and elseif's.
 	if SchoolAtestat = 1 and kanikuli > 0:

locations/kafe2.qsrc

@@ -48,6 +48,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'givi':

locations/koncepod1.qsrc

@@ -118,6 +118,7 @@ if $ARGS[0] = 'vnr2x':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0]='bdr2x':

locations/lact_lib.qsrc

@@ -1,7 +1,7 @@
 # lact_lib
 
 if $ARGS[0] = '$get_bfat_tissue':
-	!! func('lac_lib', 'get_bfattissue', npc_nbsize, npc_lactatemm)
+	!! func('lact_lib', 'get_bfattissue', npc_nbsize, npc_lactatemm)
 	!! function to get breast fat tissue amount. Can be used for NPC as well as PC.
 	!! ARGS[1] = npc_nbsize - the natural bust size of the NPC/PC.
 	!! ARGS[2] = npc_lactatemm - he lactatemm of the NPC/PC.
@@ -114,63 +114,45 @@ if $ARGS[0] = '$get_breastmilk_time':
 	if lactate > 0:
 		!! 'suck_flow_rate initialized' Base Rate of sucking is 10ml/minute.
 		if ARGS[1] = 0:
-			!! 'adult sucking'
-			suck_flow_rate = 12 + rand(0,4)
-			temp_var = pcs_mood +(ARGS[2]/8)
-			if temp_var > 100:
-				pcs_mood = 100
-			else
-				pcs_mood += ARGS[2]/8
-			end
+			!!	'adult sucking'
+			suck_flow_rate = 120
 		elseif ARGS[1] = 1:
-			!! 'child sucking'
-			suck_flow_rate = 8 + rand(0,2)
-			temp_var = pcs_mood + (ARGS[2]/2)
-			if temp_var > 100:
-				pcs_mood = 100
-			else
-				pcs_mood += ARGS[2]/2
-			end
+			!!	'child sucking'
+			suck_flow_rate = 110
 		elseif ARGS[1] = 2:
 			!!	'baby sucking'
-			suck_flow_rate = 6 + (rand(0,2))
-			temp_var = pcs_mood + ARGS[2]
-			if temp_var > 100:
-				pcs_mood = 100
-			else
-				pcs_mood += ARGS[2]
-			end
+			suck_flow_rate = 80
 		elseif ARGS[1] = 3:
 			!!	'manual_breastpump sucking'
-			suck_flow_rate = 9
+			suck_flow_rate = 180
 		elseif ARGS[1] = 4:
 			!!	'electric_breastpump sucking'
-			suck_flow_rate = 10
+			suck_flow_rate = 400
 		elseif ARGS[1] = 5:
-			!! 'hand expression'
-			suck_flow_rate = 3 + rand(1,2)
+			!!	'hand expression'
+			suck_flow_rate = 105
 		elseif ARGS[1] = 6:
-			!! 'cow milker sucking'
-			suck_flow_rate = 100
+			!!	'cow milker sucking'
+			suck_flow_rate = 1000
 		else
-			!! 'suck flow else branch'
-			suck_flow_rate = 10
+			!!	'suck flow else branch'
+			suck_flow_rate = 100
 		end
 		
 		if pcs_nips > 0:
-			max_nip_flow_rate = 6
+			max_nip_flow_rate = 60
 		elseif pcs_nips > 20:
-			max_nip_flow_rate = 8
+			max_nip_flow_rate = 80
 		elseif pcs_nips > 40:
-			max_nip_flow_rate = 10
+			max_nip_flow_rate = 100
 		elseif pcs_nips > 60:
-			max_nip_flow_rate = 12
+			max_nip_flow_rate = 120
 		elseif pcs_nips > 80:
-			max_nip_flow_rate = 14
+			max_nip_flow_rate = 140
 		elseif pcs_nips > 100:
-			max_nip_flow_rate = 16
+			max_nip_flow_rate = 160
 		else
-			max_nip_flow_rate = 10
+			max_nip_flow_rate = 100
 		end
 		
 		if breastcounter > 0:
@@ -189,50 +171,50 @@ if $ARGS[0] = '$get_breastmilk_time':
 		if nip_flow > 30: nip_flow_mod = 30
 		max_nip_flow_rate += nip_flow_mod
 		
-		if (lactaterate/600) < 1 and lactaterate > 0:
+		if (lactaterate/60) < 1 and lactaterate > 0:
 			temp_lactaterate = 1
 		else
-			temp_lactaterate = lactaterate/600
+			temp_lactaterate = lactaterate/60
 		end
 		
 		if lactatemv >= (ARGS[2]*10):
 			if max_nip_flow_rate <= suck_flow_rate:
-				temp_var = ARGS[2]/max_nip_flow_rate
+				temp_var = (ARGS[2]*10)/max_nip_flow_rate
 			else
-				temp_var = ARGS[2]/suck_flow_rate
+				temp_var = (ARGS[2]*10)/suck_flow_rate
 			end
 			RESULT = temp_var
 		elseif lactatemv > 0 and lactatemv < (ARGS[2]*10):
 			if max_nip_flow_rate <= suck_flow_rate:
-				temp_var = (lactatemv/10)/max_nip_flow_rate
-				temp_var2 = ARGS[2] - (lactatemv/10)
+				temp_var = lactatemv/max_nip_flow_rate
+				temp_var2 = (ARGS[2]*10) - lactatemv
 				if max_nip_flow_rate <= temp_lactaterate:
 					temp_var += temp_var2/max_nip_flow_rate
 				else
-					temp_var += temp_var2/temp_lactaterate
+					temp_var += temp_var2/(temp_lactaterate*10)
 				end
 			else
-				temp_var = (lactatemv/10)/suck_flow_rate
-				temp_var2 = ARGS[2] - (lactatemv/10)
+				temp_var = lactatemv/suck_flow_rate
+				temp_var2 = (ARGS[2]*10) - lactatemv
 				if suck_flow_rate <= temp_lactaterate:
 					temp_var += temp_var2/suck_flow_rate
 				else
-					temp_var += temp_var2/temp_lactaterate
+					temp_var += temp_var2/(temp_lactaterate*10)
 				end
 			end
 			RESULT = temp_var
 		elseif lactatemv <=0:
 			if max_nip_flow_rate <= suck_flow_rate:
 				if max_nip_flow_rate <= temp_lactaterate:
-					temp_var = ARGS[2]/max_nip_flow_rate
+					temp_var = (ARGS[2]*10)/max_nip_flow_rate
 				else
-					temp_var = ARGS[2]/temp_lactaterate
+					temp_var = (ARGS[2]*10)/(temp_lactaterate*10)
 				end
 			else
 				if suck_flow_rate <= temp_lactaterate:
-					temp_var = ARGS[2]/suck_flow_rate
+					temp_var = (ARGS[2]*10)/suck_flow_rate
 				else
-					temp_var = ARGS[2]/temp_lactaterate
+					temp_var = (ARGS[2]*10)/(temp_lactaterate*10)
 				end
 			end
 			RESULT = temp_var
@@ -245,20 +227,18 @@ if $ARGS[0] = '$get_breastmilk_time':
 end
 
 if $ARGS[0] = '$get_breastmilk':
-
 	!!	func('lact_lib','$get_breastmilk', sucktion_type, sucktion_time)
 	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6]
 	!!	ARGS[2] = sucktion_time: how many minutes the sucking/pumping takes place
 	!!	Usage: breastmilkvolume = func('lact_lib','$get_breastmilk', 4, 20)
 	!! 	RESULT = Milk in ml*10
-	!!	what type of sucktion is happening? different sucktion can cause a different demand of breastmilk. Base rate of sucktion is 10ml/minute.
-
-	soreness_mod = 10
+	!!	Sveta, someone or something tries to milk Svetas breasts, so the daily variable breastpumped is switched on. This is used for the femcycle. If this is not switched on, possible changes like prolactinlvl etc go down.
 	breastpumped = 1
-	!! 'suck_flow_rate initialized'
+	if soreness_mod <= 0: soreness_mod = 1
+	!!	what type of sucktion is happening? different sucktion can cause a different demand of breastmilk. Base rate of sucktion is 10ml/minute x 10. So if the sucktion rate is 10ml/min then suck_flow_rate = 100.
 	if ARGS[1] = 0:
-		!! 'adult sucking'
-		suck_flow_rate = 12 + rand(0,4)
+		!!	'adult sucking'
+		suck_flow_rate = 120
 		temp_var = pcs_mood +(ARGS[2]/8)
 		if temp_var > 100:
 			pcs_mood = 100
@@ -266,8 +246,8 @@ if $ARGS[0] = '$get_breastmilk':
 			pcs_mood += ARGS[2]/8
 		end
 	elseif ARGS[1] = 1:
-		!! 'child sucking'
-		suck_flow_rate = 8 + rand(0,2)
+		!!	'child sucking'
+		suck_flow_rate = 110
 		temp_var = pcs_mood + (ARGS[2]/2)
 		if temp_var > 100:
 			pcs_mood = 100
@@ -276,7 +256,7 @@ if $ARGS[0] = '$get_breastmilk':
 		end
 	elseif ARGS[1] = 2:
 		!!	'baby sucking'
-		suck_flow_rate = 6 + (rand(0,2))
+		suck_flow_rate = 80
 		temp_var = pcs_mood + ARGS[2]
 		if temp_var > 100:
 			pcs_mood = 100
@@ -285,264 +265,336 @@ if $ARGS[0] = '$get_breastmilk':
 		end
 	elseif ARGS[1] = 3:
 		!!	'manual_breastpump sucking'
-		suck_flow_rate = 9
+		suck_flow_rate = 180
 	elseif ARGS[1] = 4:
 		!!	'electric_breastpump sucking'
-		suck_flow_rate = 10
+		suck_flow_rate = 400
 	elseif ARGS[1] = 5:
-		!! 'hand expression'
-		suck_flow_rate = 3 + rand(1,2)
+		!!	'hand expression'
+		suck_flow_rate = 105
 	elseif ARGS[1] = 6:
-		!! 'cow milker sucking'
-		suck_flow_rate = 100
+		!!	'cow milker sucking'
+		suck_flow_rate = 1000
 	else
-		!! 'suck flow else branch'
-		suck_flow_rate = 10
+		!!	'suck flow else branch'
+		suck_flow_rate = 100
 	end
 	!!	If you pump and work your breast more, soreness will decrease after pumping. This can also decline if your breasts arent worked for a longer time.
 	if breastcounter > 0:
 		temp_var = breastcounter/10
 		soreness_mod += temp_var
-		if soreness_mod > 20: soreness_mod = 20
+		if soreness_mod > 30: soreness_mod = 30
 		if nipple_cream = 1:
 			soreness_mod += 20
 			nipple_cream = 0
 		end
 	end
-	!! No lactation, no milk, but stimulus is applied, so some things are going to happen here.
-	if lactate = 0:
+	!!	If Sveta is not lactating we still need to do some actions. This is handled in here. Nipple pain + breast pain are applied as well as stamina is used.
+	if lactate <= 0:
 		if milkoverdemand <= 0: milkoverdemand = 0
 		pump_stop_brake = 0
 		!!	This is how much milk demand is applied to the breasts. In this function it is needed to calculate the nipple pain and breast pain.
-		max_sucktion_demand = 10*suck_flow_rate*ARGS[2]
+		max_sucktion_demand = suck_flow_rate*ARGS[2]
 		if pain['nipples'] <= 60:
-			suck_until_pain = ((60 - pain['nipples'])*10*(soreness_mod/10))/suck_flow_rate
+			suck_until_pain = (((60 - pain['nipples'])*soreness_mod)*10)/(suck_flow_rate/18)
 		end
-		temp_var = pain['nipples'] + (max_sucktion_demand/100)/(soreness_mod/10)
+		temp_var = pain['nipples'] + max_sucktion_demand/(soreness_mod*100)
 		if temp_var > 60:
 			pain['nipples'] = 65
 			pump_stop_brake = 1
 			pumptime = suck_until_pain
-			max_sucktion_demand = 10*suck_flow_rate*pumptime
+			max_sucktion_demand = suck_flow_rate*pumptime
 		else
-			pain['nipples'] += (max_sucktion_demand/100)/(soreness_mod/10)
+			pain['nipples'] += max_sucktion_demand/(soreness_mod*100)
 		end
-
-		temp_var = pain['breasts'] + max_sucktion_demand/1000
+		temp_var = pain['breasts'] + max_sucktion_demand/10000
 		if temp_var > 20:
 			pain['breasts'] = 25
 		else
-			pain['breasts'] += max_sucktion_demand/1000
+			pain['breasts'] += max_sucktion_demand/10000
 		end
-		!! Pumping breasts is exhausting even if no milk comes. so this is handled here.
-
-		temp_var = pcs_energy - max_sucktion_demand/1500
+		!!	Pumping breasts is exhausting even if no milk comes. Pumping will impact the stamina of Sveta if she is not lactating.
+		temp_var = pcs_stam - max_sucktion_demand/300
 		if temp_var < 0:
-			pcs_energy = 0
-			!! energy usage flag on.
+			pcs_stam = 0
+			!!	energy usage flag on.
 			energytomilkpump = 1
+			pcs_sweat += max_sucktion_demand/1000
 		else
-			pcs_energy -= max_sucktion_demand/1500
-			!! energy usage flag on.
+			pcs_stam -= max_sucktion_demand/300
+			pcs_sweat += max_sucktion_demand/1000
+			!!	energy usage flag on.
 			energytomilkpump = 1
 		end
-
 		if pumptime < 10:
 			breastcounter += 1
 		else
 			breastcounter += pumptime/10
 		end
-
 		milkoverdemand += max_sucktion_demand
 		RESULT = 0
-	!! If there is lactation, do the magic
-	elseif lactate >0:
-		!!	How much milk can go through the nipple. Base rate is 10ml/minute when sucktion is applied to the nipple. If the demand is higher than the nipple can push through, nipple soreness will happen more quickly.
+	elseif lactate > 0:
+		!!	How much milk can go through the nipple. Base rate is 10ml/minute (100) when sucktion is applied to the nipple. If the demand is higher than the nipple can push through, nipple soreness will happen more quickly.
 		if pcs_nips > 0:
-			max_nip_flow_rate = 6
+			max_nip_flow_rate = 60
 		elseif pcs_nips > 20:
-			max_nip_flow_rate = 8
+			max_nip_flow_rate = 80
 		elseif pcs_nips > 40:
-			max_nip_flow_rate = 10
+			max_nip_flow_rate = 100
 		elseif pcs_nips > 60:
-			max_nip_flow_rate = 12
+			max_nip_flow_rate = 120
 		elseif pcs_nips > 80:
-			max_nip_flow_rate = 14
+			max_nip_flow_rate = 140
 		elseif pcs_nips > 100:
-			max_nip_flow_rate = 16
+			max_nip_flow_rate = 160
 		else
-			max_nip_flow_rate = 10
-		end
-
-		!!	If you pump and work your breast more, soreness will decrease after pumping. This can also decline if your breasts arent worked for a longer time.
-		if breastcounter > 0:
-			temp_var = breastcounter/10
-			soreness_mod += temp_var
-			if soreness_mod > 20: soreness_mod = 20
-			if nipple_cream = 1:
-				soreness_mod += 10
-				nipple_cream = 0
-			end
+			max_nip_flow_rate = 100
 		end
-
-		!!	If you pump more, more milk will come, disregarding nipplesize. Things will get used to milking and be more loose.
+		!!	If you pump more, more milk will be able to flow out, disregarding nipplesize. Svetas nipples will get used to have milk stream through them, grows and drops with the breastcounter.
 		nip_flow_mod = 1
-		temp_var = breastcounter/10
-		nip_flow_mod += temp_var
-		if nip_flow > 30: nip_flow_mod = 30
+		nip_flow_mod += breastcounter
+		if nip_flow > 400: nip_flow_mod = 400
 		max_nip_flow_rate += nip_flow_mod
-
-		!!	How much milk demand is applied to the breasts. We want to know if we can just suck out what is already stored or if additional milk production is needed to go through the whole pumping/sucking.
+		!!	How much milk demand is applied to the breasts.
+		max_sucktion_demand = suck_flow_rate*ARGS[2]
+		!!	We want to know if we can just suck out what is already stored or if additional milk production is needed to go through the whole pumping/sucking.
 		!!	If we only need 20ml from a 100ml storage, we would only substract 20ml, leaving 80ml inside the breasts.
-		
-		max_sucktion_demand = 10*suck_flow_rate*ARGS[2]
-		!!	Is enough milk already in the breasts?
+		!!	Also lets make sure we start at zero from the stuff we get from Sveta.
+		milkedvolume = 0
+		!!	Case: Enough milk in Svetas breasts, covering the demand
 		if lactatemv >= max_sucktion_demand:
-			!! can the nipples handle the flow?
+			!!	Checking if svetas nipple flow is enough to serve the demand. If yes - get the demand; If no - get what she is able to give us.
 			if max_nip_flow_rate >= suck_flow_rate:
 				milkedvolume = max_sucktion_demand
 				lactatemv -= max_sucktion_demand
-			elseif max_nip_flow_rate < suck_flow_rate:
-				milkedvolume = max_nip_flow_rate*10*ARGS[2]
+			else:
+				milkedvolume = max_nip_flow_rate*ARGS[2]
 				lactatemv -= milkedvolume
-				!!	time for sore nipples. We apply more sucking than the nipples can handle. So it hurts more. if nipple pain over 60, then it goes to 65. else it just adds soreness.
-				max_sucktion_demand -= milkedvolume
-				temp_var = pain['nipples'] + (max_sucktion_demand/100)/(soreness_mod/10)
-				if temp_var > 60:
-					pain['nipples'] = 65
-				else
-					pain['nipples'] += (max_sucktion_demand/100)/(soreness_mod/10)
-				end
-			else
-				cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$get_breastmilk</i>!</font></b><b>Error in Lactatemv bigger than max_sucktion_demand fork.</b>'
 			end
+		!!	Case: Not enough milk in Svetas breasts.
 		elseif lactatemv < max_sucktion_demand:
-			!!	Magic!
-			temp_var = (lactatemv/(max_nip_flow_rate*10))
-			if temp_var <= 0 and lactatemv > 0: temp_var = 1
-			pumptime_left = ARGS[2] - temp_var
-			if pumptime_left <= 0 and lactatemv > 0: pumptime_left = 1
-			temp_var = lactaterate/60
-			if temp_var <= 0 and lactaterate > 0: temp_var = 1
-			if temp_var >= max_nip_flow_rate:
-				if ARGS[1] = 2: breastcounter += 50
-				milkedvolume = (max_nip_flow_rate * 10 * pumptime_left) + (max_nip_flow_rate * 10 * (ARGS[2] - pumptime_left))
-				lactatemv -= (max_nip_flow_rate * 10 * (ARGS[2] - pumptime_left))
-			elseif temp_var < max_nip_flow_rate:
-				!!with a baby sucking, more milk should be made due to nature ...
-				if ARGS[1] = 2: milkoverdemand += 100000
-				milkedvolume = (temp_var * pumptime_left) + (max_nip_flow_rate * 10 * (ARGS[2] - pumptime_left))
-				lactatemv -= (max_nip_flow_rate * 10 * (ARGS[2] - pumptime_left))
-			else
-				cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$get_breastmilk</i>!</font></b><b>Error in Lactatemv smaller than max_sucktion_demand fork.</b>'
-			end
-			if lactatemv <= 0: lactatemv = 0
-			!!	the breasts had to produce milk, so energy is used.
-			temp_var = pcs_energy - milkedvolume/1000
-			if temp_var < 0:
-				pcs_energy = 0
-				if rand(0,100) > 90: fat -= 1
-				!!	this is checking if pcs_energy was impacted during milking.
-				energytomilkpump = 1
+			!!	We have two sub cases in this one. Sveta has no lactatemv and Sveta has not enough lactatemv. This means she has to produce more milk, but first we need to know how much is needed.
+			!!	temp_var will be the amount of milk Sveta has to produce to serve the demand. pump time left is the time left after lactatemv is drained.
+			if lactatemv <= 0:
+				temp_var = max_sucktion_demand
+				pumptime_left = ARGS[2]
 			else
-				pcs_energy -= milkedvolume/1000
-				!!	this is checking if pcs_energy was impacted during milking.
-				energytomilkpump = 1
-			end
-			!! the breasts had to produce milk, so hydration is used.
-			temp_var = pcs_hydra - milkedvolume/500
-			if temp_var < 0:
-				pcs_hydra = 0
-				energytomilkpump = 1
-			else
-				pcs_hydra -= milkedvolume/500
-				energytomilkpump = 1
+				temp_var = max_sucktion_demand - lactatemv
+				if max_nip_flow_rate >= suck_flow_rate:
+					pumptime_left = ARGS[2] - (lactatemv/suck_flow_rate)
+				else
+					pumptime_left = ARGS[2] - (lactatemv/max_nip_flow_rate)
+				end
+				if pumptime_left < 0: pumptime_left = 0
 			end
-			!!	if more is pumped than produced the breasts will hurt too.
-			if milkedvolume < max_sucktion_demand:
-				!!	milkoverdemand: This is used for the daily milk growth. If there is overdemand, the lactaterate will change the next day. Will be set to 0 every day.
-				milkoverdemand += max_sucktion_demand - milkedvolume
-				temp_var = pain['breasts'] + (max_sucktion_demand - milkedvolume)/1000
-				if temp_var > 20:
-					pain['breasts'] = 20
+			!!	Now we know how much time we have and how much demand we have. Time to check if Sveta can do it.
+			!!	For the case, that svetas milk flow is not big enough pumptime left will be 0, therefore this is handled here.
+			if pumptime_left >0:
+				if max_nip_flow_rate >= suck_flow_rate:
+					!!	the lactaterate is per hour, so it is possible that lactaterate will end up being zero when devided by 60. therefore everything here is multiplied by 100.
+					if (suck_flow_rate*100) <= ((lactaterate*100)/60):
+						milkedvolume += suck_flow_rate*pumptime_left
+					else
+						milkedvolume += ((((lactaterate*100)/60)*pumptime_left)/100)
+						breastcounter += 2
+					end
 				else
-					pain['breasts'] += (max_sucktion_demand - milkedvolume)/1000
+					!!	Same here as above.
+					if (max_nip_flow_rate*100) <= ((lactaterate*100)/60):
+						milkedvolume += max_nip_flow_rate*pumptime_left
+						breastcounter += 2
+					else
+						milkedvolume += ((((lactaterate*100)/60)*pumptime_left)/100)
+						breastcounter += 2
+					end
+				end
+				!!	Produced milk needs to be subtracted from the hourly lactate rate, so femcycle is only adding the milk that was not produced yet in the next hour
+				if pumptime_left > 60:
+					if ((pumptime_left*100)/60) > 100:
+						lactaterate_use -= ((((lactaterate*100)/60)*(pumptime_left mod 60))/100)
+					else
+						lactaterate_use = lactaterate
+					end
+				else
+					if lactaterate >= lactaterate_use:
+						lactaterate_use -= milkedvolume
+					else
+						lactaterate_use = lactaterate
+					end
+				end
+				if lactaterate_use <= 0: lactaterate_use = 0
+				!!	Sveta had to make milk, so she needs to use some of her body resources to make the milk.
+				if milkedvolume > 0:
+					!!	energy usage flag on. Can be used in events to show that sveta is getting hungry or thirsty
+					energytomilkpump = 1
+					pcs_stam -= max_sucktion_demand/300
+					if pcs_stam <= 0: pcs_stam = 0
+					pcs_sweat += max_sucktion_demand/1000
+					pcs_hydra -= milkedvolume/120
+					if pcs_hydra < 1: pcs_hydra = 1
+					pcs_energy -= milkedvolume/1200
 				end
 			end
+			!!	Now we check if sveta was able to make it or not. If not we have milk overdemand which will be used in femcycle to make her produce more milk next day.
+			if temp_var > milkedvolume:
+				milkoverdemand += (temp_var - milkedvolume)
+			end
+			!!	time to add the pumped lactatemv to the milkedvolume and empty lactatemv.
+			milkedvolume += lactatemv
+			lactatemv = 0
+			!!	Here we have nipple and breastpain. The idea is - if there is more sucktion than the nipples can take more pain is applied. If the breasts make less milk then demanded pain to the breasts is applied.
+			!!	Else - there will only be nipple pain.
 			if max_nip_flow_rate < suck_flow_rate:
-				!!	sore nipples again. "used to breastpumping" variable needs to come in here too!
-				temp_var = pain['nipples'] + ((((max_nip_flow_rate*100)/60) * pumptime_left)/100) + (max_sucktion_demand/100)/(soreness_mod/10)
-				if temp_var > 60:
+				temp_var = pain['nipples'] + ((suck_flow_rate - max_nip_flow_rate)*100*ARGS[2])/2000 - (soreness_mod*ARGS[2])*15
+				if temp_var >= 60:
 					pain['nipples'] = 65
+				elseif temp_var <= 0:
+					pain['nipples'] += 1
+				else
+					pain['nipples'] += (((suck_flow_rate - max_nip_flow_rate)*100*ARGS[2])/2000 - (soreness_mod*ARGS[2])*15)
+				end
+			else
+				if ARGS[2] < 10:
+					pain['nipples'] += 1
+				elseif ARGS[2] >= 10 and soreness_mod > ARGS[2]:
+					pain['nipples'] += 1
 				else
-					pain['nipples'] += ((((max_nip_flow_rate*100)/60) * pumptime_left)/100) + (max_sucktion_demand/100)/(soreness_mod/10)
+					pain['nipples'] += (ARGS[2]/10 - soreness_mod/10)
 				end
 			end
+			if max_nip_flow_rate >= suck_flow_rate:
+				if (suck_flow_rate*100) > ((lactaterate*100)/60):
+					temp_var = pain['breasts'] + (((suck_flow_rate*100)-((lactaterate*100)/60))*pumptime_left)/1000
+					if temp_var > 20:
+						pain['breasts'] = 20
+					else
+						pain['breasts'] += (((suck_flow_rate*100)-((lactaterate*100)/60))*pumptime_left)/1000
+					end
+				end
+			else				
+				if (max_nip_flow_rate*100) > ((lactaterate*100)/60):
+					temp_var = pain['breasts'] + (((max_nip_flow_rate*100)-((lactaterate*100)/60))*pumptime_left)/1000
+					if temp_var > 20:
+						pain['breasts'] = 20
+					else
+						pain['breasts'] += (((max_nip_flow_rate*100)-((lactaterate*100)/60))*pumptime_left)/1000
+					end
+				end
+			end				
 		end
-		!! The standard nipple pain applied due to pumping. Adding to the pain that is calculated above
-		temp_var = pain['nipples'] + (max_sucktion_demand/100)/(soreness_mod/10)
-		if temp_var > 60:
-			pain['nipples'] = 65
-		else
-			pain['nipples'] += (max_sucktion_demand/100)/(soreness_mod/10)
-		end
-
 		if pumptime < 10:
 			breastcounter += 1
 		else
 			breastcounter += pumptime/10
 		end
-
+		!!	Done - Result is the milked volume.
 		RESULT = milkedvolume
-	else
-		cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$get_breastmilk</i>!</font></b>'
 	end
 end
 
-!! lact_lib
-
 !!	bp_milking - breast pump milking
 !!	use href="exec:gt ''lact_lib'',''bp_milking''"
 
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0
 	pumptype = 0
-	if $location_type ! 'bathroom' and pcs_inhib < 50:
+	if pump_bottletype < 1500: pump_bottletype = 1500
+	if bpbottles <= 0: bpbottles = 1
+	if $location_type ! 'bathroom' and pcs_exhibition < 60:
 		'You can''t use it here.'
-		act 'Don''t pump':gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long do you plan to pump your breasts?<br>(Defaults 15 minutes, maximum 60 minutes)")
-		if pumptime = '':pumptime = 15
-		if pumptime > 0 and pumptime <= 60:
+		'How long do you want to pump your breasts with the manual breast pump?'
+		if bpbottlem > 0:
+			if pump_bottletype = 1500:
+				'Current bottle size in use: &gt;150ml | <a href="exec:pump_bottletype = 2500 & gt ''lact_lib'', ''bp_milking''">250ml</a>'
+			else
+				'Current bottle size in use <a href="exec:pump_bottletype = 1500 & gt ''lact_lib'', ''bp_milking''">150ml</a> | &gt;250ml'
+			end
+		end
+		'<center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
+		if lactatemv > 0:
+			pumptime = (func('lact_lib','$get_breastmilk_time', 3, (lactatemv/10)))
+			if pumptime > 5:
+				pumptime -= 2
+			end
+			if pumptime > 60:
+				act 'Pump until breasts are empty':
+					*clr
+					cla
+					minut += 2
+					'As you prepare for pumping you weight your breasts in your hands. You feel that your breasts carry a large amount of milk and pumping will probably take a long time.'
+					'Getting relieve for your breasts with the manual breast pump will probably take at least <<pumptime>> minutes.'
+					if pcs_know_mward <= 0:
+						'You concider visiting a hospital to get help or buying a better breastpump.'
+						pcs_ask_mward_help = 1
+						pcs_knows_electric_pump = 1
+					end
+					'Do you want to continue?'
+					act 'Don''t pump':gt $loc, $metka
+					act 'Continue':					
+						gt 'lact_lib', 'milking'
+					end
+				end
+			elseif pumptime <= 0:
+				act 'Pump until breasts are empty':
+					*clr
+					cla
+					minute += 2
+					'As you prepare for pumping you weight your breasts in your hands. Your breasts feel really empty. There is no need to pump now.'
+					act 'Don''t pump':gt $loc, $metka
+					act 'back':gt 'lact_lib', 'bp_milking'
+				end
+			else
+				act 'Pump until breasts are empty':
+					pumptime = func('lact_lib','$get_breastmilk_time', 3, (lactatemv/10))
+					if pumptime > 5:
+						pumptime -= 2
+					end				
+					gt 'lact_lib', 'milking'
+				end
+			end
+		end
+		act '15 Minutes':
+			pumptime = 15
+			gt 'lact_lib', 'milking'
+		end
+		act '30 Minutes':
+			pumptime = 30
 			gt 'lact_lib', 'milking'
-		elseif pumptime <= 0 or pumptime > 60:
-			minut += 2
-			act 'Don''t pump':gt $loc, $metka
 		end
+		act 'Custom':
+			pumptime = input ("How long do you plan to pump your breasts? (Not more than 60 minutes)")
+			if pumptime <= 0 or pumptime > 60:
+				minut += 2
+				act 'Don''t pump':gt $loc, $metka
+				act 'back':gt 'lact_lib', 'bp_milking'
+			elseif pumptime > 0 and pumptime <= 60:
+				gt 'lact_lib', 'milking'
+			end
+		end
+		act 'Don''t pump':gt $loc, $metka
 	end
 end
 
 !!	man_milking - manual (with hands) milking
 !!	use href="exec:gt ''lact_lib'',''man_milking''"
-
+!!	Warning! Protoype function! Don not make changes to this function as it is not used yet!
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
 	pumptype = 1
-	if $location_type ! 'bathroom' and pcs_inhib < 50:
+	if $location_type ! 'bathroom' and pcs_inhib < 60:
 		'You can''t do this here.'
-		act 'Don''t pump':gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long would you like to milk your breasts?<br>(Default 15 minutes, maximum 60 minutes)")
-		if pumptime = '':pumptime = 15
-		if pumptime > 0 and pumptime <= 60:
-			gt 'lact_lib', 'milking'
-		elseif pumptime <= 0 or pumptime > 60:
+		pumptime = input ("How long would you like to milk your breasts? (Not more than 60 minutes)")
+		if pumptime <= 0 or pumptime > 60:
 			minut += 2
-			act 'Don''t pump':gt $loc, $metka
+			act 'Don''t milk':gt $loc, $metka
+		elseif pumptime > 0 and pumptime <= 60:
+			gt 'lact_lib', 'milking'
 		end
 	end
 end
@@ -551,16 +603,129 @@ end
 !!	never use directly. Always use bp_milking, man_milking or sex_milking
 
 if $ARGS[0] = 'milking':
-	if pumptime <= 0 or pumptime > 60:
-		act 'Finish':gt $loc, $metka
-	end
+	!!	if pumptime <= 0 or pumptime > 60:
+	!!		act 'Finish':gt $loc, $metka
+	!!	end
 	if pumptype = 1:
 		pumptime = (pumptime*6)/10
 	end
+	
+		!!	:loop
+		!!	if k < kid:
+		!!	gs 'kid','kidlist'
+		!!	k += 1
+		!!	jump 'loop'
+		!! end
 	if lactate > 0 and pain['nipples'] < 60:
 		milkedvolume = func('lact_lib','$get_breastmilk', 3, pumptime)
 		'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_lactating.jpg"></center>'
-		'You attach the pump to your breast and start rythmically squeezing the bulb until your breasts feel empty.<br>You give it a few more pumps and detach the pump.<br>You filled the bottle with <<milkedvolume/10>>ml of your milk.'
+		if pumptime > 1:
+			'You attach the pump to your breast and start rythmically squeezing the bulb for <<pumptime>> minutes.'
+		else
+			'You attach the pump to your breast and start rythmically squeezing the bulb for one minute.'
+		end
+		!!	Fill the bottles :D
+		if milkedvolume > pump_bottletype and (bpbottles*1500 + bpbottlem*2500) = pump_bottletype:
+			'During pumping you have to empty the collecting bottle as it filled up with your milk.'
+			'You give it a few more pumps and detach the pump.<br>You filled the bottle with <<pump_bottletype/10>>ml of your milk.'
+			'To collect all your pumped milk you should probably check if the pharmacy has additional bottles for your breast pump.'
+			pcs_knowsmilkbottles = 1
+		elseif milkedvolume > pump_bottletype and (bpbottles*1500 + bpbottlem*2500) > pump_bottletype:
+			!!	Checking which bottletype is used and filling those bottles up before the other type is used.
+			bp_used_mbottle = 0
+			bp_used_sbottle = 0
+			:sbottleloop
+			if pump_bottletype < 2500 and milkedvolume >= 1500 and bp_used_sbottle < bpbottles:
+				bp_used_sbottle += 1
+				milkedvolume -= 1500
+				jump 'sbottleloop'
+			end
+			:mbottleloop
+			if pump_bottletype >= 2500 and milkedvolume >= 2500 and bp_used_mbottle < bpbottlem:
+				bp_used_mbottle += 1
+				milkedvolume -= 2500
+				jump 'mbottleloop'
+			end
+			!!	Checking for the milkedvolume and if there are bottles left. if yes - use these bottles
+			if milkedvolume > 0 and (((bpbottlem - bp_used_mbottle) > 0) or ((bpbottles - bp_used_sbottle) > 0)):
+				:altfill01
+				if pump_bottletype < 2500 and milkedvolume >= 2500 and bp_used_mbottle < bpbottlem:
+					bp_used_mbottle += 1
+					milkedvolume -= 2500
+					jump 'altfill01'
+				end
+				:altfill02
+				if pump_bottletype >= 2500 and milkedvolume >= 1500 and bp_used_sbottle < bpbottles:
+					bp_used_sbottle += 1
+					milkedvolume -= 1500
+					jump 'altfill02'
+				end
+			end
+			!!	by this point all bottles should have been used up. Everything else needs to end up in the drain.
+			if milkedvolume > 0 and bpbottlem = bp_used_mbottle and bpbottles = bp_used_sbottle:
+				'During pumping you have to switch the collecting bottle as it filled up with your milk. Unfortunately you don''t have enough bottles to collect all your milk.'
+				'You had to pour <<milkedvolume/10>>ml of your breast milk into the sink.'
+				milkedvolume = ((bp_used_mbottle*2500) + (bp_used_sbottle*1500))
+			elseif milkedvolume > 0 and milkedvolume < 1500 and (bpbottles - bp_used_sbottle) > 0:
+				'During pumping you have to switch the collecting bottle as it filled up with your milk.'
+			elseif milkedvolume > 0 and milkedvolume < 2500 and milkedvolume > 1500 and (bpbottlem - bp_used_mbottle) > 0:
+				'During pumping you have to switch the collecting bottle as it filled up with your milk.'
+			else
+				'During pumping you have to switch the collecting bottle as it filled up with your milk.'
+			end
+			if bp_used_mbottle >= 1 or bp_used_sbottle >= 1:
+				'<center><img <<$set_imgh>> src="images/pc/body/tits/bottles_full.jpg"></center>'
+				if milkedvolume = ((bp_used_mbottle*2500) + (bp_used_sbottle*1500)):
+					'You pumped <<milkedvolume/10>>ml of milk from your breasts, collecting it in:'
+					if bp_used_sbottle = 1:
+						'One 150ml bottle'
+					elseif bp_used_sbottle > 1:
+						'<<bp_used_sbottle>> x 150ml bottles'
+					end 
+					if bp_used_mbottle = 1:
+						'One 250ml bottle'
+					elseif bp_used_mbottle > 1:
+						'<<bp_used_mbottle>> x 250ml bottles'
+					end 
+				else
+					'You pumped <<((bp_used_mbottle*2500)+(bp_used_sbottle*1500)+milkedvolume)/10>>ml of milk from your breasts collecting it in:'
+					if bp_used_sbottle = 1:
+						'One 150ml bottle'
+					elseif bp_used_sbottle > 1:
+						'<<bp_used_sbottle>> x 150ml bottles'
+					end 
+					if bp_used_mbottle = 1:
+						'One 250ml bottle'
+					elseif bp_used_mbottle > 1:
+						'<<bp_used_mbottle>> x 250ml bottles'
+					end
+					if (bpbottles - bp_used_sbottle) > 0 and milkedvolume <= 1500:
+						'You also stored <<milkedvolume/10>>ml of breast milk in a 150ml bottle.'
+					elseif (bpbottlem - bp_used_mbottle) > 0 and milkedvolume <= 2500:
+						'You also stored <<milkedvolume/10>>ml of breast milk in a 250ml bottle.'
+					else	
+						'unhandled case - you shouldn''t end up here. Please report this in the bug section of Girl Life in the tfg-forums.'
+						'bp_used_mbottle: <<bp_used_mbottle>>'
+						'bp_used_sbottle: <<bp_used_sbottle>>'
+						'milkedvolume: <<milkedvolume>>'
+						'pump_bottletype: <<pump_bottletype>>'
+						'bpbottles: <<bpbottles>>'
+						'bpbottlem: <<bpbottlem>>'
+					end
+					milkedvolume += bp_used_mbottle*2500 + bp_used_sbottle*1500
+				end
+			else	
+				'unhandled case - you shouldn''t end up here. Please report this in the bug section of Girl Life in the tfg-forums.'
+				'bp_used_mbottle: <<bp_used_mbottle>>'
+				'bp_used_sbottle: <<bp_used_sbottle>>'
+				'milkedvolume: <<milkedvolume>>'
+				'pump_bottletype: <<pump_bottletype>>'
+				'bpbottles: <<bpbottles>>'
+				'bpbottlem: <<bpbottlem>>'
+			end
+		else
+			'You give it a few more pumps and detach the pump.<br>You filled the bottle with <<milkedvolume/10>>ml of your milk.'
+		end
 		breastcounter += 1
 		if energytomilkpump > 0 and pcs_energy = 0:
 			'<br>During pumping you feel really hungry, producing breast milk seems to be more exhausing then thought.'
@@ -575,7 +740,7 @@ if $ARGS[0] = 'milking':
 		end
 		minut += pumptime
 	elseif lactate = 0 and pain['nipples'] < 60:
-		if rand(1,50) + prolactinlvl >= rand(200,250):
+		if rand(1,50) + prolactinlvl >= rand(200,250) and milkinduceday >= 5:
 			'<center><img <<$set_imgh>> src="images/pc/body/tits/lactate_start.jpg"></center>'
 			'As usual, you attach the pump but after a few pumps white liquid suddenly starts flowing from your nipples.<br>You started lactating!'
 			lactateinduced = 1
@@ -588,13 +753,19 @@ if $ARGS[0] = 'milking':
 		else
 			milkedvolume = func('lact_lib','$get_breastmilk', 3, pumptime)
 			'<center><img <<$set_imgh>> src="images/pc/body/tits/t<<tits>>.jpg"></center>'
-			'You attach the pump to your nipples and start squeezing the bulb. The vacuum feels good on your nipples.'
-			if prolactinlvl > 70: 'A few droplets of liquid come out of your nipples but it is not milk.'
+			if breastcounter < 100:
+				'You attach the pump to your nipples and start squeezing the bulb. The vacuum feels uncomfortable on your nipples.'
+			elseif breastcounter >= 100 and breastcounter < 200:
+				'You attach the pump to your nipples and start squeezing the bulb. You are used to the vacuum on your nipples.'
+			else
+				'You attach the pump to your nipples and start squeezing the bulb. The vacuum feels good on your nipples.'
+			end
+			if prolactinlvl > 100: 'A few droplets of liquid come out of your nipples but it is not milk.'
 			breastcounter += 1
 			if pump_stop_brake = 1:
 				'During pumping your nipples start to hurt extremely. You have to stop after <<pumptime>> minutes, because you couldn''t go on.'
 			end
-			if prolactinlvl > 75:
+			if prolactinlvl > 100:
 				if rand(0,10) > 9:
 					pumpinggrowth += 1
 				end
@@ -615,9 +786,14 @@ if $ARGS[0] = 'milking':
 		act 'Pour it into the sink':
 			*clr
 			cla
-			'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
-			'<center>You pour <<milkedvolume/10>>ml of your breast milk into the sink and clean up your breastpump.</center>'
-			minut += 5
+			if milkedvolume > 1500 and bpbottles <= 1:
+				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
+				'<center>You pour 150ml of your breast milk into the sink and clean up your breastpump.</center>'
+			else
+				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
+				'<center>You pour <<milkedvolume/10>>ml of your breast milk into the sink and clean up your breastpump.</center>'
+			end
+			minute += 5
 			act 'Finish':
 				milkedvolume = 0
 				gt $loc, $metka
@@ -657,5 +833,5 @@ if $ARGS[0] = 'engorged_morning':
 	act 'Finish':gt $loc, $metka
 end
 
---- lac_lib ---------------------------------
+--- lact_lib ---------------------------------
 

locations/laketoilet.qsrc

@@ -36,6 +36,7 @@ if $ARGS[0] = 'main':
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
+		dynamic $removepan
 	end
 end
 

locations/leonid.qsrc

@@ -862,6 +862,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- leonid ---------------------------------

locations/mainQW.qsrc

@@ -49,12 +49,6 @@ act 'Investigate':
 				minut += 30
 				killobj
 
-				if oldobjmenu = 0:
-					gs 'obj_din', 'new'
-				else
-					gs 'obj_din', 'old'
-				end
-
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main1.jpg"></center>'
 				'You undress and lie down on the couch, Tatiana begins to examine you. She dabs you with charms and uses a variety strange looking devices, after half an hour of examination she sighs and tells you to get dressed.'
 				'You get up from the couch and dress and ask Tatiana, "So? Did you learn anything else about me?"'

locations/mod_setting.qsrc

@@ -33,7 +33,6 @@ if mod_list > 0:
 else
 	'<br>No Mod actived.'
 end
-'<img src="images/system/icon/mod_sample.jpg">'
 '</center>'
 act 'Install new mod':
 	killvar 'mod_info'
@@ -65,8 +64,8 @@ act 'Disable all mods':
 		act 'Continue':goto curloc
 	end
 end
-act 'Return':
-	gt $loc,$metka
+act 'Return to settings index':
+	gs '$menu_setting'
 end
 
 --- mod_setting ---------------------------------

locations/nyp_school.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'cool jocks':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'It seems time has flown by, someone turns off the music and you hear one of the teachers say. "Ok everyone it is time to go home, have a happy and safe holiday and I''ll see everyone back at school once the winter break is over."'
-				'With that the students began to pick up their stuff and head for the door, while you and Igor walk together hand in hand. When all of a sudden you hear Dimka yell out, "Hey people! My parents are away for the New Years, I am going to be having a New Years Eve party at my house on New Years, everyone is invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in. But then he stops and smirks, "Except you Sonia, you may come, I''m sure you''ll show gratitude in one way or another."'
+				'With that the students began to pick up their stuff and head for the door, while you and Igor walk together hand in hand. All of a sudden you hear Dimka yell out, "Hey everyone! My parents left for the new year, so you know what that means?! Party at my house, starts at 18:00 New Year Eve and you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in. But then he stops and smirks, "Except you Sonia, you may come, I''m sure you''ll show gratitude in one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my misbehavior and I hope you will still come to my party."'
 				'With that everyone slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -222,7 +222,7 @@ if $ARGS[0] = 'cool jocks':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'It seems time has flown by, someone turns off the music and you hear one of the teachers say. "Ok everyone it is time to go home, have a happy and safe holiday and I''ll see everyone back at school once the winter break is over."'
-				'With that the students began to pick up their stuff and head for the door, while you and Marcus walked together hand in hand. When all of a sudden you hear Dimka yell out, "Hey people! My parents are away for the New Years, I am going to be having a New Years Eve party at my house on New Years, everyone is invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in. But then he stops and smirks, "Except you Sonia, you may come, I''m sure you''ll show gratitude in one way or another."'
+				'With that the students began to pick up their stuff and head for the door, while you and Marcus walked together hand in hand. All of a sudden you hear Dimka yell out, "Hey everyone! My parents left for the new year, so you know what that means?! Party at my house, starts at 18:00 New Year Eve and you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in. But then he stops and smirks, "Except you Sonia, you may come, I''m sure you''ll show gratitude in one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my misbehavior and I hope you will still come to my party."'
 				'With that everyone slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -288,7 +288,7 @@ if $ARGS[0] = 'cool jocks':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'It seems time has flown by, someone turns off the music and you hear one of the teachers say. "Ok everyone it is time to go home, have a happy and safe holiday and I''ll see everyone back at school once the winter break is over."'
-				'With that the students begin to pick up their stuff and head for the door, while you and Katja walk together hand in hand. When all of a sudden you hear Dimka yell out, "Hey people! My parents are away for the New Years, I am going to be having a New Years Eve party at my house on New Years, everyone is invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in. But then he stops and smirks, "Except you Sonia, you may come, I''m sure you''ll show gratitude in one way or another."'
+				'With that the students begin to pick up their stuff and head for the door, while you and Katja walk together hand in hand. All of a sudden you hear Dimka yell out, "Hey everyone! My parents left for the new year, so you know what that means?! Party at my house, starts at 18:00 New Year Eve and you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in. But then he stops and smirks, "Except you Sonia, you may come, I''m sure you''ll show gratitude in one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my misbehavior and I hope you will still come to my party."'
 				InvitationToDimkaNYparty = 1
 				'With that everyone slowly makes their way out of the school.'
@@ -957,7 +957,7 @@ if $ARGS[0] = 'end':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 	'It seems time has flown by, someone turns off the music and you hear one of the teachers say. "Ok everyone it is time to go home, have a happy and safe holidays and see everyone back at school once the winter break is over."'
-	'With that the students begin to collect their stuff and head for the doors. When all of a sudden you hear Dimka yell out, "Hey people! My parents left for the new year, I am going to be having a New Years Eve party at my house on New Years, everyone is invited!" Everyone cheers at the idea of a party with out adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in.'
+	'With that the students begin to collect their stuff and head for the doors. All of a sudden you hear Dimka yell out, "Hey everyone! My parents left for the new year, so you know what that means?! Party at my house, starts at 18:00 New Year Eve and you''re all invited!" Everyone cheers at the idea of a party with out adults around to make it boring. Just then Dimka adds as he is looking at the outcasts. "Well everyone but you losers that is." He says with a laugh, which gets several of the other students to join in.'
 	if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements. I sincerely apologize for my misbehavior. I hope you will still come to my party."'
 	InvitationToDimkaNYparty = 1
 	'With that everyone slowly makes their way out of the school'

locations/onobjsel.qsrc

@@ -1,82 +1,38 @@
 # onobjsel
 !the dynamics can all be found in obj_din and Cheatmenu_din
 
-killvar 'menu_character'
-$menu_character[0] = 'Description:$menu_descrip'
-$menu_character[1] = 'Skills:$menu_skills'
-$menu_character[2] = 'Statistics:$menu_statistika'
-$menu_character[3] = 'Traits:$menu_traits'
-$menu_character[4] = 'Fame:$menu_reputation'
-$menu_character[5] = 'Pain:$menu_pain'
-$menu_character[6] = 'Calendar:$menu_calendar'
-
-if pcs_magik > 0:$menu_character[7] = 'Magic:$menu_magic'
-
-killvar 'menu_lookon'
-$menu_lookon[0] = 'Face:$menu_face'
-$menu_lookon[1] = 'Body:$menu_body'
-$menu_lookon[2] = 'Clothing:$menu_clothes'
-$menu_lookon[3] = 'Bra:$menu_bra'
-$menu_lookon[4] = 'Panties:$menu_panties'
-$menu_lookon[5] = 'Shoes:$menu_shoes'
-$menu_lookon[6] = 'Tattoos:$menu_tattoos'
-$menu_lookon[7] = 'Piercing:$menu_pirs'
-
-killvar 'menu_view'
-$menu_view[0] = 'The old menu:$menu_addoldmenu'
-$menu_view[1] = 'Game Setting:$menu_setting'
-$menu_view[2] = 'Cheat menu:$menu_cheat'
-$menu_view[3] = 'Refresh:$menu_obnovit'
-
-killvar 'menu_other'
-$menu_other[0] = 'Notebook:$menu_bloknot'
-$menu_other[1] = 'Emergency exit:$menu_avariya'
-if disable_autosave = 1:
-	$menu_other[2] = 'Enable autosave:$menu_autosave'
-else
-	$menu_other[2] = 'Disable autosave:$menu_autosave'
-end
-if mobila > 0:$menu_other[3] = 'Phone:$menu_mobila'
-
 !The old menu: beginning
-if $selobj = '<font color = green>Character</font>':gs 'obj_din', 'descrip'
-if $selobj = 'Skills':gs 'obj_din', 'skills'
-if $selobj = 'Statistics':gs 'obj_din', 'stats'
-if $selobj = 'Pain':gs 'obj_din', 'pain'
-if $selobj = 'Traits':gs 'traits', 'menu'
-if $selobj = 'Fame':gs 'obj_din', 'reputation'
-if pcs_magik > 0:if $selobj = 'Magic':gs 'obj_din', 'magic'
-if $selobj = 'Face':gs 'obj_din', 'menuface'
-if $selobj = 'Body':gs 'obj_din', 'menubody'
-if $selobj = 'Clothing':gs 'obj_din', 'clothes'
-if $selobj = 'Bra':gs 'obj_din', 'bra'
-if $selobj = 'Panties':gs 'obj_din', 'panties'
-if $selobj = 'Shoes':gs 'obj_din', 'shoes'
-if $selobj = 'Tattoos':gs 'obj_din', 'tattoos'
-if $selobj = 'Piercing':gs 'obj_din', 'piercing'
-if $selobj = 'Purse':dynamic $d_bag
-if $selobj = 'Phone':gs 'telefon','Phone_menu'
-if $selobj = 'Notebook':gs 'obj_din', 'records'
-if $selobj = 'Refresh':gs '$menu_obnovit'
-if $selobj = 'Cheats':gs '$menu_cheat'
-if $selobj = 'Settings':gs '$menu_setting'
-if $selobj = '<font color = red>Emergency</font>':gs 'obj_din', 'exit'
-if disable_autosave = 1:
-	if $selobj = '<font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font>':gs 'obj_din', 'autosave'
-else
-	if $selobj = '<font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font>':gs 'obj_din', 'autosave'
-end
+! if $selobj = '<center><font color = green>Character</font></center>':menu_page = 0 & gs 'obj_din', 'description'
+! if $selobj = '<center>Skills</center>':menu_page = 1 & gs 'obj_din', 'skills'
+! if $selobj = '<center>Statistics</center>':menu_page = 2 & gs 'obj_din', 'stats'
+! if $selobj = '<center>Pain</center>':menu_page = 3 & gs 'obj_din', 'pain'
+! if $selobj = '<center>Traits</center>':menu_page = 4 & gs 'traits', 'menu'
+! if $selobj = '<center>Renown</center>':menu_page = 5 & gs 'obj_din', 'reputation'
+! if pcs_magik > 0:if $selobj = '<center>Magic</center>':menu_page = 6 & gs 'obj_din', 'magic'
+! if $selobj = '<center>Face</center>':menu_page = 0 & gs 'obj_din', 'face'
+! if $selobj = '<center>Body</center>':menu_page = 1 & gs 'obj_din', 'body'
+! if $selobj = '<center>Clothing</center>':menu_page = 2 & gs 'obj_din', 'clothes'
+! if $selobj = '<center>Bra</center>':menu_page = 3 & gs 'obj_din', 'bra'
+! if $selobj = '<center>Panties</center>':menu_page = 4 & gs 'obj_din', 'panties'
+! if $selobj = '<center>Shoes</center>':menu_page = 5 & gs 'obj_din', 'shoes'
+! if $selobj = '<center>Tattoos</center>':menu_page = 6 & gs 'obj_din', 'tattoos'
+! if $selobj = '<center>Piercing</center>':menu_page = 7 & gs 'obj_din', 'piercing'
+! if $selobj = '<center>Purse</center>':dynamic $d_bag
+! if $selobj = '<center>Phone</center>':gs 'telefon','Phone_menu'
+! if $selobj = '<center>Notebook</center>':gs 'obj_din', 'records'
+!The old menu: beginning - still using these options for testing, but really aren''t needed for gameplay.
+if $selobj = '<center>Refresh</center>':gs '$menu_obnovit'
+!if $selobj = '<center>Cheats</center>':menu_page = 0 & gs '$menu_cheat'
+!if $selobj = '<center>Settings</center>':menu_page = 0 & gs '$menu_setting'
+! if disable_autosave = 1:
+	! if $selobj = '<center><font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font></center>':gs 'obj_din', 'autosave'
+! else
+	! if $selobj = '<center><font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font></center>':gs 'obj_din', 'autosave'
+! end
+if $selobj = '<center>Console</center>':dynamic $cheatmenu['dynamic']
+if $selobj = '<center><font color = red>Emergency</font></center>':gs 'obj_din', 'emergency'
 !The old menu: end
 
-!The new menu: beginning
-if $selobj = '<img src="images/system/icon/pers.png">':menu '$menu_character'
-if $selobj = '<img src="images/system/icon/look.png">':menu '$menu_lookon'
-if $selobj = '<img src="images/system/icon/proch.png">':menu '$menu_other'
-if $selobj = '<img src="images/system/icon/phone.png">':gs 'din_bad' & gs 'telefon','Phone_menu'
-if $selobj = '<img src="images/system/icon/purse.png">':dynamic $d_bag
-if $selobj = '<img src="images/system/icon/menu.png">':menu '$menu_view'
-!The new menu: end
-
 if $selobj = 'Player':
 	clr
 	pl'Your name is Mikhail Kuznetsov. You <<age>> years. <<$vneshPRE>>'
@@ -84,14 +40,6 @@ if $selobj = 'Player':
 	pl'Growth <<pcs_hgt>> see, weight 100 kg.'
 end
 
-
-
-!!	gs'Menu.Create','mainMenu'
-!!	gs'Menu.Add','mainMenu','Status Bar','','MenuMainLoc','0'
-!!	gs'Menu.Add','mainMenu','Text Symbols','','MenuMainLoc','1'
-!!	gs'Menu.Call','mainMenu'
-
-
 unselect
 
 --- onobjsel ---------------------------------

locations/pavCommercial.qsrc

@@ -35,29 +35,24 @@ bankloc = 0
 if streetevent_hour + 2 < hour:gt'street_event','pavCommercial', 'main'
 
 '<center><h2>Pavlovsk</h2></center>'
-if Enable_towntable = 1 : $_str = '<center><table><tr><td>' else $_str = ''
 if month >= 11 or month <= 3:
 	if hour >= 8 and hour <= 21:
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodokw.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodokw.jpg"></center>'
 	else
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavbuswn.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavbuswn.jpg"></center>'
 	end
 else
 	if hour >= 8 and hour <= 21:
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 	else
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavbusn.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavbusn.jpg"></center>'
 	end
 end
-
-if Enable_towntable = 1 : $_str += '</td><td>'
-$_str += '<center>The high street of a provincial town in a rural area of Russia.  Population: about 15000 inhabitants.</center>'
-$_str += '<center>Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> with its surrounding gardens and forest, built by Catherine the Great, and the recently rebuilt <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> (which is now a Luxury hotel and restaurant), it looks much like all the other towns in the region.</a></center> '
-$_str += '<center>The tallest building in town is the <a href="exec:minut += 10 & gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
-if Enable_towntable = 1 : $_str += '</td></tr><table></center>'
-*nl $_str
-killvar '$_str'
-''
+*nl
+'<center>The high street of a provincial town in a rural area of Russia.  Population: about 15000 inhabitants.</center>'
+'<center>Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> with its surrounding gardens and forest, built by Catherine the Great, and the recently rebuilt <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> (which is now a Luxury hotel and restaurant), it looks much like all the other towns in the region.</a></center> '
+'<center>The tallest building in town is the <a href="exec:minut += 10 & gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
+*nl
 
 gs'street_event','pavCommercial', 'extras'
 

locations/pavComplex.qsrc

@@ -26,7 +26,6 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 !!	gs 'rolanapt' , 'rolanroute'
 	'<center><h2>Apartment Complex</h2></center>'
-	if Enable_towntable = 1 : $_str = '<center><table><tr><td>' else $_str = ''
 	if month >= 11 or month <= 3:
 		if hour >= 8 and hour <= 21:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/complexw.jpg"></center>'

locations/pavComplexb2.qsrc

@@ -57,9 +57,6 @@ if $ARGS[0] = 'etaj_1':
 	act '<font color = maroon><b>Go outside</b></font>': gt 'pavcomplex', 'start'
 	act 'Go up to the second floor': CLOSE ALL & gt 'pavComplexb2','etaj_2'
 	act 'Take the elevator': CLOSE ALL & gt 'pavComplexb2','lift','etaj_1'
-	act 'Go to the residential street':minut += 1 & gt 'pavResidential'
-	act 'Go to the apartment courtyard':minut += 3 & gt 'pavComplex', 'courtyard'
-	act 'Go to the apartment garages':minut += 3 & gt 'pavComplex', 'garages'
 
 end
 

locations/pavComplexb3.qsrc

@@ -59,9 +59,7 @@ if $ARGS[0] = 'etaj_1':
 !!	end
 	act 'Go up to the second floor': CLOSE ALL & gt 'pavComplexb3','etaj_2'
 	act 'Take the elevator': CLOSE ALL & gt 'pavComplexb3','lift','etaj_1'
-	act 'Go to the residential street':minut += 1 & gt 'pavResidential'
-	act 'Go to the apartment courtyard':minut += 3 & gt 'pavComplex', 'courtyard'
-	act 'Go to the apartment garages':minut += 3 & gt 'pavComplex', 'garages'
+	
 end
 
 !floor 2

locations/pavResidential.qsrc

@@ -29,30 +29,26 @@ gs 'stat'
 if streetevent_hour + 2 < hour:gt'street_event','pavResidential', 'main'
 
 '<center><h2>Pavlovsk</h2></center>'
-if Enable_towntable = 1 : $_str = '<center><table><tr><td>' else $_str = ''
 if month >= 11 or month <= 3:
 	if hour >= 8 and hour <= 21:
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswinter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswinter.jpg"></center>'
 	else
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswintern.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswintern.jpg"></center>'
 	end
 else
 	if hour >= 8 and hour <= 21:
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
 	else
-		$_str += '<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn.jpg"></center>'
 	end
 end
+*nl
 
-if Enable_towntable = 1 : $_str += '</td><td>'
-$_str += '<center>You are in the residential area of a provincial town in a rural area of Russia.	Population: about 15000 inhabitants.</center>'
-$_str += '<center>Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> with its surrounding gardens and forest, built by Catherine the Great, and the recently rebuilt <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> (which is now a Luxury hotel and restaurant), it looks much like all the other towns in the region.</a></center> '
-$_str += '<center>The tallest building in town is the <a href="exec:minut += 5 & gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
-if Enable_towntable = 1 : $_str += '</td></tr><table></center>'
-*nl $_str
-killvar '$_str'
+'<center>You are in the residential area of a provincial town in a rural area of Russia.	Population: about 15000 inhabitants.</center>'
+'<center>Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> with its surrounding gardens and forest, built by Catherine the Great, and the recently rebuilt <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> (which is now a Luxury hotel and restaurant), it looks much like all the other towns in the region.</a></center> '
+'<center>The tallest building in town is the <a href="exec:minut += 5 & gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
+*nl
 
-''
 
 gs'street_event','pavResidential', 'extras'
 
@@ -152,7 +148,6 @@ if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''pavResident
 
 'The town square features a <a href="exec: minut += 2 & gt ''gdk''">community center</a><<$schoolname>>'
 
-
 'A <a href="exec:minut += 15 & gt ''Gshveyfab'', ''start''">garment factory</a> named Paris Commune is situated in the industrial area on the outskirts of town. Inhabitants of the Pavlovsk apartments can store their cars in the <a href="exec:minut += 5 & gt ''pavComplex'', ''garages''">garages</a>.'
 
 ''
@@ -182,6 +177,12 @@ end
 
 if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: act '<font color = green><b>Go to school</b></font>': minut += 1 & gt 'gschool_grounds', 'main'
 
+if InvitationToDimkaNYparty = 1 and month = 12 and day = 31 and hour > 14 and hour <= 18:
+	act '<b>Go to Dimka''s house at the New Year party</b>': killvar 'InvitationToDimkaNYparty' & minut += 30 & gt 'sny', '3'
+elseif InvitationToDimkaNYparty = 1 and month ! 12:
+	killvar 'InvitationToDimkaNYparty'
+end
+
 act 'Go to the high street':minut += 5 & gt 'pavCommercial'
 if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'
 if pavSharedAptEnabled = 1:act '<b>GO HOME</b> (Shared Apartment)': minut += 5 & GT 'pavSharedApt', 'start'
@@ -250,12 +251,6 @@ if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3)
 	exit
 end
 
-if InvitationToDimkaNYparty = 1 and day = 31 and hour > 14 and hour <= 18:
-	killvar 'InvitationToDimkaNYparty'
-	act 'Go to Dimka''s house at the New Year party':  minut += 30 & gt 'sny', '3'
-end
-
-
 if pcs_magik >= 1 and mainQW = 0 and altQS = 1:
 	cla
 	*clr

locations/pornhist.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'short':
 		end
 
 		if $porntitle[i] = '':
-			$pfilmhistory += '● <b><<i>>. Movie</b><br><font size=2>'+$pfilmtext+'</font><br>'
+			$pfilmhistory += '● <b><<i>>. Movie</b><br><font size=2></font><br>'
 		else
 			if i = 1:
 				$pfilmhistory += '● <b>'+$porntitle[i]+'<<$pfname>></b><br><font size=2>'+$pfilmtext+'</font><br>'
@@ -29,7 +29,10 @@ end
 
 !! Detailed description of movies, only available after selecting the "Filmography" link
 if $ARGS[0] = 'pdetail':
-	clr
+	*clr & cla
+	'<center><h1>Filmography of <font color="magenta"><<$pfname>></font></h1></center>'
+	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	i = 1
 	killvar 'firstvariable'
 	killvar 'firstvariable2'
@@ -37,68 +40,69 @@ if $ARGS[0] = 'pdetail':
 		dynamic $pornfilmdesc, pornfilmType[i]
 		if $porntitle[i] = '':
 			if firstvariable = 0:firstvariable = 1 & fvvalue = i
-			pl '<b><a href="exec:$porntitle[fvvalue] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, it will name the <b>first</b> unnamed movie! This action can be done only once!'') & gs ''pornhist'', ''pdetail''"><<i>>. Movie</a></b>'
+			'<b><a href="exec:$porntitle[fvvalue] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, it will name the <b>first</b> unnamed movie! This action can be done only once!'') & gs ''pornhist'', ''pdetail''"><<i>>. Movie</a></b>'
 		else
 			if i = 1:
-				pl '<b><font color="brown"><<$porntitle[i]>><<$pfname>></font></b>'
+				'<b><font color="brown"><<$porntitle[i]>><<$pfname>></font></b>'
 			else
-				pl '<b><font color="brown"><<$porntitle[i]>></font></b>'
+				'<b><font color="brown"><<$porntitle[i]>></font></b>'
 			end
 		end
 		if daystart - porndaystart[i] = 0:
-			pl ' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Today)</font>'
+			' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Today)</font>'
 		elseif daystart - porndaystart[i] = 1:
-			pl ' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Yesterday)</font>'
+			' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Yesterday)</font>'
 		else
-			pl ' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (<<daystart - porndaystart[i]>> days ago)</font>'
+			' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (<<daystart - porndaystart[i]>> days ago)</font>'
 		end
-		pl ' <b>Actress age:</b> <font size=2><<pornfilmActAge[i]>></font>  <font size=2>(Appears: <<pornfilmAppAge[i]>>)</font>'
+		' <b>Actress age:</b> <font size=2><<pornfilmActAge[i]>></font>  <font size=2>(Appears: <<pornfilmAppAge[i]>>)</font>'
 		if $pornfilmActor[i] = 'Fifty fans of':
-			pl ' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> <<$pfname>> and <<$pfname>> herself</font>'
+			' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> <<$pfname>> and <<$pfname>> herself</font>'
 		else
-			pl ' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> and <<$pfname>></font>'
+			' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> and <<$pfname>></font>'
 		end
-		pl ' <b>Income:</b> <font size=2><<pornfilmCash[i]>>₽</font>'
+		' <b>Income:</b> <font size=2><<pornfilmCash[i]>>₽</font>'
 		if pornfilmacting[i] < 15:
-			pl ' <b>Acting:</b> <font size=2>You were so obviously fake as a bad boobjob. Have you got paid for this?</font>'
+			' <b>Acting:</b> <font size=2>You were so obviously fake as a bad boobjob. Have you got paid for this?</font>'
 		elseif pornfilmacting[i] < 30:
-			pl ' <b>Acting:</b> <font size=2>You were acting quite fake, but it were passable.</font>'
+			' <b>Acting:</b> <font size=2>You were acting quite fake, but it were passable.</font>'
 		elseif pornfilmacting[i] < 45:
-			pl ' <b>Acting:</b> <font size=2>You probably could have done better, but at least you were not totally unconvincing.</font>'
+			' <b>Acting:</b> <font size=2>You probably could have done better, but at least you were not totally unconvincing.</font>'
 		elseif pornfilmacting[i] < 60:
-			pl ' <b>Acting:</b> <font size=2>You were actually acting, even if not totally convincingly.</font>'
+			' <b>Acting:</b> <font size=2>You were actually acting, even if not totally convincingly.</font>'
 		elseif pornfilmacting[i] < 75:
-			pl ' <b>Acting:</b> <font size=2>You were acting really well.</font>'
+			' <b>Acting:</b> <font size=2>You were acting really well.</font>'
 		elseif pornfilmacting[i] < 90:
-			pl ' <b>Acting:</b> <font size=2>As a professional actress, everybody believed your every gesture and sentence.</font>'
+			' <b>Acting:</b> <font size=2>As a professional actress, everybody believed your every gesture and sentence.</font>'
 		else
-			pl ' <b>Acting:</b> <font size=2>Your performance was phenomenal. You may actually win some award with this one.</font>'
+			' <b>Acting:</b> <font size=2>Your performance was phenomenal. You may actually win some award with this one.</font>'
 		end
 		if pornfilmvnesh[film] >= 200:
-			pl ' <b>Look:</b> <font size=2>Amazingly beautiful.</font>'
+			' <b>Look:</b> <font size=2>Amazingly beautiful.</font>'
 		elseif pornfilmvnesh[film] >= 120:
-			pl ' <b>Look:</b> <font size=2>Beautiful.</font>'
+			' <b>Look:</b> <font size=2>Beautiful.</font>'
 		elseif pornfilmvnesh[film] >= 60:
-			pl ' <b>Look:</b> <font size=2>Attractive.</font>'
+			' <b>Look:</b> <font size=2>Attractive.</font>'
 		else
-			pl ' <b>Look:</b> <font size=2>Unnoticeable.</font>'
+			' <b>Look:</b> <font size=2>Unnoticeable.</font>'
 		end
-		pl ' <b>Description:</b> <font size=2><<$pfilmtext>></font>'
+		' <b>Description:</b> <font size=2><<$pfilmtext>></font>'
 		if $pornfilmstory[i] = '':
 			if firstvariable2 = 0:firstvariable2 = 1 & fvvalue2 = i
-			pl ' <b>Story:</b> <font size=2><a href="exec:$pornfilmstory[fvvalue2] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, you will enter the story of the <b>first</b> movie which missing it! This action can be done only once!'') & gs ''pornhist'', ''pdetail''">Missing story</a></font>'
+			' <b>Story:</b> <font size=2><a href="exec:$pornfilmstory[fvvalue2] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, you will enter the story of the <b>first</b> movie which missing it! This action can be done only once!'') & gs ''pornhist'', ''pdetail''">Missing story</a></font>'
 		else
-			pl ' <b>Story:</b> <font color=#1B4532 size=2><<$pornfilmstory[i]>></font>'
+			' <b>Story:</b> <font color=#1B4532 size=2><<$pornfilmstory[i]>></font>'
 		end
-		pl ' <b>Tags: <font color=#541717 size=2><<$pfilmtags>></font></b>'
-		if pornDanger[i] = 1 and pfType = 1:pl ' <font color="red" size=2><b>You were unprotected and fertile during the shoot.</b></font>'
+		' <b>Tags: <font color=#541717 size=2><<$pfilmtags>></font></b>'
+		if pornDanger[i] = 1 and pfType = 1:' <font color="red" size=2><b>You were unprotected and fertile during the shoot.</b></font>'
 		killvar '$pfilmtags'
 	if i < film:
-		p '<font color="sienna"><hr></font>'
+		*p '<font color="sienna"><hr></font>'
 		i += 1
 		jump 'pornhistloop2'
 	end
-	pl '<a href="exec:gs ''obj_din'', ''stats'' & killvar ''pornfilmdesc'' & killvar ''porntag''"><br>Return</a>'
+	act 'Return to Reputation': killvar 'pornfilmdesc' & killvar 'porntag' & gt 'obj_din', 'reputation'
+	'</td></tr></table></center>'
 end
 
 !! Dynamic of selectable porn movies, called from:

locations/preALT.qsrc

@@ -45,11 +45,6 @@ if $ARGS[0] = 'Three':
 	if MagikDostup = 1:
 		showstat 1
 		showobjs 1
-		if oldobjmenu = 0:
-			gs 'obj_din', 'new'
-		else
-			gs 'obj_din', 'old'
-		end
 		act 'Begin':
 			*clr
 			cla
@@ -135,11 +130,6 @@ if $ARGS[0] = 'Cursed Schoolgirl Start':
 		hour = 18
 		showstat 1
 		showobjs 1
-		if oldobjmenu = 0:
-			gs 'obj_din', 'new'
-		else
-			gs 'obj_din', 'old'
-		end
 		'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'
 		'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad other issues that might pop up and all with the added spice of magic to keep things interesting!'
 		act 'Begin':
@@ -231,11 +221,6 @@ if $ARGS[0] = 'Cursed Schoolgirl Start 2':
 								act 'Continue':
 									showstat 1
 									showobjs 1
-									if oldobjmenu = 0:
-										gs 'obj_din', 'new'
-									else
-										gs 'obj_din', 'old'
-									end
 									cla
 									*clr
 									'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'

locations/preNT.qsrc

@@ -419,12 +419,6 @@ if $ARGS[0] =  'Listings':
 			cla
 			showstat 1
 			showobjs 1
-
-			if oldobjmenu = 0:
-				gs 'obj_din', 'new'
-			else
-				gs 'obj_din', 'old'
-			end
 			gt 'korr'
 		end
 	end
@@ -512,12 +506,6 @@ if $ARGS[0] =  'Train':
 						cla
 						showstat 1
 						showobjs 1
-
-						if oldobjmenu = 0:
-							gs 'obj_din', 'new'
-						else
-							gs 'obj_din', 'old'
-						end
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/system/newintown.jpg"></center>'

locations/preSYS.qsrc

@@ -154,7 +154,7 @@ if $ARGS[0] = 'SGStart2':
 	else
 		'<<$startdob>>'
 	end
-	act 'confirm':
+	act 'Confirm':
 		cls
 		'<center><img <<$set_imgh>> src="images/pre/sys/altstart26.jpg"></center>'
 		'You have two options when it comes to beginning your game. You can start at the end of the summer holiday, very close to starting the new school year, or you can start at the beginning of the summer holiday.'
@@ -512,8 +512,6 @@ if $ARGS[0] = 'charselect':
 				currentpursenumber = 9
 				dynamic $currentpursetype + '_purses[' + currentpursenumber + '] = 1'
 				bag = 1
-				if menu_option = 1:gs 'obj_din', 'old'
-				if menu_option = 0:gs 'obj_din', 'new'
 				greben = 1
 				kosmetitka = 10
 				krem = 10
@@ -818,8 +816,6 @@ if $ARGS[0] = 'charselect':
 				$currentpursetype = 'kats'
 				currentpursenumber = 10
 				bag = 1
-				if menu_option = 1:dynamic $menu_addoldmenu
-				if menu_option = 0:gs 'obj_din', 'new'
 				greben = 1
 				kosmetitka = 10
 				salfetka = 10

locations/preSYS2.qsrc

@@ -19,8 +19,6 @@ if $ARGS[0] = 'start':
 		if bag = 1:
 			!!using current combination should prevent having more than 1 bag at the start of game.
 			dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
-			if menu_option = 1:gs 'obj_din', 'old'
-			if menu_option = 0:gs 'obj_din', 'new'
 		end
 		gt 'preCUST', 'SGStart'
 	end
@@ -384,7 +382,7 @@ if $ARGS[0] = 'modatt':
 	gs 'preSYS2', 'modrel_setup2', 'pcs_vital', 'Endurance'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_intel', 'Intelligence'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_sprt', 'Spirit'
-	gs 'preSYS2', 'modrel_setup2', 'pcs_react', 'Mental Agility'
+	gs 'preSYS2', 'modrel_setup2', 'pcs_react', 'Reaction'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_chrsm', 'Charisma'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_prcptn', 'Perception'
 	if MagikDostup = 0: gs 'preSYS2', 'modrel_setup2', 'pcs_magik', 'Magic'

locations/preTG.qsrc

@@ -483,12 +483,6 @@ if $ARGS[0] = 'sleepPRE':
 					cla
 					showstat 1
 					showobjs 1
-
-					if oldobjmenu = 0:
-						gs 'obj_din', 'new'
-					else
-						gs 'obj_din', 'old'
-					end
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/system/transgender.jpg"></center>'

locations/purses.qsrc

@@ -86,8 +86,6 @@ if $ARGS[0] = 'view_purse_item':
 						bag = 1
 						$currentpursetype = $ARGS[2]
 						currentpursenumber = ARGS[3]
-						if menu_option = 1:gs 'obj_din', 'old'
-						if menu_option = 0:gs 'obj_din', 'new'
 					end
 					gt $loc, $metka
 				end
@@ -109,8 +107,6 @@ if $ARGS[0] = 'view_purse_item':
 					$currentpursetype = $ARGS[2]
 					currentpursenumber = ARGS[3]
 					bag = 1
-					if menu_option = 1:gs 'obj_din', 'old'
-					if menu_option = 0:gs 'obj_din', 'new'
 
 					gt 'wardrobe', 'start'
 				end

locations/qwBarPoletToilet.qsrc

@@ -23,6 +23,7 @@ if temp <= 6:
 	'The <a href="exec:gt ''mirror'', ''start''">mirror</a> you see above the sinks has some cracks radiating from one of the corners, but other than that, it''s perfectly usable.'
 	act 'Return to the main room': minut += 1 & gt 'qwBarPolet'
 	dynamic $basin
+	dynamic $removepan
 	dynamic $quickwash
 elseif temp = 7:
 	if pcs_horny < 90: pcs_horny += 10

locations/rolanbath.qsrc

@@ -392,6 +392,7 @@ if $ARGS[0] = 'start':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
+	dynamic $removepan
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Clean semen stains from your clothing (0:15)':
 			*clr & cla
@@ -404,43 +405,6 @@ if $ARGS[0] = 'start':
 			act 'Finish': gt 'rolanbath', 'start'
 		end
 	end
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			*clr & cla
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
-	if analplug = 1 and analplugin = 1:
-		act 'Take out your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 0
-			if pcs_ass < 30:pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Wear your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 1
-			if pcs_ass < 10:pcs_ass = pcs_ass + 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
 			cla
@@ -457,27 +421,7 @@ if $ARGS[0] = 'start':
 			act 'Finish':gt 'rolanbath', 'start'
 		end
 	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 0
-			if pcs_vag < 30:pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag > 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 1
-			if pcs_vag < 30:pcs_vag += 2
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
+	dynamic $toymanage
 end
 
 !Bathroom, Rolan caught:

locations/saunawhore.qsrc

@@ -918,9 +918,9 @@ if $ARGS[0] = 'saunawork':
 				if saunaWorkKlient = 1:
 					cls
 					gs 'stat'
-					'A client has arrived at the sauna, and the girls line up so that the customer can choose his favorite.'
 					'<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':
@@ -1054,23 +1054,8 @@ if $ARGS[0] = 'bathroom':
 		'Your razor blade looks in good enough shape for <b><<stanok>></b> more shaves.'	
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			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 for clients.'
 
-			act 'Continue':gt $locM, $metkaM
-		end
-	end
+	dynamic $toymanage
 
 	if workdolg > 0:
 		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
@@ -1095,6 +1080,7 @@ if $ARGS[0] = 'bathroom':
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
+	dynamic $removepan
 	if breastpump > 0:
 		act 'Use breast pump':gt 'lact_lib', 'bp_milking'
 	end

locations/saveupdater.qsrc

@@ -1,5 +1,48 @@
 # saveupdater
 
+!0.73 new menu.
+!delete old menus and rebuild.
+!killobj
+killvar 'Enable_settingmode'
+killvar 'menu_character'
+killvar 'menu_lookon'
+killvar 'menu_view'
+killvar 'menu_other'
+delobj '[Autosave]'
+delobj '<font color = green>Character</font>'
+delobj 'Skills'
+delobj 'Statistics'
+delobj 'Pain'
+delobj 'Traits'
+delobj 'Fame'
+delobj 'Renown'
+delobj 'Magic'
+delobj 'Face'
+delobj 'Body'
+delobj 'Clothing'
+delobj 'Panties'
+delobj 'Shoes'
+delobj 'Tattoos'
+delobj 'Piercing'
+delobj 'Phone'
+delobj 'Purse'
+delobj 'Notebook'
+delobj 'Refresh'
+delobj 'Settings'
+delobj 'Cheats'
+delobj '<font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font>'
+delobj '<font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font>'
+delobj ''
+delobj '<font color = red>Emergency</font>'
+delobj '<img src="images/system/icon/pers.png">'
+delobj '<img src="images/system/icon/look.png">'
+delobj '<img src="images/system/icon/proch.png">'
+delobj '<img src="images/system/icon/menu.png">'
+delobj '<img src="images/system/icon/phone.png">'
+delobj '<img src="images/system/icon/purse.png">'
+!add menus back to utility menu.
+gs 'obj_din', 'old'
+
 ! 0.72 water to pcs_hydra
 if water > 0: pcs_hydra = water & killvar 'water'
 ! 0.72 pavSharedApt changes.

locations/selfplay.qsrc

@@ -4,7 +4,6 @@ $d_self_ass_fingering = {
 
 }
 
-
 if $ARGS[0] = 'start':
 	if mastrOnce = 0:
 		stat['mast'] += 1
@@ -102,12 +101,12 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-
 	if pcs_horny > 0:
 		act 'Caress your clitoris':
 			cls
 			selfplaytime += 5
-
+			gs 'selfplay', 'sis_prov'
+			
 			!!if $loc = 'bedrPar':'<center><video autoplay loop src="images/shared/sex/mast/klit.mp4"></video></center>'
 
 			if $loc = 'vanrPar':
@@ -129,6 +128,8 @@ if $ARGS[0] = 'start':
 			minut -= 15
 			gs 'stat'
 
+			'<<$AnjaMsg>>'
+			
 			act 'Stop touching yourself':gt $loc, $metka
 
 			if pcs_horny > 0:gs 'selfplay', 'fingering'
@@ -139,7 +140,8 @@ if $ARGS[0] = 'start':
 		act 'Put a finger in your ass':
 			cls
 			selfplaytime += 5
-
+			gs 'selfplay', 'sis_prov'
+			
 			!!if $loc = 'bedrPar':'<center><video autoplay loop src="images/shared/sex/mast/klit.mp4"></video></center>'
 			!!if $loc = 'vanrPar':'<center><img <<$set_imgh>> src="images/shared/sex/mast/klitvann.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/mast/1.jpg"></center>'
@@ -156,14 +158,16 @@ if $ARGS[0] = 'start':
 
 			if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-			gs 'selfplay', 'sis_prov'
 			gs 'stat'
-
+			'<<$AnjaMsg>>'
+			
 			act 'Stop touching yourself':gt $loc, $metka
 
 			act 'Add a second finger':
 				cls
 				selfplaytime += 5
+				gs 'selfplay', 'sis_prov'
+				
 				'<center><img <<$set_imgh>> src="images/shared/sex/mast/2.jpg"></center>'
 
 				gs 'arousal', 'masturbate', 5
@@ -203,9 +207,10 @@ if $ARGS[0] = 'start':
 					pcs_horny -= 50
 					'When you slide in the second finger, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 				end
-
-				gs 'selfplay', 'sis_prov'
-
+				
+				gs 'stat'
+				'<<$AnjaMsg>>'
+				
 				act 'Stop touching yourself':gt $loc, $metka
 
 				if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
@@ -215,6 +220,7 @@ if $ARGS[0] = 'start':
 					act 'Thrust three fingers in':
 						cls
 						selfplaytime += 5
+						gs 'selfplay', 'sis_prov'
 						'<center><img <<$set_imgh>> src="images/shared/sex/mast/3.jpg"></center>'
 
 						gs 'arousal', 'masturbate', 5
@@ -256,18 +262,19 @@ if $ARGS[0] = 'start':
 							'When you slide in three fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 						end
 
-						gs 'selfplay', 'sis_prov'
-
-						act 'Stop touching yourself':gt $loc, $metka
-
 						if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
 						gs 'stat'
+						'<<$AnjaMsg>>'
 
+						act 'Stop touching yourself':gt $loc, $metka
+						
 						if pcs_horny > 0 and agape < 3:
 							act 'Push four fingers into your asshole':
 								cls
 								selfplaytime += 5
+								gs 'selfplay', 'sis_prov'
+								
 								'<center><img <<$set_imgh>> src="images/shared/sex/mast/4.jpg"></center>'
 
 								gs 'arousal', 'masturbate', 5
@@ -309,19 +316,20 @@ if $ARGS[0] = 'start':
 									'When you slide in four fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 								end
 
-								gs 'selfplay', 'sis_prov'
-
-								act 'Stop touching yourself':gt $loc, $metka
-
 								if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
 								gs 'stat'
+								'<<$AnjaMsg>>'
+
+								act 'Stop touching yourself':gt $loc, $metka
 
 								if pcs_horny > 0 and agape < 3:
 									act 'Put your whole hand in':
 										cls
 										SelfFisting += 1
 										selfplaytime += 5
+										gs 'selfplay', 'sis_prov'
+										
 										'<center><img <<$set_imgh>> src="images/shared/sex/mast/5.jpg"></center>'
 
 										gs 'arousal', 'masturbate', 5
@@ -363,11 +371,12 @@ if $ARGS[0] = 'start':
 											'When you push your hand into your asshole, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 										end
 
-										gs 'selfplay', 'sis_prov'
-
 										act 'Stop touching yourself':gt $loc, $metka
 
 										if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+										
+										gs 'stat'
+										'<<$AnjaMsg>>'
 									end
 								end
 							end
@@ -391,6 +400,8 @@ if $ARGS[0] = 'start':
 							act 'Yes, do it':
 								cls
 								selfplaytime += 15
+								gs 'selfplay', 'sis_prov'
+								
 								if husband > 0 and housrA = 1 and husbandrink ! 10 and $loc = 'bedr': gt 'husbsex','husb_mastr_vtor'
 								
 								dick = dildohand
@@ -401,16 +412,19 @@ if $ARGS[0] = 'start':
 								else
 									'<center><img <<$set_imgh>> src="images/shared/sex/mast/dildo.jpg"></center>'
 								end
-
+								
 								gs 'dinsex2', 'd_vag_sex_dildo', 15
 								gs 'stat'
-
+								'<<$AnjaMsg>>'
+								
 								act 'Stop using the dildo':gt 'selfplay', 'start'
 							end
 							act 'On second thoughts, no': gt 'selfplay', 'start'
 						else
 							cls
 							selfplaytime += 15
+							gs 'selfplay', 'sis_prov'
+							
 							if husband > 0 and housrA = 1 and husbandrink ! 10 and $loc = 'bedr': gt 'husbsex','husb_mastr_vtor'
 							
 							dick = dildohand
@@ -421,10 +435,11 @@ if $ARGS[0] = 'start':
 							else
 								'<center><img <<$set_imgh>> src="images/shared/sex/mast/dildo.jpg"></center>'
 							end
-
+							
 							gs 'dinsex2', 'd_vag_sex_dildo', 15
 							gs 'stat'
-
+							'<<$AnjaMsg>>'
+														
 							act 'Stop using the dildo':gt 'selfplay', 'start'
 						end
 					end
@@ -434,6 +449,8 @@ if $ARGS[0] = 'start':
 					act 'Use the dildo on your ass':
 						cls
 						selfplaytime += 15
+						gs 'selfplay', 'sis_prov'
+						
 						dick = dildohand
 
 						!!if $loc = 'bedrPar':'<center><img <<$set_imgh>> src="images/shared/sex/mast/dildoanal.jpg"></center>'
@@ -445,6 +462,7 @@ if $ARGS[0] = 'start':
 
 						gs 'dinsex2', 'd_analsex_dildo',15
 						gs 'stat'
+						'<<$AnjaMsg>>'
 
 						act 'Stop using the dildo':gt 'selfplay', 'start'
 					end
@@ -518,26 +536,24 @@ if $ARGS[0] = 'sis_prov':
 
 			if sisterHere > 0:
 				cls
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
-
 				if sisboytrio > 0 and sis_watch = 1:
 					sis_watch = 2
-					'Anya smiles as she enters the room and waves at you to carry on.'
+					$AnjaMsg = 'Anya smiles as she enters the room and waves at you to carry on.'
 				else
 					if proverkasisterhere = 2:
 						SisterKnowMastr += 1
-						'<font color="red"><b>Anja saw you masturbate.</b></font>'
+						$AnjaMsg = '<font color="red"><b>Anja saw you masturbate.</b></font>'
 					end
 
 					if proverkasisterhere = 1:
 						proverkasisterhere = 2
-						'<font color="red"><b>You hear footsteps approaching your room.</b></font>'
+						$AnjaMsg = '<font color="red"><b>You hear footsteps approaching your room.</b></font>'
 					end
 				end
 			end
 		end
+	else
+		$AnjaMsg = ''
 	end
 end
 
@@ -571,6 +587,7 @@ if $ARGS[0] = 'fingering':
 	act 'Put a finger inside your vagina':
 		cls
 		selfplaytime += 2
+		gs 'selfplay', 'sis_prov'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/finger.jpg"></center>'
 
@@ -595,8 +612,10 @@ if $ARGS[0] = 'fingering':
 
 			gs 'arousal', 'masturbate', 2
 			gs 'stat'
-
+			'<<$AnjaMsg>>'
+			
 			gs 'selfplay', 'fingering2'
+			
 		elseif mesec > 0:
 			pcs_mood -= 5
 			'Your vagina has some dried up blood from your period on it. You attempt to shove your finger in, but then are kind of grossed out by the idea and reconsider.'
@@ -611,6 +630,7 @@ if $ARGS[0] = 'fingering2':
 	act 'Fuck your fingers':
 		cls
 		selfplaytime += 10
+		gs 'selfplay', 'sis_prov'
 
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/finger.jpg"></center>'
 		if args[1] = 1:
@@ -627,6 +647,8 @@ if $ARGS[0] = 'fingering2':
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
 
+		'<<$AnjaMsg>>'
+		
 		gs 'selfplay', 'fingering2', 1
 
 		if pcs_horny > 0 and pcs_vag > 0:gs 'selfplay', 'fingering3'
@@ -639,6 +661,8 @@ if $ARGS[0] = 'fingering3':
 	act 'Thrust all of your fingers into your vagina':
 		cls
 		selfplaytime += 2
+		gs 'selfplay', 'sis_prov'
+		
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
 
 		'You shove all your fingers inside your pussy.'
@@ -666,10 +690,13 @@ if $ARGS[0] = 'fingering3':
 		gs 'arousal', 'masturbate', 2
 		gs 'stat'
 
+		'<<$AnjaMsg>>'
+		
 		act 'Fuck yourself with your fingers':
 			cls
 			selfplaytime += 10
-
+			gs 'selfplay', 'sis_prov'
+			
 			if pcs_vag < 10:
 				if vgape = 2:vgape = 3
 				if vgape = 1:vgape = 2
@@ -692,6 +719,8 @@ if $ARGS[0] = 'fingering3':
 
 			if pcs_vag < 20:vaginaTemp += 1
 
+			'<<$AnjaMsg>>'
+			
 			gs 'selfplay', 'fingering3'
 			
 			act 'Stop touching yourself':gt $loc, $metka

locations/sexshop.qsrc

@@ -673,6 +673,7 @@ if $ARGS[0] = 'toi':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'pip':

locations/shop.qsrc

@@ -309,8 +309,6 @@ if $shoplocation= 'cosmetics':
 	end
 
 	act 'Leave the cosmetics department':
-		if menu_option = 1:gs 'obj_din', 'old'
-		if menu_option = 0:gs 'obj_din', 'new'
 		gt 'shop', 'start'
 	end
 	if $loc = 'torgcentr': gs 'shoplifting', 'city'

locations/shulgabath.qsrc

@@ -43,6 +43,7 @@ if $ARGS[0] = 'start':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
@@ -59,47 +60,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			*clr & cla
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
-
-	if analplug = 1 and analplugin = 1:
-		act 'Take out your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 0
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Wear your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 1
-			if pcs_ass < 10:pcs_ass = pcs_ass + 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
+	dynamic $toymanage
 
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
@@ -118,28 +79,6 @@ if $ARGS[0] = 'start':
 			act 'Finish':gt 'shulgabath', 'start'
 		end
 	end
-
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 0
-			if pcs_vag < 30:pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag > 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 1
-			if pcs_vag < 30:pcs_vag += 2
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
 end
 
 !Bathroom, Sonia choice opening event:

locations/stat.qsrc

@@ -6,11 +6,6 @@ if opPRE > 0: exit
 if Enable_Android = 0:
 	clr
 	!only clear status and renew object in non-Android mode
-	if oldobjmenu = 0:
-		gs 'obj_din', 'new'
-	else
-		gs 'obj_din', 'old'
-	end
 end
 
 if daystart_start < 100:

locations/stat_display.qsrc

@@ -142,7 +142,7 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$img_temp = FUNC('$body_image','shoes')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
-	$stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']">◎Setting</a>'
+	$stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']">◎Settings</a>'
 
 end
 !!----------------image Extra messages, end --------------------------
@@ -164,6 +164,10 @@ $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exe
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
 if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
+
+!New icon based menu.
+$stat_msg += '<table><tr><td><a href="exec:killvar ''menu_page'' & gt ''obj_din'', ''description''"><img src="images/system/menu icons/icon_character.png"></a></td><td><a href="exec:killvar ''menu_page'' & gt ''obj_din'', ''face''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'+iif(bag > 0,'<td><a href="exec:dynamic $d_bag"><img src="images/system/menu icons/icon_purse.png"></a></td>','')+'<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td><td><a href="exec:gt ''obj_din'', ''records''"><img src="images/system/menu icons/icon_additional.png"></a></td><td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img src="images/system/menu icons/icon_menu.png"></a></td></tr></table>'
+
 $pockets = 'Pockets'
 if bag > 0: $pockets = 'Purse'
 if bankAccount = 0 and stolmoney = 0:
@@ -269,13 +273,11 @@ else
 			$dom_stat_msg = 'neutral'
 		end
 
-		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '3', 100+pcs_dom-sub, 100+pcs_dom-sub,$dom_stat_msg)+'</TD><TD> Dominance</TD></TR>  <TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Mental Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
+		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '3', 100+pcs_dom-sub, 100+pcs_dom-sub,$dom_stat_msg)+'</TD><TD> Dominance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD> Inhibition</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Reaction</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
 		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
 		if succubusflag = 1: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', sucexcess, sucexcess)+'</TD><TD> Succubus Energy</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD> Attractiveness</TD></TR>'
 		if SchoolAtestat = 0 and StoryLine > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_grades, pcs_grades)+'</TD><TD nowrap> School Grades</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD> Inhibition</TD></TR>'
-		if pcs_heels > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_heels, pcs_heels)+'</TD><TD> Heels skill</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
 		killvar '$dom_stat_msg'
 	else
@@ -288,7 +290,8 @@ else
 		else
 			$stat_extra_msg += ' (natural)'
 		end
-!		$stat_extra_msg += '<BR>'
+		gs 'indik', '1', 100 - pcs_inhib, 100 - pcs_inhib
+		$stat_extra_msg += '<BR><<$ind>> inhibition'
 		gs 'indik', '1', pcs_stren, pcs_stren
 		$stat_extra_msg += '<BR><<$ind>> Strength'
 		gs 'indik', '1', pcs_agil, pcs_agil
@@ -300,7 +303,7 @@ else
 		gs 'indik', '1', pcs_sprt, pcs_sprt
 		$stat_extra_msg += '<BR><<$ind>> Spirit'
 		gs 'indik', '1', pcs_react, pcs_react
-		$stat_extra_msg += '<BR><<$ind>> Mental Agility'
+		$stat_extra_msg += '<BR><<$ind>> Reaction'
 		gs 'indik', '1', pcs_chrsm, pcs_chrsm
 		$stat_extra_msg += '<BR><<$ind>> Charisma'
 		gs 'indik', '1', pcs_prcptn, pcs_prcptn
@@ -321,13 +324,6 @@ else
 			$stat_extra_msg += '<BR><<$ind>> School Grades'
 		end
 
-		gs 'indik', '1', 100 - pcs_inhib, 100 - pcs_inhib
-		$stat_extra_msg += '<BR><<$ind>> inhibition'
-
-		if pcs_heels > 0:
-			gs 'indik', '1', pcs_heels, pcs_heels
-			$stat_extra_msg += '<BR><<$ind>> Heels skill'
-		end
 		$stat_extra_msg += '<BR>'
 	end
 end
@@ -370,7 +366,8 @@ else
 		if pcs_shoot > 0: gs 'show_table', '<<pcs_shoot>> Marksmanship', '2'
 		if pcs_chess > 0: gs 'show_table', '<<pcs_chess>> Chess', '2'
 		if pcs_icesktng > 0: gs 'show_table', '<<pcs_icesktng>> Ice Skating', '2'
-		if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Gaming', '2'
+		if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Tabletop Gaming', '2'
+		if pcs_gaming > 0: gs 'show_table', '<<pcs_gaming>> Video Gaming', '2'
 		if pcs_pool > 0: gs 'show_table', '<<pcs_pool>> Pool', '2'
 	end
 
@@ -384,6 +381,7 @@ else
 		if pcs_dancero > 0: gs 'show_table', '<<pcs_dancero>> Erotic Dancing', '2'
 		if pcs_dancpol > 0: gs 'show_table', '<<pcs_dancpol>> Pole Dancing', '2'
 		if pcs_mdlng > 0: gs 'show_table', '<<pcs_mdlng>> Modelling', '2'
+		if pcs_heels > 0: gs 'show_table', '<<pcs_heels>> Heels', '2'
 	end
 
 	!!---------------------Artistic skills-------------------
@@ -666,7 +664,11 @@ if dirtyclothes = 1 and swamp_clothes = 0:
 	end
 end
 
-if lactate = 1:
+if lactate <= 0 and prolactinlvl >= 100:
+	$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts feel weirdly engorged and sore.</font><BR>'
+end
+
+if lactate >= 1:
 	if lactatemv >= lactatemm-1:
 		if lact_engorgement > 0 and lact_engorgement < 3:
 			$stat_msg += '<BR><font color = orange>Your breasts are so full they hurt.</font><BR>'

locations/stripclub.qsrc

@@ -132,8 +132,11 @@ if $ARGS[0] = 'start':
 						act 'Leave':gt 'Nord', 'redlight'			
 					end
 				end
+			elseif stripwork = 0 and pcs_inhib < 60:
+				'You could ask the manager for a job, but you don''t feel confident enough to be a stripper, you should get more used to showing off your body first.'
 			end
-			act 'Walk into the dressing room':frost = 0 & gt 'stwork', 'start'
+			
+			if stripwork = 1: act 'Walk into the dressing room':frost = 0 & gt 'stwork', 'start'
 		end
 	end
 

locations/stwork.qsrc

@@ -151,28 +151,11 @@ if $ARGS[0] = 'toilet':
 		dynamic $brit
 	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 $toymanage
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- stwork ---------------------------------

locations/telefon.qsrc

@@ -896,7 +896,7 @@ if $ARGS[0] = 'Phone_camera_selfie':
 	elseif $locclass = 'kitr':
 		$phone_loc = 'kitchen'
 		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'livingroom':
+	elseif $locclass = 'livingr':
 		$phone_loc = 'livingroom'
 		gs 'telefon', 'Phone_selfie_image'
 	else
@@ -997,8 +997,8 @@ if $ARGS[0] = 'Phone_menu':
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs''stat''"><img src="images/system/icon/back.png"></a></center>'
+	pl'<center><a href="exec:gs ''Cheatmenu_din'' dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>'
+	pl'<center><a href="exec:clr & gs''stat''"><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_menu ---
 
 if $ARGS[0] = 'Add_contact':

locations/traits.qsrc

@@ -1,93 +1,96 @@
 # traits
 
 if $ARGS[0] = 'menu':
-	clr
-	pl '<center>Traits Menu</center>'
-	pl'<a href="exec:gs ''stat''">Leave</a>'
-	nl
-	pl '<b>Bimbo</b>'
+	*clr & cla
+	gs 'obj_din', 'chartabs'
+	'<center><h2>Traits</h2></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td>'
+	'<center><b>Bimbo</b></center>'
 	if bimbolevel = 0:
-		pl 'You do not have this trait.'
-		pl 'To gain this trait you must wear bimbo clothing / shoes for a few days.'
-		pl 'You have <<bimbo>> out of 10 points towards level 1.'
+		'You do not have this trait.'
+		'To gain this trait you must wear bimbo clothing / shoes for a few days.'
+		'You have <<bimbo>> out of 10 points towards level 1.'
 	elseif bimbolevel = 1:
-		pl 'You have this trait at level 1.'
-		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
-		pl 'Due to this trait you gain a very small bonus to appearance and a very small penalty to intelligence.'
-		pl 'You have <<bimbo>> out of 20 points towards level 2.'
+		'You have this trait at level 1.'
+		'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		'Due to this trait you gain a very small bonus to appearance and a very small penalty to intelligence.'
+		'You have <<bimbo>> out of 20 points towards level 2.'
 		if bimbowithdrawal = 0:
-			pl 'You are not in withdrawal.'
+			'You are not in withdrawal.'
 		else
-			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+			'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
 		end
 	elseif bimbolevel = 2:
-		pl 'You have this trait at level 2.'
-		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
-		pl 'Due to this trait you gain a small bonus to appearance and a small penalty to intelligence.'
-		pl 'You have <<bimbo>> out of 30 points towards level 3.'
+		'You have this trait at level 2.'
+		'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		'Due to this trait you gain a small bonus to appearance and a small penalty to intelligence.'
+		'You have <<bimbo>> out of 30 points towards level 3.'
 		if bimbowithdrawal = 0:
-			pl 'You are not in withdrawal.'
+			'You are not in withdrawal.'
 		else
-			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+			'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
 		end
 	else
-		pl 'You have this trait at level 3.'
-		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
-		pl 'Due to this trait you gain a moderate bonus to appearance and a moderate penalty to intelligence.'
+		'You have this trait at level 3.'
+		'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		'Due to this trait you gain a moderate bonus to appearance and a moderate penalty to intelligence.'
 		if bimbowithdrawal = 0:
-			pl 'You are not in withdrawal.'
+			'You are not in withdrawal.'
 		else
-			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+			'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
 		end
 	end
-	nl
-	pl '<b>Exhibitionist</b>'
+	*nl
+	'<center><b>Exhibitionist</b></center>'
 	if Exhibitionist_lvl = 0:
-		pl 'You do not have this trait.'
-		pl 'To gain this trait you must have low enough inhibition and choose to expose your breasts in public.'
-		pl 'You have <<pcs_exhib>> out of 10 points towards level 1. This will slowly decrease each day unless you expose yourself.'
-    elseif Exhibitionist_lvl = 1:
-		pl 'You have this trait at level 1.'
-		pl 'To increase this trait you must choose to expose your breasts and/or bare bottom in public.'
-		pl 'This trait grants you a small amount or excitement from exposing yourself.'
-		pl 'You have <<pcs_exhib>> out of 50 points towards level 2.'
-    elseif Exhibitionist_lvl = 2:
-		pl 'You have this trait at level 2.'
-		pl 'To increase this trait you must choose to expose your breasts, bare bottom and/or pussy in public.'
-		pl 'This trait grants you a moderate amount or excitement from exposing yourself.'
+		'You do not have this trait.'
+		'To gain this trait you must have low enough inhibition and choose to expose your breasts in public.'
+		'You have <<pcs_exhib>> out of 10 points towards level 1. This will slowly decrease each day u*nless you expose yourself.'
+	elseif Exhibitionist_lvl = 1:
+		'You have this trait at level 1.'
+		'To increase this trait you must choose to expose your breasts and/or bare bottom in public.'
+		'This trait grants you a small amount or excitement from exposing yourself.'
+		'You have <<pcs_exhib>> out of 50 points towards level 2.'
+	elseif Exhibitionist_lvl = 2:
+		'You have this trait at level 2.'
+		'To increase this trait you must choose to expose your breasts, bare bottom and/or pussy in public.'
+		'This trait grants you a moderate amount or excitement from exposing yourself.'
 		if pcs_exhib < 100:
-			pl 'You have <<pcs_exhib>> out of 100 points towards level 3.'
+			'You have <<pcs_exhib>> out of 100 points towards level 3.'
 		else
-			pl 'You must trigger an event in the park to gain level 3.'
+			'You must trigger an event in the park to gain level 3.'
 		end
-    else
-		pl 'You have this trait at level 3.'
-		pl 'This is the highest level of this trait.'
-		pl 'This trait grants you a large amount or excitement from exposing yourself.'
-    end
-	nl
-	pl '<b>Cumeater</b>'
+	else
+		'You have this trait at level 3.'
+		'This is the highest level of this trait.'
+		'This trait grants you a large amount or excitement from exposing yourself.'
+	end
+	*nl
+	'<center><b>Cumeater</b></center>'
 	if trt_cumeater = 0:
-		pl 'You do not have this trait.'
-		pl 'To gain this trait you must swallow cum 10 times.'
-		pl 'You have swallowed cum <<swallow>> times.'
+		'You do not have this trait.'
+		'To gain this trait you must swallow cum 10 times.'
+		'You have swallowed cum <<swallow>> times.'
 	else
-		pl 'You have this trait.'
-		pl 'It allows you to remove cum from certain locations and eat it'
-		pl 'This trait cannot be lost.'
+		'You have this trait.'
+		'It allows you to remove cum from certain locations and eat it'
+		'This trait cannot be lost.'
 	end
+
+	act 'Exit the menu': gt $loc, $metka
+	'</td></tr></table></center>'
 end
 
 if $ARGS[0] = 'hourly':
 	if swallow >= 10 and trt_cumeater = 0:
 		trt_cumeater = 1
 		msg 'You have gained the trait "Cumeater"'
-	end	
+	end
 end
 
 if $ARGS[0] = 'overnight':
-	
-	
+
 end
 
 --- traits ---------------------------------

locations/vokmantoiev.qsrc

@@ -32,6 +32,7 @@ if $ARGS[0] = 'female':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'male':

locations/vokzaltoilet.qsrc

@@ -31,6 +31,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-	
+dynamic $removepan
+
 --- vokzaltoilet ---------------------------------
 

locations/wardrobe.qsrc

@@ -145,8 +145,6 @@ if $ARGS[0] = 'default_entry_wear':
 	else
 		bag = 1
 	end
-	if menu_option = 1:dynamic $menu_addoldmenu
-	if menu_option = 0:gs 'obj_din', 'new'
 
 	if dyneval('RESULT = coat[<<defcoat[default_entry]>>]') = 0: defcoat[default_entry] = 0
 	defaultcoat = defcoat[default_entry]

locations/zaprF.qsrc

@@ -121,6 +121,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- zaprF ---------------------------------

locations/zaprFWash.qsrc

@@ -5,9 +5,7 @@
 if $ARGS[0] = 'start':
 	$metka = 'start'
 	$loc = 'zaprFWash'
-	cla
-	clr
-
+	*clr & cla
 	! can''t wash cars if have visible cum already
 	if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
 		minut += 5