[fixed] a whole bunch of sex_ev changes didn't get added when i added them for some reason?

locations/sex_ev_after.qsrc

@@ -1660,13 +1660,13 @@ if $ARGS[0] = 'plan_b':
 			cla & *clr
 			$sex_ev['bed_room']
 			if cumloc[0] > 0:
-				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+				if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill Luda gave you.'
 				else
 					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill you keep inside.'
 				end
 			else
-				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+				if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 					'You reach down to your purse and pull out the morning after pill Luda gave you.'
 				else
 					'You reach down to your purse and pull out the morning after pill you keep inside.'
@@ -1688,7 +1688,7 @@ if $ARGS[0] = 'plan_b2':
 	act'Take it shyly':
 		cla & *nl
 		'<<$npc_firstname[$boy]>> watches you pop the pill out of it''s packaging and you can''t help but blush beneath his gaze.'
-		if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+		if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 			'"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
 		else
 			'"The instructions say to take it as soon as possible for best effect," you smile shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
@@ -1826,26 +1826,10 @@ if $ARGS[0] = 'smoke_ciga1':
 			gt'sex_ev_after', 'smoke_ciga2'
 		end
 	end
-<<<<<<< Updated upstream
-	
-	act'Bum a cigarette':
-		sex_ev['bum_cigarette'] = 1
-		mc_inventory['cigarettes'] += 1
-		siga_bum = 1
-		gt'sex_ev_after', 'smoke_ciga_bum'
-	end
-	
-	act'Bum a cigarette and play with your phone':
-		sex_ev['bum_cigarette'] = 1
-		sex_ev['cigarette'] = 3
-		mc_inventory['cigarettes'] += 1
-		siga_bum = 1
-		gt'sex_ev_after', 'smoke_ciga_bum'
-=======
 	if sex_ev['boy_in_shower'] ! 1:
 		act'Bum a cigarette':
 			sex_ev['bum_cigarette'] = 1
-			siga += 1
+			mc_inventory['cigarettes'] += 1
 			siga_bum = 1
 			gt'sex_ev_after', 'smoke_ciga_bum'
 		end
@@ -1853,11 +1837,10 @@ if $ARGS[0] = 'smoke_ciga1':
 		act'Bum a cigarette and play with your phone':
 			sex_ev['bum_cigarette'] = 1
 			sex_ev['cigarette'] = 3
-			siga += 1
+			mc_inventory['cigarettes'] += 1
 			siga_bum = 1
 			gt'sex_ev_after', 'smoke_ciga_bum'
 		end
->>>>>>> Stashed changes
 	end
 end
 

locations/sex_ev_boy_pillow_talk.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = 'boy_broken_condom':
 				'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"'
 			end
 			
-			if morning_after_pill = 0:
+			if mc_inventory['morning_after_pill'] = 0:
 				act'I''ll buy a morning after pill':
 					cla & *nl
 					'"It''s okay," you nod reassuringly. "I''ll get a morning after pill tomorrow. No big deal."'
@@ -156,13 +156,13 @@ if $ARGS[0] = 'boy_broken_condom':
 end
 
 if $ARGS[0] = 'boy_take_pill_now':
-	if sex_ev['ma_pill'] < 2 and morning_after_pill > 0:
+	if sex_ev['ma_pill'] < 2 and mc_inventory['morning_after_pill'] > 0:
 		act'Take your morning after pill (shy)':
 			cla & *nl
 			sex_ev['ma_pill'] = 2
 			'"It''s okay," you say. "In fact..."'
 			'<<$npc_firstname[$boy]>> watches you reach into your purse and pull out your morning after pill and you can''t help but blush beneath his gaze.'
-			if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+			if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 				'"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
 			else
 				'"The instructions say to take it as soon as possible for best effect," you smile shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'boy_take_pill_now':
 			'As <<$npc_firstname[$boy]>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.'
 			if $sex_ev['last_cum'] = 'swallow':
 				'"If only I thought to do this earlier," you grin. "Could''ve washed it down with your load."'
-			elseif LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+			elseif LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 				'"My aunt gave me this," you grin.'
 				'"She sounds like a good aunt," <<$npc_firstname[$boy]>> smirks back. "Or a slutty one."'
 				'"Kind of both actually," you say, causing both of you to laugh.'

locations/sex_ev_condoms.qsrc

@@ -2669,7 +2669,7 @@ if $ARGS[0] = 'virgin_condom2':
 			else
 				'"Were you expecting to lose your virginity today?"'
 			end
-			if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+			if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 				if LudaQW['condom_give_day'] = daystart:
 					'"My aunt gave it to me today," you say. "I don''t think she was expecting me to use it this soon though..."'
 				elseif LudaQW['condom_give_day'] >= daystart - 7:

locations/sex_ev_morning.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'morning_menu1':
 				cla & *clr
 				$sex_ev['bed_room']
 				
-				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+				if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 					'You reach down to your purse and pull out the morning after pill Luda gave you, popping it from the packaging and swallowing it dry.'
 				else
 					'You reach down to your purse and pull out the morning after pill you keep inside, popping it from the packaging and swallowing it dry.'
@@ -365,418 +365,6 @@ if $ARGS[0] = 'end_morning':
 end
 
 
