diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 83fade01523a746607b42fa0a66ee4e1f33b5dd0..8300ce581623fc2eaa08c426a9a46830765df8e6 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -6,13 +6,13 @@
<<if $smilingManProgress == 0>>
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
- <br>
+ <br> /* TODO: fix grammatical errors */
During your morning routine, you stumble upon a peculiar report: it's been several weeks now that your arcology has been victim of a series of cyber-crimes conducted by a mysterious figure.
The egocentric criminal took great pride in their acts, to the point of signing his acts with their peculiar symbol: a stylized smiling face. Your arcology was not the only one under assault by the
machinations of the one the media quickly nicknamed //the smiling man//.
<br>Despite the sheer damage this criminal was doing, you cannot help but admire the skill with which every misdeed is carried - the worst white collar crimes of the century, carried out with such elegance
that they almost seemed the product of natural laws, rather than the masterful manipulation of the digital market.
- While you sift through the pages of the report, $assistantName remains strangely quiet. "I'm worried <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, this individual seems to be able to penetrate whichever system garners his attention. I... feel vulnerable" she said "It's not something I'm used to."
+ While you sift through the pages of the report, $assistantName remains strangely quiet. "I'm worried <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, this individual seems to be able to penetrate whichever system garners his attention. I... feel vulnerable." she said "It's not something I'm used to."
<br>Fortunately you have not been hit directly by this criminal - not yet at least. Still, the repercussions of numerous bankruptcies take their toll on your arcology, whose @@.red;prosperity suffers@@.
<br><<set $arcologies[0].prosperity *= random(80,90) * 0.01>>
<br>
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index b77036a13c87c1d52d5b886639afefba9e2f81ac..dcff1b6786c99a0b108912332e5db7139a6f9eab 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -2,6 +2,8 @@
/*TODO: add zoo facility / minifacility*/
+/* TODO: add "plots" of "crops" */
+
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Farmyard", $showEncyclopedia = 1, $encyclopedia = "Farmyard">>
<<if $farmyardName != "the Farmyard">>
@@ -273,8 +275,8 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<<if ($farmyardCages == 0)>>
<br>
- [[Add cages|Farmyard][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $farmyardCages = 1]]
- //Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>> and allows you to keep cats//
+ [[Add cages|Farmyard][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $farmyardCages = 1]]
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and allows you to keep cats//
<br>
<<elseif ($farmyardCages == 1)>>
<br>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 55ff0c4ecec739c7ff0e076db08ec91271934207..e3bb925d287c5ba0409bc37d319bd61fc1951a5a 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -55,7 +55,7 @@
<<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid.
<<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>>
<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
- She tries her best to be your perfect farmwife.
+ $He tries $his best to be your perfect farmwife.
<</if>>
<<if (_DL > 0) && ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>>
<<set _milkmaidImpregnated = 0>>
@@ -68,14 +68,14 @@
<</if>>
<</for>>
<<if _milkmaidImpregnated > 0>>
- It's her responsibility to keep her charges pregnant, and she constantly
+ It's $his responsibility to keep $his charges pregnant, and $he constantly
<<if _milkmaidImpregnated == 1>>
breeds the one fertile cow.
<<else>>
- fills the _milkmaidImpregnated cows' cunts with her cum.
+ fills the _milkmaidImpregnated cows' cunts with $his cum.
<</if>>
<<if $Milkmaid.career == "a breeding bull">>
- She was conditioned to fill empty wombs, so she takes a @@.hotpink;deep pleasure@@ in her job.
+ $He was conditioned to fill empty wombs, so $he takes a @@.hotpink;deep pleasure@@ in $his job.
<<set $slaves[_FLs].devotion++>>
<</if>>
<<set _Tmult = (_milkmaidImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Milkmaid.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>>
@@ -83,13 +83,13 @@
<</if>>
<</if>>
<<if (_FLsFetish == 1)>>
- In her line of work, she touches more breasts than even you do. She lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when she touches their creamy nipples. She has @@.lightcoral;become more of a breast girl.@@
+ In $his line of work, $he touches more breasts than even you do. $He lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when $he touches their creamy nipples. $He has @@.lightcoral;become more of a breast girl.@@
<<elseif (_FLsFetish == 2)>>
- It's a hard life, pulling teats and washing cows, but it does @@.lightsalmon;make her more of a breast fetishist.@@
+ It's a hard life, pulling teats and washing cows, but it does @@.lightsalmon;make $him more of a breast fetishist.@@
<</if>>
<<if ($Milkmaid.muscles > 30)>>
<<set $milkmaidHealthBonus++>>
- Her muscles help her handle the fattest or most reluctant cow.
+ $His muscles help $his handle the fattest or most reluctant cow.
<</if>>
<<if $dairyRestraintsSetting != 2>> /* how much effort the MM must take to force a slave into a stall */
<<for _dI = 0; _dI < _DL; _dI++>>
@@ -138,11 +138,11 @@
<</for>>
<</if>>
<<if (_MMWorkout > random(1,30)) && $Milkmaid.muscles < 60>>
- Constantly having to wrestle unruly or aiding heavy cows into their stalls forces her to @@.lime;build muscle.@@
+ Constantly having to wrestle unruly or aiding heavy cows into their stalls forces $him to @@.lime;build muscle.@@
<<set $slaves[_FLs].muscles++>>
<</if>>
<<if ($Milkmaid.oralSkill > 30)>>
- Her skilled tongue helps her keep her girls happy.
+ $His skilled tongue helps $him keep $his girls happy.
<</if>>
<<if ($Milkmaid.oralSkill < 90)>>
<<set $skillIncrease = 3>>
@@ -150,18 +150,18 @@
<</if>>
<<if ($Milkmaid.sexualQuirk == "caring")>>
<<set $milkmaidTrustBonus++>>
- She's very caring, and does her best to get the cows to trust her.
+ $He's very caring, and does $his best to get the cows to trust $him.
<</if>>
<<if ($Milkmaid.behavioralQuirk == "funny")>>
<<set $milkmaidTrustBonus++>>
- She's funny, and does her best to get the cows to trust her by keeping them laughing.
+ $He's funny, and does $his best to get the cows to trust $him by keeping them laughing.
<</if>>
<<if setup.milkmaidCareers.includes($Milkmaid.career)>>
<<set $milkmaidHealthBonus++>>
- She has career experience dealing with milk animals.
+ $He has career experience dealing with milk animals.
<<elseif $Milkmaid.skillFA >= $masteredXP>>
<<set $milkmaidHealthBonus++>>
- She has experience dealing with milk animals from working for you.
+ $He has experience dealing with milk animals from working for you.
<<else>>
<<set $slaves[_FLs].skillFA += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>>
<</if>>
@@ -169,7 +169,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if ($slaves[$i].balls > 0) && ($slaves[$i].prostate > 0)>>
- She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating.
+ $He uses $his turgid cock to give prostate stimulation to slaves that need help ejaculating.
<<set $slaves[_FLs].need -= 50>>
<<break>>
<</if>>
@@ -179,39 +179,39 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if $Milkmaid.rivalryTarget == $slaves[$i].ID>>
- She either neglects or harasses her <<print rivalryTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure she is unhappy and uncomfortable.
+ $He either neglects or harasses $his <<print rivalryTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure $he is unhappy and uncomfortable.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<<if random(1,100) > 65>>
<<set $Milkmaid.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Milkmaid.relationshipTarget == $slaves[$i].ID>>
- She dotes over her <<print relationshipTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure she is happy and comfortable.
+ $He dotes over $his <<print relationshipTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure $he is happy and comfortable.
<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- She pays special attention to her <<print relativeTerm($Milkmaid.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure she is well kept and happy.
+ $He pays special attention to $his <<print relativeTerm($Milkmaid.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure $he is well kept and happy.
<<set $slaves[$i].trust++>>
<<elseif $Milkmaid.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she is well kept and happy.
+ $He pays special attention to $his $slaves[$i].relation, $slaves[$i].slaveName, making sure $he is well kept and happy.
<<set $slaves[$i].trust++>>
<</if>>
- <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
+ <<if $slaves[$i].prestigeDesc == "$He is remembered for winning best in show as a dairy cow.">>
<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
- She spends extra time with $slaves[$i].slaveName, the well-known cow. She is fascinated by $slaves[$i].slaveName's massive $slaves[$i].boobs cc breasts and spends extra time massaging and kneading them to maximize production.
+ $He spends extra time with $slaves[$i].slaveName, the well-known cow. $He is fascinated by $slaves[$i].slaveName's massive $slaves[$i].boobs cc breasts and spends extra time massaging and kneading them to maximize production.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
- She is disappointed that the well-known cow $slaves[$i].slaveName<<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>>'s breasts have shrunken considerably from their heyday.<</if>>
+ $He is disappointed that the well-known cow $slaves[$i].slaveName<<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>>'s breasts have shrunken considerably from their heyday.<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
+ <<if $slaves[$i].prestigeDesc == "$He is remembered for winning best in show as a cockmilker.">>
<<if (($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>>
- She spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
+ $He spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. $He can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
- She is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>>
+ $He is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[$i].bellyPreg >= 1500>>
- She spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable.
+ <<if $slaves[$i].prestigeDesc == "$He is remembered for winning best in show as a breeder." && $slaves[$i].bellyPreg >= 1500>>
+ $He spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by $his growing pregnancy and popular womb. $He makes sure $his belly and it's occupants are nice and comfortable.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
<</for>>
@@ -348,7 +348,7 @@
<<else>>
is serving as a cow in $dairyName.
<</if>>
- <br> She <<include "SA get milked">>
+ <br> $He <<include "SA get milked">>
<br>
<<include "SA rules">>
<<include "SA diet">>
@@ -866,32 +866,32 @@
<<if _chemMinor > 1>>
_chemMinor cows have been drugged and used long enough that they require increased curative doses, slightly reducing their output.
<<elseif _chemMinor > 0>>
- One cow has been drugged and used long enough that she requires increased curative doses, slightly reducing her output.
+ One cow has been drugged and used long enough that $he requires increased curative doses, slightly reducing $his output.
<</if>>
<<if _desterilized > 1>>
_desterilized cows had minor health issues preventing their fertile womb from conceiving; the issues have been resolved and they have been impregnated.
<<elseif _chemMinor > 0>>
- One cow had minor health issues preventing her fertile womb from conceiving; they have been resolved and she has been impregnated.
+ One cow had minor health issues preventing $his fertile womb from conceiving; they have been resolved and $he has been impregnated.
<</if>>
<<if _hatefilled > 1>>
_hatefilled cows stopped struggling so much when fucked by the machines; it seems they have sunk into a fugue.
<<elseif _hatefilled > 0>>
- One cow stopped struggling so much when fucked by the machines; it seems she has sunk into a fugue.
+ One cow stopped struggling so much when fucked by the machines; it seems $he has sunk into a fugue.
<</if>>
<<if _horrified > 1>>
_horrified cows' emotional activity dropped significantly; this indicates acceptance that they are not likely to leave $dairyName, ever again.
<<elseif _horrified > 0>>
- One cow's emotional activity dropped significantly; this indicates acceptance that she is not likely to leave $dairyName, ever again.
+ One cow's emotional activity dropped significantly; this indicates acceptance that $he is not likely to leave $dairyName, ever again.
<</if>>
<<if _skillsLost > 1>>
_skillsLost cows forgot skills due to their inability to focus on anything but machine rape.
<<elseif _skillsLost > 0>>
- One cow forgot skills due to her inability to focus on anything but machine rape.
+ One cow forgot skills due to $his inability to focus on anything but machine rape.
<</if>>
<<if _careerForgotten > 1>>
_careerForgotten cows forgot the details of their past professional lives; all they can remember now is this.
<<elseif _careerForgotten > 0>>
- One cow forgot the details of her past professional life; all she can remember now is this.
+ One cow forgot the details of $his past professional life; all $he can remember now is this.
<</if>>
<<if _vaginasStretched > 1>>
_vaginasStretched cows' vaginas were broken in for machine use, and are unlikely to be any use for anything other than receiving cum and medication, and giving birth.
@@ -911,7 +911,7 @@
<<if _stupidified > 1>>
_stupidified cows were so mentally dulled by use as biological factories that they were reduced to a very low level of intelligence.
<<elseif _stupidified > 0>>
- One cow was so mentally dulled by use as biological factories that she was reduced to a very low level of intelligence.
+ One cow was so mentally dulled by use as biological factories that $he was reduced to a very low level of intelligence.
<</if>>
<<if _mindbroken > 1>>
_mindbroken cows finally lost higher mental function, and are now nothing more than industrial equipment made of meat.
@@ -926,7 +926,7 @@
<<if _balltacular > 1>>
_balltacular cows' testicles reached the largest size drug treatments can produce; the machines will now focus on buttfucking them with extra force.
<<elseif _balltacular > 0>>
- One cow's testicles reached the largest size drug treatments can produce; the machines will now focus on buttfucking her with extra force.
+ One cow's testicles reached the largest size drug treatments can produce; the machines will now focus on buttfucking $him with extra force.
<</if>>
<<if ($dairyPregUpgrade == 1)>>
@@ -1025,7 +1025,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if ($slaves[$i].ID == $bioreactorPerfectedID)>>
- <br><br> <<= SlaveFullName($slaves[$i])>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
+ <br><br> <<= SlaveFullName($slaves[$i])>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. $He has been reclassified as part of the machine $he's now permanently attached to. This combination is projected to produce approximately
<<if $slaves[$i].balls > 0>><<print 1000*Math.trunc((3*52*(45-$slaves[$i].physicalAge))/1000)>> liters of cum,<</if>>
<<if $slaves[$i].ovaries == 1>><<print 100*Math.trunc((52*(45-$slaves[$i].physicalAge))/100)>> liters of vaginal secretions, <<if $dairyPregSetting == 3>><<print 13*(45-$slaves[$i].physicalAge)>><<else>><<print 5*(45-$slaves[$i].physicalAge)>><</if>> slaves,<</if>>
and <<print 1000*Math.trunc((300*52*(45-$slaves[$i].physicalAge))/1000)>> liters of milk over a <<print 45-$slaves[$i].physicalAge>> year period before its biological components must be replaced.
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index 1bd319bc12dbeff668962a63d0fc5fbb131baaa0..a458a1add76515d7890071e30f652c1fe170f6d7 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -41,17 +41,17 @@
<<set _devBonus++>>
<</if>>
<<set $slaves[_FLs].devotion += _devBonus, $Matron = $slaves[_FLs]>>
- <<= SlaveFullName($Matron)>> is serving as the nursery matron.<<if $Matron.relationship == -3 && $Matron.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>>
+ <<= SlaveFullName($Matron)>> is serving as the nursery matron.<<if $Matron.relationship == -3 && $Matron.devotion > 50>> $He tries $his best to be your perfect attentive, caring and loving wife.<</if>>
<<if (_FLsFetish == 1)>>
- When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes more caring.@@
+ When $he is paid a visit by a slave with sexual issues to work out, $he provides $him with an understanding, willing, giving partner. $He finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes more caring.@@
<<elseif (_FLsFetish == 2)>>
- Every new slave in the nursery is a new girl she gets to connect with and serve. Sexually. @@.lightsalmon;She becomes more caring.@@
+ Every new slave in the nursery is a new girl $he gets to connect with and serve. Sexually. @@.lightsalmon;$He becomes more caring.@@
<</if>>
<<if setup.attendantCareers.includes($Matron.career)>>
- She has experience with childcare from her life before she was a slave, making her better at properly raising children, and giving her a better chance of softening flaws into beneficial quirks.
+ $He has experience with childcare from $his life before $he was a slave, making $him better at properly raising children, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
<<elseif $Matron.skillMT >= $masteredXP>>
- She has experience with childcare from working for you, making her better at properly raising children, and giving her a better chance of softening flaws into beneficial quirks.
+ $He has experience with childcare from working for you, making $him better at properly raising children, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
<<else>>
<<set $slaves[_FLs].skillMT += random(1,($Matron.intelligence+4)*2)>>
@@ -65,18 +65,18 @@
<<set _idleBonus++>>
*/
<<elseif ($Matron.fetishKnown == 1)>>
- $Matron.slaveName can't keep her hands to herself, preventing the slaves in the nursery from relaxing completely.
+ $Matron.slaveName can't keep $him hands to herself, preventing the slaves in the nursery from relaxing completely.
<</if>>
<<if ($Matron.visualAge > 35)>>
- Her apparent maturity encourages the slaves in the nursery to relax and pour out their troubles to her.
+ Her apparent maturity encourages the slaves in the nursery to relax and pour out their troubles to $him.
<<set _healthBonus++, _idleBonus++>>
<</if>>
<<if ($Matron.intelligence > 0)>>
- She's so intelligent she can suss out the cause of slaves' emotional issues and counsel them effectively.
+ $He's so intelligent $he can suss out the cause of slaves' emotional issues and counsel them effectively.
<<set _idleBonus++>>
<</if>>
<<if isFertile($Matron) || ($Matron.bellyPreg >= 1500) || ($Matron.birthsTotal > 0) || ($Matron.bellyImplant >= 1500)>>
- She has a natural mothering instinct and really makes her girls feel at home.
+ $He has a natural mothering instinct and really makes $his girls feel at home.
<<set _idleBonus++, _healthBonus++>>
<</if>>
/* TODO: this will need to be reworked
@@ -86,7 +86,7 @@
<<if ($slaves[$i].fetish == "mindbroken") && ($slaves[$i].health > 20) && (_attendantUsedCure == 0) && ($nurseryFix != 2)>>
<<set _attendantUsedCure = 1>>
<<if (random(1,100) > 90-$Matron.devotion)>>
- <br> @@.green;Something almost miraculous has happened.@@ $Matron.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on her in $nurseryName. $slaves[$i].slaveName has begun to respond, and is stirring from her mental torpor.
+ <br> @@.green;Something almost miraculous has happened.@@ $Matron.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on $him in $nurseryName. $slaves[$i].slaveName has begun to respond, and is stirring from $him mental torpor.
<<set $slaves[$i].devotion = -3, $slaves[$i].sexualFlaw = "apathetic", $slaves[$i].behavioralFlaw = either("hates men", "odd"), $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1>>
<<set _spr = $genePool.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
<<if $genePool[_spr].intelligence > -3>>
@@ -103,55 +103,55 @@
<<set $slaves[$i].trust++>>
<</if>>
<<if $Matron.rivalryTarget == $slaves[$i].ID>>
- She constantly harasses her <<if $Matron.rivalry == 1>>growing rival<<elseif $Matron.rivalry == 2>>rival<<elseif $Matron.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
+ $He constantly harasses $him <<if $Matron.rivalry == 1>>growing rival<<elseif $Matron.rivalry == 2>>rival<<elseif $Matron.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, preventing $him from getting comfortable and forcing $him to keep $him guard up.
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
<<if random(1,100) > 35>>
<<set $Matron.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Matron.relationshipTarget == $slaves[$i].ID>>
- She dedicates most of her attention to her <<if $Matron.relationship == 1>>friend<<elseif $Matron.relationship == 2>>best friend<<elseif $Matron.relationship == 3>>friend with benefits<<elseif $Matron.relationship == 4>>lover<<elseif $Matron.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making her stress, both physical and mental, wash away.
+ $He dedicates most of $him attention to $him <<if $Matron.relationship == 1>>friend<<elseif $Matron.relationship == 2>>best friend<<elseif $Matron.relationship == 3>>friend with benefits<<elseif $Matron.relationship == 4>>lover<<elseif $Matron.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making $him stress, both physical and mental, wash away.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<elseif $familyTesting == 1 && areRelated($Matron, $slaves[$i]) > 0>>
<<if $slaves[$i].mother == $Matron.ID || $slaves[$i].father == $Matron.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him daughter, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<<elseif $slaves[$i].ID == $Matron.mother>>
- She makes sure to spend extra time caring for her mother, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him mother, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<<elseif $slaves[$i].ID == $Matron.father>>
- She makes sure to spend extra time caring for her father, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him father, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<<else>>
<<switch areSisters($slaves[$i], $Matron)>>
<<case 1>>
- She makes sure to spend extra time caring for her twin sister, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him twin sister, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<<case 2>>
- She makes sure to spend extra time caring for her sister, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him sister, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<<case 3>>
- She makes sure to spend extra time caring for her half-sister, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him half-sister, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<</switch>>
<</if>>
<<elseif $Matron.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She makes sure to spend extra time caring for her $slaves[$i].relation, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $him $slaves[$i].relation, $slaves[$i].slaveName.
<<set $slaves[$i].trust++>>
<</if>>
<<switch $slaves[$i].prestigeDesc>>
- <<case "She is a famed Free Cities whore, and commands top prices.">>
- She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to pay special attention to her worn holes.
+ <<case "$He is a famed Free Cities whore, and commands top prices.">>
+ $He does $him best to relax the famous whore, $slaves[$i].slaveName, making sure to pay special attention to $him worn holes.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
- <<case "She is a famed Free Cities slut, and can please anyone.">>
- She does her best to soothe the famous entertainer, $slaves[$i].slaveName, letting her relax in blissful peace.
+ <<case "$He is a famed Free Cities slut, and can please anyone.">>
+ $He does $him best to soothe the famous entertainer, $slaves[$i].slaveName, letting $him relax in blissful peace.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
- <<case "She is remembered for winning best in show as a cockmilker.">>
+ <<case "$He is remembered for winning best in show as a cockmilker.">>
<<if ($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)>>
<<if $Matron.fetish == "cumslut">>
- She can't keep her hands off $slaves[$i].slaveName's cock and balls, but she doesn't mind being milked constantly. Before long, strands of cum can be found floating all throughout the bath.
+ $He can't keep $him hands off $slaves[$i].slaveName's cock and balls, but $he doesn't mind being milked constantly. Before long, strands of cum can be found floating all throughout the bath.
<<set $Matron.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's massive genitals and tends to her whenever she feels a need for release.
+ $He does $him best to accommodate $slaves[$i].slaveName's massive genitals and tends to $him whenever $he feels a need for release.
<<if random(1,100) > 65 && $Matron.fetish == "none">>
After taking several massive loads to the face, $Matron.slaveName begins to find satisfaction in being coated in cum.
<<set $Matron.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
@@ -159,13 +159,13 @@
<</if>>
<</if>>
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
- <<case "She is remembered for winning best in show as a dairy cow.">>
+ <<case "$He is remembered for winning best in show as a dairy cow.">>
<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
<<if $Matron.fetish == "boobs">>
- She can't keep her hands off $slaves[$i].slaveName's huge breasts, but she doesn't mind being milked constantly. Before long the bath gains a white tint.
+ $He can't keep $him hands off $slaves[$i].slaveName's huge breasts, but $he doesn't mind being milked constantly. Before long the bath gains a white tint.
<<set $Matron.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's massive breasts and tends to her whenever she feels a need for release.
+ $He does $him best to accommodate $slaves[$i].slaveName's massive breasts and tends to $him whenever $he feels a need for release.
<<if random(1,100) > 65 && $Matron.fetish == "none">>
After multiple milking sessions, $Matron.slaveName begins to find herself fantasizing about having giant milky breasts too.
<<set $Matron.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
@@ -173,13 +173,13 @@
<</if>>
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
- <<case "She is remembered for winning best in show as a breeder.">>
+ <<case "$He is remembered for winning best in show as a breeder.">>
<<if $slaves[$i].bellyPreg >= 5000>>
<<if $Matron.fetish == "pregnancy">>
- She can't keep her hands off $slaves[$i].slaveName's pregnancy, but she doesn't mind her full belly being fondled.
+ $He can't keep $his hands off $slaves[$i].slaveName's pregnancy, but $he doesn't mind $his full belly being fondled.
<<set $Matron.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
+ $He does $him best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
<<if random(1,100) > 65 && $Matron.fetish == "none">>
After massaging $slaves[$i].slaveName's growing belly multiple times, $Matron.slaveName begins to find herself fantasizing about being swollen with life too.
<<set $Matron.fetish = "pregnancy", $slaves[_FLs].fetish = "pregnancy">>
@@ -188,10 +188,10 @@
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
<<if $Matron.fetish == "pregnancy">>
- She can't help but pester $slaves[$i].slaveName with questions about her famous pregnancy, limiting her ability to truly relax.
+ $He can't help but pester $slaves[$i].slaveName with questions about $him famous pregnancy, limiting $him ability to truly relax.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
<<elseif canGetPregnant($slaves[$i])>>
- She does her best to encourage $slaves[$i].slaveName's fertilization by performing any fertility boosting actions she can.
+ $He does $him best to encourage $slaves[$i].slaveName's fertilization by performing any fertility boosting actions $he can.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
<</if>>
@@ -200,11 +200,11 @@
<<if $slaves[$i].behavioralFlaw != "none">>
<<run SoftenBehavioralFlaw($slaves[$i])>>
<<set _attendantUsedCure += 1>>
- <br> $Matron.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
+ <br> $Matron.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens $him behavioral flaw@@ into an appealing quirk.
<<elseif $slaves[$i].sexualFlaw != "none">>
<<run SoftenSexualFlaw($slaves[$i])>>
<<set _attendantUsedCure += 1>>
- <br> $Matron.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
+ <br> $Matron.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens $him sexual flaw@@ into an appealing quirk.
<</if>>
<</if>>
<</for>>
@@ -212,7 +212,7 @@
<<if (_DL < $nursery)>>
<<set _seed = random(1,10)+(($nursery-_DL)*(random(150,170)+(_idleBonus*10)))>>
<<set $cash += _seed>>
- <br> Since she doesn't have enough children to occupy all her time, the nursery takes in citizens' children on a contract basis and she cares for them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since $he doesn't have enough children to occupy all $him time, the nursery takes in citizens' children on a contract basis and $he cares for them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<<if ($arcologies[0].FSRepopulationFocus > 0) && (_DL == 0)>>
Society @@.green;loves@@ the way you are raising more children for $arcologies[0].name.
<<= FSChange ("Repopulationist", 2)>>
@@ -301,7 +301,7 @@
<<else>>
is working in $nurseryName.
<</if>>
- <br> She <<= saRest($slaves[$i])>>
+ <br> $He <<= saRest($slaves[$i])>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -330,12 +330,12 @@
<<if (_restedSlaves > 0)>>
<br><br>
<<if (_restedSlaves == 1)>>
- One slave has rested until she reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the nursery 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 nursery 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 nursery before the end of the week.
<</if>>
<<if $nurseryDecoration != "standard">>
- <br><br> $nurseryNameCaps's $nurseryDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ working.
+ <br><br> $nurseryNameCaps's $nurseryDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>$him while $he was<<else>>them while they were<</if>>@@ working.
<</if>>
<</if>>
*/
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index c22bfac2e8b768263447750deed0327af7b24d92..d6554c0ba41f800d0ceb756765b1675a8a688676 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -573,7 +573,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $farmyard = 0>>
<<set $farmyardSlaves = 0>>
<<set $farmyardDecoration = "standard">>
-<<set $farmyardUpgrade = 0>>
+<<set $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}>>
<<set $farmyardUpgradeList = []>>
<<set $farmyardCrops = 0>>
<<set $farmyardStable = 0>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 360ca845eaeb0324331dd0385383190227929781..57fce8ac14ffc95e7cb5926abd509551358173fe 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -6,6 +6,8 @@
<<set _lisping = 1>>
<</if>>
+/* TODO: clean up this passage - lots of repeating blocks */
+
<<if ($activeSlave.devotion < -50)>>
$He
<<if ($activeSlave.trust >= -20)>>
@@ -157,11 +159,13 @@ My favorite part of my body i<<s>>
<<if ($activeSlave.anus > 3)>>
my gaping butthole. It'<<s>> //<<s>>o// fucked out and beautiful. I can barely remember what anal pain feel<<s>> like, but thinking about the sort<<s>> of thing<<s>> we can put in me, now, get<<s>> me <<s>>o hot.
<<elseif ($activeSlave.anus > 2)>>
- my a<<ss>>pu<<ss>>y - I can take anything! It'<<s>> //<<s>>o// much better than my <<if $activeSlave.dick > 0>>cock<<else>>pu<<ss>>y<</if>>. It bring<<s>> me so much plea<<s>>ure - and pain - and - I'm <<s>>orry, <<Master>> what were we talking about again? Oh! Right.
+ my a<<ss>>pu<<ss>>y - I can take anything! It'<<s>> //<<s>>o// much better than my <<if $activeSlave.dick > 0>>cock<<else>>pu<<ss>>y<</if>>. It bring<<s>> me so much plea<<s>>ure -- and pain -- and -- I'm <<s>>orry, <<Master>> what were we talking about again? Oh! Right.
<<elseif ($activeSlave.anus > 1)>>
- my a<<ss>>hole, I like how I can take anyone'<<s>> cock. It'<<s>> //<<s>>o// much better than my <<if $activeSlave.dick > 0>>cock<<else>>pu<<ss>>y<</if>>. It brings me <<s>>o much plea<<s>>ure - and pain. - and - I'm <<s>>orry, <<Master>> what were we talking about again? Oh! Right.
- <<else>>
+ my a<<ss>>hole, I like how I can take anyone'<<s>> cock. It'<<s>> //<<s>>o// much better than my <<if $activeSlave.dick > 0>>cock<<else>>pu<<ss>>y<</if>>. It brings me <<s>>o much plea<<s>>ure -- and pain. -- and- - I'm <<s>>orry, <<Master>> what were we talking about again? Oh! Right.
+ <<elseif ($activeSlave.anus == 1)>>
my tight little anu<<s>>, I like feeling it <<s>>tretch to take a fuck. It's //so// much better than my <<if $activeSlave.dick > 0>>cock<<else>>pu<<ss>>y<</if>>. It brings me so much plea<<s>>ure... and pain... and... I'm <<s>>orry, <<Master>> what were we talking about again? Oh! Right.
+ <<elseif ($activeSlave.anus == 0)>>
+ my little virgin butthole. I can't wait for the fir<<s>>t time you fuck me in the a<<ss>> -- I wonder if it'll hurt.
<</if>>
<<elseif ($activeSlave.sexualFlaw == "breeder") && ($activeSlave.fetishStrength > 95)>>
<<if ($activeSlave.bellyPreg >= 600000)>>
@@ -224,7 +228,7 @@ My favorite part of my body i<<s>>
my boob<<s>>, of cour<<s>>e. They're <<s>>o beautiful, and the <<c>>enter of my world.
<</if>>
<<elseif ($activeSlave.energy > 95)>>
- - i<<s>> - I can't de<<c>>ide!
+ - i<<s>> -- I can't de<<c>>ide!
<<if $activeSlave.vagina > -1>>
I love my pu<<ss>>y of cour<<s>>e.
<<if $activeSlave.clit > 0>>Having another <<s>>lave <<s>>uck my big clit i<<s>> incredible.<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index f748d92ed030f49ad90f4cf1c9203771f070f1af..12378fa21854ea902630ec2569455337a8ecda3a 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -224,7 +224,7 @@
<</if>>
<</if>>
<<if $cheatMode == 1>>
- | <<link "Check $his deadliness @@.red;FOR TESTING@@">><<replace "#miniscene">><<set $deadliness = Deadliness($activeSlave)>>$deadliness<br> <</replace>><</link>>
+ | <<link "Check $his stats @@.red;FOR TESTING@@">><<replace "#miniscene">><<set $deadliness = Deadliness($activeSlave)>><<include "Slave Stats">><br> <</replace>><</link>>
<</if>>
| <<link "Abuse $him">><<replace "#miniscene">><<include "FAbuse">><</replace>><</link>>
<<if $familyTesting == 1>>
diff --git a/src/uncategorized/deadliness.tw b/src/uncategorized/slaveStats.tw
similarity index 74%
rename from src/uncategorized/deadliness.tw
rename to src/uncategorized/slaveStats.tw
index 9a5d72ce33c10dab225a4c9d11f8778e366b5641..3647e439aa6d955c3a496fc9738f71af25d05423 100644
--- a/src/uncategorized/deadliness.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -1,4 +1,6 @@
-:: Deadliness [nobr]
+:: Slave Stats [nobr]
+
+/* TODO: add more stats here */
<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>