From 37edbddb930ce5f86bccc62101c6d4d815871029 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 12 May 2019 20:47:28 -0500
Subject: [PATCH] NonlocalStuff

---
 Changelog.txt                  | 3 +--
 src/uncategorized/dairy.tw     | 9 +++++----
 src/uncategorized/spaReport.tw | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 8164570f79a..2527f4343b3 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -97,7 +97,7 @@ Pregmod
 
 	3
 	-fixes
-	-css tweaks
+	-CSS tweaks
 	-body modification reactions expanded
 
 	2
@@ -8399,7 +8399,6 @@ last known lolimod merge - 08/30/16
 	0.7.5.1
 	0.7.5.0
 
-
 06/22/16
 	0.7.4.1
 
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 5032ffbcf13..01b77264d79 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -95,6 +95,7 @@
 		<</if>>
 		as their sphincters gradually recover from wide open to merely gaping. The machines switch out the withdrawn dildos for phalli that are just large, but the slaves barely react at all as they are penetrated. After what their sphincters have been through, a merely big dick is nothing to them.<br><br>
 	<</if>>
+	<<setNonlocalPronouns $seeDicks>>
 	<<if $dairyRestraintsSettingChanged == 1>>
 		<<if $dairyRestraintsSetting == 1>>
 			<<for _Di = 0; _Di < _DL; _Di++>>
@@ -106,9 +107,9 @@
 					<<set _DL--, _Di-->>
 				<</if>>
 			<</for>>
-			The next cow to stumble over to a milking machine to be drained is gently but firmly embraced by its restraints, allowing it to suck her dry and violate her without any regard for her feelings. Most of the cows accept this new wrinkle in their lives, since the restraints let them go afterward, and the milking machines bring temporary relief. Some, however, begin to regard the machines with concern.
+			The next cow to stumble over to a milking machine to be drained is gently but firmly embraced by its restraints, allowing it to suck _himU dry and violate _himU without any regard for _hisU feelings. Most of the cows accept this new wrinkle in their lives, since the restraints let them go afterward, and the milking machines bring temporary relief. Some, however, begin to regard the machines with concern.
 		<<else>>
-			The next cow to stumble over to a milking machine to be drained finds to her surprise that she is not restrained while it sucks her dry. She wiggles around experimentally, verifying that she is indeed free to pull herself away from its ministrations if she wishes. There's little actual impact on the cows' behavior, since they still need the relief the machines offer.
+			The next cow to stumble over to a milking machine to be drained finds to _hisU surprise that _heU is not restrained while it sucks _himU dry. _HeU wiggles around experimentally, verifying that _heU is indeed free to pull _himselfU away from its ministrations if _heU wishes. There's little actual impact on the cows' behavior, since they still need the relief the machines offer.
 		<</if>>
 		<br><br>
 	<<elseif $dairyRestraintsSettingChanged == -1>>
@@ -122,9 +123,9 @@
 					<<set _DL--, _Di-->>
 				<</if>>
 			<</for>>
-			The next time a cow tries to get up after being milked, she finds to her sudden terror that the machine will not let her go. It continues to add fluids to her body, and remove them from her nipples, ignoring her mounting panic as she realizes that it's to be her new partner and lover, on a level far more intimate than any possible human relationship. The other cows approach their machines with trepidation, but the mounting pressure in their udders forces them to embrace their immurement despite their terror.
+			The next time a cow tries to get up after being milked, _heU finds to _hisU sudden terror that the machine will not let _himU go. It continues to add fluids to _hisU body, and remove them from _hisU nipples, ignoring _hisU mounting panic as _heU realizes that it's to be _hisU new partner and lover, on a level far more intimate than any possible human relationship. The other cows approach their machines with trepidation, but the mounting pressure in their udders forces them to embrace their immurement despite their terror.
 		<<else>>
-			The next time a cow finishes an intensive milking period, her restraints loosen. She does not move for a long time, as though she is unable to believe that she is, at least in an immediate and local sense, free. Finally, she prises herself out of her milking machine's embrace, thick strings of fluid leading from it to her orifices as she pulls each one off of its corresponding port.
+			The next time a cow finishes an intensive milking period, _hisU restraints loosen. _HeU does not move for a long time, as though _heU is unable to believe that _heU is, at least in an immediate and local sense, free. Finally, _heU prises _himselfU out of _hisU milking machine's embrace, thick strings of fluid leading from it to _hisU orifices as _heU pulls each one off of its corresponding port.
 		<</if>>
 		<br><br>
 	<</if>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 800a5ec57bc..65533a399b1 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -258,7 +258,7 @@
 
 <<for _dI = 0; _dI < _DL; _dI++>>
 	<<set $i = $slaveIndices[$SpaiIDs[_dI]]>>
-	<<setLocalPronouns $slaves[$i] 2>>
+	<<setLocalPronouns $slaves[$i]>>
 	<<set $slaves[$i].devotion += _devBonus, $slaves[$i].trust += _trustBonus, $slaves[$i].health += _healthBonus>>
 	<<if ($slaves[$i].devotion < 60) && ($slaves[$i].trust < 60)>>
 		<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
@@ -279,7 +279,7 @@
 		<<set $slaves[$i].livingRules = "luxurious">>
 	<</switch>>
 	<<if ($slaves[$i].health >= 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
-		<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;_his2 assignment has defaulted to rest.@@
+		<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;$his assignment has defaulted to rest.@@
 		<<= removeJob($slaves[$i], "rest in the spa")>>
 		<<set _restedSlaves++, _DL--, _dI-->>
 		<<continue>>
@@ -336,12 +336,12 @@
 <<if (_restedSlaves > 0)>>
 	<br><br>&nbsp;&nbsp;&nbsp;
 	<<if (_restedSlaves == 1)>>
-		One slave has rested until she reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the spa before the end of the week.
+		One slave has rested until $he reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the spa before the end of the week.
 	<<else>>
 		_restedSlaves slaves have rested until they reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the spa before the end of the week.
 	<</if>>
 	<<if $spaDecoration != "standard">>
-		<br><br>&nbsp;&nbsp;&nbsp;&nbsp;$spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ resting.
+		<br><br>&nbsp;&nbsp;&nbsp;&nbsp;$spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>$him while $he was<<else>>them while they were<</if>>@@ resting.
 	<</if>>
 <</if>>
 <<if _DL > 0 || $Attendant != 0>>
-- 
GitLab