-<<<<<<< Updated upstream
-
-!! ------------------------------------ Morning Sex Stuff -------------------------------------------------------
-
-if $ARGS[0] = 'cumshot_wakeup1':
-	'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake1.mp4"></video></center>'
-	'You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<$npc_firstname[$boy]>>''s cock and hit you square in the face.'
-	act'What the fuck!':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
-		'"What the fuck are you doing?!" you exclaim, sputtering as strands of semen dribble last your lips.'
-		'"You were so hot lying there," <<$npc_firstname[$boy]>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."'
-		'"So you thought it would be a good idea to cum on my face?!"'
-		'"Come on, don''t be like that. Here, clean me off. Get the rest out." He lowers his cock, pushing it towards your lips.'
-		gs'sex_ev_morning', 'cumshot_wakeup_clean1'
-	end
-	
-	act'Take it in stride':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
-		'You sputter briefly as some of the salty sperm slips past your lips, but can''t help but feel amusement when you see the lewd satisfaction on <<$npc_firstname[$boy]>>''s face.'
-		act'Guess that means no morning BJ':
-			cla & *nl
-			'"Guess that means it''s too late for a morning blowjob," you snicker.'
-			'"No it''s not," he grins back and pushes his cock towards your lips.'
-			gs'sex_ev_morning', 'cumshot_wakeup_clean2'
-		end
-		
-		act'At least I haven''t put on makeup':
-			cla & *nl
-			'"At least I haven''t put on my makeup yet," you giggle.'
-			'"Clean me off too," he insists, pushing his cock towards your lips.'
-			gs'sex_ev_morning', 'cumshot_wakeup_clean2'
-		end
-	end
-	
-	if npc_cumshot_wake[$boy] > 0:
-		act'Again?! (annoyed)':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
-			'"Ugh, again?!" you moan, allowing the salty sperm to slip into your mouth.'
-			'"You know you love it. Come here, clean me off," he says, pushing his cock towards your lips.'
-			gs'sex_ev_morning', 'cumshot_wakeup_clean1'
-		end
-	end
-	npc_cumshot_wake[$boy] += 1
-end
-
-if $ARGS[0] = 'cumshot_wakeup_clean1':
-	act'No way':
-		cla & *clr
-		$sex_ev['bed_room']
-		'"Ugh!" you grimace, turning your head away from the offending cock. "No way. I''m not giving you a blowjob as a reward for being a pervert."'
-		gs'sex_ev_morning', 'wakeup1'
-	end
-	
-	act'Acquiesce':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
-		gs 'arousal', 'bj', 1, 'sub'
-		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
-		'Before you can make any more protest, <<$npc_firstname[$boy]>>''s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.'
-		gs'sex_ev_morning', 'wakeup1'
-	end
-end
-
-if $ARGS[0] = 'cumshot_wakeup_clean2':
-	act'No way':
-		cla & *clr
-		$sex_ev['bed_room']
-		'"Nuh uh!" you giggle, turning your head away from his tip. "One face shot is all you get No double dipping."'
-		gs'sex_ev_morning', 'wakeup1'
-	end
-	
-	act'Acquiesce':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
-		gs 'arousal', 'bj', 1, 'sub'
-		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
-		'"Oh fiiiine," you say, mock frowning as <<$npc_firstname[$boy]>>''s cock pushes past your lips and you subserviently suck out the last drops of cum from it.'
-		gs'sex_ev_morning', 'wakeup1'
-	end
-end
-
-
-!! ------------------------------------ Misc Stuff -------------------------------------------------------
-
-if $ARGS[0] = 'forgot_bc_pill':
-	act'Forgot your birth control':
-		$temp_loc = 'sex_ev_morning'
-		sex_ev['forgot_bc'] = 1
-		cla & *clr
-		if npc_earlyriser[$boy] ! 1:
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock1.mp4"></video></center>'
-			'You bolt upright as a horrible realization jolts through your mind.'
-		else
-			'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
-			'You jolt awake as a horrible realization jumps through your mind.'
-		end
-		*nl
-		'<i>I forgot to take my birth control!</i>'
-
-		act'Panic':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-			'Panic begins to set in as you sit up, your breathing already at the edge of hyperventilation.'
-			*nl
-			if sex_ev['creampie_count'] > 3:
-				'Not only did you forget your birth control, but <<$npc_firstname[$boy]>> came inside you last night too. <i>A lot.</i> How could you fuck up like this?'
-			elseif sex_ev['creampie_count'] > 0:
-				'Not only did you forget your birth control, but <<$npc_firstname[$boy]>> came inside you last night too. How could you fuck up like this?'
-			else
-				if pharmacy_timers['birth_control'] > 0:
-					'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won''t work. So if you take it now, does that mean you''re still not safe?'
-				else
-					'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, but this breaks your streak. Are you still safe if you skip a day?'
-				end
-			end
-			if mc_inventory['morning_after_pill'] > 0:
-				*nl
-				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
-					'Wait, don''t you have that morning after pill Aunt Luda gave you?'
-				else
-					'Wait, don''t you have a morning after pill in your bag?'
-				end
-			end
-			gs'sex_ev_morning', 'forgot_bc_pill2'
-		end
-		
-		act'Calm down':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-			'You sit up and start taking big deep breaths, forcing yourself to calm down and try to approach the situation logically.'
-			act'You can take a morning after pill':
-				cla & *nl
-				if sex_ev['creampie_count'] > 0:
-					if sex_ev['creampie_count'] > 5:
-						'Okay, so <<$npc_firstname[$boy]>> came inside you last night... <i>A lot.</i> But you can still take a morning after pill. Maybe it''ll be okay.'
-					elseif sex_ev['creampie_count'] > 1:
-						'Okay, so <<$npc_firstname[$boy]>> came inside you last night... More than once... A <i>few</i> times. But you can still take a morning after pill. Maybe it''ll be okay.'
-					elseif sex_ev['creampie_count'] = 1:
-						'Okay, so <<$npc_firstname[$boy]>> came inside you last night... But only once. That''s not too bad, right? Maybe you can still take a morning after pill. Maybe it''ll be okay.'
-					end
-					if mc_inventory['morning_after_pill'] > 0:
-						*nl
-						if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
-							'Actually, you have the one Aunt Luda gave you. For emergencies she said...'
-						else
-							'Actually, you have one in your bag. You could take it right now.'
-						end
-					end
-				else
-					if pharmacy_timers['birth_control'] > 0:
-						'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, so you''re not in any real danger of getting pregnant right this second. But this breaks your streak. Aunt Luda said you need to take it every day or it won''t work. So if you take it now, does that mean you''re still not safe?'
-					else
-						'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, so you''re not in any real danger of getting pregnant right this second. But does this mean you''ll need to wait a few days to build up the birth control in your system again? If you take your next pill now, does that mean you''re still not safe?'
-					end
-				end
-				gs'sex_ev_morning', 'forgot_bc_pill2'
-			end
-			
-			if stat['dangerous_day'] ! 1:
-				act'You''re not fertile right now':
-					cla & *nl
-					if sex_ev['creampie_count'] > 0:
-						if sex_ev['creampie_count'] > 5:
-							'Okay, so <<$npc_firstname[$boy]>> came inside you last night... <i>A lot.</i> But it''s not the fertile stage of your cycle. You should be fine, right?'
-						elseif sex_ev['creampie_count'] > 1:
-							'Okay, so <<$npc_firstname[$boy]>> came inside you last night... More than once... A <i>few</i> times. But it''s not the fertile stage of your cycle. You should be fine, right?'
-						elseif sex_ev['creampie_count'] = 1:
-							'Okay, so <<$npc_firstname[$boy]>> came inside you last night... But only once. And it''s not the fertile stage of your cycle. You should be fine, right?'
-						end
-					else
-						if pharmacy_timers['birth_control'] > 0:
-							'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, so you''re not in any real danger of getting pregnant right this second. But this breaks your streak. Aunt Luda said you need to take it every day or it won''t work. So if you take it now, does that mean you''re still not safe?'
-						else
-							'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, so you''re not in any real danger of getting pregnant right this second. But does this mean you''ll need to wait a few days to build up the birth control in your system again? If you take your next pill now, does that mean you''re still not safe?'
-						end
-					end
-					gs'sex_ev_morning', 'forgot_bc_pill2'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'forgot_bc_pill2':
-	act'Continue':
-		cla & *clr
-		$sex_ev['bed_room']
-		if npc_earlyriser[$boy] = 1:
-			!! for later: create option for him to burst in with breakfast in bed
-			gs'sex_ev_morning', 'npc_morning_shower_desc'
-			gs'sex_ev_morning', 'wakeup1'
-		elseif npc_latesleeper[$boy] = 1:
-			'<<$npc_firstname[$boy]>> is still asleep next to you snoring softly, completely ignorant to the situation.'
-			gs'sex_ev_morning', 'wakeup1'
-		else
-			'<<$npc_firstname[$boy]>> stirs next to you.'
-			if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
-				'"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What''s up? Something wrong?"'
-				act'Don''t tell him':
-					cla & *nl
-					'"It''s nothing," you mumble, flashing a smile to pretend like everything is fine.'
-					gs'sex_ev_morning', 'wakeup1'
-				end
-				
-				act'Tell him':
-					cla & *nl
-					'"I forgot my birth control yesterday," you sigh. "I fucked up. I''m sorry."'
-					gs'sex_ev_talk', 'forgot_bc_talk'
-				end
-				
-				if mc_inventory['morning_after_pill'] > 0:
-					act'Take your morning after pill':
-						gs 'medical_din', 'morning_after_pill_function'
-						cla & *nl
-						'"I forgot my birth control yesterday," you sigh, opening the packaging on your plan B and popping it into your mouth. "Don''t worry, I''m taking a morning after pill right now. I''m just mad at myself for being so stupid."'
-						gs'sex_ev_morning', 'wakeup1'
-					end
-				end
-			else
-				'"Hey," he stretches, looking over at you. "You just wake up too?"'
-				act'Yeah':
-					cla & *nl
-					'"Yeah," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
-					gs'sex_ev_morning', 'wakeup1'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'guilt1':
-	cla & *clr
-	sex_ev['guilt'] = 1
-	if stat['bf_cheated_on'] <= 10:
-		if npc_earlyriser[$boy] ! 1:
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock1.mp4"></video></center>'
-			'You bolt upright as a lance of guilt pierces your chest.'
-		else
-			'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
-			'You jolt awake as a lance of guilt pierces your chest.'
-		end
-		*nl
-		'<i>My <<$sex_ev[''cheat'']>>...</i> you think.'
-		act'Wallow':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-			'Throwing your legs over the side of the bed, you sit up, hands at your sides, taking panicked breaths in your guilt.'
-			*nl
-			'<i>I just cheated on my <<$sex_ev[''cheat'']>>...</i>'
-			*nl
-			'Your thoughts wander through your night with <<$npc_firstname[$boy]>>...'
-			*nl
-			if sex_ev['bj'] > 0:'<i>Sucking his cock...</i>'
-			if sex_ev['fuck'] > 0:
-				if sex_ev['virgin'] = 1:
-					'<i>You gave him your virginity...</i>'
-				else
-					'<i>Fucking him on his bed...</i>'
-				end
-				if sex_ev['no_condom'] = 1:
-					'<i>You didn''t even use condoms...</i>'
-				end
-			end
-			if sex_ev['creampie_orgasm'] > 0:
-				'<i>You came together, orgasming as he filled you with his cum...</i>'
-			else
-				if sex_ev['orgasm_count'] > 5:
-					'<i>He made you come so many times...</i>'
-				elseif sex_ev['orgasm_count'] > 0:
-					'<i>How he made you come...</i>'
-				end
-			
-				if sex_ev['creampie_count'] > 3:
-					'<i>He filled you with his cum...</i>'
-				elseif sex_ev['creampie_count'] > 0:
-					'<i>And he came inside you...</i>'
-				end
-			end
-			
-			if $sex_ev['cum_choice'] = 'face': '<i>And he came on your face...</i>'
-			if $sex_ev['cum_choice'] = 'mouth': 
-				'<i>And he came in your mouth...</i>'
-				if sex_ev['swallow'] = 1:'<i>You even swallowed...</i>'
-			end
-			*nl
-			'You feel sick to your stomach...'
-			gs'sex_ev_morning', 'guilt_excuses'
-		end
-	else
-		if npc_earlyriser[$boy] ! 1:
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock1.mp4"></video></center>'
-			'You bolt upright as a lance of guilt pierces your chest.'
-		else
-			'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
-			'Your eyes snap open as a lance of guilt pierces your chest.'
-		end
-!!		'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
-!!		'Your eyes snap open as your thoughts settle on one thing.'
-!!		'<i>My <<$sex_ev[''cheat'']>>...</i> you think.'
-		act'Wallow':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-			'You sit up, throwing your legs over the side of the bed as the shame flows through you.'
-			'It''s nothing you haven''t felt before. This isn''t the first time you''ve cheated. It''s not the second time. It''s not even the tenth time. You''ve lost count by now. But somehow, the crippling guilt always feels the same.'
-			gs'sex_ev_morning', 'guilt_excuses'
-		end
-	end
-end
-
-if $ARGS[0] = 'guilt_excuses':
-	act'It''s not your fault':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-		'<i>It''s not my fault,</i> you try to rationalize. <i>I have needs. Sexual needs. He preyed on that. He seduced me. I''m a victim here...</i>'
-		*nl
-		'All your excuses ring hollow in your ears.'
-		gs'sex_ev_morning', 'guilt2'
-	end
-	
-	act'It''s just sex':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-		'<i>It''s just sex,</i> you try to rationalize. <i>It''s not like I''m falling in love with <<$npc_firstname[$boy]>> or anything. It''s not cheating. It''s just sex...</i>.'
-		*nl
-		'You''re not sure whether you believe yourself.'
-		gs'sex_ev_morning', 'guilt2'
-	end
-	
-	act'You''re a whore':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock3.mp4"></video></center>'
-		'You scold yourself internally, screaming insults that impale your own soul.'
-		*nl
-		if arrsize('$fuckbuddy') > 5:
-			'<i>One lover isn''t enough for you? Not even two? You need to have a whole stable to satisfy you? You filthy cock-hungry whore!</i>'
-		elseif arrsize('$fuckbuddy') > 1:
-			'<i>You slut! You can''t keep your legs closed. Just how much cock do you need? You''re nothing but a filthy whore...</i>'
-		else
-			'<i>You slut! What''s wrong with you? A committed relationship isn''t enough to satisfy you? Can''t keep your legs closed? You''re nothing but a filthy whore...</i>'
-		end
-		*nl
-		if stat['bf_cheated_on'] > 10:
-			'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
-		end
-		act'Continue':gt'sex_ev_morning', 'guilt3'
-	end
-end
-
-if $ARGS[0] = 'guilt2':
-	*nl
-	if stat['bf_cheated_on'] <= 10:
-		'The guilt doesn''t go away.'
-	else
-		'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
-	end
-	act'Continue':gt'sex_ev_morning', 'guilt3'
-end
-
-if $ARGS[0] = 'guilt3':
-	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-	if npc_earlyriser[$boy] = 1:
-		!! for later: create option for him to burst in with breakfast in bed
-		if $sex_ev['loc'] = 'player_home':
-			sex_ev['npc_morning_shower'] = 1
-			'The bed next to you is empty but you can hear water running through the wall. <<$npc_firstname[$boy]>> must be in the shower.'
-		else
-			gs'sex_ev_morning', 'npc_morning_shower_desc'
-		end
-		gs'sex_ev_morning', 'wakeup1'
-	elseif npc_latesleeper[$boy] = 1:
-		if $sex_ev['type'] = 'hookup':
-			'<<$npc_firstname[$boy]>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
-		else
-			'<<$npc_firstname[$boy]>> is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
-		end
-		gs'sex_ev_morning', 'wakeup1'
-	else
-		'<<$npc_firstname[$boy]>> stirs next to you.'
-		if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
-			'"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What''s up? Something wrong?"'
-			act'It''s nothing':
-				cla & *nl
-				'"It''s nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
-				gs'sex_ev_morning', 'wakeup1'
-			end
-			
-			!!{
-			if npc_know_cheat[$boy] = 0:
-				act'Tell him you''re cheating':
-				
-				end
-			elseif npc_know_cheat[$boy] = 1:
-				act'Thinking about your <<$sex_ev[''cheat'']>>':
-				
-				end
-			end}
-		else
-			'"Hey," he stretches, looking over at you. "You just wake up too?"'
-			act'Yeah':
-				cla & *nl
-				'"Yeah," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
-				gs'sex_ev_morning', 'wakeup1'
-			end
-		end
-	end
-end
-
-=======
->>>>>>> Stashed changes
 if $ARGS[0] = 'boy_breakfast_offer':
 	act'No thanks':
 		sex_ev['breakfast_finished'] = -1

