Merge remote-tracking branch 'hornguy6/master'

locations/bed2.qsrc

@@ -320,7 +320,6 @@ if $ARGS[0] = 'dream':
 		alarm_set -= 1440
 	end
 	
-	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','dildo_wakeup1'
 
 	if slept_in = 1:
 		gs 'stat'
@@ -440,6 +439,7 @@ if $ARGS[0] = 'wake_horny':
 end
 
 if $ARGS[0] = 'wake':
+	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','dildo_wakeup1'
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'

locations/mother_sextalk.qsrc

@@ -98,7 +98,8 @@ if $ARGS[0] = 'bathroom_dildo_shriek2':
 	if motherKnowDildo = 1 or dildo_ownership = 1:
 		act'"Sorry...?"':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -113,7 +114,8 @@ if $ARGS[0] = 'bathroom_dildo_shriek2':
 		end
 	else
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
 		'You feel a sinking feeling in your chest. Not looking like you''re going to be able to weasel your way out of this one.'
@@ -130,7 +132,8 @@ if $ARGS[0] = 'bathroom_dildo_shriek2':
 		
 		act'Well I need some kind of outlet!':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
@@ -158,7 +161,8 @@ end
 if $ARGS[0] = 'bathroom_dildo_shriek3':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
-	vanrPar_shower_dildo = 0
+	vanrPar_bath_shower_dildo = 0
+	vanrPar_suction_dildo = 0
 	suction_dildo += motherQW['bathroom_dildos']
 	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
@@ -172,7 +176,8 @@ end
 if $ARGS[0] = 'bathroom_dildo_shriek4':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
-	vanrPar_shower_dildo = 0
+	vanrPar_bath_shower_dildo = 0
+	vanrPar_suction_dildo = 0
 	suction_dildo += motherQW['bathroom_dildos']
 	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
@@ -228,7 +233,8 @@ if $ARGS[0] = 'bathroom_dildos1':
 	
 	act'Well I need some kind of outlet!':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
 		cla & *clr
@@ -265,7 +271,8 @@ if $ARGS[0] = 'bathroom_dildos2':
 	if motherKnowDildo = 1 or dildo_ownership = 1:
 		act'"Sorry...?"':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			gs 'npc_relationship', 'modify', 'A29', -10
 			motherQW['bathroom_dildos'] = 0
 			cla & *clr
@@ -281,7 +288,8 @@ if $ARGS[0] = 'bathroom_dildos2':
 		end
 	else
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherKnowDildo = 1
 		motherQW['bathroom_dildos'] = 0
 		act'"No..."':
@@ -296,7 +304,8 @@ if $ARGS[0] = 'bathroom_dildos2':
 		
 		act'Well I need some kind of outlet!':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
@@ -324,7 +333,8 @@ end
 if $ARGS[0] = 'bathroom_dildos3':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
-	vanrPar_shower_dildo = 0
+	vanrPar_bath_shower_dildo = 0
+	vanrPar_suction_dildo = 0
 	motherQW['dildo_caught'] += 1
 	suction_dildo += motherQW['bathroom_dildos']
 	motherQW['bathroom_dildos'] = 0
@@ -342,7 +352,8 @@ end
 if $ARGS[0] = 'bathroom_dildos4':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
-	vanrPar_shower_dildo = 0
+	vanrPar_bath_shower_dildo = 0
+	vanrPar_suction_dildo = 0
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'As you step into the hall of your family home, you see your mother is there waiting for you. She looks very angry.'
@@ -360,7 +371,8 @@ end
 if $ARGS[0] = 'bathroom_dildos5':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
-	vanrPar_shower_dildo = 0
+	vanrPar_bath_shower_dildo = 0
+	vanrPar_suction_dildo = 0
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'As you step into the hall of your family home, you see your mother is there waiting for you. She looks very angry.'
@@ -376,15 +388,18 @@ if $ARGS[0] = 'bathroom_dildos5':
 end
 
 if $ARGS[0] = 'dildo_wakeup1':
