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

sanityCheck

@@ -94,6 +94,8 @@ $GREP 'if $ ' -- 'src/*'  | myprint "missing ; before statement"
 $GREP 'elseif $ ' -- 'src/*'  | myprint "missing ; before statement"
 # Check for a . inside a <<>>
 $GREP "<<[a-zA-Z]\([^\"'>]\|[^\"'>]>[^\"'>]\)*[a-zA-Z][.][^a-zA-Z]" | myprint "StrangeCharacterAfterDot"
+# Check for @@. instead of .@@		TODO: get this to work
+$GREP "@@(\.|,|;)\s" | myprint "WrongSelectorPunctuation"
 
 # Check that we do not have any variables that we use only once.   e.g.     $onlyUsedOnce
 # Ignore  *Nationalities

src/facilities/nursery/childSummary.tw

@@ -131,13 +131,7 @@
         <</if>>
         <<goto "Personal Attention Select">>
     <</link>>
-<<elseif $Flag == 1>>
-        <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Child 1>></div><</if>>
-        [[_childName|Child Interact][$activeSlave = $cribs[_csi]]]
-<<else>>
-        <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Child 1>></div><</if>>
-        [[_childName|Child Interact][$activeSlave = $cribs[_csi]]]
-<</if>>
+
 <<case "New Game Plus">>
 <<if $Flag == 0>>
         <br>__''@@.pink;_Child.slaveName@@''__

src/facilities/nursery/nursery.tw

@@ -377,6 +377,10 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 	 <</link>>
 <</if>>
 
+@@.hotpink;test@@. 
+@@.@@, 
+@@.@@; 
+
 <br><br>
 Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
    [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]]
@@ -625,7 +629,6 @@ Filter by assignment: |
 	<</if>>
 <</if>>
 <</for>>
-<</if>>
 <</if>>	/* closes $nurseryBabies check *//*
 <br>
 */

src/uncategorized/newSlaveIntro.tw

@@ -1178,12 +1178,10 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 
 //...or show $him what it's like here for a slave//
 
-/* TODO: add more scene variants */
-
 <<if $activeSlave.fetish != "mindbroken">>
 	/*
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<link "Teach $him how to use $his throat">>
+	<<link "Teach $him how to use $his throat">> TODO: write this <</link>>
 	*/
 
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;