Merge remote-tracking branch 'Anjuna/master'

locations/bed2.qsrc

@@ -30,15 +30,15 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!!
 	!! This is NOT for events!!
 
-	gt 'bed2', 'end'
+	gt 'bed2', 'main'
 end
 
 
-if $ARGS[0] = 'end':
+if $ARGS[0] = 'main':
 	$menu_loc = 'bed2'
 	$alarmloc = 'bed2'
-	$menu_arg = 'end'
-	$alarmarg = 'end'
+	$menu_arg = 'main'
+	$alarmarg = 'main'
 	menu_off = 0
 
 	if pcs_makeup ! 1 and cosmetic_tattoo = 0: *nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'end':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	*nl
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''start''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''start''">ON</a>.')
+	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''main''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''main''">ON</a>.')
 	*nl
 	gs 'bed2', 'wear_panties_decider'
 	*nl
@@ -84,11 +84,11 @@ end
 if $ARGS[0] = 'wear_panties_decider':
 	if hypnoPanty <= 0:
 		if sleepVars['bedPanty'] = 0:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed2'', ''end''">AS IS</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">AS IS</a>.'
 		elseif sleepVars['bedPanty'] = 1:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed2'', ''end''">YES</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed2'', ''main''">YES</a>.'
 		elseif sleepVars['bedPanty'] = 2:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed2'', ''end''">NO</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		end
 	end
 end
@@ -96,9 +96,9 @@ end
 if $ARGS[0] = 'wear_buttplug_decider':
 	if mc_inventory['buttplug'] = 1:
 		if sleepVars['bedAnal'] = 0:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed2'', ''end''">NO</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		elseif sleepVars['bedAnal'] = 1:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed2'', ''end''">YES</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed2'', ''main''">YES</a>.'
 		end
 	end
 end
@@ -106,9 +106,9 @@ end
 if $ARGS[0] = 'wear_vibe_decider':
 	if mc_inventory['vibe'] = 1 and sleepVars['cheatVib'] = 1:
 		if sleepVars['bedVibrator'] = 0:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''end''">NO</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		elseif sleepVars['bedVibrator'] = 1:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed2'', ''end''">YES</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed2'', ''main''">YES</a>.'
 		end
 	end
 end

locations/sleep.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = 'sleep_handler':
 	if sleepVars['minutes_to_wakeup'] > 0:
 		xgt 'sleep', 'sleep_loop'
 	else
+		killvar 'sleep_loop_loop'
 		xgt 'sleep', 'post_sleep'
 	end
 end