-	motherQW['dildo_caught'] += 1
+	motherQW['dildo_wakeup'] = 1
+	InSleep = 0
+	gs'stat'
 !!	if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','dildo_wakeup4'
-	if motherQW['dildo_wakeup'] = 0:
-		motherQW['dildo_wakeup'] = 1
-	elseif motherQW['dildo_wakeup'] = 1 and motherKnowDildo = 1:
-		gt'mother_sextalk','dildo_wakeup3'
-	elseif motherQW['dildo_wakeup'] = 1:
+	if motherQW['dildo_caught'] = 0:
+		motherQW['dildo_caught'] += 1
+	elseif motherQW['dildo_caught'] = 1:
 		gt'mother_sextalk','dildo_wakeup2'
+	elseif motherQW['dildo_caught'] >= 2 and motherKnowDildo = 1:
+		gt'mother_sextalk','dildo_wakeup3'
 	end
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	if motherQW['bathroom_dildos'] = 1:
 		'"<<$pcs_firstname>> what the hell is this?!"'
 		'You wake up in a shock when your door bangs open and you see your mother standing in the doorway holding... a dildo?'
@@ -398,7 +413,7 @@ if $ARGS[0] = 'dildo_wakeup1':
 	
 	act'Shamelessly lie your ass off':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'"What''re you talkin'' about...?" you say blearily, feining being drowsy from just having woken up. It''s an obvious lie, made even more obvious by the fact that your face turns bright red when you say it. "Is that a dildo? I-"'
 		'"Don''t you lie to me <<$pcs_firstname>>, <i>I am your mother.</i> And I know it''s yours. Anya isn''t stupid enough to bring home another one of these after the last time I caught her with one, let alone stupid enough to leave it in the bathroom where Kolka or Vladimir could find it! What were you thinking?! You''ll ruin your brother''s innocence behaving like this, give your father a heart attack too! And you''ll ruin yourself for marriage if you- She cuts off suddenly with a horrified look on her face.'
 		'"My God... you haven''t..."'
@@ -408,7 +423,7 @@ if $ARGS[0] = 'dildo_wakeup1':
 	
 	act'Blame it on Anya':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'"It''s not mine," you say blearily, feining being drowsy from just having woken up. "It must be Anya''s."'
 		'"Mmrrph. Not mine," your sister mumbles from her bed, rolling over to the other side and going back to sleep.'
 		'"Ahuh. You were saying?" Your mother puts her hands on her hips and glares at you. "I can''t believe you''re stupid enough to leave this in the bathroom where Kolka or Vladimir could find it! What were you thinking?! You''ll ruin your brother''s innocence behaving like this, give your father a heart attack too! And you''ll ruin yourself for marriage if you- She cuts off suddenly with a horrified look on her face.'
@@ -419,7 +434,8 @@ if $ARGS[0] = 'dildo_wakeup1':
 	
 	act'Well I need some kind of outlet!':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
 		cla & *clr
@@ -442,7 +458,7 @@ if $ARGS[0] = 'dildo_wakeup1':
 		end
 		*nl
 		'<i>Ugh. Great. Now I need new ones.</i>'
-		act'Continue':gt 'bed2', 'end'
+		act'Continue':gt 'bed2', 'wake'
 	end
 end
 
@@ -460,11 +476,12 @@ if $ARGS[0] = 'dildo_wakeup2':
 	if motherKnowDildo = 1 or dildo_ownership = 1:
 		act'"Sorry...?"':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			gs 'npc_relationship', 'modify', 'A29', -10
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 			'Unfortunately, you don''t think you can weasel out of this one.'
 			'"Uhh... Sorry...?" you say, hopeful that she won''t do what she did last time.'
 			'She returns your apology with a glare.'
@@ -472,26 +489,28 @@ if $ARGS[0] = 'dildo_wakeup2':
 			'She walks out of your bedroom and shuts the door.'
 			*nl
 			'<i>Well, so much for that...</i>'
