Merge remote-tracking branch 'Hornguy6/master'

locations/sex_ev_after.qsrc

@@ -1816,7 +1816,7 @@ if $ARGS[0] = 'kiss':
 				end
 			end
 			if sex_ev['virgin'] > 0 and sex_ev['fuck_count'] > 0:
-				act'For making taking your virginity':
+				act'For taking your virginity':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 					'"For popping my cherry," you smile wryly. "You''ve made a woman out of me."'

locations/sex_ev_condoms.qsrc

@@ -2961,7 +2961,7 @@ if $ARGS[0] = 'virgin_condom2':
 					'"My aunt gave it to me earlier this week," you say. "For emergencies..."'
 				elseif LudaQW['condom_give_day'] >= daystart - 30:
 					'"My aunt gave it to me a few weeks ago," you say. "Just in case..."'
-				elseif LudaQW['condom_give_day'] >= daystart - 7:
+				else
 					'"My aunt gave it to me a long time ago," you say. "Just in case..."'
 				end
 				gs 'sex_ev_condoms', 'virgin_condom3'

locations/sex_ev_foreplay.qsrc

@@ -164,6 +164,7 @@ if $ARGS[0] = 'selfish_fuck_start':
 				gs 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>>_goto'
 			end
 			gs 'sex_ev_condoms', 'condom_wait'
+			gs 'sex_ev_condoms', 'dont_cum_in_me'
 		elseif stat['think_virgin'] = 0 or sex_ev['fuck_count'] > 0:
 			if $npc_fav_pos[$boy] = 'doggy' or sex_ev['position_rand'] = 2:
 				$sex_ev['position'] = 'doggy'
@@ -176,6 +177,7 @@ if $ARGS[0] = 'selfish_fuck_start':
 			end
 			gs 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>>_goto'
 			gs 'sex_ev_condoms', 'condom_wait'
+			gs 'sex_ev_condoms', 'dont_cum_in_me'
 		else
 			gs 'sex_ev_sex', 'rand_position'
 			gs 'sex_ev_foreplay', 'selfish_fuck_start'

locations/sex_ev_shower.qsrc

@@ -1083,6 +1083,7 @@ if $ARGS[0] = 'shower_together_ending_kiss':
 end
 
 if $ARGS[0] = 'shower_together_towel':
+	sex_ev['boy_in_shower'] = 0
 	sex_ev['shower'] = 1
 	noshampoo = 1
 	dynamic $showerdin

locations/sex_ev_talk.qsrc

@@ -701,7 +701,7 @@ if $ARGS[0] = 'creampie_permission_code':
 end
 
 if $ARGS[0] = 'creampie_permission1':
-	if npc_free_creampies[$boy] < 1 and npc_creampie_permission[$boy] < 1 and sex_ev['creampie_allowance'] = 0 and sex_ev['no_condom'] = 1 and sex_ev['pullout_thank'] + sex_ev['promise_no_creampie'] = 0:
+	if npc_free_creampies[$boy] < 1 and npc_creampie_permission[$boy] < 1 and sex_ev['creampie_allowance'] = 0 and sex_ev['no_condom'] = 1 and sex_ev['pullout_thank'] + sex_ev['promise_no_creampie'] = 0 and sex_ev['not_inside'] ! 1:
 		act'"You don''t have to pull out" (free creampies)':
 			cla & *clr
 			if sex_ev['sex_over'] = 0: