Merge branch 'fixes' into 'pregmod-master'

More specific assignment links

Closes #257

See merge request pregmodfan/fc-pregmod!2530

src/uncategorized/slaveInteract.tw

@@ -478,7 +478,10 @@
 	/* CAN BE REASSIGNED */
 
 	Assignment: <strong><span id="assign">$activeSlave.assignment<<if $activeSlave.sentence>> ($activeSlave.sentence weeks)<</if>></span>.</strong>
-	  <<link "Rest">>                   <<= removeJob($activeSlave, $activeSlave.assignment)>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+	  <<link "Rest">>                   <<= assignJob($activeSlave, "rest")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+	<<if ["be confined in the arcade", "work in the brothel", "serve in the club", "work in the dairy", "serve in the master suite", "work as a servant"].includes($activeSlave.assignment)>>
+	| <<link "Remove From Facility">>	<<= removeJob($activeSlave, $activeSlave.assignment)>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+	<</if>>
 	| <<link "Fucktoy">>                <<= assignJob($activeSlave, "please you")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
 
 	<<if ($activeSlave.indentureRestrictions <= 0) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>