Merge branch 'pregmod-dev' into 'pregmod-master'

Fixed lack of origin in jeSlaveDispute.tw and some indenture ignoring in remoteSurgery.tw

See merge request pregmodfan/fc-pregmod!3845

src/uncategorized/jeSlaveDispute.tw

@@ -374,6 +374,7 @@
 		<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
 		<<set $activeSlave.indenture = random(52,78)>>
 		<<set $activeSlave.indentureRestrictions = 2>>
+		<<set $activeSlave.origin = "You took over her indenture after she launched a legal complaint against an abusive master.">>
 		<<run cashX(forceNeg($contractCost), "slaveTransfer")>>
 		<<replace "#result">>
 			You offer to simply buy out the indenture contract, thereby acquiring $him, to which both parties readily agree. This decision is viewed as @@.green;incredibly generous@@ by both your arcology's romantically-minded and financially-inclined citizens. For their part, your new servant is hopeful that you will be more considerate of $his health, while the former holder is just happy to have $him off his hands.

src/uncategorized/remoteSurgery.tw

@@ -294,7 +294,9 @@ $He has
 /*Horns*/
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 $He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if>>.
-<<if $activeSlave.horn != "none">>
+<<if $activeSlave.indentureRestrictions >= 2>>
+	//$His indenture forbids elective surgery//
+<<elseif $activeSlave.horn != "none">>
 	[[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "hornGone"]]<</if>>
 	Give $him:
 <<if $activeSlave.horn != "curved succubus horns">>