Merge branch 'master' of https://git.tfgames.site/HoodedSilence/glife

# Conflicts:
#	locations/albina_starlets.qsrc

locations/BDsex.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'end':
 		pcs_horny += 1
 		pcs_hairbsh = 1
 		pcs_makeup = 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		'You go into the bathroom and turn on the shower, lathering body and washing as well as you can.'

locations/BelSex.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'shower':
 	'<<$boydesc>> is finally done with you. He looks at you all pleased as you get up and head off to the bathroom to take a quick shower and freshen up.'
 	act 'Take a 15 minute shower':
 		cls
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		minut += 15
 		gs 'fame', 'pav', 'prostitute', 1

locations/Cheatmenu_din.qsrc

@@ -644,10 +644,10 @@ $cheatmenu['permanent'] = {
 	'Peeing: <a href="exec:dynamic $cheatmenu[''pee'']"><<$cheatPee>></a>'
 
 	*nl
-	if Enable_auto$mc_inventory['tampons'] =  1:
-		'Automatic cheat on Tampon: <a href="exec:Enable_auto$mc_inventory['tampons'] =  0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
+	if Enable_auto_tampons =  1:
+		'Automatic cheat on Tampon: <a href="exec:Enable_auto_tampons =  0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
 	else
-		'Automatic cheat on Tampon: <a href="exec:Enable_auto$mc_inventory['tampons'] =  1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
+		'Automatic cheat on Tampon: <a href="exec:Enable_auto_tampons =  1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
 	*nl
 	if Enable_nodream > 0:
@@ -3268,8 +3268,8 @@ $cheatmenu['items'] = {
 		*pl 'Lubricants: <a href="exec:lubri=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lubri>> </b></a>'
 		*pl 'Lip balms: <a href="exec:lipbalm=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lipbalm>> </b></a>'
 		*pl 'Weight loss pill: <a href="exec:fatdel=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<fatdel>> </b></a>'
-		*pl 'Tampons: <a href="exec:tampon=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<tampon>> </b></a>'
-		*pl 'Sanitary napkins: <a href="exec:$mc_inventory['sanitary_pads']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['sanitary_pads']>> </b></a>'
+		*pl 'Tampons: <a href="exec:$mc_inventory[''tampons'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<tampon>> </b></a>'
+		*pl 'Sanitary napkins: <a href="exec:$mc_inventory[''sanitary_pads'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''sanitary_pads'']>> </b></a>'
 
 		if klisma = 0:
 			*pl 'Enema kit: <a href="exec:klisma = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
@@ -3326,42 +3326,42 @@ $cheatmenu['items'] = {
 
 	'<h4>Cosmetics items</h4>'
 	if showCosmeticsItems = 0:
-		'<a href = "exec: showCosmeticsItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
+		'<a href = "exec:showCosmeticsItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
 	end
 
 	if showCosmeticsItems = 1:
-		'<a href = "exec: showCosmeticsItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
-		*pl 'Cosmetics: <a href="exec:$mc_inventory['cosmetics'] =input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['cosmetics']>> </b></a>'
-		*pl 'Moisturiser: <a href="exec:$mc_inventory['moisturiser']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<item_moisturizer>> </b></a>'
-		*pl 'Lip balms: <a href="exec:$mc_inventory['lipstick']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['lipstick'] >> </b></a>'
-		*pl 'Plain false lashes: <a href="exec:$mc_inventory['eyelash_fake']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['eyelash_fake']>> </b></a>'
-		*pl 'Mink false lashes: <a href="exec:$mc_inventory['eyelash_mink']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['eyelash_mink']>> </b></a>'
-		*pl 'Razors: <a href="exec:$mc_inventory['razor']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['razor']>> </b></a>'
-		*pl 'Sunblock: <a href="exec:$mc_inventory['suncream']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> << $mc_inventory['suncream']>> </b></a>'
-		*pl 'Deodorant: <a href="exec:$mc_inventory['deodorant']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['deodorant']>> </b></a>'
-		*pl 'Tampons: <a href="exec:$mc_inventory['tampons']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['tampons']>> </b></a>'
-		*pl 'Sanitary Napkins: <a href="exec:$mc_inventory['sanitary_pads']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['sanitary_pads']>> </b></a>'
-		*pl 'Shampoo: <a href="exec:$mc_inventory['shampoo']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<sha$mc_inventory['shampoo']mpoo>> </b></a>'
-		*pl 'Hair scrunchies: <a href="exec:$mc_inventory['scrunchies']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['scrunchies']>> </b></a>'
-		*pl 'Hair pins: <a href="exec:$mc_inventory['kirbygrips']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['kirbygrips']>> </b></a>'
+		'<a href = "exec:showCosmeticsItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
+		*pl 'Cosmetics: <a href="exec:$mc_inventory[''cosmetics''] =input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''cosmetics'']>> </b></a>'
+		*pl 'Moisturiser: <a href="exec:$mc_inventory[''moisturiser'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''moisturiser'']>> </b></a>'
+		*pl 'Lip balms: <a href="exec:$mc_inventory[''lipstick'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''lipstick''] >> </b></a>'
+		*pl 'Plain false lashes: <a href="exec:$mc_inventory[''eyelash_fake'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''eyelash_fake'']>> </b></a>'
+		*pl 'Mink false lashes: <a href="exec:$mc_inventory[''eyelash_mink'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''eyelash_mink'']>> </b></a>'
+		*pl 'Razors: <a href="exec:$mc_inventory[''razor'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''razor'']>> </b></a>'
+		*pl 'Sunblock: <a href="exec:$mc_inventory[''suncream'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> << $mc_inventory[''suncream'']>> </b></a>'
+		*pl 'Deodorant: <a href="exec:$mc_inventory[''deodorant'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''deodorant'']>> </b></a>'
+		*pl 'Tampons: <a href="exec:$mc_inventory[''tampons'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''tampons'']>> </b></a>'
+		*pl 'Sanitary Napkins: <a href="exec:$mc_inventory[''sanitary_pads'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''sanitary_pads'']>> </b></a>'
+		*pl 'Shampoo: <a href="exec:$mc_inventory[''shampoo'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''shampoo'']>> </b></a>'
+		*pl 'Hair scrunchies: <a href="exec:$mc_inventory[''scrunchies'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''scrunchies'']>> </b></a>'
+		*pl 'Hair pins: <a href="exec:$mc_inventory[''kirbygrips'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''kirbygrips'']>> </b></a>'
 
 		if bag = 1:
-			*pl 'Wipes: <a href="exec:$mc_inventory['makeup_wipes']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['makeup_wipes']>> </b></a>'
-			*pl 'Portable makeup: <a href="exec:$mc_inventory['travel_makeup']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['travel_makeup']>> </b></a>'
-			*pl 'Mouthwash: <a href="exec:$mc_inventory['mouthwash']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['mouthwash']>> </b></a>'
+			*pl 'Wipes: <a href="exec:$mc_inventory[''makeup_wipes'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''makeup_wipes'']>> </b></a>'
+			*pl 'Portable makeup: <a href="exec:$mc_inventory[''travel_makeup'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''travel_makeup'']>> </b></a>'
+			*pl 'Mouthwash: <a href="exec:$mc_inventory[''mouthwash'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory[''mouthwash'']>> </b></a>'
 
 			if $mc_inventory['comb'] =  0:
-				*pl 'Comb: <a href="exec:$mc_inventory['comb'] =  1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+				*pl 'Comb: <a href="exec:$mc_inventory[''comb''] =  1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
 			if $mc_inventory['comb'] =  1:
-				*pl 'Comb: <a href="exec:$mc_inventory['comb'] =  0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+				*pl 'Comb: <a href="exec:$mc_inventory[''comb''] =  0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 
 			if $mc_inventory['travel_mirror'] =  0:
-				*pl 'Compact mirror: <a href="exec:$mc_inventory['travel_mirror'] =  1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+				*pl 'Compact mirror: <a href="exec:$mc_inventory[''travel_mirror''] =  1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
 			if $mc_inventory['travel_mirror'] =  1:
-				*pl 'Compact mirror: <a href="exec:$mc_inventory['travel_mirror'] =  0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+				*pl 'Compact mirror: <a href="exec:$mc_inventory[''travel_mirror''] =  0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 		end
 	end

