Merge branch 'fixes' into 'pregmod-master'

Option to temporarily hide NaN variable warning

See merge request pregmodfan/fc-pregmod!2732

src/uncategorized/main.tw

@@ -37,6 +37,7 @@
 <<if $slaves.includes(null)>>
 	<br><br>@@.red;ERROR: Main slaves array contains a null entry! Please report this.@@ <<link "Repair">><<set $slaves.delete(null)>><</link>><<goto "Main">><br><br>
 <</if>>
+<span id="NaNArray">
 <<if ndef $NaNArray>>
 	<<set $NaNArray = findNaN()>>
 <</if>>
@@ -47,7 +48,9 @@
 		$NaNArray[_main] <br>
 		<<set _main++>>
 	<</for>><br>
+	<<link "Hide NaN variables until next week">><<replace #NaNArray>><<set $NaNArray = []>><</replace>><</link>>
 <</if>>
+</span>
 /* end extra sanity checks and repair */
 
 <<set _duplicateSlaves = _($slaves).countBy(s => s.ID).pickBy(v => v > 1).keys().map(v => Number(v)).value()>>

src/utility/assayWidgets.tw

@@ -960,7 +960,7 @@
 <</if>>
 
 <<if ($args[0].boobsImplant == 0) && ($args[0].buttImplant == 0) && ($args[0].waist >= -95) && ($args[0].lipsImplant == 0) && ($args[0].faceImplant < 30) && ($args[0].bellyImplant == -1) && (Math.abs($args[0].shouldersImplant) < 2) && (Math.abs($args[0].hipsImplant) < 2)>>
-	<<if def $pure>><<set $pure += 1>><</if>>
+	<<if def $pure>><<set $pure += 1>><<else>><<set $pure = 1>><</if>>
 	<<if $arcologies[0].FSBodyPurist != "unset">>
 	<<set $beauty += ($arcologies[0].FSBodyPurist/5)>>
 	<</if>>