-			act'Continue':gt 'bed2', 'end'
+			act'Continue':gt 'bed2', 'wake'
 		end
 	else
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
 		act'"No..."':
 			gs 'npc_relationship', 'modify', 'A29', -10
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 			'"No..." you say dejectedly.'
 			'"Honestly," she huffs, shaking her head in disappointment. "I expected more of you <<$pcs_firstname>>."'
 			'She walks out of your bedroom and shuts the door.'
-			act'Continue':gt 'bed2', 'end'
+			act'Continue':gt 'bed2', 'wake'
 		end
 		
 		act'Well I need some kind of outlet!':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
@@ -506,7 +525,7 @@ if $ARGS[0] = 'dildo_wakeup2':
 			'She walks out of your bedroom and shuts the door.'
 			*nl
 			'<i>Ugh. Great.</i> you think, throwing your head back against your pillow. <i>Now I need a new one. But maybe at least this gets <<$npc_nickname[''A29'']>> off my back...</i>'
-			act'Continue':gt 'bed2', 'end'
+			act'Continue':gt 'bed2', 'wake'
 		end		
 	end
 end
@@ -522,7 +541,7 @@ if $ARGS[0] = 'dildo_wakeup3':
 	motherQW['bathroom_dildos'] = 0
 	'"Again, <<$pcs_firstname>>?" Looking up, you see your mother sighing in the doorway to your bedroom with a hand on her forehead. "God, I hope you washed everything before I touched it. I''m not going to throw it away this time because I know you''re just going to buy another one. But please <<$pcs_nickname>>. Think of your brother and father. Stop leaving it laying around like that."'
 	'She walks out of your bedroom and shuts the door.'
-	act'Continue':gt 'bed2', 'end'
+	act'Continue':gt 'bed2', 'wake'
 end
 
 !! branching path if a SINGLE dildo was left in the bathroom
@@ -530,7 +549,8 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 	if dildo_ownership ! 1:
 		act'I swear! It''s not mine!':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			Gspravka = 0
 			GspravkaT = 0
@@ -548,13 +568,18 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 			else
 				'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 			end
-			act'Continue':gt $loc, $loc_arg
+			if motherQW['dildo_wakeup'] = 1:
+				act'Continue':gt 'bed2', 'wake'
+			else
+				act'Continue':gt $loc, $loc_arg
+			end
 		end
 	end
 	
 	act'I didn''t get to use it yet':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		Gspravka = 0
 		GspravkaT = 0
@@ -563,7 +588,7 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 		GspravkaTimes = 2
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-		if count['vaginal_dildo'] = 0 or pcs_vag = 0:
+		if stat['vaginal_dildo'] = 0 or pcs_vag = 0:
 			'"No! I haven''t! I... I didn''t get to use it yet..."'
 			'"You think I''m going to fall for an obvious lie like that <<$pcs_firstname>>??"'
 			'"No! I swear! It''s true!"'
@@ -581,12 +606,16 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 			*nl
 			'<i>Great. Now I''m going to get in even bigger trouble. <b>And</b> I lost my dildo...</i>'
 		end
-		act'Continue':gt $loc, $loc_arg
+		if motherQW['dildo_wakeup'] = 1:
+			act'Continue':gt 'bed2', 'wake'
+		else
+			act'Continue':gt $loc, $loc_arg
+		end
 	end
-	
 	act'I just suck on it':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		Gspravka = 0
 		GspravkaT = 0
@@ -606,13 +635,18 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 		else
 			'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 		end
-		act'Continue':gt $loc, $loc_arg
+		if motherQW['dildo_wakeup'] = 1:
+			act'Continue':gt 'bed2', 'wake'
+		else
+			act'Continue':gt $loc, $loc_arg
+		end
 	end
 	
 	
 	act'Well I need some kind of outlet!':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
 		cla & *clr
@@ -633,7 +667,11 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 		end
 		*nl
 		'<i>Ugh. Great. Now I need a new one.</i>'
-		act'Continue':gt $loc, $loc_arg
+		if motherQW['dildo_wakeup'] = 1:
+			act'Continue':gt 'bed2', 'wake'
+		else
+			act'Continue':gt $loc, $loc_arg
+		end
 	end
 end
 
