Merge remote-tracking branch 'Anya/master'

locations/din_van.qsrc

@@ -72,7 +72,7 @@ $shower = {
 		menu_off = 1
 		*clr & cla
 		minut += 15
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or hotelShampoo = 1: noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelShampoo = 1: noShampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -208,7 +208,7 @@ $bath = {
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or hotelShampoo = 1: noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelShampoo = 1: noShampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin