Merge remote-tracking branch 'upstream/master'

locations/sex_ev_condoms.qsrc

@@ -462,7 +462,7 @@ if $ARGS[0] = 'npc_out_of_condoms':
 	if prezik > 0:
 		act'Use one of your condoms':
 			sex_ev['using_pc_condoms'] = 1
-			gs 'sex_ev_condoms', 'pc_condom_use'
+			gs 'sex_ev_condoms', 'pc_use_condoms'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
 			if prezik > 1:
@@ -476,7 +476,7 @@ if $ARGS[0] = 'npc_out_of_condoms':
 
 		act'Use one of your condoms (mouth)':
 			sex_ev['using_pc_condoms'] = 1
-			gs 'sex_ev_condoms', 'pc_condom_use'
+			gs 'sex_ev_condoms', 'pc_use_condoms'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
 			'"That''s okay, I''ve got some."'
@@ -880,7 +880,7 @@ if $ARGS[0] = 'npc_lets_skip_condom':
 end
 
 if $ARGS[0] = 'dont_cum_in_me':
-	if birth_control['think_safe'] = 0 and npc_creampie_okay[$boy] = 0:
+	if birth_control['think_safe'] = 0 and npc_creampie_okay[$boy] = 0 and npc_free_creampies[$boy] < 2:
 		act'Don''t come inside me':
 			cla & *nl
 			sex_ev['promise_no_creampie'] = 1
@@ -1232,7 +1232,7 @@ if $ARGS[0] = 'reenable_condoms2':
 			act'Mine':
 				cla & *nl
 				'"Mine," you smile, happy that this didn''t have to be a big deal.'
-				gs 'sex_ev_condoms', 'pc_condom_use'
+				gs 'sex_ev_condoms', 'pc_use_condoms'
 			end
 		end
 	end
@@ -1730,7 +1730,7 @@ if $ARGS[0] = 'already_creampie1':
 				end
 			end
 		end
-		if npc_creampie_okay[$boy] ! 2:
+		if npc_creampie_okay[$boy] ! 2 and npc_free_creampies[$boy] < 2:
 			act'Already been creampied today (free creampies)':
 				sex_ev['no_condom'] = 1
 				sex_ev['creampie_allowance'] = 1

locations/sex_ev_pillow_talk.qsrc

@@ -1775,7 +1775,10 @@ if $ARGS[0] = 'boy_topic_check':
 	if sex_ev['cum_count'] >= (npc_sexdrive[$boy] / 4 * 3) and sex_ev['good_for_you'] ! 1: sex_ev['boy_topics'] += 1
 !!	if sex_ev['broken_condom'] >= 1 and sex_ev['broken_condom_talk'] ! 1 and (npc_selfish ! 1 and (npc_childfree = 1 or npc_caretaker = 1)): sex_ev['boy_topics'] += 1
 !!	if sex_ev['creampie_surprise'] >= 1 and sex_ev['creampie_okay'] ! 1: sex_ev['boy_topics'] += 1
-	if sex_ev['boy_pube_talk'] ! 1: sex_ev['boy_topics'] += 1
+
+!!{	DISABLED UNTIL YOU PUSH THE PUBIC STYLE CHANGES IN BODY_DIN
+	if sex_ev['boy_pube_talk'] ! 1: sex_ev['boy_topics'] += 1}
+
 !!	if sex_ev['broken_condom'] >= 1 and sex_ev['boy_pube_talk'] ! 1: sex_ev['boy_topics'] += 1
 !!	if sex_ev['condom'] ! 1 and sex_ev['boy_condom_rule_talk'] ! 1: sex_ev['boy_topics'] += 1
 	sex_ev['boy_topic_check'] = 1