Merge remote-tracking branch 'upstream/pregmod-newcontent1_0' into pregmod-master

src/facilities/nursery/nursery.tw

@@ -465,7 +465,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
 <<for $i = 0; $i < $nurseryBabies; $i++>>
 	<<capture $i>>
 	<<setLocalPronouns $cribs[$i]>>
-		<br><<link "<<= SlaveFullName($cribs[$i])>>" "Child Interact">><<set $activeSlave = $cribs[$i]>><<<</link>> occupies this room. $He is <<if $cribs[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $cribs[$i].hColor hair<<if $cribs[$i].eyes != -2>> and $cribs[$i].eyeColor eyes.<<else>>. $He is blind.<</if>>
+		<br><<link "<<= SlaveFullName($cribs[$i])>>" "Child Interact">><<set $activeSlave = $cribs[$i]>><</link>> occupies this room. $He is <<if $cribs[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $cribs[$i].hColor hair<<if $cribs[$i].eyes != -2>> and $cribs[$i].eyeColor eyes.<<else>>. $He is blind.<</if>>
 		/*Statistical projections indicates that once released $he will be around <<= heightToEitherUnit($cribs[$i].height + random(-5,5))>> tall. TODO: would this make sense to include?*/ Most likely $he will be
 			<<if $cribs[$i].weight <= 30 && $cribs[$i].weight >= -30>>
 				at a healthy weight and

src/uncategorized/saChoosesOwnJob.tw

@@ -50,7 +50,7 @@
 			<<= assignJob($slaves[$i], "be a servant")>>
 		<</if>>
 
-	<<elseif $universalRulesAssignsSelfFacility == 1 && $slaves[$i].devotion > 50 && canWalk($slaves[$i]) && canSee($slave[$i]) && && $slaves[$i].sexualQuirk == "caring" && $nurseryNannies > $nurserySlaves>>
+	<<elseif $universalRulesAssignsSelfFacility == 1 && $slaves[$i].devotion > 50 && canWalk($slaves[$i]) && canSee($slaves[$i]) && && $slaves[$i].sexualQuirk == "caring" && $nurseryNannies > $nurserySlaves>>
 		<<set $slaves[$i].choosesOwnAssignmentText += " enjoys taking care of children, so $he decides to work in $nurseryName.">>
 		<<= assignJob($slaves[$i], "work as a nanny")>>