@@ -643,7 +681,8 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 	if dildo_ownership ! 1:
 		act'I swear! They''re not mine!':
 			vanrPar_bathtub_dildo = 0
-			vanrPar_shower_dildo = 0
+			vanrPar_bath_shower_dildo = 0
+			vanrPar_suction_dildo = 0
 			motherQW['bathroom_dildos'] = 0
 			Gspravka = 0
 			GspravkaT = 0
@@ -661,13 +700,18 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 			else
 				'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 			end
-			act'Continue':gt $loc, $loc_arg
+			if motherQW['dildo_wakeup'] = 1:
+				act'Continue':gt 'bed2', 'wake'
+			else
+				act'Continue':gt $loc, $loc_arg
+			end
 		end
 	end
 	
 	act'I didn''t get to use them yet':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		Gspravka = 0
 		GspravkaT = 0
@@ -676,7 +720,7 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 		GspravkaTimes = 2
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-		if count['vaginal_dildo'] = 0 or pcs_vag = 0:
+		if stat['vaginal_dildo'] = 0 or pcs_vag = 0:
 			'"No! I haven''t! I... I didn''t get to use them yet..."'
 			'"You think I''m going to fall for an obvious lie like that <<$pcs_firstname>>? There were <i>two of them</i> in there!"'
 			'"No! I swear! It''s true!"'
@@ -694,12 +738,17 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 			*nl
 			'<i>Great. Now I''m going to get in even bigger trouble. <b>And</b> I lost my dildo...</i>'
 		end
-		act'Continue':gt $loc, $loc_arg
+		if motherQW['dildo_wakeup'] = 1:
+			act'Continue':gt 'bed2', 'wake'
+		else
+			act'Continue':gt $loc, $loc_arg
+		end
 	end
 	
 	act'I just suck on it':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		Gspravka = 0
 		GspravkaT = 0
@@ -719,13 +768,18 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 		else
 			'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 		end
-		act'Continue':gt $loc, $loc_arg
+		if motherQW['dildo_wakeup'] = 1:
+			act'Continue':gt 'bed2', 'wake'
+		else
+			act'Continue':gt $loc, $loc_arg
+		end
 	end
 	
 	
 	act'Well I need some kind of outlet!':
 		vanrPar_bathtub_dildo = 0
-		vanrPar_shower_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
 		cla & *clr
@@ -741,7 +795,11 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 		gs'mother_sextalk','dildo_ending1'
 		*nl
 		'<i>Ugh. Great. Now I need new ones.</i>'
-		act'Continue':gt $loc, $loc_arg
+		if motherQW['dildo_wakeup'] = 1:
+			act'Continue':gt 'bed2', 'wake'
+		else
+			act'Continue':gt $loc, $loc_arg
+		end
 	end
 end
 

locations/obj_din.qsrc

@@ -883,7 +883,7 @@ if $ARGS[0] = 'reputation':
 				elseif motherKnowSpravka > 0:
 					'Your mother knows that you are sexually active.'
 				elseif motherKnowDildo > 0:
-					'Your mother knows you took your own virginity with a dildo.'
+					'Your mother knows you masturbate with a dildo.'
 				else
 					'Your mother thinks that you are a virgin.'
 				end

locations/selfplay.qsrc

@@ -495,7 +495,7 @@ if $ARGS[0] = 'suction_dildo':
 		'Your <a href="exec:gs ''selfplay'',''bath_suction_dildo''">suction dildo</a> is stuck to the bath tub.'
 	end
 	*nl
-	if suction_dildo > 0 and dyneval('result = <<$loc>>_bath_shower_dildo') ! 1 or dyneval('result = <<$loc>>_bath_shower_dildo') ! 1:
+	if suction_dildo > 0 and (dyneval('result = <<$loc>>_bath_shower_dildo') ! 1 or dyneval('result = <<$loc>>_glass_shower_dildo') ! 1):
 		'You can also stick a suction dildo inside <a href="exec:gs ''selfplay'',''shower_suction_dildo_apply'' & gt $loc, $loc_arg">the shower</a>.'
 	elseif dyneval('result = <<$loc>>_bath_shower_dildo') = 1 or dyneval('result = <<$loc>>_glass_shower_dildo') = 1:
 		'Your suction dildo is <a href="exec:gs ''selfplay'',''shower_suction_dildo''">inside the shower</a>.'
