Merge branch 'master' of maankamara/glife into master

[Fix] BC shot not counting down when on the pill at the same time and pill being considered the main contraception method
[Fix] npc reaction about pregnancy causing blank screen
[Change] contraception disqualifying potential fathers. If there's a baby, somebody's got to be the father
[Change] commented out the twinge message which gives 100% spoiler about pregnancy before we could possibly know about it
[Fix] corrected journal displaying up to 2 unborn kids after you already had 2+ children born.

locations/femcyc.qsrc

@@ -567,7 +567,9 @@ if $ARGS[0] = 'cyc2':
 			if cumarrkno[can_idx] = 1 and arrpos('$wombpotfath', $cumarrnam[can_idx]) < 0:$wombpotfath[arrsize('$wombpotfath')] = $cumarrnam[can_idx]
 
 			!! If the guy is a known/possible element (PC know about the sex, it was actual sex, condom/pill was not used or condom was broken, etc.), he can be considered as father.
-			if instr('14570',str(cumarrcon[can_idx])) > 0 and cumarrdel[can_idx] = 0 and cumarrkno[can_idx] >= 0:
+			if cumarrdel[can_idx] = 0 and cumarrkno[can_idx] >= 0:
+				!! Removed 'instr('14570',str(cumarrcon[can_idx])) > 0 and ' from above if-statement
+				!! to make each conscious vaginal sex partner eligible for consideration to be the dad if pregnancy happens
 				!! If guy is recorded already, increase his cumtime, else record him for the first time.
 				if arrpos('$cumfthname', $cumarrnam[can_idx]) = -1:
 					$cumfthname[arrsize('$cumfthname')] = $cumarrnam[can_idx]

locations/fertility.qsrc

@@ -69,8 +69,10 @@ if $ARGS[0] = 'birth_control':
 		end
 
 		if shotdays > -100:shotdays -=1
-		if tabletkishot > 0:tabletkishot -= 1
 	end
+	!! dropped the decrement out of the above if-statement so that players on pill would still run out of BC shot
+	!! as in for example the case of the therapist forcing you on the pill while you already had the shot.
+	if tabletkishot > 0:tabletkishot -= 1
 
 	!! birth_control['implant_status']
 	!! 0: No implant

locations/journal.qsrc

@@ -337,7 +337,7 @@ if $ARGS[0] = 'relationstab':
 		else
 			'You have children:'
 			:LoopKidCounter
-			if i <= kid + 1:
+			if i < kid:
 				'<br> a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>.'
 				i += 1
 				jump 'LoopKidCounter'

locations/stat_display.qsrc

@@ -1049,9 +1049,9 @@ if cheatStatusIcons = 0:
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
 		$stat_bleed_msg = 'Your period is due to start soon.'
 		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
-	elseif implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
-		$stat_bleed_msg = 'You feel a slight twinge in your abdomen.'
-		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
+!!TMI				elseif implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
+!!pregnancy spoiler		$stat_bleed_msg = 'You feel a slight twinge in your abdomen.'
+!!				$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
 	elseif thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
 		if abortionbirthdate = 0 and daystart - daylastperiod > 28:
 			if (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
@@ -1706,9 +1706,9 @@ if enable_extra_msg = 1:
 		end
 	end
 
-	if implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
-		$stat_msg += '<BR><font color=#AB052A>You feel a slight twinge in your abdomen.</font>'
-	end
+!!TMI			if implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
+!!pregnancy spoiler		$stat_msg += '<BR><font color=#AB052A>You feel a slight twinge in your abdomen.</font>'
+!!			end
 
 	if mesec > 0:
 		$stat_msg += '<BR><font color="red">You are currently having your period. '