locations/FedorEv4_sex.qsrc

@@ -1837,7 +1837,7 @@ if $ARGS[0] = 'Shower 2':
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You climb into the shower and begin lathering your body, cleaning yourself as thoroughly as possible until you can hear Fedor enter the room and you peek out of the curtain to see him taking a piss and as soon as he notices you, he gives you a wink with a mischievous grin on his face.'
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 

locations/JuliaMilHome.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'bathroom':
 	act 'Take a shower':
 		menu_off = 1
 		minut += 10
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		gs 'stat'
 		

locations/KatjaHomeTalk.qsrc

@@ -459,7 +459,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Have a shower alone':
 			cla & *clr
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			minut += 15
 			pcs_hairbsh = 1
@@ -478,7 +478,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Bathe together':
 			cla & *clr
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			pcs_hairbsh = 1
 			pcs_makeup = 1
@@ -539,7 +539,7 @@ if $ARGS[0] = 'shower':
 			end
 		end
 	else
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		minut += 15
 		pcs_hairbsh = 1

locations/LBZhouse.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'Shower':
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You grab your stuff and walk over to the bathroom to have a shower. You carefully run the faucet, checking the water temperature before washing yourself off, enjoying the warm water hitting your body.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	minut += 15
 	pcs_hairbsh = 1

locations/LariskaHome.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'bathroom_join_2':
 	'You quickly strip your clothing off, and gently tap on the shower door. Startled, she turns to see you standing there, before smiling shyly and opening the door for you.'
 	
 	act 'Finish the shower':
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		minut += 15
 		pcs_horny += 10
@@ -403,7 +403,7 @@ if $ARGS[0] = 'bathroom_join_3':
 		gs 'arousal', 'end'
 		'As your body comes down from its high, she stands back up and kisses you some more. You taste yourself on her lips, you taste great! Eventually you break away to continue the shower.'
 		act 'Finish your shower':
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			minut += 5
 			pcs_horny += 10

locations/UnitAppearance.qsrc

@@ -1530,7 +1530,7 @@ if $ARGS[0] = 'CurVal':
 	'    unitPShoQuality = <<PShoQuality>>'
 	'    $unitpantyworntype = ''<<$pantyworntype>>'''
 	'    $unitbraworntype = ''<<$braworntype>>'''
-	'    unitpcs_$mc_inventory['lipstick']  = <<pcs_lipbalm>>'
+	'    unitpcs_lipbalm = <<pcs_lipbalm>>'
 	'    unitmopkoef = <<mopkoef>>'
 	'    unitpcs_hairbsh = <<pcs_hairbsh>>'
 	'    unitpcs_breath = <<pcs_breath>>'

locations/VoltrenerSexShower.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = '3':
 					'You can see from the look in his eyes that he''s been at the wine, and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
 					gs 'stat'
 					act 'Wash your ass':
-						no$mc_inventory['shampoo'] =  1
+						no$mc_inventory['noshampoo'] =  1 =  1
 						dynamic $showerdin
 						gt 'gdksport', 'start'
 					end
@@ -151,7 +151,7 @@ if $ARGS[0] = '3':
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wash your ass':
-					no$mc_inventory['shampoo'] =  1
+					no$mc_inventory['noshampoo'] =  1 =  1
 					dynamic $showerdin
 					gt 'gdksport', 'start'
 				end

locations/Zvereva_house_events.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'chris_shower':
 		'When she sees you, she opens the door and says "Get in here, I need my back washed."'
 		'You step inside, lather your hands in soap, and start washing her.'
 
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		pcs_horny += 10
 		pcs_hairbsh = 1

locations/_stock_item_info.qsrc

@@ -13,13 +13,13 @@ $item_info['tabletki'] = '<center><b>Birth control pills</b></center><br>Combina
 $item_info['vitamin'] = '<center><b>Vitamin drinks</b></center><br>A complete multivitamin in a fun-to-chew gummy, specially formulated to provide nutritional support for growing teenage girls.<br>Application: one pill a day.'
 $item_info['lekarstvo'] = '<center><b>Antibiotics</b></center><br>Antibiotics specifically treat infections caused by bacteria, such as Staph., Strep., or E. Coli., and either kill the bacteria (bactericidal) or keep it from reproducing and growing (bacteriostatic)<br>Application: one tablet a day.'
 $item_info['mosolmaz'] = '<center><b>Healing Ointment</b></center><br>Protects and soothes cracked and chafed skin. This will cure your itchy vulva'
-$item_info['lipbalm'] = '<center><b>Lip balm</b></center><br>Balm moisturizes lips, leaves them super soft and adds a subtle shimmer that makes your lips more attractive. There is a side effect: irreversible increased lip size when used for a long time.'
+$item_info[$mc_inventory['lipstick']] = '<center><b>Lip balm</b></center><br>Balm moisturizes lips, leaves them super soft and adds a subtle shimmer that makes your lips more attractive. There is a side effect: irreversible increased lip size when used for a long time.'
 $item_info['fatdel'] = '<center><b>Weight loss pill</b></center><br>This magic pill can increase fat burning, and the effect lasts for X days from the date of application. Intensive physical exertion, such as running, significantly increases the effectiveness of this drug.'
 $item_info['klisma'] = '<center><b>Enema kit</b></center><br>A medical tool for cleaning and rinsing the rectum.'
 $item_info['lubri'] = '<center><b>Lubricant</b></center><br>A specialized gel used during sex and masturbation to ease penetration or reduce friction to or between the penis or sex toy and the vagina, anus, or other body parts.'
 $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 cylinder-shape cotton swabs with a string that is capable of absorbing menstrual fluids during your period.'
-$item_info['$mc_inventory['sanitary_pads']'] = '<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[$mc_inventory['tampons']] = '<center><b>Tampons</b></center><br>A pack of cylinder-shape cotton swabs with a string that is capable of absorbing menstrual fluids during your period.'
+$item_info[$mc_inventory['sanitary_pads']] = '<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. This is a manual model and comes with one bottle.'
 $item_info['bpbottles'] = '<center><b>Breastmilk Bottle S</b></center><br>Used to collect breast milk with a breast pump. This set contains three 150ml bottles.'
 $item_info['bpbottlem'] = '<center><b>Breastmilk Bottle M</b></center><br>Used to collect breast milk with a breast pump. This set contains two 250ml bottles.'
@@ -28,7 +28,7 @@ $item_info['fairy'] = '<center><b>Dishwashing detergent</b></center><br>A liquid
 $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.'
 $item_info[$mc_inventory['cosmetics']] = '<center><b>Cosmetics</b></center><br>A complete cosmetic set that covers every part of your makeup routine. There is enough products in there to allow you to create various looks.'
-$item_info['stanok'] = '<center><b>Razors</b></center><br>Cheap and disposable razors. They are not meant to last very long, but they get the job done.'
+$item_info[$mc_inventory['razor']] = '<center><b>Razors</b></center><br>Cheap and disposable razors. They are not meant to last very long, but they get the job done.'
 $item_info['pranik'] = '<center><b>Tea biscuits</b></center><br>A small package of yummy biscuits you can eat in a single sitting, perfect to be paired with a nice cup of tea'
 $item_info['siga'] = '<center><b>Pack of cigarettes</b></center><br>On the front in large print is a warning about potential health risks but it does not seem to stop some people from buying them...'
 $item_info['bottle'] = '<center><b>Bottle of water</b></center><br>A cheap and convenient bottle of water that fits into any bag to be carried around with you.'

locations/abduction.qsrc

@@ -675,7 +675,7 @@ if $ARGS[0] = 'abdFood':
 		menu_off = 1
 		minut += 15
 		pcs_horny += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'

locations/albina_starlets.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'starlets':
 					'The performance goes smoothly and you and the other Starlets leave the stage, where Albina distributes the money while everyone takes turns using the single shower in the dressing room.'
 					act 'Shower':
 						*clr & cla
-						no$mc_inventory['shampoo'] =  1
+						$mc_inventory['noshampoo'] =  1
 						dynamic $showerdin
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
@@ -467,7 +467,7 @@ if $ARGS[0] = 'parkrally':
 		gs 'exercise', 'tier2', 0, 'agil', 'danc'
 		profiDanceTime += 1
 		inhib_exp += rand(3,5)
