Merge remote-tracking branch 'Hooded_Silence/master'

locations/din_van.qsrc

@@ -1026,7 +1026,9 @@ if $ARGS[0] = 'private':
 	end
 
 	if mosolmaz > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
-
+	if item_moisturizer > 0: 
+		'You look at your moisturiser and think you have about <<item_moisturizer>> applications left.'
+	end
 	if tampon = 0 and sanpad = 0:
 		'<b><font color="red">You have no feminine hygiene products left.</font></b>'
 	elseif tampon = 1 and tampon['warning'] ! daystart:
@@ -1034,7 +1036,7 @@ if $ARGS[0] = 'private':
 		msg'<font color="red">You only have <b><<tampon>></b> tampon left!</font>'
 	elseif tampon = 1:
 		msg'<font color="red">You only have <b><<tampon>></b> tampon left.</font>'
-	else
+	elseif tampon > 0:
 		'You have <b><<tampon>></b> tampons.'
 	end
 	
@@ -1043,7 +1045,7 @@ if $ARGS[0] = 'private':
 		msg'<font color="red">You only have <b><<sanpad>></b> pad left!</font>'
 	elseif sanpad = 1:
 		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
-	else
+	elseif sanpad > 0:
 		'You have <b><<sanpad>></b> pads.'
 	end
 
@@ -1768,7 +1770,6 @@ if $ARGS[0] = 'shave_options':
 		'Rectangle'
 	end
 	
-	
 	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
 	*nl

locations/kit_din.qsrc

@@ -555,10 +555,10 @@ $sandwich = {
 
 $lekarstvo = {
 	if lekarstvo > 0:
-		'You have <b><<lekarstvo>></b> tablets.'
+		'You have <b><<lekarstvo>></b> antibiotics.'
 
 		if sick > 0 and lekarday ! daystart:
-			act 'Take a pill (0:05)':
+			act 'Take an antibiotic (0:05)':
 				*clr & cla
 				menu_off = 1
 				minut += 5
@@ -571,7 +571,7 @@ $lekarstvo = {
 					pcs_hydra += 50
 				end
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<rand(1,3)>>.jpg"></center>'
-				'You took a pill'
+				'You took an antibiotic pill'
 				gs 'stat'
 
 				act 'Move away':gt $loc, $loc_arg