@@ -529,8 +529,12 @@ if $ARGS[0] = 'shower_suction_dildo_apply':
 end
 
 if $ARGS[0] = 'shower_suction_dildo_remove':
-	dynamic('<<$loc>>_shower_dildo = 0')
 	dynamic('<<$loc>>_suction_dildo -= 1')
+	if $bathtype = 'bathtub shower': 
+		dynamic('<<$loc>>_bath_shower_dildo = 0')
+	elseif $bathtype = 'glass shower' or $bathtype = 'glass shower and tub': 
+		dynamic('<<$loc>>_glass_shower_dildo = 0')
+	end
     suction_dildo += 1
 
 end
@@ -566,7 +570,15 @@ if $ARGS[0] = 'shower_suction_dildo':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shower_dildo.jpg"></center>'
 	'Your suction dildo is currently stuck on the wall of the shower.'
 	act'Leave it there':gt $loc, $loc_arg
-	act'Take it off':suction_dildo = 1 & dynamic('<<$loc>>_shower_dildo = 0') & gt $loc, $loc_arg
+	act'Take it off':
+		suction_dildo += 1 
+		if $bathtype = 'bathtub shower': 
+			dynamic('<<$loc>>_bath_shower_dildo = 0')
+		elseif $bathtype = 'glass shower' or $bathtype = 'glass shower and tub': 
+			dynamic('<<$loc>>_glass_shower_dildo = 0')
+		end
+		gt $loc, $loc_arg
+	end
 end
 
 !! for using a dildo suctioned to the BATHTUB when not bathing
@@ -600,7 +612,7 @@ if $ARGS[0] = 'bath_suction_dildo_ride':
 	act'Finish masturbating and unmount your dildo':
 		dildo_timer = 0
 		gs'arousal','end'
-		gs 'bathtub_suction_dildo_remove'
+		gs 'selfplay','bathtub_suction_dildo_remove'
 		gt $loc, $loc_arg
 	end
 end
@@ -664,7 +676,7 @@ if $ARGS[0] = 'shower_bathtub_suction_dildo_ride':
 	end
 	act'Finish masturbating, unmount your dildo, and get out and dry off':
 		dildo_timer = 0
-		gs 'bathtub_suction_dildo_remove'
+		gs 'selfplay','bathtub_suction_dildo_remove'
 		gs'arousal','end'
 		mirror_steam = hour
 		gt $loc, $loc_arg
@@ -729,7 +741,7 @@ if $ARGS[0] = 'bath_bathtub_suction_dildo_ride':
 	end
 	act'Finish masturbating, unmount your dildo, and get out and dry off':
 		dildo_timer = 0
-		gs 'bathtub_suction_dildo_remove'
+		gs 'selfplay','bathtub_suction_dildo_remove'
 		gs'arousal','end'
 		mirror_steam = hour
 		gt $loc, $loc_arg
@@ -801,7 +813,7 @@ if $ARGS[0] = 'shower_bathtub_wall_dildo_fuck':
 	end
 	act'Finish masturbating, unmount your dildo, and get out and dry off':
 		dildo_timer = 0
-		gs 'shower_suction_dildo_remove'
+		gs 'selfplay','shower_suction_dildo_remove'
 		mirror_steam = hour
 		gs'arousal','end'
 		gt $loc, $loc_arg
@@ -852,7 +864,7 @@ if $ARGS[0] = 'glass_shower_suction_dildo_fuck':
 	end
 	act'Finish masturbating, unmount your dildo, and get out and dry off':
 		dildo_timer = 0
-		gs 'shower_suction_dildo_remove'
+		gs 'selfplay','shower_suction_dildo_remove'
 		mirror_steam = hour
 		gs'arousal','end'
 		gt $loc, $loc_arg