Merge remote-tracking branch 'julzor/master'

locations/brother_voyeur.qsrc

@@ -1963,7 +1963,7 @@ if $ARGS[0] = 'brother_shower_fuck_first2':
 
 			if succubusflag = 0:
 				if pillcon >= 30000 or tabletkishot >= 1:
-					'<i>Well,</i> you think to yourself, <i>It''s a good thing I''m on birth control.</i>'
+					'<i>Well,</i> you think to yourself, <i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant.', 'I''m on birth control.')+'</i>'
 				elseif mesec > 0:
 					'<i>Well,</i> you think to yourself, <i>I don''t think I can get pregnant when I''m on my period... right...?</i>'
 				elseif knowpreg = 1:
@@ -2111,7 +2111,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				orgasm += 1
 				'You smile mischievously and suddenly speed up, causing your brother to erupt inside you. He groans as his cum spills into you, sending you over the edge as well with legs quivering and pussy milking his cock for everything he has to give. Finally, Kolka pulls away and as his cock slips from inside you, cum bursts out like your pussy was a champagne bottle uncorked.'
 				if pillcon >= 30000 or tabletkishot >= 1:
-					'"Happy?" you ask him. He nods back at you with a self-satisfied grin. "Be grateful I''m on birth control. Might not let you do that otherwise."'
+					'"Happy?" you ask him. He nods back at you with a self-satisfied grin. "Be grateful '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant.', 'I''m on birth control.')+' Might not let you do that otherwise."'
 				elseif mesec > 0:
 					'"Happy?" you ask him. He nods back at you with a self-satisfied grin. "Just feel lucky that I''m on my period. I might not have let you do that otherwise."'
 				else
@@ -2125,7 +2125,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
 						'<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-						'<i>It''s a good thing I''m on birth control...</i>'
+						'<i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 					elseif mesec > 0:
 						'<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
 						'<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
@@ -2151,7 +2151,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 				elseif pillcon >= 30000 or tabletkishot >= 1:
 					'<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-					'<i>It''s a good thing I''m on birth control...</i>'
+					'<i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 				elseif mesec > 0:
 					'<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
 					'<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
@@ -2193,7 +2193,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
 						'<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
-						'<i>At least I''m on birth control...</i>'
+						'<i>At least '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 					elseif mesec > 0:
 						'<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
 						'<i>At least I don''t have to worry about getting pregnant on my period... right...?</i>'
@@ -2214,7 +2214,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
 						'<i>Fuck, that felt good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-						'<i>It''s a good thing I''m on birth control...</i>'
+						'<i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 					elseif mesec > 0:
 						'<i>Fuck, that felt good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
 						'<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
@@ -2232,7 +2232,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
 						'<i>Fuck, that feels good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-						'<i>It''s a good thing I''m on birth control...</i>'
+						'<i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 					elseif mesec > 0:
 						'<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
 						'<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
@@ -2276,7 +2276,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
 						'<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
-						'<i>At least I''m on birth control...</i>'
+						'<i>At least '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 					elseif mesec > 0:
 						'<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
 						'<i>At least I don''t have to worry about getting pregnant on my period... right...?</i>'
@@ -2294,7 +2294,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'"Okay, it''s a promise!" you say, standing back up and kissing him on the cheek. "So long as I can stop myself that is."'
 				if pillcon >= 30000 or tabletkishot >= 1:
 					'<i>Fuck, that felt good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-					'<i>It''s a good thing I''m on birth control...</i>'
+					'<i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 				elseif mesec > 0:
 					'<i>Fuck, that felt good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
 					'<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
@@ -2313,7 +2313,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
 						'<i>Fuck, that feels good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-						'<i>It''s a good thing I''m on birth control...</i>'
+						'<i>It''s a good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on birth control')+'...</i>'
 					elseif mesec > 0:
 						'<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
 						'<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'

locations/cum_arrcheat.qsrc

@@ -101,7 +101,7 @@ if cycletemp[4] > 0:
 	elseif cumarrcon[cycletemp] = 1:
 		$cycletemp[3] = 'You lied about being on the pill'
 	elseif cumarrcon[cycletemp] = 2:
-		$cycletemp[3] = 'You were on the pill'
+		$cycletemp[3] = iif(birth_control['implant_status'] > 1, 'You have a birth control implant', 'You were on the pill')
 	elseif cumarrcon[cycletemp] = 3:
 		$cycletemp[3] = 'You used a condom'
 	elseif cumarrcon[cycletemp] = 4:

locations/cuminsidereact.qsrc

@@ -17,7 +17,7 @@ if eff_contra ! 3:
 	elseif tmp = -2:
 		'"I''m glad I got my birth control shot!" you think to yourself.'
 	elseif tmp = -1:
-		'"Good thing I''m on the pill..." you think to yourself.'
+		'"Good thing '+iif(birth_control['implant_status'] > 1, 'I have a birth control implant', 'I''m on the pill')+'..." you think to yourself.'
 	elseif tmp = 1:
 		if $risk_boy ! '':
 			'You unconsicously put a hand on your belly as you realize you could become pregnant with the child of <<$risk_boy>>.'

locations/mother.qsrc

@@ -469,7 +469,7 @@ if $ARGS[0] = '':
 				end
 
 				act 'Offer to help around the house':
-					cla
+					*clr & cla
 					minut += 60
 					gs 'npc_relationship', 'modify', 'A29', rand(1,5)
 					pcs_mood -= 10

locations/traits.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'menu':
 	elseif traits['nerd_status'] = 2:
 		'<center><b>Loves to learn</b></center>'
 		'You have level 2 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<60 - traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 40 points, you''ll fall back to level 1.'		
-	elseif traits['nerd_status'] = 2:
+	elseif traits['nerd_status'] = 3:
 		'<center><b>Teacher''s pet</b></center>'
 		'You have level 3 of this trait and <<traits[''nerd_points'']>> points. If you fall below 60 points, you''ll fall back to level 2.'		
 	end