Fixes

src/facilities/nursery/nurseryWidgets.js

@@ -16757,33 +16757,32 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
 			/* 000-250-006 */
 			r += `<strong><u><span class="pink">${SlaveFullName(slave)}</span></u></strong>`;
 			if (slave.choosesOwnAssignment === 2) {
-				r += `<<include "SA chooses own job">>`;
+				r += `<<include "SA chooses own job">>`;	// TODO:
 			} else {
 				r += ` is working in ${V.nurseryName}. `;
 			}
-			r += `<br>&nbsp;&nbsp;&nbsp;&nbsp;${He} ${saNanny(slave)}
-			<br>&nbsp;&nbsp;&nbsp;
-			${saChoosesOwnClothes(slave)}
-			<<include "SA rules">>
-			<<include "SA diet">>
-			<<include "SA long term effects">>
-			<<include "SA drugs">>
-			<<include "SA relationships">>
-			<<include "SA rivalries">>
-			<br><<include "SA devotion">>`;
+			// TODO: clean this mess up
+			r += `<br>&nbsp;&nbsp;&nbsp;&nbsp;${He} ${saNanny(slave)}<br>&nbsp;&nbsp;&nbsp;`;
+			r += `${saChoosesOwnClothes(slave)}`;
+			r += `${saRules(slave)}`;
+			r += `<<include "SA diet">>`;					// TODO:
+			r += `<<include "SA long term effects">>`;		// TODO:
+			r += `<<include "SA drugs">>`;					// TODO:
+			r += `<<include "SA relationships">>`;			// TODO:
+			r += `<<include "SA rivalries">>`;				// TODO:
+			r += `<br><<include "SA devotion">>`;			// TODO:
 		} else {
-			r += `<<silently>>
-			<<include "SA chooses own job">>
-			${saChoosesOwnClothes(slave)}
-			${saNanny(slave)}
-			<<include "SA rules">>
-			<<include "SA diet">>
-			<<include "SA long term effects">>
-			<<include "SA drugs">>
-			<<include "SA relationships">>
-			<<include "SA rivalries">>
-			<<include "SA devotion">>
-			<</silently>>`;
+			r += `<<silently>><<include "SA chooses own job">>`;
+			r += `${saNanny(slave)}`;
+			r += `${saChoosesOwnClothes(slave)}`;
+			r += `${saRules(slave)}`;
+			r += `<<include "SA diet">>`;
+			r += `<<include "SA long term effects">>`;
+			r += `<<include "SA drugs">>`;
+			r += `<<include "SA relationships">>`;
+			r += `<<include "SA rivalries">>`;
+			r += `<<include "SA devotion">>`;
+			r += `<</silently>>`;
 		}
 	}

src/uncategorized/saRules.tw

@@ -4,6 +4,8 @@
 
 /* TODO: may need updating to detail effects of chastity */
 
+<<print $slaves[$i].slaveName>>
+
 <<if $slaves[$i].fuckdoll == 0>>
 	$He
 	<<if $slaves[$i].fetish == "mindbroken">>