diff --git a/src/endWeek/saRules.js b/src/endWeek/saRules.js
index 1ea957f1b8405f1115c3966ede77a17f68502294..34dbc243129eaaeb49670b1f546e11af167d8a19 100644
--- a/src/endWeek/saRules.js
+++ b/src/endWeek/saRules.js
@@ -7,7 +7,6 @@ App.EndWeek.slaveRules = function() {
function saRules(slave) {
const
{
- // eslint-disable-next-line no-unused-vars
he, him, his, himself, He
} = getPronouns(slave);
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 4859b05c7cd64511dff75f53bcb892a1dedffcee..c9c3006ae50cc4ac4e0cc0ae9d22e0fa47dc44df 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -576,7 +576,7 @@ The room containing all the clothes and accessories you have available to dress
[[Order a shipment of extra long dildos and bullet vibes|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtDildos = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierTrade))>></span>
<<else>>
- You are well stocked with extra long dildos in a variety of sizes, as well as a good amount of bullet vibrators. /* FIXME: not happy with this line */
+ You are well stocked with extra long dildos in a variety of sizes, as well as a good amount of bullet vibrators.
<<if $toysBoughtSmartVibes == 0>>
<div class="indent">
[[Order the "smart" variant of the bullet vibrators|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtSmartVibes = 1]]
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 89bc38f44955ea95687a2a3729863d13a8db4e71..84029a4857225775fff5959924a99289ceb67169 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -125,7 +125,7 @@
<</if>>
<</if>>
-<<case "work as a farmhand">> /* TODO: This needs a rewrite */
+<<case "work as a farmhand">>
<<set _animals = []>>
<<if $canines.length > 0>>
<<set _roll = random(0, $canines.length)>>
@@ -140,18 +140,19 @@
<<set _animals.push($canines[_roll])>>
<</if>>
<<if $slaves[$i].fetish == "mindbroken">>
- <<if $farmyardShows == 1>>
+ <<if $farmyardShows && $seeBestiality>>
<<set _roll = random(0, _animals.length)>>
- $He shows no interest in $his coming birth as $he continues being rutted by a <<print _animals[_roll].species>>, so <<if $Farmer > 0>>$Farmer.name<<else>>another slave<</if>> has to pull the animal off of $him and drag $him into the nearest birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
+ $He shows no interest in $his coming birth as $he continues being rutted by a <<print _animals[_roll].species>>, so <<if _S.Farmer>> 0>>_S.Farmer.slaveName<<else>>another slave<</if>> has to pull the animal off of $him and drag $him into the nearest birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
<<else>>
$He shows no interest in $his coming birth as $he continues <<print either("loading hay bales", "milking a cow", "pulling weeds")>>, until $his contractions become so strong that $he collapses to $his knees. <<if $Farmer > 0>>$Farmer.name<<else>>Another slave<</if>> is at $his side in an instant, pulling $him to $his feet and into a birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
<</if>>
<<else>>
- <<if $farmyardShows == 1>>
- Since the farmyard is designed for pregnant slaves, $he stays hooked up to the milkers. $He meekly protests $his situation, but ultimately accepts it. $He begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, and catches a glimpse of $his child<<if $slaves[$i].pregType > 1>>ren<</if>> being removed from the milking stall, but quickly forgets when $he is hosed off.
+ <<if $farmyardShows && $seeBestiality>>
+ <<set _roll = random(0, _animals.length)>>
+ <<if _S.Farmer>>_S.Farmer.slaveName<<else>>Another slave<</if>> pulls the <<print _animals[_roll].species>> off of $him after $he begins to feel contractions coming. $He begins to give birth where $he is<<if $farmyardRestraints>>, restraints still on,<</if>> and gives $his viewers a different kind of show than the kind they were expecting. The crowd is appreciative, and after $he has finished, a slave takes $his child<<if $slaves[$i].pregType > 1>>ren<</if>> from $him and leads $him back to $his room to shower and rest before $he is expected to return to $his shows.
<<set $humiliation = 1>>
<<else>>
- <<if !canWalk($slaves[$i])>>$He is helped back to $his bed and stripped before slipping into it<<else>>$He returns to $his bed and strips before slipping into it<</if>>. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he rests awhile before returning to the milkers to lighten $his swelling breasts.
+ <<if !canWalk($slaves[$i])>>$He is helped back to $his bed and stripped before slipping into it<<else>>$He returns to $his bed and strips before slipping into it<</if>>. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he rests awhile before returning to $farmyardName to continue <<print either("loading hay bales", "milking cows", "pulling weeds")>>.
<</if>>
<</if>>
@@ -240,30 +241,21 @@
<</if>>
<<else>>
<<if $slaves[$i].fetish == "mindbroken">>
- $He returns to $his bed and strips before slipping into it. Instinctively, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, after a short rest, $he returns to wandering the penthouse.
+ $He is lead back to $his bed and strips before slipping into it. Instinctively, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, after a short rest, $he returns to wandering the penthouse.
<<else>>
$He returns to $his bed and strips before slipping into it. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, after a short rest, $he returns to pondering $his preferred assignment.
<</if>>
<</if>>
<<case "rest in the spa">>
- <<if $slaves[$i].fetish == "mindbroken">>
- <<if _S.Attendant>>_S.Attendant.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside _S.Attendant.slaveName,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to $his watching helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
- <<else>>
- <<if _S.Attendant>>_S.Attendant.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside _S.Attendant.slaveName,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, aided by $his helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
- <</if>>
+ <<if _S.Attendant>>_S.Attendant.slaveName <<if $slaves[$i].fetish == "mindbroken">>leads<<else>>escorts<</if>> $him to a special pool designed to give birth in. Once $he is safely in the water alongside _S.Attendant.slaveName,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, <<if $slaves[$i].fetish == "mindbroken">>indifferent to<<else>>aided by<</if>> $his helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
-<<case "work as a nanny">> /* TODO: write a description for this */
- //This needs a description//
+<<case "work as a nanny">>
+ $He finishes <<if $nurseryBabies>>changing the child's diaper<<else>>cleaning the area of $nurseryName that $he's been working on<</if>> and heads back to $his little room before stripping and getting into bed. $He begins the ordeal of childbirth, and after $he is finished, rests for a bit while $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> collected. After a short shower, $he returns to $his duties in $nurseryName.
<<case "learn in the schoolroom">>
- <<if !canWalk($slaves[$i])>>
- Having been notified in the weeks leading up to $his birth, $he is helped to the front of the class and stripped. $He is being used as a learning aid in this lesson. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of the rapt attention of the other students. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning and fresh change of clothes, $he is helped back to $his seat. $He can't help but <<if canSee($slaves[$i])>>notice some of the detailed notes the class took on $his genitals<<else>>overhear the descriptions of $his <<if $slaves[$i].mpreg == 1>>asshole<<else>>vagina<</if>> being passed between $his peers<</if>>.
- <<set $humiliation = 1>>
- <<else>>
- Having been notified in the weeks leading up to $his birth, $he heads to the front of the class and strips. $He is being used as a learning aid in this lesson. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of the rapt attention of the other students. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning and fresh change of clothes, $he returns to $his seat. $He can't help but <<if canSee($slaves[$i])>>notice some of the detailed notes the class took on $his genitals<<else>>overhear the descriptions of $his <<if $slaves[$i].mpreg == 1>>asshole<<else>>vagina<</if>> being passed between $his peers<</if>>.
- <<set $humiliation = 1>>
- <</if>>
+ Having been notified in the weeks leading up to $his birth, $he <<if canWalk($slaves[$i])>>heads<<else>>is helped<</if>> to the front of the class and strips. $He is being used as a learning aid in this lesson. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of the rapt attention of the other students. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning and fresh change of clothes, $he returns to $his seat. $He can't help but <<if canSee($slaves[$i])>>notice some of the detailed notes the class took on $his genitals<<else>>overhear the descriptions of $his <<if $slaves[$i].mpreg == 1>>asshole<<else>>vagina<</if>> being passed between $his peers<</if>>.
+ <<set $humiliation = 1>>
<<case "take classes">>
Or $he would have, had $assistant.name allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $his birth will be turned into a live broadcast. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, trying $his best to hide $his shame. Exhausted from the birth, $he is permitted a short break as $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> collected to clean $himself up before the lesson is continued.
@@ -353,7 +345,7 @@
_S.Attendant.slaveName waddles to a special pool designed to give birth in. Once $he is safely in the water, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, something $he has been trained for. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he heads back to the main pool.
<<case "be the Matron">>
- //This needs a description//
+ $He quickly waddles back to $his private room before stripping and calling in several slaves to assist $him in childbirth. $He has quite a bit of experience in taking care of children, but not as much in delivering them, and less so in delivering $his own. $He soon figures it out, though, and after an exhausting birthing ordeal, $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> taken from $him, and $he is allowed a shower and a rest before returning to work.
<<case "be the Madam">>
$He heads to a private room in the back of the club accompanied by an influential patron. $He settles $himself onto his lap and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, basking in his attention as he strips $him. Placing $his child<<if $slaves[$i].pregType > 1>>ren<</if>> outside the room, $he returns to get more intimate with $his catch.
@@ -364,11 +356,11 @@
<<case "be the Milkmaid">>
$He returns to $his bed and strips before slipping into it. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $He is quite experienced in delivering $his cows' children, but $he finds it much more difficult to apply $his knowledge to $himself. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, after a short rest, $he returns to caring for your cows.
-<<case "be the Farmer">> /* TODO: write this */
- //This needs a description//
+<<case "be the Farmer">>
+ $He heads to $his private room before stripping and calling in a couple of nearby slaves to aid $him. Though $he has delivered more than a few of $his livestocks' offspring, delivering $his own proves to be a slightly more difficult ordeal. $He manages, though, and after $his child<<if $slaves[$i].pregType > 1>>ren<</if>>ren are<</else>> is<</if>> taken from $him and $he's had a shower and a short rest, $he returns to looking after $farmyardName.
<<case "be the Wardeness">>
- <<if $slaves[$i].fetish == "mindbroken">>
+ <<if $slaves[$i].fetish == "mindbroken">> /* FIXME: can Wardens be mindbroken? */
$He enters an empty cell, strips, and seats $himself on the cot. $He instinctively begins birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he returns to mindlessly breaking the confined slaves.
<<else>>
$He returns to $his bed and strips before slipping into it. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he rests awhile before returning to the cellblock.
@@ -556,9 +548,6 @@
$He is placed in a special flotation device and placed in a birthing pool. Giving birth to $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>> is easy under such relaxing circumstances. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is carried back to the spa.
<</if>>
-<<case "work as a nanny">> /* TODO: write a description for this */
- //This needs a description//
-
<<case "learn in the schoolroom">>
$He is placed on special seat at the front of the class and stripped. $He is being used as a learning aid in this lesson. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of the rapt attention of the other students. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning and fresh change of clothes, $he is carried back to $his seat. $He can't help but <<if canSee($slaves[$i])>>notice some of the detailed notes the class took on $his genitals<<else>>overhear the descriptions of $his <<if $slaves[$i].mpreg == 1>>asshole<<else>>vagina<</if>> being passed between $his peers<</if>>.
<<set $humiliation = 1>>
@@ -1028,11 +1017,9 @@
<</if>>
<</if>>
-<<case "work as a nanny">> /* TODO: This needs a rewrite */
- While heading for the changing room before a nice soak,$slaves[$i].slaveName's water breaks. $He hurries into the changing room only to find it unusually crowded. Without any choice left, $he assumes a birthing position.
- <<set $humiliation = 1>>
+ In the middle of <<if $nurseryBabies>>changing a baby's diaper<<else>>cleaning $nurseryName<</if>>, $slaves[$i].slaveName's water breaks. $He hurries into a changing room and assumes a birthing position.
<<ClothingBirth>>
- Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<if _S.Attendant>>_S.Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into the bath to clean up and relax<</if>>.
+ Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>>. <<if _S.Matron>>_S.Matron.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into a shower to clean up and relax<</if>>.
<<case "learn in the schoolroom">>
<<if ($Schoolteacher != 0)>>
@@ -1110,8 +1097,8 @@
<<ClothingBirth>>
$He thanks $his charges for their less than helpful efforts and collects $his child<<if $slaves[$i].pregType > 1>>ren<</if>> for removal. Upon returning, $he strips down and enters the pool, desperate for a break.
-<<case "be the Matron">> /* TODO: This needs a rewrite */
- While tending to the infants in the nursery, $slaves[$i].slaveName's water breaks. The nannies quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
+<<case "be the Matron">>
+ While tending to the infants in $nurseryName, $slaves[$i].slaveName's water breaks. The nannies quickly come to $his aid as the contractions get closer and closer together. They crowd around and watch, their curiousity getting the better of them.
<<set $humiliation = 1>>
<<ClothingBirth>>
$He thanks $his assistants for their less than helpful efforts and collects $his child<<if $slaves[$i].pregType > 1>>ren<</if>> for removal.
@@ -1147,10 +1134,10 @@
<<ClothingBirth>>
Quickly, $he collects $his child<<if $slaves[$i].pregType > 1>>ren<</if>> for removal before returning to $dairyName. The cows around $his stall all have a knowing look on their faces<<if $dairyPregSetting > 0>> but with their own swollen bellies hanging heavily from them, they know that they soon will follow $his lead.<<else>>.<</if>>
-<<case "be the Farmer">> /* TODO: This needs a rewrite */
- While tending to $his stock, $slaves[$i].slaveName's water breaks. $He hastily pulls $himself into a vacant stall and seats $himself in its corner.
+<<case "be the Farmer">>
+ While tending to some of $his livestock, $slaves[$i].slaveName's water breaks. $He hastily finds a secluded corner and takes a seat on the (luckily fresh) hay.
<<ClothingBirth>>
- Quickly, $he collects $his child<<if $slaves[$i].pregType > 1>>ren<</if>> for removal before returning to $dairyName. The cows around $his stall all have a knowing look on their faces<<if $dairyPregSetting > 0>> but with their own swollen bellies hanging heavily from them, they know that they soon will follow $his lead.<<else>>.<</if>>
+ Once $he's finished, $he hands off $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to a nearby slave to look after for the time being before returning to what $he was previously doing.
<<case "be the Wardeness">>
<<setNonlocalPronouns $seeDicks>>