Merge remote-tracking branch 'Hornguy6/master'

locations/pav_disco_sex.qsrc

@@ -884,8 +884,9 @@ if $ARGS[0] = 'blowjob':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 				
 				if npc_condom_conscious > 0:
-					'"Hang on. Use a-" You start to turn around to ask him to put on a condom but see he''s already halfway through rolling one on. "Oh. Way ahead of me, I guess."'
+					'"Hang on. Use a-" You start to turn around to ask him to put on a condom but see he''s already pulling one out. "Oh. Way ahead of me, I guess."'
 					gs'pav_disco_sex','insert'
+					act 'Get fucked':gt'pav_disco_sex','fuck1'
 				elseif npc_selfish > 0:
 					'"Hang on. Can you please use a condom?"'
 					'"What? Fuck that rubber shit."'
@@ -1468,16 +1469,16 @@ end
 if $ARGS[0] = 'disco_sex_end':
 	gs'arousal','end'
 	if PCloSkirt > 0:
-		if pantyworntype = 'none' or gdk['fuck'] ! 1:
+		if $pantyworntype ! 'none' or gdk['fuck'] ! 1:
 			if $gdk['cum'] = 'facial':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 				'Zipping his pants back up, <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark with cum on your face.'
 			elseif $gdk['cum'] = 'mouth':
 				'Zipping his pants back up, <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.'
 			elseif $gdk['cum'] = 'creampie' and (mesec > 0 or gdk['virgin'] = 1):
-				'You pull up your panties while <<$npc_firstname[$boy]>> zips up his pants before heading back inside, leaving you alone in the dark, cum and blood soaking into your underwear.'
+				'Zipping his pants back up, <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum and menstrual fluids running down your legs.'
 			elseif $gdk['cum'] = 'creampie':
-				'Zipping his pants back up, <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum running down your leg.'
+				'Zipping his pants back up, <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum running down your legs.'
 			elseif $gdk['cum'] = 'condom':
 				'<<$npc_firstname[$boy]>> pulls off the condom and tosses it aside, zipping his pants back up to head back inside and leaving you alone in the dark, pussy juices running down your legs.'
 			end
@@ -1514,14 +1515,14 @@ if $ARGS[0] = 'disco_sex_end':
 				'The two of you pull your pants back up, and <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.'
 			elseif $gdk['cum'] = 'creampie' and (mesec > 0 or gdk['virgin'] = 1):
 				*nl
-				if pantyworntype = 'none':
+				if $pantyworntype = 'none':
 					'The two of you pull your pants back up, and <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum and blood seeping into the crotch of your pants.'
 				else
 					'The two of you pull your pants back up, and <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum and blood seeping into your panties.'
 				end
 			elseif $gdk['cum'] = 'creampie':
 				*nl
-				if pantyworntype = 'none':
+				if $pantyworntype = 'none':
 					'The two of you pull your pants back up, and <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum seeping into the crotch of your pants.'
 				else
 					'The two of you pull your pants back up, and <<$npc_firstname[$boy]>> heads back inside, leaving you alone in the dark, cum seeping into your panties.'

locations/sex_ev_after.qsrc

@@ -643,7 +643,7 @@ if $ARGS[0] = 'wipe_hands':
 			gs 'cum_cleanup'
 			gs 'stat'
 			'You grab some tissues and clean your hands off, wiping the cum from every finger.'
-			gs 'sex_ev_sex', 'wipe_menu'
+			gs 'sex_ev_after', 'wipe_menu'
 		end
 	end
 end
@@ -672,7 +672,7 @@ if $ARGS[0] = 'wipe_tits':
 			gs 'cum_cleanup'
 			gs 'stat'
 			'You grab some tissues and clean up, wiping the cum from your tits.'
-			gs 'sex_ev_sex', 'wipe_menu'
+			gs 'sex_ev_after', 'wipe_menu'
 		end
 	end
 end
@@ -686,7 +686,7 @@ if $ARGS[0] = 'wipe_stomach':
 			gs 'cum_cleanup'
 			gs 'stat'
 			'You carefully wipe across your stomach, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least it won''t be staining the inside of your top.'
-			gs 'sex_ev_sex', 'wipe_menu'
+			gs 'sex_ev_after', 'wipe_menu'
 		end
 	end
 end
@@ -702,7 +702,7 @@ if $ARGS[0] = 'wipe_butt':
 			gs 'cum_cleanup'
 			gs 'stat'
 			'You grab some tissues and clean up, awkwardly wiping your ass and back with it.'
-			gs 'sex_ev_sex', 'wipe_menu'
+			gs 'sex_ev_after', 'wipe_menu'
 		end
 	end
 end
@@ -732,7 +732,7 @@ if $ARGS[0] = 'wipe_pussy':
 				*nl
 				'It takes a few tries, more cum seemingly coming out with every next wipe, but eventually you feel like you got most of it out. At least enough that nothing is going to be running down your legs any time soon.'
 			end
-			gs 'sex_ev_sex', 'wipe_menu'
+			gs 'sex_ev_after', 'wipe_menu'
 		end
 	end
 end

locations/sex_ev_cum.qsrc

@@ -580,6 +580,10 @@ if $ARGS[0] = 'fuck_cum':
 		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
 	elseif sex_ev['his_choice'] = 2:
 		act'Continue':gt 'sex_ev_cum', 'cum_his_choice'
+	else
+		*nl
+		'Tell hornguy6 that the fuck_cum failsafe activated.'
+		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
 	end
 	
 	gs'sex_ev_cum', 'girl_cum'

locations/sex_ev_pillow_talk2.qsrc

@@ -1264,6 +1264,8 @@ if $ARGS[0] = 'wakeup_sex_late_for_school':
 	if sex_ev['late_for_school'] = 0 and kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and (hour = 7 or hour = 8):
 		act'Late for school':
 			sex_ev['late_for_school'] = 1
+			sex_ev['sex_over'] = 1
+			sex_ev['cock_inserted'] = 0
 			gs'sex_ev_pillow_talk', 'talk_time_add'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/check_phone1.mp4"></video></center>'