Merge remote-tracking branch 'Violet_Kitten/master'

locations/NikoMeyHome.qsrc

@@ -865,7 +865,7 @@ if $ARGS[0] = 'Bath':
 	minut += 20
 	gs 'clothing', 'strip'
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bathroom/bath.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
 	'You turn the water on and watch as the bathtub slowly fills. You look around the room feeling rather lonely but nevertheless you wait for the tub to fill before carefully climbing inside and relaxing as the warm water sooths you sore body. After a few minutes, you begin slowly scrubbing yourself until you finally feel clean. You then rest for a few more seconds before you get up, dry yourself off then get dressed.'
 
 	act 'Continue':gt 'NikoMeyHome', 'Bathroom'

locations/salon.qsrc

@@ -2,7 +2,7 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
-	if momloc = 15 and momloc[11] ! daystart: gt 'mom'
+	if momloc = 15 and momloc[11] ! daystart: gt 'salon', 'mom'
 	$sexloc = $CURLOC
 	if week = 1 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
 	if week = 3 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'