locations/sex_ev_pillow_talk.qsrc

@@ -1986,850 +1986,6 @@ if $ARGS[0] = 'couldnt_sleep_fuck':
 	end
 end
 
-<<<<<<< Updated upstream
-!! ------------------------------ BOY INITIATED CONVERSATIONS -------------------------------------------------
-if $ARGS[0] = 'boy_talk':
-	if sex_ev['boy_topic_check'] = 0: gs 'sex_ev_pillow_talk', 'boy_topic_check'
-	
-	if sex_ev['boy_topics'] > 0 and rand(0,1) = 1:
-		if sex_ev['good_for_you'] = 0 and rand(1,sex_ev['boy_topics']) = 1:
-			cla
-			act'<<$npc_firstname[$boy]>> has something to say':gs 'sex_ev_favorite_part', 'boy_good_for_you'
-		elseif sex_ev['boy_pube_talk'] = 0 and rand(1,sex_ev['boy_topics']) = 1:
-			cla
-			act'<<$npc_firstname[$boy]>> has something to say':gs'sex_ev_pillow_talk', 'boy_pube_talk'
-!!		elseif sex_ev['broken_condom_talk'] = 0 and rand(1,2) = 1:
-		
-!!		elseif sex_ev['creampie_okay'] = 0:
-		
-!!		elseif sex_ev['boy_no_kids'] = 0:
-
-		end
-	end
-end
-
-if $ARGS[0] = 'boy_topic_check':
-	sex_ev['boy_topics'] = 0
-	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
-
-!!{	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
-end
-
-if $ARGS[0] = 'boy_topic_choose':
-	
-end
-
-
-if $ARGS[0] = 'boy_broken_condom':
-	if sex_ev['broken_condom_talk'] = 0 and sex_ev['broken_condom'] >= 1 and npc_know_bc[$boy] = 0 and sex_ev['ma_pill'] = 0 and (npc_selfish[$boy] ! 1 and (npc_childfree[$boy] = 1 or npc_caretaker[$boy] = 1)):
-		gs'sex_ev_pillow_talk', 'talk_time_add'
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-		if cum_loc['vagina'] > 0:
-			'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything...?"'
-		else
-			'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"'
-		end
-		
-		if mc_inventory['morning_after_pill'] = 0:
-			act'I''ll buy a morning after pill':
-				cla & *nl
-				'"It''s okay," you nod reassuringly. "I''ll get a morning after pill tomorrow. No big deal."'
-				'He smiles back, seeming to relax a bit.'
-				gs'sex_ev_pillow_talk', 'topic_route'
-			end
-		else
-			act'I have a pill':
-				cla & *nl
-				sex_ev['ma_pill'] = 1
-				'"It''s okay," you smile. "I have a morning after pill. No big deal."'
-				'He nods, smiling and seeming to relax a bit.'
-				gs'sex_ev_pillow_talk', 'topic_route'
-			end
-			
-			act'Take your morning after pill (shy)':
-				cla & *nl
-				sex_ev['ma_pill'] = 2
-				'"It''s okay," you say. "In fact..."'
-				'<<$npc_firstname[$boy]>> watches you reach into your purse and pull out your morning after pill and you can''t help but blush beneath his gaze.'
-				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
-					'"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
-				else
-					'"The instructions say to take it as soon as possible for best effect," you smile shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
-				end
-				gs 'medical_din', 'morning_after_pill_function'
-				gs'sex_ev_pillow_talk', 'topic_route'
-			end
-			
-			act'Take your morning after pill (sexy)':
-				cla & *nl
-				sex_ev['ma_pill'] = 2
-				'"It''s fine," you say, smiling mischievously. "In fact..."'
-				'As <<$npc_firstname[$boy]>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.'
-				if $sex_ev['last_cum'] = 'swallow':
-					'"If only I thought to do this earlier," you grin. "Could''ve washed it down with your load."'
-				elseif LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
-					'"My aunt gave me this," you grin.'
-					'"She sounds like a good aunt," <<$npc_firstname[$boy]>> smirks back. "Or a slutty one."'
-					'"Kind of both actually," you say, causing both of you to laugh.'
-				else
-					'"I''m not ready to be a mom," you smirk.'
-				end
-				gs 'medical_din', 'morning_after_pill_function'
-				gs'sex_ev_pillow_talk', 'topic_route'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'boy_pube_talk':
-	sex_ev['boy_pube_talk'] = 1
-	sex_ev['boy_topics'] -= 1
-	if ($npc_like_pubestyle[$boy] ! '' and $npc_like_pubestyle[$boy] ! $pube_style['word']) or ($npc_like_pubestyle[$boy] = 'none' and $npc_know_pubes[$boy] ! $pube_style['word']):gt'sex_ev_pillow_talk', 'boy_pubes_changed'
-	
-	$npc_know_pubes[$boy] = $pube_style['word']
-	gs'sex_ev_pillow_talk', 'talk_time_add'
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-	if $pube_style['word'] = 'shaved':
-		if $npc_like_pubestyle[$boy] = $pube_style['word']:
-			!! this determines if you''ve already had this conversation before
-			'"I love how sexy your pussy is," <<$npc_firstname[$boy]>> says, admiringly running his fingers across the smooth skin of your pubic area.'
-			gs'sex_ev_pillow_talk', 'boy_likes_pubes2'
-		else
-			'"I see you keep it clean down there," he says, looking at your smooth-shaven pussy.'
-			act'I like it this way':
-				sex_ev['like_pubes'] = 1
-				cla
-				act'It''s feels good':
-					cla & *nl
-					'"I like it this way," you say. "It feels nice to have a smooth pussy. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'It''s classy':
-					cla & *nl
-					'"I like it this way," you say. "I think it''s classier keep a clean shave. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'It''s sexy':
-					cla & *nl
-					'"I like it this way," you say. "It''s sexy to keep a smooth pussy. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-			
-			act'When I feel like it':
-				sex_ev['lazy_shave'] = 1
-				cla & *nl
-				if pubestyle = 11:
-					'"Sometimes," you shrug. "I''ll give it a shave when it starts turning into bush, but I''ll live with the stubble for a few days at a time. Why do you ask?"'
-				else
-					'"Sometimes," you shrug. "On some days I''ll just give it a trim, on other days I''ll shave it all off. Sometimes I just go full bush. Why do you ask?"'
-				end
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-			
-			if model['status'] = 1:
-				act'It''s for work':
-					cla & *nl
-					'"It''s for work," you shrug. "I''m a model, so it''s better to keep it shaved."'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-			gs'sex_ev_pillow_talk', 'pubes_problem'
-			
-			gs'sex_ev_pillow_talk', 'pubes_other_lovers'
-		end
-	elseif $pube_style['word'] = 'stubble':
-		if $npc_like_pubestyle[$boy] = 'shaved':
-			!! this determines if you''ve already had this conversation before
-			'"You forget to shave today?" <<$npc_firstname[$boy]>> says eyeing your stubbly pussy.'
-			gs'sex_ev_pillow_talk', 'boy_likes_pubes2'
-		else
-			'"Looks like someone forgot to shave today," <<$npc_firstname[$boy]>> says eyeing your stubbly pussy.'
-			act'Forgot':
-				cla
-				act'Shrug':
-					cla & *nl
-					'"Yeah," you say with a shrug. "Happens sometimes. What of it?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'Annoyance':
-					cla & *nl
-					'"Yeah," you say, drawing your eyebrows together in irritation. "I forgot. So what? Got a problem with that?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-			end
-			
-			act'Growing it out':
-				cla & *nl
-				'"No I didn''t," you reply. "I''m growing it out. But you gotta go through stubble to get to hair."'
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-			
-			act'No time':
-				cla & *nl
-				'"Wanted to but I didn''t have time this morning," you reply.'
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-			
-			act'I''m lazy':
-				sex_ev['lazy_shave'] = 1
-				cla & *nl
-				if pubestyle = 11:
-					'"I''m just lazy," you sigh. "Too much work to keep it smooth down there all the time. I''ll do it when it gets to be too annoying. Why do you ask?"'
-				else
-					'"I''m just lazy," you sigh. "Didn''t feel like doing it today. Why do you ask?"'
-				end
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-			
-			if model['status'] = 1:
-				act'It''s for work':
-					cla & *nl
-					'"It''s for work," you shrug. "I''m a model, so it''s better to keep it shaved."'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-			
-			gs'sex_ev_pillow_talk', 'pubes_other_lovers2'
-		end
-	elseif $pube_style['word'] = 'trimmed':
-		if $npc_like_pubestyle[$boy] = $pube_style['word']:
-			!! ^^ this determines if you''ve already had this conversation before
-			if $npc_know_pubeshape[$boy] = $pube_style['shape']:
-				'"I still can''t get over how sexy your bush is," <<$npc_firstname[$boy]>> says, looking admiringly at your neatly trimmed pussy hair.'
-				gs'sex_ev_pillow_talk', 'boy_likes_pubes2'
-			else
-				'"Did you do something new down there?" <<$npc_firstname[$boy]>> asks, looking at your <<$pube_style[''shape'']>>-shaped pubic hair.'
-				gs'sex_ev_pillow_talk', 'changed_pube_style'
-			end
-		else
-			'"I see you keep it trimmed down there," he says, looking at your neatly maintained pubic hair.'
-			act'I like it this way':
-				sex_ev['like_pubes'] = 1
-				cla
-				act'It''s feels good':
-					cla & *nl
-					'"I like it tidy down there," you say. "It feels better than full bush. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'It''s classy':
-					cla & *nl
-					'"I like it tidy down there," you say. "I think it''s classier to have some hair down there without going full bush. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'It''s sexy':
-					cla & *nl
-					'"I like it tidy down there," you say. "Makes me feel sexy. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-			
-			if model['status'] = 1:
-				act'It''s for work':
-					cla & *nl
-					'"It''s for work," you shrug. "I''m a model, so it''s better to keep things tidy between the legs."'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-			gs'sex_ev_pillow_talk', 'pubes_problem'
-			
-			gs'sex_ev_pillow_talk', 'pubes_other_lovers'
-		end
-	elseif $pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed':
-	!! full bush talk
-	!! find real number later
-		if $npc_like_pubestyle[$boy] = $pube_style['word']:
-			!! this determines if you''ve already had this conversation before
-			'"I still can''t get over how sexy your bush is," <<$npc_firstname[$boy]>> says, looking admiringly at your furry pussy.'
-			gs'sex_ev_pillow_talk', 'boy_likes_pubes2'
-		else
-			'"So, you don''t shave?" <<$npc_firstname[$boy]>> asks, looking at your furry pussy.'
-			act'I like it this way':
-				sex_ev['like_pubes'] = 1
-				cla
-				act'It''s feels good':
-					cla & *nl
-					'"I like it this way," you say. "There''s just something comfortable about having a full bush between my legs. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'It''s classy':
-					cla & *nl
-					'"I like it this way," you say. "I think it''s classy to go full bush instead of shaving it off. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-				
-				act'It''s sexy':
-					cla & *nl
-					'"I like it this way," you say. "I think bush is sexy. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-			
-			act'Lazy':
-				sex_ev['lazy_shave'] = 1
-				cla & *nl
-				if pubestyle = 10:
-					'"I''m just lazy," you shrug. "I''ll trim it back if it starts getting out of hand, but it''s too much hassle to maintain a landing strip or anything like that. Why do you ask?"'
-				else
-					'"I''m just lazy," you shrug. "It''s too much trouble to maintain. Easier to just let it grow. Why do you ask?"'
-				end
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-			
-			act'Hate shaving':
-				sex_ev['lazy_shave'] = 1
-				cla & *nl
-				if pubestyle = 10:
-					'"I hate shaving," you sigh. "I''ll trim it back if it starts getting out of hand, but it''s such a pain in the ass to do anything more than that. Why do you ask?"'
-				else
-					'"I hate shaving," you sigh. "It''s such a pain in the ass. Can''t stand it. Easier to just let it grow. Why do you ask?"'
-				end
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-			
-			gs'sex_ev_pillow_talk', 'pubes_young'
-			
-			gs'sex_ev_pillow_talk', 'pubes_problem'
-			
-			gs'sex_ev_pillow_talk', 'pubes_other_lovers'
-						
-			if pubestyle = 10:
-				act'Just trim':
-					cla & *nl
-					'"I just trim," you sigh. "Don''t really like going ''full jungle'' down there, but don''t really like shaving either. Why do you ask?"'
-					gs'sex_ev_pillow_talk', 'boy_pubes_response'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'boy_pubes_response':
-	if pcs_pubes >= 4 and npc_bush_pref[$boy] = 1:
-		'"You''d look super hot if you shaved it clean," he says.'
-		gs'sex_ev_pillow_talk', 'boy_asks_cleanshave'
-	elseif ($pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed'):
-		if npc_bush_pref[$boy] = 2:
-			'"Ever considered trimming it down?"'
-			gs'sex_ev_pillow_talk', 'boy_asks_trim'
-		elseif npc_bush_pref[$boy] = 3:
-			'"I think it''s sexy too," he grins. "Too many girls feel peer pressured into shaving it off, but I love a nice full bush."'
-			gs'sex_ev_pillow_talk', 'boy_likes_pubes'
-		end
-	elseif $pube_style['word'] = 'trimmed':
-		if npc_bush_pref[$boy] = 2:
-			'"I think it''s hot," <<$npc_firstname[$boy]>> grins. "I love it when a girl knows how to take care of her bush."'
-			gs'sex_ev_pillow_talk', 'boy_likes_trimmed'
-		elseif npc_bush_pref[$boy] = 3:
-			'"Ever considered letting it grow out more?"'
-			gs'sex_ev_pillow_talk', 'boy_asks_bush'
-		end
-	elseif pcs_pubes < 4:
-		if npc_bush_pref[$boy] = 1:
-			'"I think it''s hot," he grins. "No one likes to find a gorilla between a girl''s legs. Clean-shaven is the best."'
-			gs'sex_ev_pillow_talk', 'boy_likes_pubes2'
-		elseif npc_bush_pref[$boy] = 2:
-			'"Ever considered letting it grow out a little?"'
-			gs'sex_ev_pillow_talk', 'boy_asks_trim'
-		elseif npc_bush_pref[$boy] = 3:
-			'"Ever considered letting it grow out?"'
-			gs'sex_ev_pillow_talk', 'boy_asks_bush'
-		end
-	else
-		'Bug report: boy_pubes_response dead-end'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	if npc_bush_pref[$boy] = 0:
-		$npc_like_pubestyle[$boy] = 'none'
-		'"Some girls shave, some don''t. Some guys want it one way, other guys another. Me? I don''t care if it''s more like an apple, a kiwi, or a coconut," he laughs aloud. "I just like pussy."'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-end
-
-if $ARGS[0] = 'dont_shave_like_talk':
-	
-end
-
-if $ARGS[0] = 'boy_asks_cleanshave':
-	act'No way':
-		cla & *nl
-		if sex_ev['like_pubes'] = 1:
-			'"No way," you say, giving him a look. "I already told you, I like it this way. I''m not shaving it just for you."'
-		elseif sex_ev['lazy_shave'] = 1:
-			'"No way," you say, giving him a look. "If I''m already too lazy to do it for me, what makes you think I''m going to do it for you?"'
-		end
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'You think I should?':
-		cla & *nl
-		'"You think I should?" you ask him, looking down and inspecting your pussy.'
-		'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy without any hair down there. Just your bare beautiful pussy lips on display."'		
-		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
-	end
-	
-	act'You''d like that?':
-		cla & *nl
-		'"You''d like it like that?" you ask, looking down and inspecting your pussy.'
-		'"Yeah," <<$npc_firstname[$boy]>> says. "I''d really love it if you went full clean shave. It''d be so hot."'		
-		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
-	end
-	
-	gs'sex_ev_pillow_talk', 'annoyed_shave'
-	
-	if pubestyle = 10:
-		act'I''ll get to it later':
-			cla & *nl
-			'"Yeah, yeah," you wave your hand absently. "I''ll get to it eventually."'
-		end
-	end
-end
-
-if $ARGS[0] = 'boy_asks_trim':
-	act'No':
-		cla & *nl
-		if sex_ev['like_pubes'] = 1:
-			'"Not really," you shrug. "I already told you, I like it this way. Why would I consider doing anything different?"'
-		elseif sex_ev['lazy_shave'] = 1:
-			'"No way," you say, giving him a look. "If I''m already lazy about it, what makes you think I''m going to do it for you?"'
-		end
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'You think I should?':
-		cla & *nl
-		if pcs_pubes < 4:
-			'"You think I should?" you ask him, looking down and inspecting your smooth pussy.'
-			'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy if you had a bit of hair down there. Not a full bush or anything like that, but just a landing strip or something."'
-		elseif $pube_style['word'] = 'stubble':
-			'"You think I should?" you ask him, looking down and inspecting your stubbly pussy.'
-			'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy if you had a bit of hair down there. Not a full bush or anything like that, but just a landing strip or something."'
-		else
-			'"You think I should?" you ask him, looking down and inspecting your bush.'
-			'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy if you trimmed it back a little."'
-		end
-		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
-	end
-	
-	act'You''d like that?':
-		cla & *nl
-		'"You''d like it like that?" you ask, looking down and inspecting your bush.'
-		'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy if you trimmed it back a little. It''d be so hot."'		
-		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
-	end
-	
-	gs'sex_ev_pillow_talk', 'annoyed_shave'
-end
-
-if $ARGS[0] = 'boy_asks_bush':
-	act'No':
-		cla & *nl
-		if sex_ev['like_pubes'] = 1:
-			'"Not really," you shrug. "I already told you, I like it this way. Why would I consider doing anything different?"'
-		else
-			'"Not really," you say, giving him a look. "What makes you think I''d grow a bush just for you?"'
-		end
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'You think I should?':
-		cla & *nl
-		if pcs_pubes < 4:
-			'"You think I should?" you ask him, looking down and inspecting your smooth pussy.'
-		elseif $pube_style['word'] = 'stubble':
-			'"You think I should?" you ask him, looking down and inspecting your stubbly pussy.'
-		else
-			'"You think I should?" you ask him, looking down and inspecting your pubic hair.'
-		end
-		'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy with a full bush."'
-		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
-	end
-	
-	act'You''d like that?':
-		cla & *nl
-		if pcs_pubes < 4:
-			'"You''d like it like that?"" you ask him, looking down and inspecting your smooth pussy.'
-		elseif $pube_style['word'] = 'stubble':
-			'"You''d like it like that?" you ask him, looking down and inspecting your stubbly pussy.'
-		else
-			'"You''d like it like that?" you ask him, looking down and inspecting your pubic hair.'
-		end
-		'"Yeah," <<$npc_firstname[$boy]>> says. "I''d love it if you went full bush."'
-		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
-	end
-	
-	gs'sex_ev_pillow_talk', 'annoyed_shave'
-end
-
-if $ARGS[0] = 'change_pubes_for_boy':
-	act'I''ll think about it':
-		npc_shave_think[$boy] = daystart
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/after/pillow_talk3.mp4"></video></center>'
-		'"I''ll think about it," you say. "But no promises."'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'Sure':
-		npc_shave_promise[$boy] = daystart
-		cla & *nl
-		'"Sure," you smile at <<$npc_firstname[$boy]>>. "I could give it a try..."'
-		'<<$npc_firstname[$boy]>> grins back eagerly at you.'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'I guess I could':
-		npc_shave_promise[$boy] = daystart
-		cla & *nl
-		'"Well..." you say. "I guess I could give it a try..."'
-		'<<$npc_firstname[$boy]>> grins back eagerly at you.'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'For you (hesitant)':
-		npc_shave_promise[$boy] = daystart
-		cla & *nl
-		'"Well..." you say. "I guess I could try it? For you."'
-		'You punctuate your promise with an affectionate smile, returned with an eager grin from <<$npc_firstname[$boy]>>.'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'For you (affectionate)':
-		npc_shave_promise[$boy] = daystart
-		cla & *nl
-		'"If it will make you happy, then of course I''ll do it."'
-		'You smile affectionately at <<$npc_firstname[$boy]>>, who returns it with an eager grin.'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-end
-
-if $ARGS[0] = 'annoyed_shave':
-	act'Get annoyed':
-		cla & *nl
-		if sex_ev['fuck_count'] > 0:
-			if sex_ev['like_pubes'] = 1:
-				'"No?" you say, glaring at him. "I just told you I like it this way and you didn''t seem to have a problem fucking it a few minutes ago."'
-			elseif sex_ev['lazy_shave'] = 1:
-				'"No?" you say, glaring at him. "You didn''t seem to have a problem fucking it a few minutes ago, so why should I?"'
-			end
-		else
-			if sex_ev['like_pubes'] = 1:
-				'"No?" you say, glaring at him. "I just told you I like it this way and it didn''t seem to be a problem with making you hard a few minutes ago."'
-			elseif sex_ev['lazy_shave'] = 1:
-				'"No?" you say, glaring at him. "It didn''t seem to be a problem with making you hard a few minutes ago, so why should I?"'
-			end
-		end
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-end
-
-if $ARGS[0] = 'boy_likes_pubes':
-	if $pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed':
-		$npc_like_pubestyle[$boy] = pubestyle
-		act'Good to know':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk3.mp4"></video></center>'
-			'"Well good to know," you laugh. "I''ll keep it in mind next time I look at a razor."'
-			gs'sex_ev_pillow_talk', 'topic_route'
-		end
-		
-		act'Glad you think so':
-			cla & *nl
-			'"I''m glad you think so. It''s always nice to know someone thinks you''re sexy," you say, giving him a soft smile.'
-			gs'sex_ev_pillow_talk', 'topic_route'
-		end
-		
-		act'Glad I have your permission (sarcastic)':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk_eyeroll.mp4"></video></center>'
-			'"Well I''m glad I have your permission to shave the way I like it," you huff, acerbically rolling your eyes.'
-			if npc_argumentative[$boy] = 1:
-				npc_rel[$boy] -= 2
-				'"What the fuck is your problem?" <<$npc_firstname[$boy]>> growls. "I was trying to pay you a compliment!"'
-				act'Apologize':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					'You immediately feel bad and look back at him with a guilty expression on your face.'
-					'"I''m sorry," you say. "I... I don''t know why I snapped at you like that. You''re right. I should be happy you think I''m sexy."'
-					'You give him an apologetic smile and though <<$npc_firstname[$boy]>> still seems a little annoyed with you, he mostly calms down as well.'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-				
-				act'I didn''t ask!':
-					sex_ev['angry_after'] = 1
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					'"Well I didn''t ask for your opinion!" you snap back. "It''s my body and my bush, I can do whatever I want without hearing how you feel about it!"'
-					*nl
-					'<i>Ugh! Men!</i> you grumble internally.'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-			else
-				'"I didn''t mean it like that," <<$npc_firstname[$boy]>> says, looking bemused. "I just wanted to let you know I think you''re hot."'
-				act'Apologize':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					'You immediately feel guilty and look back at him.'
-					'"I''m sorry," you say. "I... I don''t know why I snapped at you like that. That was... uncalled for..."'
-					'You give him an embarrassed smile and <<$npc_firstname[$boy]>> smiles back, letting you know he accepts your apology.'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-				
-				act'I didn''t ask for a man''s opinion!':
-					sex_ev['angry_after'] = 1
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					'"Well I didn''t ask for your opinion!" you snap back. "It''s my body and my bush, I can do whatever I want without hearing how a man feels about it!"'
-					*nl
-					'<i>Ugh! Men!</i> you grumble internally.'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-			end
-		end
-	else
-		
-	end
-end
-
-if $ARGS[0] = 'boy_likes_pubes2':
-	act'Thanks':
-		cla & *nl
-		'"Thanks," you smile back. "It''s always nice to be complimented."'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'I like it too':
-		cla & *nl
-		'"Me too," you smile back before taking an admiring look yourself. "I love the look of my pussy."'
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'Don''t do it for you':
-		cla & *nl
-		'"It''s not like I do it for you," you say, brushing his compliment aside and rolling your eyes.'
-		if npc_argumentative[$boy] = 1:
-			'"Way to be a bitch about it," he mumbles under his breath.'
-		else
-			'"Doesn''t mean I can''t appreciate it for myself," he grins back.'
-		end
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-	
-	act'Compliment his cock':
-		npc_rel[$boy] += 2
-		cla & *nl		
-		if $npc_dick_desc[$boy] = 'tiny':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his flaccid manhood. "For a guy with a tiny dick, you sure know how to use it."'
-		elseif $npc_dick_desc[$boy] = 'short':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his flaccid manhood. "It''s pretty small, but you sure know how to use it."'
-		elseif $npc_dick_desc[$boy] = 'chode':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his flaccid manhood. "You may be small, but so you''re <i>so</i> thick. I love feeling you stretch me out."'
-		elseif $npc_dick_desc[$boy] = 'skinny':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his flaccid manhood. "For a guy with such a skinny dick, you sure know how to use it."'
-		elseif $npc_dick_desc[$boy] = 'normal':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his flaccid manhood. "You fill me up just right."'
-		elseif $npc_dick_desc[$boy] = 'thick':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his manhood. Even flaccid, its girth is impressive. "You''re <i>so</i> big!"'
-		elseif $npc_dick_desc[$boy] = 'long':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his manhood, stretching its length down his thighs even when flaccid. "It''s <i>so</i> long. All the other guys I sleep with can''t get nearly as deep as you can."'
-		elseif $npc_dick_desc[$boy] = 'huge':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his manhood, impressive in its size even flaccid. "It''s <i>huge</i>! And I love how deep I can feel you inside me."'
-		elseif $npc_dick_desc[$boy] = 'enormous':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his manhood, impressive in its size even flaccid. "You''re packing some serious firepower. I can barely even fit you inside me!"'
-		elseif $npc_dick_desc[$boy] = 'lengthy':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his manhood, stretching its <<npc_dick[$boy]>>cm length down his thighs even when flaccid. "I can practically feel you in my stomach when you''ve got the whole thing inside me."'
-		elseif $npc_dick_desc[$boy] = 'gigantic':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his manhood, stretching its <<npc_dick[$boy]>>cm length down his thighs even when flaccid. "I can practically feel you in my stomach when you''ve got the whole thing inside me."'
-		elseif $npc_dick_desc[$boy] = 'monster':
-			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his monstrously large manhood, stretching its <<npc_dick[$boy]>>cm length down his thighs with a girth nearly as thick as your wrist even flaccid. "It''s like you''ve got an arm for a dick. I didn''t even know cocks could get that big!"'
-		end
-		gs'sex_ev_pillow_talk', 'topic_route'
-	end
-end
-
-if $ARGS[0] = 'pubes_young':
-	act'Makes me feel too young':
-		cla & *nl
-		if $pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed':
-			'"I tried it once but I didn''t like it," you grimace. "Made me feel like a little girl. It was weird. I prefer to have a full bush compared to that. Why do you ask?"'
-		else
-			'"I tried it once but I didn''t like it," you grimace. "Made me feel like a little girl. It was weird. So now I always make sure I have some hair down there. Why do you ask?"'
-		end
-		gs'sex_ev_pillow_talk', 'boy_pubes_response'
-	end
-end
-
-
-if $ARGS[0] = 'pubes_problem':
-	act'Got a problem with that?':
-		cla & *nl
-		if $pube_style['word'] = 'shaved':
-			'"Got a problem with my pussy?" you ask, giving <<$npc_firstname[$boy]>> a hard side-eye.'
-!!			gs'sex_ev_pillow_talk', 'pubes_problem2'
-		elseif $pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed':
-			'"Got a problem with my bush?" you ask, giving <<$npc_firstname[$boy]>> a hard side-eye.'
-!!{			if npc_bush_pref[$boy] = 1:
-				'"You''d look super sexy if you shaved it all off," he says.'
-				gs'sex_ev_pillow_talk', 'boy_asks_cleanshave'
-			elseif npc_bush_pref[$boy] = 2:
-				'"Ever considered trimming it down?" he asks.'
-				gs'sex_ev_pillow_talk', 'boy_asks_trim'
-			elseif npc_bush_pref[$boy] = 3:
-				'"I think it''s sexy too," he grins. "Too many girls feel peer pressured into shaving it off, but I love a nice full bush."'
-				gs'sex_ev_pillow_talk', 'boy_likes_pubes'
-			end}
-		else
-			'"Got a problem with my pubes?" you ask, giving <<$npc_firstname[$boy]>> a hard side-eye.'
-		end
-		gs'sex_ev_pillow_talk', 'boy_pubes_response'
-	end
-end
-
-if $ARGS[0] = 'pubes_problem_bush':
-	
-end
-
-
-if $ARGS[0] = 'pubes_other_lovers':
-	if $npc_like_pubestyle ! '':
-		act'My ex liked it':
-			cla & *nl
-			'"My ex preferred it this way," you shrug. "Why do you ask?"'
-			gs'sex_ev_pillow_talk', 'boy_pubes_response'
-		end
-		
-		if pcs_lover > 0 and pcs_lover - pcs_girlfriends > 0:
-			act'My boyfriend likes it':
-				cla & *nl
-				'"My boyfriend likes it this way," you shrug. "Why do you ask?"'
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-		end
-		
-		if pcs_girlfriends > 0:
-			act'My girlfriend likes it':
-				cla & *nl
-				'"My girlfriend likes it this way," you shrug. "Why do you ask?"'
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-		end
-		
-		act'My last fuckbuddy liked it':
-			cla & *nl
-			'"A fuckbuddy I used to have liked it this way," you shrug. "Why do you ask?"'
-			gs'sex_ev_pillow_talk', 'boy_pubes_response'
-		end
-		
-		
-		if arrsize('$fuckbuddy') > 1:
-			act'My other fuckbuddy likes it':
-				cla & *nl
-				'"My other fuckbuddy likes it this way," you shrug. "Why do you ask?"'
-				gs'sex_ev_pillow_talk', 'boy_pubes_response'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'pubes_other_lovers2':
-
-end
-
-if $ARGS[0] = 'boy_condom_rule':
-	if sex_ev['condom'] ! 1:
-	
-	end
-end
-
-if $ARGS[0] = 'boy_no_kids':
-	if sex_ev['no_kids'] = 1 and npc_know_no_kids = 1:
-		'"So you don''t want kids?" <<$npc_firstname[$boy]>> asks, looking over at you.'
-		act'Not right now':
-			cla & *nl
-			'"Not right now," you shake your head. "Maybe one day, but I''m not ready to be a mother. What about you?"'
-			if npc_childfree[$boy] = 1:
-				pc_know_childfree[$boy] = 1
-				'"I never want kids," he replies.'
-				act'Really?':
-					cla & *nl
-					'"Really?" you ask, sitting up to look at him with astonishment. "Never? Never ever?"'
-					'"Never ever ever," he says, grimacing. "I already hate other people''s kids. Why would I want to have any of my own?"'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-				
-				act'I get that':
-					cla & *nl
-					'"I get that," you nod back. "Parenthood isn''t for everyone."'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-			else
-				'"It wouldn''t be so bad, being a father," he replies. "Not sure about the when, but I think I''d really like to have a kid or two one day."'
-				act'Maybe one day':
-					cla & *nl
-					'"Maybe one day," you say again, shrugging.'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-				
-				act'I get that':
-					cla & *nl
-					'"I get that," you nod back. "Might be nice to have someone to live for."'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-			end
-		end
-		
-		act'Never':
-			cla & *nl
-			'"Not now, not ever," you grimace. "Motherhood sounds... ugh."'
-			if npc_childfree[$boy] = 1:
-				'"I feel the same way," he says, nodding. "I never want to be a parent. That sounds awful."'
-				gs'sex_ev_pillow_talk', 'topic_route'
-			else
-				'"Don''t you think you''d get lonely?" <<$npc_firstname[$boy]>> asks. "Y''know, knowing that you wouldn''t have anything to live for except yourself when you get old?"'
-				act'I guess...':
-					cla & *nl
-					'"I guess, maybe," you mumble. "I don''t know. Why does everything have to be about procreation? Why can''t I just live my life?"'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-				
-				act'I''ll have a spouse':
-					cla & *nl
-					'"I''ll get married," you shrug. "Why would I be lonely then?"'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-				
-				act'Play it off':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					'"That''s what I have guys like you for," you smirk. "To fuck me when I get lonely."'
-					*nl
-					'<<$npc_firstname[$boy]>> can tell you just sidestepped the question, but doesn''t press the topic any further.'
-					gs'sex_ev_pillow_talk', 'topic_route'
-				end
-			end
-		end
-	end
-end
-
-=======
->>>>>>> Stashed changes
 
 if $ARGS[0] = 'angry_end':
 	cla & *nl

locations/sex_ev_reactions.qsrc

@@ -587,84 +587,6 @@ if $ARGS[0] = 'facial_smile_img':
 	else
 		$sex_ev['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
 	end
-<<<<<<< Updated upstream
-!!{	if mc_inventory['morning_after_pill'] = 0:
-		act'I guess I need a pill':
-			cla
-			act'Annoyed':
-				sex_ev['ma_pill_tomorrow'] = 1
-				cla & *nl
-				'"I guess I''m going to need a pill tomorrow," you say, frowning.'
-				gs'sex_ev_cum', 'what_now'
-			end
-			
-			act'Unconcerned':
-				sex_ev['ma_pill_tomorrow'] = 1
-				cla & *nl
-				'"I guess I''m going to need a pill tomorrow," you shrug, unconcerned.'
-				gs'sex_ev_cum', 'what_now'
-			end
-			
-			act'Humorous':
-				sex_ev['ma_pill_tomorrow'] = 1
-				cla & *nl
-				'"I guess I''m going to need a pill tomorrow," you say, giving <<$npc_firstname[$boy]>> a wry smirk to let him know you''re not mad.'
-				gs'sex_ev_cum', 'what_now'
-			end
-		end
-	else}
-		gs'sex_ev_reactions', 'have_plan_b'
-!!	end
-end
-
-if $ARGS[0] = 'have_plan_b':
-	if birth_control['think_safe'] = 0 and npc_know_bc[$boy] ! 1:
-		if mc_inventory['morning_after_pill'] > 0:
-			act'I have some plan B':
-				cla
-				act'Calm':
-					sex_ev['ma_pill'] = 1
-					cla & *nl
-					'"I have a morning after pill," you say calmly. "I''ll be okay."'
-					gs'sex_ev_cum', 'what_now'
-				end
-				
-				act'Amused':
-					sex_ev['ma_pill'] = 1
-					cla & *nl
-					if npc_selfish[$boy] = 1 or npc_abusive[$boy] > 0:
-						'"It''s okay," you giggle, finding a strange amusement in how unapologetic <<$npc_firstname[$boy]>> is about it. "I have a morning after pill."'
-					else
-						'"It''s okay," you giggle, unable to keep from laughing at <<$npc_firstname[$boy]>>''s worry. "I have some plan B on me."'
-					end
-					gs'sex_ev_cum', 'what_now'
-				end
-				
-				act'Sexy':
-					sex_ev['ma_pill'] = 1
-					cla & *nl
-					'"It''s okay," you say with a sexy smile. "I have a morning after pill."'
-					gs'sex_ev_cum', 'what_now'
-				end
-			end
-		else
-			act'I''ll buy some plan B':
-				cla
-				act'Calm':
-					sex_ev['plan_b_buy'] = 1
-					cla & *nl
-					'"I''ll get a morning after pill later," you shrug. "No big deal."'
-					gs'sex_ev_cum', 'what_now'
-				end
-				
-				act'Amused':
-					sex_ev['plan_b_buy'] = 1
-					cla & *nl
-					if npc_selfish[$boy] = 1 or npc_abusive[$boy] > 0:
-						'"I''ll get a morning after pill later," you giggle, finding a strange amusement in how unapologetic <<$npc_firstname[$boy]>> is about it.'
-					else
-						'"I''ll get a morning after pill later," you giggle, unable to keep from laughing at <<$npc_firstname[$boy]>>''s worry.'
-=======
 end
 
 if $ARGS[0] = 'facial_reactions':
@@ -716,7 +638,6 @@ if $ARGS[0] = 'facial_happy_reacts':
 							'"Well," you say, letting the smile creep back onto your face. "I guess you''re not wrong about what kind of girl I am..."'
 							gs 'sex_ev_sex', 'sex_end'
 						end
->>>>>>> Stashed changes
 					end
 				end
 				
@@ -734,17 +655,6 @@ if $ARGS[0] = 'facial_happy_reacts':
 			end
 		end
 		
-<<<<<<< Updated upstream
-	elseif stat['probably_safe_day'] = 1 and sex_ev['probably_safe_day'] = 0:
-	
-	end
-end
-
-if $ARGS[0] = 'have_plan_b2':
-	if sex_ev['ma_pill'] = 0 and sex_ev['plan_b_buy'] = 0 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and birth_control['think_safe'] = 0 and npc_know_bc[$boy] ! 1:
-		if mc_inventory['morning_after_pill'] > 0:
-			act'I have some plan B':
-=======
 		act'It''s so warm':
 			cla & *clr
 			$sex_ev['facial_pic']
@@ -755,7 +665,6 @@ if $ARGS[0] = 'have_plan_b2':
  
 		if $sex_ev['last_cum'] ! 'face_mouth' and npc_know_love_facials[$boy] ! 1:
 			act'Do guys really like this?':
->>>>>>> Stashed changes
 				cla
 				
 				act'Annoyed':

locations/sex_ev_reactions_creampie.qsrc

@@ -2352,7 +2352,7 @@ if $ARGS[0] = 'oh_shit_options':
 			'"Well this isn''t good," you gulp, looking horrified at <<$npc_firstname[$boy]>>. "I''m not on birth control..."'
 			gs'sex_ev_cum', 'what_now'
 		end
-	!!{	if morning_after_pill = 0:
+	!!{	if mc_inventory['morning_after_pill'] = 0:
 			act'I guess I need a pill':
 				cla
 				act'Annoyed':
@@ -2384,7 +2384,7 @@ end
 
 if $ARGS[0] = 'have_plan_b':
 	if birth_control['think_safe'] = 0 and npc_know_bc[$boy] ! 1 and sex_ev['plan_b_buy'] ! 1 and sex_ev['ma_pill'] ! 1:
-		if morning_after_pill > 0:
+		if mc_inventory['morning_after_pill'] > 0:
 			act'I have some plan B':
 				cla
 				act'Calm':
@@ -2473,7 +2473,7 @@ end
 
 if $ARGS[0] = 'have_plan_b2':
 	if sex_ev['ma_pill'] = 0 and sex_ev['plan_b_buy'] = 0 and sex_ev['safe_day'] = 0 and sex_ev['probably_safe_day'] = 0 and birth_control['think_safe'] = 0 and npc_know_bc[$boy] ! 1:
-		if morning_after_pill > 0:
+		if mc_inventory['morning_after_pill'] > 0:
 			act'I have some plan B':
 				cla
 				act'Calm':

locations/sex_ev_wakeup.qsrc

@@ -717,9 +717,9 @@ if $ARGS[0] = 'forgot_bc_pill':
 						'<<$npc_firstname[$boy]>> didn''t come inside you yesterday, but this breaks your streak. Are you still safe if you skip a day?'
 					end
 				end
-				if morning_after_pill > 0:
+				if mc_inventory['morning_after_pill'] > 0:
 					*nl
-					if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+					if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 						'Wait, don''t you have that morning after pill Aunt Luda gave you?'
 					else
 						'Wait, don''t you have a morning after pill in your bag?'
@@ -742,9 +742,9 @@ if $ARGS[0] = 'forgot_bc_pill':
 						elseif sex_ev['creampie_count'] = 1:
 							'Okay, so <<$npc_firstname[$boy]>> came inside you last night... But only once. That''s not too bad, right? Maybe you can still take a morning after pill. Maybe it''ll be okay.'
 						end
-						if morning_after_pill > 0:
+						if mc_inventory['morning_after_pill'] > 0:
 							*nl
-							if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+							if LudaQW['free_condoms'] = 1 and stat['mc_inventory['morning_after_pill']'] = 0:
 								'Actually, you have the one Aunt Luda gave you. For emergencies she said...'
 							else
 								'Actually, you have one in your bag. You could take it right now.'
@@ -813,7 +813,7 @@ if $ARGS[0] = 'forgot_bc_pill2':
 					gs'sex_ev_talk', 'forgot_bc_talk'
 				end
 				
-				if morning_after_pill > 0:
+				if mc_inventory['morning_after_pill'] > 0:
 					act'Take your morning after pill':
 						gs 'medical_din', 'morning_after_pill_function'
 						cla & *nl