[fixed] pavSharedApt now returns to correct room.

[added] mood fill to cheat menu.

locations/Cheatmenu_din

@@ -367,9 +367,9 @@ $cheatmenu['status'] = {
 	pl'<a href="exec:pcs_horny = 0 & dynamic $cheatmenu[''status'']">Min arousal</a>'
 	pl'<a href="exec:dynamic $cheatmenu[''bodyMod'']">Body Modification</a>'
 	nl
-	pl'<a href="exec:pcs_health = pcs_vital*10 + pcs_stren*5+1000 & pcs_willpwr = pcs_intel*5 + will*5+1000 & pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $cheatmenu">Full restoration of health, manna, Reason.</a>'
-	pl'<a href="exec:pcs_sleep = 100 & pcs_stam = stammax & dynamic $cheatmenu">Full restoration of sleep and stamina.</a>'
-	pl'<a href="exec:pcs_energy = 200 & pcs_hydra = 200 & dynamic $cheatmenu">Full restoration of hunger and water.</a>'
+	pl'<a href="exec:pcs_health = pcs_vital*10 + pcs_stren*5+1000 & pcs_willpwr = pcs_intel*5 + will*5+1000 & pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $cheatmenu">Full restoration of Health, Manna, Reason.</a>'
+	pl'<a href="exec:pcs_sleep = 100 & pcs_stam = stammax & pcs_mood = 100 & dynamic $cheatmenu">Full restoration of Sleep, Stamina, Mood.</a>'
+	pl'<a href="exec:pcs_energy = 200 & pcs_hydra = 200 & dynamic $cheatmenu">Full restoration of Hunger and Water.</a>'
 	pl'<a href="exec:dynamic $cheatmenu[''money'']">Change money</a>'
 	pl'<a href="exec:money = 0 & dynamic $cheatmenu">Zero money</a>'
 	pl'<a href="exec:dynamic $cheatmenu[''std_cure'']">Cure all stds</a>'

locations/pavSharedApt

@@ -331,7 +331,7 @@ if $ARGS[0] = 'payService':
 	minut += 1
 	'The amount '+price+' <b>₽</b> was taken in account of your weekly rent.'
 	servicePaid += price
-	act 'Continue':gt 'pavSharedApt', 'start'
+	act 'Continue':gt $loc, $metka
 end
 
 if $ARGS[0] = 'rentSetup':
@@ -775,6 +775,8 @@ end
 if $ARGS[0] = 'cookForGuys':
 	cla
 	*clr
+	$loc = 'pavSharedApt'
+	$metka = 'kitchen'
 	minut += 90
 	eda -= 3
 	kuhdrova = 0
@@ -977,12 +979,16 @@ if $ARGS[0] = 'pcsRoom':
 	dynamic $removepan
 	!gs 'subkid'
 	if pcs_sleep <= 80:
-		if succubusQW = 2:
+		if succubusQW = 2 and $clothingworntype ! 'nude':
 			act 'Undress and go to sleep':
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				gs 'clothing', 'strip'
 				gt 'bed2', 'succhoice'
 			end
-		else
+		elseif succubusQW = 2 and $clothingworntype = 'nude':
+			act 'Go to sleep':
+				gt 'bed2', 'succhoice'
+			end
+		elseif $clothingworntype ! 'nude':
 			act 'Undress and go to sleep':
 				if disable_autosave = 0:
 					if StoryLine = 0:
@@ -991,7 +997,22 @@ if $ARGS[0] = 'pcsRoom':
 						savegame 'autosave_alt.sav'
 					end
 				end
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				gs 'clothing', 'strip'
+				if magf2bdo = 2:
+					gt 'bed2', 'magbstchoice'
+				else
+					gt 'bed2', 'sleep'
+				end
+			end
+		elseif $clothingworntype = 'nude':
+			act 'Go to sleep':
+				if disable_autosave = 0:
+					if StoryLine = 0:
+						savegame 'autosave.sav'
+					else
+						savegame 'autosave_alt.sav'
+					end
+				end
 				if magf2bdo = 2:
 					gt 'bed2', 'magbstchoice'
 				else
@@ -1004,6 +1025,8 @@ if $ARGS[0] = 'pcsRoom':
 end
 
 if $ARGS[0] = 'ndRoom':
+	$loc = 'pavSharedApt'
+	$metka = 'ndRoom'
 	minut += 2
 	'<center><h3><font color=#<<$nd_font>>><<$nd_name>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/room.jpg"></center>'
@@ -1026,6 +1049,8 @@ if $ARGS[0] = 'ndRoom':
 end
 
 if $ARGS[0] = 'gpRoom':
+	$loc = 'pavSharedApt'
+	$metka = 'gpRoom'
 	minut += 2
 	'<center><h3><font color=#<<$gp_font>>><<$gp_name>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/room.jpg"></center>'
@@ -1047,6 +1072,8 @@ if $ARGS[0] = 'gpRoom':
 end
 
 if $ARGS[0] = 'spRoom':
+	$loc = 'pavSharedApt'
+	$metka = 'spRoom'
 	minut += 2
 	'<center><h3><font color=#<<$sp_font>>><<$sp_name>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/room.jpg"></center>'

locations/pavShared_gp

@@ -430,7 +430,7 @@ if $ARGS[0] = 'gpHandjob':
 		end
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':gt 'pavSharedApt', 'payService'
+		act 'Leave':$loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 	end
 end
 
@@ -658,7 +658,7 @@ if $ARGS[0] = 'gpSuck':
 		end
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Get up and leave':gt 'pavSharedApt', 'payService'
+		act 'Get up and leave':$loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 	end
 end
 
@@ -907,7 +907,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gs 'arousal', 'vaginal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!stomach
 		elseif subStep = 2:
@@ -920,7 +920,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gs 'cum_call', 'stomach', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!ass
 		elseif subStep = 3:
@@ -933,7 +933,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gs 'cum_call', 'butt', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!face
 		elseif subStep = 4:
@@ -947,7 +947,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gs 'cum_call', 'face', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!takeout fail
 		elseif subStep = 5:
@@ -973,7 +973,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 
 		!will you swallow?
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gs 'cum_call', 'mouth', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!swallow NO
 		elseif subStep = 30:
@@ -1293,7 +1293,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gs 'arousal', 'anal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!stomach
 		elseif subStep = 2:
@@ -1306,7 +1306,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gs 'cum_call', 'stomach', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!ass
 		elseif subStep = 3:
@@ -1319,7 +1319,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gs 'cum_call', 'butt', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!face
 		elseif subStep = 4:
@@ -1333,7 +1333,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gs 'cum_call', 'face', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!takeout fail
 		elseif subStep = 5:
@@ -1355,7 +1355,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!will you swallow?
 		elseif subStep = 6:
@@ -1382,7 +1382,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gs 'cum_call', 'mouth', $boy, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':gp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'gpRoom' & gt 'pavSharedApt', 'payService'
 
 		!swallow NO
 		elseif subStep = 30:

locations/pavShared_nd

@@ -531,7 +531,7 @@ if $ARGS[0] = 'ndSuckBellowTable':
 		end
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':gt 'pavSharedApt', 'payService'
+		act 'Leave':$loc = 'pavSharedApt' & $metka = 'ndRoom' & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 	end
 end
 
@@ -759,7 +759,7 @@ if $ARGS[0] = 'ndSuck':
 		end
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Get up and leave':gt 'pavSharedApt', 'payService'
+		act 'Get up and leave':$loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 	end
 end
 
@@ -969,7 +969,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			gs 'arousal', 'vaginal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!stomach
 		elseif subStep = 2:
@@ -982,7 +982,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			gs 'cum_call', 'stomach', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!ass
 		elseif subStep = 3:
@@ -995,7 +995,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			gs 'cum_call', 'butt', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!face
 		elseif subStep = 4:
@@ -1008,7 +1008,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			gs 'cum_call', 'face', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!takeout fail
 		elseif subStep = 5:
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 
 		!will you swallow?
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			gs 'cum_call', 'mouth', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!swallow NO
 		elseif subStep = 30:
@@ -1309,7 +1309,7 @@ if $ARGS[0] = 'ndSexAnal':
 			gs 'arousal', 'anal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!stomach
 		elseif subStep = 2:
@@ -1322,7 +1322,7 @@ if $ARGS[0] = 'ndSexAnal':
 			gs 'cum_call', 'stomach', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!ass
 		elseif subStep = 3:
@@ -1335,7 +1335,7 @@ if $ARGS[0] = 'ndSexAnal':
 			gs 'cum_call', 'butt', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!face
 		elseif subStep = 4:
@@ -1348,7 +1348,7 @@ if $ARGS[0] = 'ndSexAnal':
 			gs 'cum_call', 'face', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!takeout fail
 		elseif subStep = 5:
@@ -1369,7 +1369,7 @@ if $ARGS[0] = 'ndSexAnal':
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 
 		!will you swallow?
@@ -1394,7 +1394,7 @@ if $ARGS[0] = 'ndSexAnal':
 			gs 'cum_call', 'mouth', $boy, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':nd_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':nd_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 
 		!swallow NO
 		elseif subStep = 30:
@@ -1579,7 +1579,7 @@ if $ARGS[0] = 'ndSexPiss':
 			act 'Definitely!':nd_piss = -2 & step = 110 & gt 'pavShared_nd', 'ndSexPiss'
 		elseif pissLike = 1:
 			'<font color=#<<$nd_font>>>"Does that mean that you will be willing to do it sometime again?"</font>'
-			act 'Yes':nd_piss = 1 & step = 110 & gt 'pavSharedApt', 'payService'
+			act 'Yes':nd_piss = 1 & step = 110 & $loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 			act 'Rather not':nd_piss = -1 & step = 110 & gt 'pavShared_nd', 'ndSexPiss'
 		elseif pissLike = 2:
 			'<font color=#<<$nd_font>>>"Awesome! And I thought I am the only one who likes this kinda stuff!"</font>'
@@ -1594,7 +1594,7 @@ if $ARGS[0] = 'ndSexPiss':
 		gs 'stat'
 		nd_piss += 1
 		step = 0
-		gt 'pavSharedApt', 'payService'
+		$loc = 'pavSharedApt' & $metka = 'ndRoom' & gt 'pavSharedApt', 'payService'
 	end
 end
 

locations/pavShared_sp

@@ -518,7 +518,7 @@ if $ARGS[0] = 'spSuck':
 		end
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Get up and leave':gt 'pavSharedApt', 'payService'
+		act 'Get up and leave':$loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 	end
 end
 
@@ -669,7 +669,7 @@ if $ARGS[0] = 'spSexVaginal':
 			gs 'arousal', 'vaginal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!stomach
 		elseif subStep = 2:
@@ -682,7 +682,7 @@ if $ARGS[0] = 'spSexVaginal':
 			gs 'cum_call', 'stomach', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!ass
 		elseif subStep = 3:
@@ -695,7 +695,7 @@ if $ARGS[0] = 'spSexVaginal':
 			gs 'cum_call', 'butt', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!face
 		elseif subStep = 4:
@@ -708,7 +708,7 @@ if $ARGS[0] = 'spSexVaginal':
 			gs 'cum_call', 'face', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!takeout fail
 		elseif subStep = 5:
@@ -732,7 +732,7 @@ if $ARGS[0] = 'spSexVaginal':
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 
 		!will you swallow?
@@ -757,7 +757,7 @@ if $ARGS[0] = 'spSexVaginal':
 			gs 'cum_call', 'mouth', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!swallow NO
 		elseif subStep = 30:
@@ -915,7 +915,7 @@ if $ARGS[0] = 'spSexAnal':
 			gs 'arousal', 'anal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!stomach
 		elseif subStep = 2:
@@ -928,7 +928,7 @@ if $ARGS[0] = 'spSexAnal':
 			gs 'cum_call', 'stomach', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!ass
 		elseif subStep = 3:
@@ -941,7 +941,7 @@ if $ARGS[0] = 'spSexAnal':
 			gs 'cum_call', 'butt', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!face
 		elseif subStep = 4:
@@ -954,7 +954,7 @@ if $ARGS[0] = 'spSexAnal':
 			gs 'cum_call', 'face', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!takeout fail
 		elseif subStep = 5:
@@ -976,7 +976,7 @@ if $ARGS[0] = 'spSexAnal':
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!will you swallow?
 		elseif subStep = 6:
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'spSexAnal':
 			gs 'cum_call', 'mouth', $boy, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':sp_cumVol = 0 & gt 'pavSharedApt', 'payService'
+			act 'Leave':sp_cumVol = 0 & $loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 
 		!swallow NO
 		elseif subStep = 30:
@@ -1169,7 +1169,7 @@ if $ARGS[0] = 'spSexGiantdildo':
 		step = 0
 		gs 'arousal', 'end'
 		gs 'stat'
-		gt 'pavSharedApt', 'payService'
+		$loc = 'pavSharedApt' & $metka = 'spRoom' & gt 'pavSharedApt', 'payService'
 	end
 end