-		no$mc_inventory['shampoo'] =  1
+		$mc_inventory['noshampoo'] =  1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'

locations/backwater.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'alone':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($pantyworntype = 'none','backwaterswim2.jpg','backwaterswim1.jpg')+'"></center>'
 			*nl 'You washed in the creek.'
 			menu_off = 1
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0

locations/booty_call_shower.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = 'before_alone':
 	minut += 5
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	booty_call['start_shower'] = 1
 	gs 'stat'
@@ -94,7 +94,7 @@ end
 
 if $ARGS[0] = 'before_together1':
 	booty_call['start_shower'] = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	gs'arousal', 'massage',5,'no_orgasm_msg'
 	gs'stat'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'before_jerkoff_cum1':
 		'You work him even harder, trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -514,7 +514,7 @@ end
 
 if $ARGS[0] = 'after_borrow_shower':
 	cla & *clr
-	No$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	$npc_apt_bedroom[$boy]
 	'"I''m gonna borrow your shower," you say, sliding out of the bed.'
 	if rand(1,10) < npc_sexdrive[$boy] and booty_call['angry_after'] = 0:
@@ -573,7 +573,7 @@ if $ARGS[0] = 'after_alone':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	booty_call['shower'] = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	gs 'stat'
 	'You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off and step out.'
@@ -631,7 +631,7 @@ end
 
 if $ARGS[0] = 'after_shower_together':
 	booty_call['shower'] = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	cla & *clr
 	gs 'stat'
@@ -1109,7 +1109,7 @@ if $ARGS[0] = 'after_shower_cum_rinse':
 		act'Rinse off':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			$orgasm_or = 'no'
 			gs'arousal', 'vaginal_finger',rand(1,2),'no_orgasm_msg', 'masturbate'
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'after_shower_again':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 5
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			gs'stat'
 			if booty_call['shower_fuck'] = 1:
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'after_shower_again_long':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 15
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			gs'stat'
 			if booty_call['shower_creampie'] = 1:
@@ -1181,7 +1181,7 @@ if $ARGS[0] = 'after_shower_again_long':
 end
 
 if $ARGS[0] = 'after_shower_together_end':
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	cla & *clr
 	$npc_apt_bathroom[$boy]
@@ -1416,7 +1416,7 @@ if $ARGS[0] = 'morning_together_sex1':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
 		gs 'arousal', 'foreplay', 10
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
 		*nl
@@ -1465,7 +1465,7 @@ if $ARGS[0] = 'morning_jerkoff_cum1':
 		'You turn to face him, staring into <<$npc_firstname[$boy]>>''s eyes as you work him even harder trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -1772,7 +1772,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_shower_together_end':
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	act'Finish up':
 		cla

locations/brothel.qsrc

@@ -543,7 +543,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'From a box beneath a table you can take some '+iif($mc_inventory['cosmetics'] < 1,'<a href="exec: $mc_inventory['cosmetics'] += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+$mc_inventory['cosmetics'] >+') or, '+iif(shampoo < 1,'<a href="exec: $mc_inventory['shampoo'] +=  5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: $mc_inventory['lipstick'] += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif($mc_inventory['razor'] < 1,'<a href="exec: $mc_inventory['razor'] +=  5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'From a box beneath a table you can take some '+iif($mc_inventory['cosmetics'] < 1,'<a href="exec: $mc_inventory[''cosmetics''] += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+$mc_inventory['cosmetics'] >+') or, '+iif(shampoo < 1,'<a href="exec: $mc_inventory[''shampoo''] +=  5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif($mc_inventory['lipstick'] < 1,'<a href="exec: $mc_inventory[''lipstick''] += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif($mc_inventory['razor'] < 1,'<a href="exec: $mc_inventory[''razor''] +=  5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+$mc_inventory['razor'] +'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $loc_arg">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $loc_arg">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl

locations/brother_shower_sex.qsrc

@@ -1327,7 +1327,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

locations/brother_voyeur_sex.qsrc

@@ -1377,7 +1377,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

locations/buklinik_event.qsrc

@@ -883,7 +883,7 @@ if $ARGS[0] = 'event2':
 															act'Well on this we''re finished':
 																cls
 																nanny_vika = 1
-																no$mc_inventory['shampoo'] =  1
+																no$mc_inventory['noshampoo'] =  1 =  1
 																dynamic $showerdin
 																'You take a quick shower and get dressed, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 																if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -958,7 +958,7 @@ if $ARGS[0] = 'event2':
 									cls
 									nanny_vika = 1
 									gs'stat'
-									no$mc_inventory['shampoo'] =  1
+									no$mc_inventory['noshampoo'] =  1 =  1
 									dynamic $showerdin
 									'You take a quick shower and dress yourself and Michael, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 									if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'event2':
 									act'Wait For Vika':
 										cls
 										nanny_vika = 1
-										no$mc_inventory['shampoo'] =  1
+										no$mc_inventory['noshampoo'] =  1 =  1
 										dynamic $showerdin
 										'You take a quick shower and dress yourself and Michael.'
 										if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.<br>'

locations/cikl.qsrc

@@ -432,8 +432,8 @@ else
 	isprok_lastday = 0
 end
 
-if Enable_auto$mc_inventory['tampons'] =  0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
-if Enable_auto$mc_inventory['tampons'] =  0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
+if Enable_auto_tampons =  0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
+if Enable_auto_tampons =  0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if preg = 1:
 	pregtime = pregchem / 24

locations/city_irinaroom.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'first5':
 	'"Could you help me out with my back?" She hands you a loofah, and as you start lathering her body you notice her nipples are erect.'
 	IrinaQW = 10
 	alko += 3
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	pcs_hairbsh = 1
 	pcs_makeup = 1

locations/city_market.qsrc

@@ -39,10 +39,10 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'city_market')
 	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'city_market')
 	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'city_market')
-	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, '$mc_inventory['cosmetics'] >', 'city_market')
-	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, 'stanok', 'city_market')
-	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'city_market')
-	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, '$mc_inventory['sanitary_pads']', 'city_market')
+	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, '$mc_inventory[''cosmetics''] >', 'city_market')
+	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, ' $mc_inventory[''razor'']', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Tampons', 160, '$mc_inventory[''tampons'']', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, '$mc_inventory[''sanitary_pads'']', 'city_market')
 	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'city_market', '', iif(bag > 0, 0, 1), 'You need a purse')
 	'</table></center>'
 	*pl

locations/city_pharmacy.qsrc

@@ -64,10 +64,10 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*P func ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', $curloc, $ARGS[0])
 	*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', $curloc, $ARGS[0])
 	!!tube of 5 uses as far as I can tell, price is set to that
-	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc, $ARGS[0])
+	*P func ('$stock_item', 30, 'Lip balm', 127, '$mc_inventory[''lipstick'']', $curloc, $ARGS[0])
 	*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', $curloc, $ARGS[0])
-	*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', $curloc, $ARGS[0])
-	*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', $curloc, $ARGS[0])
+	*P func ('$stock_item', 20, 'Tampons', 200, '$mc_inventory[''tampons'']', $curloc, $ARGS[0])
+	*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory[''sanitary_pads'']', $curloc, $ARGS[0])
 	*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', $curloc, $ARGS[0])
 	*P func ('$single_stock_item', 1, 'Breast pump', 2200, 'breastpump', $curloc, $ARGS[0])
 	*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', $curloc, $ARGS[0])

locations/din_bad.qsrc

@@ -86,18 +86,18 @@ $d_salf = {
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your face and hands clean</b></a>'
-	if cumloc[14] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your belly clean</b></a>'
-	if cumloc[15] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your breasts clean</b></a>'
-	if cumloc[0] > 0 or cumloc[1] > 0 or cumloc[3] > 0 or cumloc[4] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your ass and pussy clean</b></a>'
-	if cumloc[10] > 0 or cumloc[9] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your arms and legs clean</b></a>'
-	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Clean your clothing</b></a>'
-	if pcs_makeup ! 1 and cosmetic_tattoo = 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & pcs_makeup = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Remove your makeup</b></a>'
+	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your face and hands clean</b></a>'
+	if cumloc[14] > 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your belly clean</b></a>'
+	if cumloc[15] > 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your breasts clean</b></a>'
+	if cumloc[0] > 0 or cumloc[1] > 0 or cumloc[3] > 0 or cumloc[4] > 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your ass and pussy clean</b></a>'
+	if cumloc[10] > 0 or cumloc[9] > 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your arms and legs clean</b></a>'
+	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Clean your clothing</b></a>'
+	if pcs_makeup ! 1 and cosmetic_tattoo = 0: '<a href="exec:$mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Remove your makeup</b></a>'
 	'<a href="exec:gs ''stat'' & gs ''din_bad'', ''d_bag''"><br><b>Put tissues away</b></a>'
 	'</td></tr></table></center>'
 }
 		
