From e1c45e876376e45c92f4f8d972f3bc84e6ac7213 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 7 Mar 2019 20:52:01 -0600
Subject: [PATCH] OtherWork

---
 src/facilities/farmyard/farmyardReport.tw | 2 +-
 src/uncategorized/RESS.tw                 | 2 +-
 src/uncategorized/RETS.tw                 | 2 +-
 src/uncategorized/newSlaveIntro.tw        | 2 +-
 src/uncategorized/surgeryDegradation.tw   | 1 -
 src/uncategorized/toychest.tw             | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index fd8c0b6b08a..2338cb6e9e1 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -96,7 +96,7 @@
 		<<set $FarmerCashBonus += 0.05>>
 	<</if>>
 	<<if !canSmell($Farmer)>>
-		$His lack of a sense of smell protects $him that omnipresent barnyard scent.
+		$His lack of a sense of smell protects $him from that omnipresent barnyard scent.
 		<<set $FarmerCashBonus += 0.05>>
 	<</if>>
 
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 52ff19f30b3..03ffdc29a57 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5177,7 +5177,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<replace "#result">>
 		$He is far stronger than you expected and has you trapped in a compromising position. You've seen $activeSlave.slaveName fuck before; $he's a quick shot, only in it to get $his mate pregnant. You question what you are thinking as $his gigantic dick pokes at your crotch, eager to find the egg at the end of the tunnel. $He lacks even the basic understanding of foreplay, you realize, as $he drives $his cock deep into your pussy. You groan with pain at the sheer size of the rod stretching out your poor hole and struggle to hold back the tears once $he starts thrusting. There is no pleasure for you here as $he batters your cervix; you barely stop yourself from screaming out as $he slams through your final defense and cums directly into your exposed womb.
 		<br><br>
-		You immediately realize you've made a mistake; you feel full already and $he's still cumming. You watch in horror as your belly steadily swells with seed, unable to flow out thanks to your obstructed cunt. $activeSlave.slaveName grunts as $he pushes out the last of $his load before pulling out and releasing you. You try to get up, but the experience has left you drained, so you are left hoping that $his instincts tell $him $he's done $his job. $He lowers $his nose to your violated pussy and sniffs; unsatisfied, $he moves back into position to properly seed you this time. You black out as $his second load joins the first, only to awaken sometime later
+		You immediately realize you've made a mistake; you feel full already and $he's still cumming. You watch in horror as your belly steadily swells with seed, unable to flow out thanks to your obstructed cunt. $activeSlave.slaveName grunts as $he pushes out the last of $his load before pulling out and releasing you. You try to get up, but the experience has left you drained, so you are left hoping that $his instincts tell $him $he's done $his job. $He lowers $his <<if canSmell($activeSlave)>>nose to your violated pussy and sniffs<<else>>face to your violated pussy to feel the heat emanating from it<</if>>; unsatisfied, $he moves back into position to properly seed you this time. You black out as $his second load joins the first, only to awaken sometime later
 		<<if $Concubine != 0>>
 			<<setLocalPronouns $Concubine 2>>
 			with $Concubine.slaveName trying _his2 best to drain your swollen belly.
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index f8152910dba..136814b8826 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1922,7 +1922,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<</if>>
 	can feel that _his2 breasts aren't nearly empty of milk yet, and of course the milkers are tugging at _his2 teats as industriously as ever, so _he2 relaxes luxuriantly as $activeSlave.slaveName starts to climb out from under _him2.
 	<br><br>
-	You announce your presence by ordering $activeSlave.slaveName to stay where $he is. Startled, $he sticks $his head out from under $subSlave.slaveName and chirps "Ye<<s>>, <<Master>>!" and scoots back under, waiting to see what you're planning. You straddle $subSlave.slaveName's face; as <<if canSee($subSlave)>>_his2 vision is filled by your <<if $PC.dick>>erect dick<<else>>wet pussy<</if>><<else>>_his2 nose samples the scent of <<if $PC.dick>>the precum budding at the tip of your erect dick<<else>>your wet pussy<</if>><</if>>, _he2 opens _his2 mouth compliantly and <<if $PC.dick>>receives _his2 owner's hot cock, pressed past _his2 lips and down _his2 throat. _He2 starts sucking<<else>>is rewarded with _his2 owner's hot womanhood, pressed against _his2 lips. _He2 starts eating you out<</if>> obediently, until you reach down to _his2 still-jiggling udders and tug one of the milkers loose. $subSlave.slaveName starts with discomfort, moaning uncomfortably into your <<if $PC.dick>>member<<else>>cunt<</if>> before getting back to work. _His2 <<if $subSlave.lactation > 1>>lactation is unnaturally copious<<else>>milk is really flowing<</if>>, and a thin stream of cream squirts out of _him2. It lands on $activeSlave.slaveName's face below, surprising $him. $He splutters comically, but obeys eagerly when you squeeze $subSlave.slaveName's freed boob and order $activeSlave.slaveName to start drinking. After all, you point out, a balanced diet is important. $activeSlave.slaveName @@.mediumaquamarine;giggles complaisantly@@ and reaches for the proffered tit. $subSlave.slaveName is still basking in the afterglow of _his2 orgasm and shudders silently with overstimulation as _he2 feels $activeSlave.slaveName's lips <<if $subSlave.nipples != "fuckable">>latch around<<else>>encircle<</if>> _his2 $subSlave.nipples nipple.
+	You announce your presence by ordering $activeSlave.slaveName to stay where $he is. Startled, $he sticks $his head out from under $subSlave.slaveName and chirps "Ye<<s>>, <<Master>>!" and scoots back under, waiting to see what you're planning. You straddle $subSlave.slaveName's face; as <<if canSee($subSlave)>>_his2 vision is filled by your <<if $PC.dick>>erect dick<<else>>wet pussy<</if>><<elseif canSmell($subSlave)>>_his2 nose samples the scent of <<if $PC.dick>>the precum budding at the tip of your erect dick<<else>>your wet pussy<</if>><<else>>_his2 face is warmed by the heat from your <<if $PC.dick>>hard cock<<else>>wet cunt<</if>><</if>>, _he2 opens _his2 mouth compliantly and <<if $PC.dick>>receives _his2 owner's hot cock, pressed past _his2 lips and down _his2 throat. _He2 starts sucking<<else>>is rewarded with _his2 owner's hot womanhood, pressed against _his2 lips. _He2 starts eating you out<</if>> obediently, until you reach down to _his2 still-jiggling udders and tug one of the milkers loose. $subSlave.slaveName starts with discomfort, moaning uncomfortably into your <<if $PC.dick>>member<<else>>cunt<</if>> before getting back to work. _His2 <<if $subSlave.lactation > 1>>lactation is unnaturally copious<<else>>milk is really flowing<</if>>, and a thin stream of cream squirts out of _him2. It lands on $activeSlave.slaveName's face below, surprising $him. $He splutters comically, but obeys eagerly when you squeeze $subSlave.slaveName's freed boob and order $activeSlave.slaveName to start drinking. After all, you point out, a balanced diet is important. $activeSlave.slaveName @@.mediumaquamarine;giggles complaisantly@@ and reaches for the proffered tit. $subSlave.slaveName is still basking in the afterglow of _his2 orgasm and shudders silently with overstimulation as _he2 feels $activeSlave.slaveName's lips <<if $subSlave.nipples != "fuckable">>latch around<<else>>encircle<</if>> _his2 $subSlave.nipples nipple.
 	<<set $subSlave.oralCount++, $oralTotal++, $subSlave.mammaryCount++, $mammaryTotal++>>
 	<<set $activeSlave.oralCount++, $oralTotal++>>
 	<<set $activeSlave.trust += 5>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 5f8e3d563cb..bd794d915d4 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -30,7 +30,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	staring at the ground in fear.
 <<elseif $activeSlave.devotion <= 50>>
 	waiting meekly for orders.
-<<elseif $activeSlave.career == "a breeding bull" && isPlayerFertile($PC)>>
+<<elseif canSmell($activeSlave) && $activeSlave.career == "a breeding bull" && isPlayerFertile($PC)>>
 	sniffing the air and staring intently at your crotch.
 <<elseif $activeSlave.origin == "She submitted to enslavement to escape the hard life of an Old World whore.">>
 	wondering what one of your working girls can expect.
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index e429fb0f60d..6722dae36b4 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -507,7 +507,6 @@ As the remote surgery's long recovery cycle completes,
 	
 <<case "retaste">>
 	The oral surgery is brief, with @@.red;nothing more than minor health effects.@@ In the sterile environment of the autosurgery, $he's unable to notice any improvement to $his sense of taste, and so must wait to discover the change when $he's released much later on.
-	<<set $activeSlave.devotion += 15, $activeSlave.trust += 15>>
 	<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
 		<<set $activeSlave.devotion += 15, $activeSlave.trust += 15>>
 		<<if ($activeSlave.devotion > 50)>>
diff --git a/src/uncategorized/toychest.tw b/src/uncategorized/toychest.tw
index 3ebe3689528..7ffc433c9df 100644
--- a/src/uncategorized/toychest.tw
+++ b/src/uncategorized/toychest.tw
@@ -8,7 +8,7 @@
 <<if $slaves[$i].fuckdoll > 0>>
 	is waiting for use nearby.
 <<elseif $slaves[$i].fetish == "mindbroken">>
-	<<if $slaves[$i].career == "a breeding bull" && isPlayerFertile($PC) && canPenetrate($slaves[$i])>>
+	<<if canSmell($slaves[$i]) && $slaves[$i].career == "a breeding bull" && isPlayerFertile($PC) && canPenetrate($slaves[$i])>>
 		is rock hard and sniffing the air.
 	<<else>>
 		is waiting dumbly nearby.
-- 
GitLab