Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dcoded-dev

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -6,6 +6,7 @@
 
 	3
 	-more fixes
+	-uncommented incubator semen donations
 
 11/28/2018
 

src/pregmod/artificialInsemination.tw

@@ -21,7 +21,6 @@ __Select an eligible slave to serve as the semen donatrix:__
 	<br>//You have no slaves with potent sperm.//
 <</if>>
 
-/*
 <<if $incubatorSlaves > 0 && $incubatorReproductionSetting == 2>>
 	<br><br>
 	
@@ -38,7 +37,6 @@ __Select an eligible slave to serve as the semen donatrix:__
 		<br>//You have no growing slaves producing sperm.//
 	<</if>>
 <</if>>
-*/
 
 <<if $PC.dick == 1>>
 	<br>

src/pregmod/surrogacyWorkaround.tw

@@ -37,7 +37,6 @@ __Semen donatrix: _impreg __
 	<br>//You have no slaves with potent sperm.//
 <</if>>
 
-/*
 <<if $incubatorSlaves > 0 && $incubatorReproductionSetting == 2>>
 	<br><br>
 	
@@ -57,7 +56,6 @@ __Semen donatrix: _impreg __
 		<br>//You have no growing slaves producing sperm.//
 	<</if>>
 <</if>>
-*/
 
 <<if $PC.dick == 1>>
 	<br>

src/pregmod/widgets/playerDescriptionWidgets.tw

@@ -371,9 +371,13 @@
 				Something startling happened this week; while enjoying a slave, your belly button popped out!
 			<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
 				<<set _babyDaddy = findFather($PC.pregSource)>>
-				<<set _babyDaddy.PCKnockedUp++>>
+				<<if def _babyDaddy>>
+					<<set _adjust = _babyDaddy.PCKnockedUp++>>
+					<<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
+				<</if>>
 				<<if def $slaveIndices[$PC.pregSource]>>
-					Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+					<<setLocalpronouns _babyDaddy>>
+					Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
 				<</if>>
 			<</if>>
 		<</if>>
@@ -440,9 +444,13 @@
 				Something startling happened this week; while enjoying a slave, your belly button popped out!
 			<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
 				<<set _babyDaddy = findFather($PC.pregSource)>>
-				<<set _babyDaddy.PCKnockedUp++>>
+				<<if def _babyDaddy>>
+					<<set _adjust = _babyDaddy.PCKnockedUp++>>
+					<<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
+				<</if>>
 				<<if def $slaveIndices[$PC.pregSource]>>
-					Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+					<<setLocalpronouns _babyDaddy>>
+					Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
 				<</if>>
 			<</if>>
 		<</if>>
@@ -509,9 +517,13 @@
 				Something startling happened this week; while enjoying a slave, your belly button popped out!
 			<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
 				<<set _babyDaddy = findFather($PC.pregSource)>>
-				<<set _babyDaddy.PCKnockedUp++>>
+				<<if def _babyDaddy>>
+					<<set _adjust = _babyDaddy.PCKnockedUp++>>
+					<<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
+				<</if>>
 				<<if def $slaveIndices[$PC.pregSource]>>
-					Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+					<<setLocalpronouns _babyDaddy>>
+					Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
 				<</if>>
 			<</if>>
 		<</if>>