-$d_$mc_inventory['mouthwash'] =  {
+$d_mouthwash =  {
 	*clr & cla
 	'<center><h1>Mouth Wash</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
@@ -141,13 +141,13 @@ if $ARGS[0] = 'd_bag':
 		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
 	end
 	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
-		'There''s <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''p_deodorant''">deodorant</a> in your purse. <b><<deodorant>></b> uses remaining.'
+		'There''s <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''p_deodorant''">deodorant</a> in your purse. <b><<$mc_inventory[''deodorant'']>></b> uses remaining.'
 	elseif $mc_inventory['deodorant'] > 0 and deodorant_on = 1:
-		'You are already wearing deodorant. <b><<deodorant>></b> uses remaining.'
+		'You are already wearing deodorant. <b><<$mc_inventory[''deodorant'']>></b> uses remaining.'
 	elseif $mc_inventory['deodorant'] =  0 and deodorant_on = 0:
-		'You are not wearing deodorant. <b><<deodorant>></b> uses remaining.'
+		'You are not wearing deodorant. <b><<$mc_inventory[''deodorant'']>></b> uses remaining.'
 	elseif $mc_inventory['deodorant'] =  0 and deodorant_on = 1:
-		'You are already wearing deodorant. <b><<$mc_inventory['deodorant']>></b> uses remaining.'
+		'You are already wearing deodorant. <b><<$mc_inventory[''deodorant'']>></b> uses remaining.'
 	end
 !! Hair options
 	*nl

locations/din_van.qsrc

@@ -24,7 +24,7 @@ $showerdin = {
 	if shampoo < 0: $mc_inventory['shampoo'] =  0
 	lactation['lactmess'] = 0
 	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-	if no$mc_inventory['shampoo'] =  0:
+	if no$mc_inventory['noshampoo'] =  1 =  0:
 		$mc_inventory['shampoo'] -=  1
 	else
 		killvar 'noShampoo'
@@ -74,7 +74,7 @@ $shower = {
 		menu_off = 1
 		*clr & cla
 		minut += 15
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotel$mc_inventory['shampoo'] =  1: no$mc_inventory['shampoo'] =  1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotel$mc_inventory['shampoo'] =  1: no$mc_inventory['noshampoo'] =  1 =  1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -210,7 +210,7 @@ $bath = {
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotel$mc_inventory['shampoo'] =  1: no$mc_inventory['shampoo'] =  1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotel$mc_inventory['shampoo'] =  1: no$mc_inventory['noshampoo'] =  1 =  1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -1040,16 +1040,16 @@ if $ARGS[0] = 'private':
 		'You have <b><<tampon>></b> tampons.'
 	end
 	
-	if $mc_inventory['sanitary_pads'] = 1 and $mc_inventory['sanitary_pads']['warning'] ! daystart:
-		$mc_inventory['sanitary_pads']['warning'] = daystart
-		msg'<font color="red">You only have <b><<$mc_inventory['sanitary_pads']>></b> pad left!</font>'
+	if $mc_inventory['sanitary_pads'] = 1 and tampon['warning'] ! daystart:
+		tampon['warning'] = daystart
+		msg'<font color="red">You only have <b><<$mc_inventory[''sanitary_pads'']>></b> pad left!</font>'
 	elseif $mc_inventory['sanitary_pads'] = 1:
-		'<font color="red">You have only <b><<$mc_inventory['sanitary_pads']>></b> pads left.</font>'
+		'<font color="red">You have only <b><<$mc_inventory[''sanitary_pads'']>></b> pads left.</font>'
 	elseif $mc_inventory['sanitary_pads'] > 0:
-		'You have <b><<$mc_inventory['sanitary_pads']>></b> pads.'
+		'You have <b><<$mc_inventory[''sanitary_pads'']>></b> pads.'
 	end
 
-	'Your deodorant will last you for <b><<deodorant>></b> more '+iif($mc_inventory['deodorant'] =  1, 'application.', 'applications.')
+	'Your deodorant will last you for <b><<$mc_inventory[''deodorant'']>></b> more '+iif($mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 	
 	if $ARGS[1] = 'hotelroom':
 		dynamic $shower

locations/fit.qsrc

@@ -226,7 +226,7 @@ if $ARGS[0] = 'fitgirl':
 		*clr & cla
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		shovertania += 1
 		gs 'stat'

locations/foto.qsrc

@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'blackm':
 								act 'No!':
 									cla
 									*clr
-									no$mc_inventory['shampoo'] =  1
+									no$mc_inventory['noshampoo'] =  1 =  1
 									dynamic $showerdin
 									gs 'boyStat', $boy1
 									spafinloc = 3
@@ -1327,7 +1327,7 @@ if $ARGS[0] = 'blackm':
 									act 'Finally':
 										cla
 										*clr
-										no$mc_inventory['shampoo'] =  1
+										no$mc_inventory['noshampoo'] =  1 =  1
 										dynamic $showerdin
 										gs 'boyStat', $boy1
 										gs 'cum_manage'

locations/gadbana.qsrc

@@ -85,7 +85,7 @@ if mira_guest = 0:
 					menu_off = 1
 					minut += 120
 					pcs_sweat = rand(0,5)
-					no$mc_inventory['shampoo'] =  1
+					no$mc_inventory['noshampoo'] =  1 =  1
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
@@ -123,7 +123,7 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 25
-			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): no$mc_inventory['shampoo'] =  1
+			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			if frost > 0:frost = 0
 			!!gs 'clothing', 'strip', 'gadbana'
@@ -193,9 +193,9 @@ if mira_guest = 0:
 	if $mc_inventory['sanitary_pads'] = 0 and $mc_inventory['tampons'] =  0:
 		'<b><font color="red">You have no pads left.</font></b>'
 	elseif $mc_inventory['sanitary_pads'] = 1:
-		'<font color="red">You have only <b><<$mc_inventory['sanitary_pads']>></b> pads left.</font>'
+		'<font color="red">You have only <b><<$mc_inventory[''sanitary_pads'']>></b> pads left.</font>'
 	else
-		'You have <b><<$mc_inventory['sanitary_pads']>></b> pads.'
+		'You have <b><<$mc_inventory[''sanitary_pads'']>></b> pads.'
 	end
 
 	if bcream_have > 0:
@@ -312,7 +312,7 @@ else
 			gs 'stat'
 			act 'Steam':
 				cls
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				pcs_hairbsh = 0
 				pcs_makeup = 1

locations/gdksport.qsrc

@@ -580,7 +580,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
-	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): no$mc_inventory['shampoo'] =  1
+	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

locations/gschool_boys_bathroom.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'boy2_sub':
 				'When he''s finished cleaning up and his uniform is back in place, he heads for the door, but pauses on his way out. "I look forward to next time, but maybe do some exercises to tighten up that pussy, " he says as he walks out the door, leaving you standing there with his cum leaking out of you.'
 				*nl
 				'Luckily for you, no one else enters the bathroom while you clean yourself and get dressed. You leave the bathroom just before the bell rings, hoping no one spots you. You can''t help but wonder if Radomir was serious about those exercises...'
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
@@ -396,7 +396,7 @@ if $ARGS[0] = 'boy3_kiss':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'clit_finger', 5
 				gs 'arousal', 'end'
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of cum lands on your inner thigh, another lands on your pubic area and a third hits your wet cunt and fingers. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was amazing," he comments and you''re inclined to agree.'
@@ -678,7 +678,7 @@ if $ARGS[0] = 'boy5':
 						gs 'cum_call', 'mouth', $boy
 						gs 'boyStat', 'A3'
 						gs 'cum_call', 'anus', $boy
-						no$mc_inventory['shampoo'] =  1
+						no$mc_inventory['noshampoo'] =  1 =  1
 						dynamic $showerdin
 						gs 'stat'
 						'Shortly after this, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a few more times before pulling out and standing up to watch Ivan, who''s still pounding your ass. A few seconds later, Ivan groans loudly and buries his dick deep in your ass. You feel a warmth flood inside you as he starts cumming. When his dick leaves your ass, which gapes after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles. "Fuck, that was great. You''re the best <<$pcs_nickname>>."'
@@ -917,7 +917,7 @@ if $ARGS[0] = 'boy6_sub':
 						act 'Clean up':
 							*clr & cla
 							*nl
-							no$mc_inventory['shampoo'] =  1
+							no$mc_inventory['noshampoo'] =  1 =  1
 							dynamic $showerdin
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/gangaftermath.jpg"></center>'

locations/gschool_sex.qsrc

@@ -745,7 +745,7 @@ if $ARGS[0] = 'storagesex':
 										minut += 10
 										pcs_mood += 10
 										shower_shave = 0
-										no$mc_inventory['shampoo'] =  0
+										no$mc_inventory['noshampoo'] =  1 =  0
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 										'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers, where you enjoy the sensation of the hot water on your skin as the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 										dynamic $showerdin
@@ -802,7 +802,7 @@ if $ARGS[0] = 'storagesex':
 								minut += 10
 								pcs_mood += 10
 								shower_shave = 0
-								no$mc_inventory['shampoo'] =  0
+								no$mc_inventory['noshampoo'] =  1 =  0
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 								'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers, where you enjoy the sensation of the hot water on your skin as the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 								dynamic $showerdin
@@ -849,7 +849,7 @@ if $ARGS[0] = 'storagesex_anal':
 			minut += 10
 			pcs_mood += 10
 			shower_shave = 0
-			no$mc_inventory['shampoo'] =  0
+			no$mc_inventory['noshampoo'] =  1 =  0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 			'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
 			dynamic $showerdin
@@ -994,7 +994,7 @@ if $ARGS[0] = 'vd_lockerroom':
 					'Vitek laughs at the comment. "No shit! You''re such a dirty little whore!"'
 					'Vitek walks away as Dan reaches over and turns the shower back on. "You better take a shower, you nasty slut!"' 
 					'You can hear the two of them walking out, talking and laughing as they do. The water runs over you, slowly washing their cum away. You get up and clean up, then walk into the locker room to dry off and get dressed.'
-					no$mc_inventory['shampoo'] =  1
+					no$mc_inventory['noshampoo'] =  1 =  1
 					dynamic $showerdin
 					gs 'arousal', 'hj', 3
 					gs 'arousal', 'hj', 3

locations/husbSex.qsrc

@@ -144,7 +144,7 @@ end
 if $ARGS[0] = 'dolgend':
 	cla
 	*clr
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	gs'stat'
 

locations/intro_customization.qsrc

@@ -179,7 +179,7 @@ if $ARGS[0] = 'modite_cos':
 	'<center><b>Cosmetic items</b></center>'
 	*nl
 	killvar '$table_display'
-	gs 'intro_customization', 'modrel_setup2', '$mc_inventory['cosmetics'] >', 'Cosmetics'
+	gs 'intro_customization', 'modrel_setup2', '$mc_inventory[''cosmetics''] >', 'Cosmetics'
 	gs 'intro_customization', 'modrel_setup2', 'stanok', 'Razors (number of shaves)'
 	gs 'intro_customization', 'modrel_setup2', 'krem', 'Sunblock'
 	gs 'intro_customization', 'modrel_setup2', 'hscrunch', 'Hair scrunchies'
@@ -207,7 +207,7 @@ if $ARGS[0] = 'modite_pha':
 	gs 'intro_customization', 'modrel_setup2', 'lipbalm', 'Lip balms'
 	gs 'intro_customization', 'modrel_setup2', 'fatdel', 'Weight loss pills'
 	gs 'intro_customization', 'modrel_setup2', 'tampon', 'Tampons'
-	gs 'intro_customization', 'modrel_setup2', '$mc_inventory['sanitary_pads']', 'Sanitary napkins'
+	gs 'intro_customization', 'modrel_setup2', '$mc_inventory[''sanitary_pads'']', 'Sanitary napkins'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
 	$table_display
 	'</table></center>'

locations/kotovdom.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'vann':
 		pcs_horny += 1
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 

locations/lesbisubhouse.qsrc

@@ -1402,7 +1402,7 @@ if $ARGS[0] = 'ev1':
 						pcs_horny += RAND(10,20)
 						pcs_hairbsh = 0
 						pcs_makeup = 1
-						no$mc_inventory['shampoo'] =  1
+						no$mc_inventory['noshampoo'] =  1 =  1
 						dynamic $showerdin
 						gs'stat'
 
@@ -1418,7 +1418,7 @@ if $ARGS[0] = 'ev1':
 						pcs_horny += RAND(10,20)
 						pcs_hairbsh = 0
 						pcs_makeup = 1
-						no$mc_inventory['shampoo'] =  1
+						no$mc_inventory['noshampoo'] =  1 =  1
 						dynamic $showerdin
 						gs'stat'
 

locations/mey_vika_events.qsrc

@@ -965,7 +965,7 @@ if $ARGS[0] = 'beach_event0':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach3.jpg"></center>'
@@ -978,7 +978,7 @@ if $ARGS[0] = 'beach_event0':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach4.jpg"></center>'
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'gym0':
 												cla
 												*clr
 												minut += 15
-												no$mc_inventory['shampoo'] =  1
+												no$mc_inventory['noshampoo'] =  1 =  1
 												dynamic $showerdin
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/after_bath0.jpg"></center>'
 												'It takes you about fifteen minutes to take a shower.'
@@ -1713,7 +1713,7 @@ if $ARGS[0] = 'bath_common':
 								act 'Further':
 									*clr & cla
 									pcs_mood += 20
-									no$mc_inventory['shampoo'] =  1
+									no$mc_inventory['noshampoo'] =  1 =  1
 									dynamic $showerdin
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw10.jpg"></center>'

locations/mirror.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 		! ----- actions
 		$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
 		! ----- lip balm and false lashes
-		if$mc_inventory['lipstick']  > 0 and pcs_lipbalm <= 0:
+		if $mc_inventory['lipstick']  > 0 and pcs_lipbalm <= 0:
 			$serv['lipbalm']='<a href="exec: cla & gs ''mirror'',''applyLipbalm'' & act ''View results'':gt ''mirror'', ''start''"><img src="images/system/icons/action/lipbalm.png"></a>'
 		end
 		if $mc_inventory['eyelash_fake'] > 0 and pcs_lashes < 3 and lashextensionstyle <= 0:
@@ -236,10 +236,10 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if $mc_inventory['cosmetics'] > 0: *nl 'Cosmetics: <<$mc_inventory['cosmetics'] >>>' else *nl 'You have no makeup.'
-	if $mc_inventory['lipstick'] > 0: *pl ' | Lip gloss: <<lipb$mc_inventory['lipstick'] alm>>' else *pl ' You have no lip gloss left.'
-	if $mc_inventory['eyelash_fake'] > 0: *nl 'False lashes: <<falsel$mc_inventory['eyelash_fake']>>' else *nl 'You have no false lashes left.'
-	if $mc_inventory['eyelash_mink'] > 0: *pl ' | Mink lashes: <<$mc_inventory['eyelash_mink']>>' else *pl ' You have no mink lashes left.'
+	if $mc_inventory['cosmetics'] > 0: *nl 'Cosmetics: <<$mc_inventory[''cosmetics'']>>' else *nl 'You have no makeup.'
+	if $mc_inventory['lipstick'] > 0: *pl ' | Lip gloss: <<$mc_inventory[''lipstick'']>>' else *pl ' You have no lip gloss left.'
+	if $mc_inventory['eyelash_fake'] > 0: *nl 'False lashes: <<$mc_inventory[''eyelash_fake'']>>' else *nl 'You have no false lashes left.'
+	if $mc_inventory['eyelash_mink'] > 0: *pl ' | Mink lashes: <<$mc_inventory[''eyelash_mink'']>>' else *pl ' You have no mink lashes left.'
 	*nl
 	
 	! WD: Cheat Unused ~ 'AutoHapri'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'start':
 		'You don''t have any makeup to apply.'
 	end
 
-	if Auto$mc_inventory['lipstick']  = 1:	gs 'mirror','applyLipbalm'
+	if AutoLipBalm = 1:	gs 'mirror','applyLipbalm'
 	if $mc_inventory['lipstick']  > 0 and pcs_lipbalm <= 0:
 		act 'Apply lip balm':
 			cla
@@ -471,7 +471,9 @@ if $ARGS[0] = 'start':
 	killvar 'serv'
 
 	act '<<iif(newstylemirror,''Change to the old style mirror'',''Change to the new style mirror'')>>': newstylemirror = iif(newstylemirror,0,1) & gt 'mirror','start'
-end &! --- start ---
+end 
+
+!! --- start ---
 
 
 $createcustroutine = {
@@ -763,15 +765,15 @@ if $ARGS[0] = 'd_bag_mirror':
 	'<center><img <<$set_imgh>> src="/images/pc/items/mirror_compact.jpg"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	'You have '+iif($mc_inventory['travel_makeup']  >0, '<b><<kosmetitka>></b>', 'no')+' cosmetic applications and '+iif($mc_inventory['makeup_wipes'] > 0, '<b><<salfetka>></b>', 'no')+' tissues left in your purse.'
+	'You have '+iif($mc_inventory['travel_makeup']  >0, '<b><<$mc_inventory[''travel_makeup'']>></b>', 'no')+' cosmetic applications and '+iif($mc_inventory['makeup_wipes'] > 0, '<b><<salfetka>></b>', 'no')+' tissues left in your purse.'
 	*nl
 	if pcs_hairbsh < 1: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	if $mc_inventory['makeup_wipes'] > 0 and pcs_makeup ! 1 and cosmetic_tattoo = 0: '<center><a href="exec: $mc_inventory['makeup_wipes'] -= 1 & pcs_makeup = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
+	if $mc_inventory['makeup_wipes'] > 0 and pcs_makeup ! 1 and cosmetic_tattoo = 0: '<center><a href="exec: $mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
 	if $mc_inventory['travel_makeup']  >0 and pcs_makeup = 1:
-		'<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & $mc_inventory['travel_makeup'] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></a>'
+		'<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & $mc_inventory[''travel_makeup''] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></a>'
 		!!Remove this coment and uncomment the next line to restore the ability to put on any typ of makeup
 		!!'<center><a href="exec: gt ''mirror'', ''kosmetitka_apply'' "><b>Put on makeup</b></a></center>'
-	elseif $mc_inventory['makeup_wipes'] > 0 and pcs_makeup = 0 and ((makeupSetting = 1 and kosmetitka >= 1) or (makeupSetting = 2 and kosmetitka >= 2) or (makeupSetting = 3 and kosmetitka >= 3) or (makeupSetting = 4 and kosmetitka >= 3)):
+	elseif $mc_inventory['makeup_wipes'] > 0 and pcs_makeup = 0 and ((makeupSetting = 1 and $mc_inventory['travel_makeup']  >= 1) or (makeupSetting = 2 and $mc_inventory['travel_makeup']  >= 2) or (makeupSetting = 3 and $mc_inventory['travel_makeup']  >= 3) or (makeupSetting = 4 and $mc_inventory['travel_makeup']  >= 3)):
 		'a href="exec: gt ''mirror'', ''kosmetitka_fix'' "><b>Fix your makeup</b></a>'
 	elseif ($mc_inventory['travel_makeup'] =  0 or $mc_inventory['makeup_wipes'] =  0) and pcs_makeup = 0:
 		'You need portable makeup and tissues to fix your makeup.'
@@ -788,10 +790,10 @@ if $ARGS[0] = 'kosmetitka_apply':
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	gs 'stat'
 
-	if kosmetitka >= 1: '<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & $mc_inventory['travel_makeup'] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Light make-up</b></a>'
-	if kosmetitka >= 2: '<a href="exec: minut += 5 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 3 & $mc_inventory['travel_makeup'] -=  2 & gt ''mirror'', ''d_bag_mirror''"><b>Natural make-up</b></a>'
-	if kosmetitka >= 3: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 4 & $mc_inventory['travel_makeup'] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Heavy make-up</b></a>'
-	if kosmetitka >= 4: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 6 & $mc_inventory['travel_makeup'] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Bimbo make-up</b></a>'
+	if $mc_inventory['travel_makeup']  >= 1: '<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & $mc_inventory[''travel_makeup''] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Light make-up</b></a>'
+	if $mc_inventory['travel_makeup']  >= 2: '<a href="exec: minut += 5 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 3 & $mc_inventory[''travel_makeup''] -=  2 & gt ''mirror'', ''d_bag_mirror''"><b>Natural make-up</b></a>'
+	if $mc_inventory['travel_makeup']  >= 3: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 4 & $mc_inventory[''travel_makeup''] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Heavy make-up</b></a>'
+	if $mc_inventory['travel_makeup']  >= 4: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 6 & $mc_inventory[''travel_makeup''] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Bimbo make-up</b></a>'
 	'</td></tr></table></center>'
 	act 'Finish': gt 'mirror', 'd_bag_mirror'
 end

locations/natbelapt.qsrc

@@ -516,7 +516,7 @@ if $ARGS[0] = 'bathroom':
 		*clr & cla
 		menu_off = 1
 		minut += 10
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		gs 'stat'
 		

locations/nichTaras.qsrc

@@ -255,7 +255,7 @@ elseif $ARGS[0] = 'katinka':
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/washing1.jpg"></center>'
 		'<<$nichKatinkaNameUC>> takes a bottle of shower gel and covers you in it. Being all tied up there is nothing you can do to prevent it. Her touch feels soft on your skin. Then she uses a hose to clean you. The water is ice cold. She gently dries you with a towel before combing your hair.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		pcs_hairbsh = 1
 		gs 'stat'

locations/pav_hotelReception.qsrc

@@ -1292,7 +1292,7 @@ if $ARGS[0] = 'ffshower':
 						'"I''d love that. My... My clients usually aren''t as gentle with me as you were. I-I liked it. A lot." You say a bit abashed.'
 						'"See you next time then sweetie" She says and walks out of the hotelroom. "And remember to keep this our little secret."'
 						orgasm += 1
-						no$mc_inventory['shampoo'] =  1
+						no$mc_inventory['noshampoo'] =  1 =  1
 						dynamic $showerdin
 						gs 'arousal', 'kiss', 5, 'prostitution'
 						gs 'stat'
@@ -1310,7 +1310,7 @@ if $ARGS[0] = 'ffshower':
 				'"That was pretty incredible. I''ll make sure to ask for you when I''m in town again." She says as she puts her clothes back on.'
 				'"I''d love that. My... My clients usually aren''t as gentle with me as you were. I-I liked it. A lot." You say a bit abashed.'
 				'"See you next time then sweetie" She says and walks out of the hotelroom. "And remember to keep this our little secret."'
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				gs 'arousal', 'kiss', 5, 'prostitution'
 				gs 'stat'

locations/pav_pharmacy.qsrc

@@ -85,8 +85,8 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'pav_pharmacy', 'start')
-		*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', 'pav_pharmacy', 'start')
-		*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', 'pav_pharmacy', 'start')
+		*P func ('$stock_item', 20, 'Tampons', 200, '$mc_inventory[''tampons'']', 'pav_pharmacy', 'start')
+		*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory[''sanitary_pads'']', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'pav_pharmacy', 'start')
@@ -115,8 +115,8 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'pav_pharmacy', 'buy_lube')
 		*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'pav_pharmacy', 'start')
-		*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', 'pav_pharmacy', 'start')
-		*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', 'pav_pharmacy', 'start')
+		*P func ('$stock_item', 20, 'Tampons', 200, '$mc_inventory[''tampons'']', 'pav_pharmacy', 'start')
+		*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory[''sanitary_pads'']', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'pav_pharmacy', 'start')

locations/placer_sex.qsrc

@@ -14,7 +14,7 @@ if frost > 0: frost = 0
 
 $din_dush  = {
 	*clr & cla
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

locations/post_events.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = '1-1':
 		act 'Reassure him he did nothing wrong':
 			*clr & cla
 			minut += 15
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			gs 'stat'
 			postmarriedQW = 2

locations/rolanbath.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 	act 'Take a shower (0:15)':
 		*clr & cla
 		minut += 15
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'start':
 								cla
 								*clr
 								minut += 5
-								no$mc_inventory['shampoo'] =  1
+								no$mc_inventory['noshampoo'] =  1 =  1
 								dynamic $showerdin
 								pcs_horny += rand(0,2)
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'start':
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
 		pcs_skin += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'start':
 								cla
 								*clr
 								minut += 5
-								no$mc_inventory['shampoo'] =  1
+								no$mc_inventory['noshampoo'] =  1 =  1
 								dynamic $showerdin
 								pcs_horny += rand(0,2)
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
@@ -524,7 +524,7 @@ if $ARGS[0] = 'pervshower':
 		cla
 		*clr
 		minut += 15
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
@@ -622,7 +622,7 @@ end
 if $ARGS[0] = 'bonershower':
 	*clr & cla
 	minut += 5
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	if frost > 0:frost = 0
 	gs 'stat'
@@ -727,7 +727,7 @@ if $ARGS[0] = 'dryOff':
 				cla
 				*clr
 				minut += 5
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				pcs_horny += rand(0,2)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'

locations/saveupdater.qsrc

@@ -1214,7 +1214,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 	if item_moisturizer['time'] > 0:
 		item_moisturizer_time = item_moisturizer['time']
-		gs 'shortgs', 'remove_array_element', '<<$mc_inventory['moisturiser']>>', 'time'
+		gs 'shortgs', 'remove_array_element', '<<$mc_inventory[''moisturiser'']>>', 'time'
 	end
 end
 

locations/sex_ev_shower.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'before_alone':
 	minut += 5
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	sex_ev['start_shower'] = 1
 	gs 'stat'
@@ -96,7 +96,7 @@ end
 
 if $ARGS[0] = 'before_together1':
 	sex_ev['start_shower'] = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	gs'arousal', 'massage',5,'no_orgasm_msg'
 	gs'stat'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'before_jerkoff_cum1':
 		'You work him even harder, trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -513,7 +513,7 @@ end
 
 if $ARGS[0] = 'after_borrow_shower':
 	cla & *clr
-	No$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	$sex_ev['bed_room']
 	'"I''m gonna borrow your shower," you say, sliding out of the bed.'
 	if rand(1,10) < npc_sexdrive[$boy] and sex_ev['angry_after'] = 0:
@@ -572,7 +572,7 @@ if $ARGS[0] = 'after_alone':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	sex_ev['shower'] = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	gs 'stat'
 	'You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off and step out.'
@@ -630,7 +630,7 @@ end
 
 if $ARGS[0] = 'after_shower_together':
 	sex_ev['shower'] = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	cla & *clr
 	gs 'stat'
@@ -1095,7 +1095,7 @@ if $ARGS[0] = 'after_shower_cum_rinse':
 		act'Rinse off':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			$orgasm_or = 'no'
 			gs'arousal', 'vaginal_finger',rand(1,2),'no_orgasm_msg', 'masturbate'
@@ -1121,7 +1121,7 @@ if $ARGS[0] = 'after_shower_again':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 5
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			gs'stat'
 			if sex_ev['shower_fuck'] = 1:
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'after_shower_again_long':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 15
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			gs'stat'
 			if sex_ev['shower_creampie'] = 1:
@@ -1167,7 +1167,7 @@ if $ARGS[0] = 'after_shower_again_long':
 end
 
 if $ARGS[0] = 'after_shower_together_end':
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	cla & *clr
 	$sex_ev['bath_room']
@@ -1414,7 +1414,7 @@ if $ARGS[0] = 'morning_together_sex1':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
 		gs 'arousal', 'foreplay', 10
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
 		*nl
@@ -1463,7 +1463,7 @@ if $ARGS[0] = 'morning_jerkoff_cum1':
 		'You turn to face him, staring into <<$npc_firstname[$boy]>>''s eyes as you work him even harder trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -1770,7 +1770,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_shower_together_end':
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	act'Finish up':
 		cla

locations/shop.qsrc

@@ -390,24 +390,24 @@ if $shoplocation= 'cosmetics':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*p func ('$stock_item', 50, 'Cosmetics', 1300, '$mc_inventory['cosmetics'] >', $curloc)
-	*p func ('$stock_item', 30, 'Moisturizer', 2100, '$mc_inventory['moisturiser']', $curloc)
-	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc)
-	*p func ('$stock_item', 10, 'Plain false lashes', 1500, '$mc_inventory['eyelash_fake']',$curloc)
-	*p func ('$stock_item', 3, 'Mink false lashes', 900, '$mc_inventory['eyelash_mink']',$curloc)
-	*p func ('$stock_item', 25, 'Razors (number of shaves)', 350, '$mc_inventory['razor']', $curloc)
-	*p func ('$stock_item', 20, 'Sunblock', 500, 'kr $mc_inventory['suncream']em', $curloc)
-	*p func ('$stock_item', 40, 'Deodorant', 200, '$mc_inventory['deodorant']', $curloc)
-	*p func ('$stock_item', 20, 'Tampons', 200, '$mc_inventory['tampons']', $curloc)
-	*p func ('$stock_item', 20, 'Sanitary napkins', 100, 'sa$mc_inventory['sanitary_pads']npad', $curloc)
-	*p func ('$stock_item', 30, 'Shampoo', 250, '$mc_inventory['shampoo']', $curloc)
-	*p func ('$stock_item', 10, 'Hair scrunchies', 80, '$mc_inventory['scrunchies']', $curloc)
-	*p func ('$stock_item', 12, 'Hair pins', 100, '$mc_inventory['kirbygrips']', $curloc)
-	*p func ('$stock_item', 10, 'Wipes', 50, '$mc_inventory['makeup_wipes']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*p func ('$stock_item', 10, 'Portable makeup', 700, '$mc_inventory['travel_makeup']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*p func ('$stock_item', 20, 'Mouthwash', 150, '$mc_inventory['mouthwash']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*p func ('$single_stock_item', 1, 'Comb', 150, '$mc_inventory['comb']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*p func ('$single_stock_item', 1, 'Compact Mirror', 1150, '$mc_inventory['travel_mirror']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$stock_item', 50, 'Cosmetics', 1300, '$mc_inventory[''cosmetics''] >', $curloc)
+	*p func ('$stock_item', 30, 'Moisturizer', 2100, '$mc_inventory[''moisturiser'']', $curloc)
+	*P func ('$stock_item', 30, 'Lip balm', 127, '$mc_inventory[''lipstick''] =  1', $curloc)
+	*p func ('$stock_item', 10, 'Plain false lashes', 1500, '$mc_inventory[''eyelash_fake'']',$curloc)
+	*p func ('$stock_item', 3, 'Mink false lashes', 900, '$mc_inventory[''eyelash_mink'']',$curloc)
+	*p func ('$stock_item', 25, 'Razors (number of shaves)', 350, '$mc_inventory[''razor'']', $curloc)
+	*p func ('$stock_item', 20, 'Sunblock', 500, 'kr $mc_inventory[''suncream'']em', $curloc)
+	*p func ('$stock_item', 40, 'Deodorant', 200, '$mc_inventory[''deodorant'']', $curloc)
+	*p func ('$stock_item', 20, 'Tampons', 200, '$mc_inventory[''tampons'']', $curloc)
+	*p func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory[''sanitary_pads'']', $curloc)
+	*p func ('$stock_item', 30, 'Shampoo', 250, '$mc_inventory[''shampoo'']', $curloc)
+	*p func ('$stock_item', 10, 'Hair scrunchies', 80, '$mc_inventory[''scrunchies'']', $curloc)
+	*p func ('$stock_item', 12, 'Hair pins', 100, '$mc_inventory[''kirbygrips'']', $curloc)
+	*p func ('$stock_item', 10, 'Wipes', 50, '$mc_inventory[''makeup_wipes'']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$stock_item', 10, 'Portable makeup', 700, '$mc_inventory[''travel_makeup'']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$stock_item', 20, 'Mouthwash', 150, '$mc_inventory[''mouthwash'']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$single_stock_item', 1, 'Comb', 150, '$mc_inventory[''comb'']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$single_stock_item', 1, 'Compact Mirror', 1150, '$mc_inventory[''travel_mirror'']', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*p '</table></center>'
 	gs 'stat'
 	gs 'themes', 'indoors'

locations/swamphouse.qsrc

@@ -552,7 +552,7 @@ if $ARGS[0] = 'tub':
 	*nl
 	'An old tub that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water and get undressed first.'
 	*nl
-	'If you are desperate enough, you find a handful of well-used '+iif($mc_inventory['razor'] < 1,'<a href="exec: $mc_inventory['razor'] +=  5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf that you can use to shave with. '+iif($mc_inventory['razor'] > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
+	'If you are desperate enough, you find a handful of well-used '+iif($mc_inventory['razor'] < 1,'<a href="exec: $mc_inventory[''razor''] +=  5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf that you can use to shave with. '+iif($mc_inventory['razor'] > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
 	dynamic $brit
 	if swamp_enema = 1:*nl & 'You find an enema syringe on the shelf.'
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
@@ -563,7 +563,7 @@ if $ARGS[0] = 'tub':
 		act 'Bathe in the tub (0:30)':
 			cla
 			*clr
-			no$mc_inventory['shampoo'] =  1
+			no$mc_inventory['noshampoo'] =  1 =  1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0

locations/uni_shop.qsrc

@@ -40,9 +40,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*p func ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*p func ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*p func ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*p func ('$stock_item', 20, 'Tampons', 200, 'tampon', $curloc)
-	*p func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', $curloc)
-	*p func ('$stock_item', 30, 'Shampoo', 250, 'shampoo', $curloc)
+	*p func ('$stock_item', 20, 'Tampons', 200, '$mc_inventory[''tampons'']', $curloc)
+	*p func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory[''sanitary_pads'']', $curloc)
+	*p func ('$stock_item', 30, 'Shampoo', 250, '$mc_inventory[''shampoo'']', $curloc)
 	*p '</table></center>'
 
 	act 'Leave the store':minut += 2 & gt 'city_island'

locations/unused/porn_view.qsrc

@@ -242,7 +242,7 @@ if seepornofut >= 10:
 
 		if pcs_horny >= 70: seepornofut += 1
 		pcs_horny = 0
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -255,7 +255,7 @@ if seepornofut >= 10:
 		func('porn_view_strings', 'view_14'+iif(pcs_pubes>10,'_bush','_no_bush'))
 
 		func('porn_view_strings', 'view_14_next')
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		pcs_horny = 0
 		stat['hj'] += 2
@@ -269,7 +269,7 @@ if seepornofut >= 10:
 		func('porn_view_strings', 'view_15_next'+iif(pcs_vag=0,'_virgin',iif(mesec>0,'_wdays','')))
 
 		func('porn_view_strings', 'view_15_fin')
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		pcs_horny = 0
 		stat['hj'] += 3
@@ -302,7 +302,7 @@ if seepornofut >= 10:
 		pcs_horny = 0
 		brotherstat['vaginal'] += 1
 		gs 'cum_call', 'face', $boy
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -324,7 +324,7 @@ if seepornofut >= 10:
 		stat['hj'] += 2
 		pcs_horny = 0
 		gs 'cum_call', 'face', $boy
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -338,7 +338,7 @@ if seepornofut >= 10:
 		swallow += 3
 		pcs_horny = 0
 		gs 'cum_call', 'face', $boy
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -358,7 +358,7 @@ if seepornofut >= 10:
 		swallow += 3
 		pcs_horny = 0
 		gs 'cum_call', 'face', $boy
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -404,7 +404,7 @@ if seepornofut >= 10:
 		pcs_horny = 0
 		gang += 1
 		swallow += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -426,7 +426,7 @@ if seepornofut >= 10:
 		stat['bj'] += 3
 		gang += 1
 		seepornofut += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -447,7 +447,7 @@ if seepornofut >= 10:
 		pcs_horny = 0
 		stat['bj'] += 3
 		gang += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -467,7 +467,7 @@ if seepornofut >= 10:
 				stat['bj'] += 3
 				minut += 20
 				act 'Go':
-					no$mc_inventory['shampoo'] =  1
+					no$mc_inventory['noshampoo'] =  1 =  1
 					dynamic $showerdin
 					killvar '$_zz_boy_arr'
 					minut += iif(seepornofut < 4,rand(15,30),rand(60,80))
@@ -481,7 +481,7 @@ if seepornofut >= 10:
 		gang += 1
 		seepornofut += 1
 		pcs_horny = 0
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -518,7 +518,7 @@ if seepornofut >= 10:
 		stat['bj'] += 2
 		swallow += 2
 		pcs_horny = 0
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -557,7 +557,7 @@ if seepornofut >= 10:
 		end
 		gang += 1
 		pcs_horny = 0
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -576,7 +576,7 @@ if seepornofut >= 10:
 		seepornofut += 1
 		gang += 1
 		pcs_horny = 0
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -588,7 +588,7 @@ if seepornofut >= 10:
 		seepornofut += 1
 		gang += 1
 		pcs_horny = 0
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -613,7 +613,7 @@ if seepornofut >= 10:
 		end
 		pcs_horny = 0
 		gang += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -641,7 +641,7 @@ if seepornofut >= 10:
 		end
 		pcs_horny = 0
 		gang += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end
@@ -661,7 +661,7 @@ if seepornofut >= 10:
 		end
 		pcs_horny = 0
 		gang += 1
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		exit
 	end

locations/vanrPar.qsrc

@@ -323,7 +323,7 @@ if $ARGS[0] = 'stepdad_sex_end':
 
 	act 'Wash again':
 		minut += 15
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		gs 'stat'
 		gt 'vanrPar'
@@ -339,7 +339,7 @@ if $ARGS[0] = 'stepdad_sex_analend':
 
 	act 'Wash again':
 		minut += 15
-		no$mc_inventory['shampoo'] =  1
+		no$mc_inventory['noshampoo'] =  1 =  1
 		dynamic $showerdin
 		gs 'stat'
 		gt 'vanrPar'

locations/vasily_home_sex.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'sonia_les_bathroom':
 	npc_sex['A25'] += 1
 	pcs_hairbsh = 0
 	pcs_makeup = 1
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	if frost > 0: frost = 0
 	gs 'stat'

locations/yarik.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = '4':
 
 			act 'Take a shower':
 				minut += 15
-				no$mc_inventory['shampoo'] =  1
+				no$mc_inventory['noshampoo'] =  1 =  1
 				dynamic $showerdin
 				money += 2250
 				gt 'yarik', 'end'
@@ -267,7 +267,7 @@ if $ARGS[0] = '5':
 
 					act 'Take a shower':
 						minut += 15
-						no$mc_inventory['shampoo'] =  1
+						no$mc_inventory['noshampoo'] =  1 =  1
 						dynamic $showerdin
 						money += 2500
 						gt 'yarik', 'end'
@@ -349,7 +349,7 @@ if $ARGS[0] = '6':
 
 								act 'Take a shower':
 									minut += 15
-									no$mc_inventory['shampoo'] =  1
+									no$mc_inventory['noshampoo'] =  1 =  1
 									dynamic $showerdin
 									money += 3000
 									gt 'yarik', 'end'
@@ -420,7 +420,7 @@ if $ARGS[0] = '7':
 
 						act 'Take a shower':
 							minut += 15
-							no$mc_inventory['shampoo'] =  1
+							no$mc_inventory['noshampoo'] =  1 =  1
 							dynamic $showerdin
 							money += 3500
 							gt 'yarik', 'end'
@@ -435,7 +435,7 @@ end
 if $ARGS[0] = 'end':
 	cls
 	pcs_hairbsh = 0
-	no$mc_inventory['shampoo'] =  1
+	no$mc_inventory['noshampoo'] =  1 =  1
 	dynamic $showerdin
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/yaroslav/sex/rabotu_28.jpg" ></center>'

locations/youry.qsrc

@@ -195,7 +195,7 @@ if $ARGS[0] = 'quest':
 													cla
 													*clr
 													minut += 15
-													no$mc_inventory['shampoo'] =  1
+													no$mc_inventory['noshampoo'] =  1 =  1
 													dynamic $showerdin
 													pcs_horny += 1
 													pcs_hairbsh = 1