Merge branch 'master' of http://git.tfgamessite.com/rachels/girllife-ecv

locations/kafe

@@ -858,7 +858,7 @@ if $ARGS[0] = 'workPred':
 						:looptongue_pir
 
 						if dyneval('RESULT = PirsA<<i>>_owned') = 1:
-							pirsA = <<i>>
+							pirsA = i
 						else
 							i += 1
 							jump 'looptongue_pir'

locations/mirror

@@ -220,7 +220,7 @@ if $ARGS[0] = 'start':
 
 	act 'Move away from the mirror':gt 'mirror','fin'
 	
-end --- start ---
+end &! --- start ---
 
 if $ARGS[0] = 'steam':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/mirror1.jpg"></center>'

locations/shortgs

@@ -71,7 +71,6 @@ if $ARGS[0] = 'guy':
 		jump 'loop_shya'
 	end
 	if len($temptask) > 0:jump 'loop_shtty'
-	end
 	result = r_sht
 	killvar 'r_sht'
 	killvar '$temptask'