Merge remote-tracking branch 'Awesome/master'

# Conflicts:
#	locations/Cheatmenu_din.qsrc

locations/Cheatmenu_din.qsrc

@@ -3267,7 +3267,7 @@ $cheatmenu['items'] = {
 		*pl 'Painkillers: <a href="exec:painkiller=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<painkiller>> </b></a>'
 		*pl 'Ointments for chafing: <a href="exec:mosolmaz=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mosolmaz>> </b></a>'
 		*pl 'Lubricants: <a href="exec:lubri=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lubri>> </b></a>'
-		*pl 'Lip balms: <a href="exec:mc_inventory[''lipbalm'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lipbalm>> </b></a>'
+		*pl 'Lip balms: <a href="exec:mc_inventory[''lipbalm'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''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: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>'

locations/booty_call_after.qsrc

@@ -1183,7 +1183,7 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Continue':gs'booty_call_after', 'boy_bathroom'
 		end
 	end
-	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
+	if mc_inventory['tampons'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla

locations/brothel.qsrc

@@ -563,7 +563,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 	act 'Have a glass of water (0:05)':gs 'beverage', 'bev_wat'
 	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Have a shower':
 			cls
 			dynamic $showerdin

locations/dimaHome.qsrc

@@ -178,7 +178,7 @@ if $ARGS[0] = 'bathroom2':
 	*nl
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			*clr & cla
 			menu_off = 1
@@ -317,7 +317,7 @@ if $ARGS[0] = 'dimka_master_bathroom':
 	'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 > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower':
 			*clr & cla
 			minut += 10

locations/din_bad.qsrc

@@ -127,9 +127,9 @@ if $ARGS[0] = 'd_bag':
 	elseif painkiller > 0 and (pain['total'] = 0 or pain['killer'] > 0):
 		'You have <b><<painkiller>></b> painkiller'+iif(painkiller > 1, 's ', ' ')+'left in your purse.'
 	end
-	if mouthwash > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
+	if mc_inventory['mouthwash'] > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
 		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
-	elseif mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0:
+	elseif mc_inventory['mouthwash'] > 0 and pcs_breath = 1 and cumloc[12] = 0:
 		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
 	end
 	if mc_inventory['travel_mirror'] =  1: 

locations/din_van.qsrc

@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'private':
 		msg'<font color="red">You only have <b><<mc_inventory[''tampons'']>></b> tampon left!</font>'
 	elseif mc_inventory['tampons'] =  1:
 		msg'<font color="red">You only have <b><<mc_inventory[''tampons'']>></b> tampon left.</font>'
-	elseif tampon > 0:
+	elseif mc_inventory['tampons'] > 0:
 		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
 	

locations/etoexhib.qsrc

@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'pos34':
 		act 'Next':gt 'etoexhib', 'pos33'
 	end
 
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower':gt 'ptu_dush', 'pos1'
 	else
 		*nl
@@ -1383,7 +1383,7 @@ if $ARGS[0] = 'pos39':
 		act 'Remove underwear':gs 'underwear', 'remove' & gt $loc,$loc_arg
 	end
 
-	if tampon > 0 and mesec > 0 and isprok = 0:
+	if mc_inventory['tampons'] > 0 and mesec > 0 and isprok = 0:
 		act 'Change tampon':
 			cla
 			*clr

locations/fit.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'dressing_room':
         end
     end
 
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			cla
 			*clr

locations/foto.qsrc

@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'showers':
 
 	act 'Go to the studio floor':gt'foto','studio'
 
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			cla
 			*clr

locations/gadbana.qsrc

@@ -118,7 +118,7 @@ if mira_guest = 0:
 	end
 	*nl
 
-	if shampoo > 0 or (locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home')):
+	if mc_inventory['shampoo'] > 0 or (locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home')):
 		act 'Wash your body (0:25)':
 			*clr & cla
 			menu_off = 1

locations/gdksport.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'default_sport_options'
 
-	if shampoo > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
+	if mc_inventory['shampoo'] > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'

locations/model_krystal.qsrc

@@ -794,7 +794,7 @@ if $ARGS[0] = 'krystalshower':
 	'Sure enough, when you round the corner you see Krystal in one of the stalls with her boyfriend doing what sounds like an excellent job of eating her pussy out.'
 	pcs_horny += 10
 	act 'Leave':gt'foto','studio'
-	if shampoo > 0:
+	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			cla
 			*clr

locations/sex_ev_after.qsrc

@@ -1405,7 +1405,7 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Continue':gs'sex_ev_after', 'boy_bathroom'
 		end
 	end
-	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
+	if mc_inventory['tampons'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla