[fixed] closed loophole that could allow you to skip undressing

locations/sex_ev_shower.qsrc

@@ -6,13 +6,14 @@
 !! --------------------------------- Before Sex Showers ---------------------------------------
 
 if $ARGS[0] = 'before_borrow_shower':
-	act'Borrow yours?':
+	act'"Use your shower?"':
 		cla & *nl
-		'"Can I borrow yours before we get started?" you ask.'
+		'"Can I borrow your shower before we get started?" you ask.'
 		!! replace with an npc stat later
 		if rand(0,1) = 1:
 			'"I don''t mind the sweat," he answers, grinning.'
 			act'I want to shower':
+				gs 'sex_ev_start', 'undress_function'
 				cla & *nl
 				'"It''s for me," you roll your eyes. "I''ll feel better if I clean up first."'
 				if rand(1,10) < npc_sexdrive[$boy]:
@@ -39,6 +40,7 @@ if $ARGS[0] = 'before_borrow_shower':
 				end
 			end
 		else
+			gs 'sex_ev_start', 'undress_function'
 			if rand(1,10) < npc_sexdrive[$boy]:
 				'"How about I join you in there?" he says looking at you meaningfully.'
 				gs'sex_ev_shower', 'borrow_shower2'

locations/sex_ev_start.qsrc

@@ -544,10 +544,7 @@ end
 
 if $ARGS[0] = 'undress':
 	cla & *clr
-	if CloDress = 1:sex_ev['CloDress'] = 1
-	if $clothingworntype ! 'nude':gs 'clothing', 'strip'
-	if $braworntype ! 'none':gs 'bras', 'remove'
-	if $pantyworntype ! 'none':gs 'panties', 'remove'
+	gs 'sex_ev_start', 'undress_function'
 	gs 'arousal', 'foreplay', 2
 	gs 'arousal', 'foreplay_give', -2
 	gs'stat'
@@ -556,6 +553,14 @@ if $ARGS[0] = 'undress':
 	gs 'sex_ev_start', 'bed_start'
 end
 
+if $ARGS[0] = 'undress_function':
+	if CloDress = 1:sex_ev['CloDress'] = 1
+	if CloStyle2 = 4: npc_know_schoolgirl[$boy] = 1
+	if $clothingworntype ! 'nude':gs 'clothing', 'strip'
+	if $braworntype ! 'none':gs 'bras', 'remove'
+	if $pantyworntype ! 'none':gs 'panties', 'remove'
+end
+
 if $ARGS[0] = 'bed_start':
 	!! $sex_ev['bed_room']
 	if rand(0,1) = 1: