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

Resync prior to induced NCS merge

See merge request pregmodfan/fc-pregmod!2080

src/pregmod/huskSlaveSwap.tw

@@ -31,7 +31,7 @@ $slaves[_m].slaveName's body was bought by the Flesh Heap for <<print cashFormat
 				<<set $slaves[_myBody].devotion -= 30, $slaves[_myBody].trust -= 30>>
 			<<else>>
 				$slaves[_myBody].slaveName is @@.medimorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@
-				<<set $slaves[_myBody].devotion -= 50, $slaves[_myBody].trust += 200>>
+				<<set $slaves[_myBody].devotion -= 50, $slaves[_myBody].trust = 100>>
 			<</if>>
 		<</if>>
 	<</if>>

src/pregmod/pBodyswapReveal.tw

@@ -6,4 +6,4 @@
 
 You receive countless messages throughout the day; mostly worthless spam, several uninteresting business offers and the occasional enslavement request. This one catches your eye however. It's an offer from a top surgeon who has recently been experimenting with radical new surgeries. You've been loosely following their work for the last few weeks, ever since they successfully swapped the consciousness from one slave to another with minimal side effects, assuming they are kept on a special suppressant, and it seems they are now offering their work to anyone with a surgical suite capable of performing the surgery and willing to undertake the risk.
 <br><br>
-It's an interesting offer and your remote surgery will suffice should you want to change up your slaves' bodies more than any drug or implant ever could. You'll need a slave to swap them with, however. Perhaps one the mindless slaves from the Flesh Heap will suit your needs, should you not wish to use your own stock
+It's an interesting offer and your remote surgery will suffice should you want to change up your slaves' bodies more than any drug or implant ever could. You'll need a slave to swap them with, however. Perhaps one of the mindless slaves from the Flesh Heap will suit your needs, should you not wish to use your own stock.

src/uncategorized/saDevotion.tw

@@ -190,7 +190,7 @@
 				<<set $slaves[$i].devotion -= 30, $slaves[$i].trust -= 30>>
 			<<else>>
 				$slaves[$i].slaveName is @@.mediumorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@
-				<<set $slaves[$i].devotion -= 50, $slaves[$i].trust += 200>>
+				<<set $slaves[$i].devotion -= 50, $slaves[$i].trust = 100>>
 			<</if>>
 		<</if>>
 	<</if>>