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

src/endWeek/saRest.js

@@ -5,16 +5,16 @@ window.saRest = /** @param {App.Entity.SlaveState} slave */ function saRest(slav
 	var He = capFirstChar(he), His = capFirstChar(his);
 	var V = State.variables;
 
-	var t = " takes the week off.";
+	var t = ` takes the week off.`;
 
 	if (slave.fuckdoll > 0) {
-		t += " ${He} has nothing to do but ";
+		t += ` ${He} has nothing to do but `;
 		if (slave.amp == 0) {
-			t += "lie ";
+			t += `lie `;
 		} else {
-			t += "stand ";
+			t += `stand `;
 		}
-		t += "in place.";
+		t += `in place.`;
 	}
 
 	if (slave.health > 90) {

src/uncategorized/clinicReport.tw

@@ -295,6 +295,17 @@
 			is receiving treatment in $clinicName.
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;$He <<= saRest($slaves[$i])>>
+		<<if ($slaves[$i].health <= 40)>>
+			$He stays in the clinic as $he is still sick.
+		<<elseif ($Nurse != 0) && ($slaves[$i].chem > 15) && ($clinicUpgradeFilters == 1)>>
+			$He stays in the clinic as unhealthy chemicals are still being flushed from $his system.
+		<<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation >= 0 || $slaves[$i].pregControl == "speed up")>>
+			$He stays in the clinic to hurry $his pregnancy along safely.
+		<<elseif ($Nurse != 0) && ($slaves[$i].pregAdaptation*1000 < $slaves[$i].bellyPreg || $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33)>>
+			$He stays in the clinic waiting for the child to be born.
+		<<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>>
+			$He stays in the clinic as $his implants can still recieve more filling.
+		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>

src/uncategorized/spaReport.tw

@@ -300,6 +300,15 @@
 			is resting in $spaName.
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;_He2 <<= saRest($slaves[$i])>>
+		<<if ($slaves[$i].fetish == "mindbroken")>>
+			$He remains in the Spa, completely mindbroken.
+		<<elseif($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none")>>
+			$He remains in the Spa, stubborn in $his flaw.
+		<<elseif ($slaves[$i].trust < 60) || ($slaves[$i].devotion < 60)>>
+			$He remains in the Spa, as $he is still learning to accept life as a slave.
+		<<elseif ($slaves[$i].health < 20)>>
+			$He remains in the Spa, as $his health is still low.
+		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>