diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index 550aacd54d36709e15c6b5b6785cff07ed709fcc..2000c6a3809ea50e977cf5a49bc2ab80b3067244 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -716,7 +716,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
}
r.push(`before asking for ${his2} portion to be plated appropriately. ${subName} struggles to eat`);
if (slave.dick > 0) {
- if (slave.chastityDick) {
+ if (slave.chastityPenis) {
r.push(`with an eager tongue probing the gaps around ${his} chastity cage trying to gather every last drop of slave food.`);
} else {
r.push(`while ${his}`);
@@ -760,7 +760,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
if (slave.vasectomy) {
r.push(`forcing ${him} to buck and ram ${his} cock a little too far into ${domName}.`);
} else if (slave.balls >= 30 || slave.prostate > 2) {
- r.push(`unleashing a massive spurt down ${domName}'s throat. ${domName} gags and pulls back, recieving the rest of ${subName}'s load across ${his2} face and body. ${domName} couldn't even come close to hiding what happened — just the way ${he2} likes it.`);
+ r.push(`unleashing a massive spurt down ${domName}'s throat. ${domName} gags and pulls back, receiving the rest of ${subName}'s load across ${his2} face and body. ${domName} couldn't even come close to hiding what happened — just the way ${he2} likes it.`);
} else if (slave.balls >= 10) {
r.push(`filling ${domName}'s throat with such volume it sprays out ${his2} nose. ${domName} stands no chance of cleaning ${himself2} up without being seen — quite enjoyable, really.`);
} else {
@@ -873,7 +873,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
slave.counter.vaginal += fuckCount;
V.vaginalTotal += fuckCount;
}
- } else if (domslave.pregKnown === 1 || slave.belly > 10000 || slave.bellyPreg >= 1500) {
+ } else if (domSlave.pregKnown === 1 || slave.belly > 10000 || slave.bellyPreg >= 1500) {
if (domSlave.pregKnown === 1) {
if (slave.devotion < -20) {
r.push(`Since ${domName} is pregnant, ${subName} finds ${himself} forced to`);
diff --git a/src/facilities/nursery/nurseryFramework.js b/src/facilities/nursery/nurseryFramework.js
index 61e2a148d3feb0167361bf5f64bb116e2053302f..394def23fd3d40792329f06c30d00577bb2982e0 100644
--- a/src/facilities/nursery/nurseryFramework.js
+++ b/src/facilities/nursery/nurseryFramework.js
@@ -64,8 +64,8 @@ App.Entity.Facilities.Nursery = class extends App.Entity.Facilities.SingleJobFac
/** @override */
occupancyReport(long) {
return long
- ? `${V.nurseryBabies}/${V.nursery} babies, ${this.nursery.hostedSlaves}/${V.nurseryNannies} nannies${this.manager.currentEmployee ? `, ${this.manager.desc.position}` : ""}`
- : `${V.nurseryBabies}/${V.nursery}, ${this.nursery.hostedSlaves}/${V.nurseryNannies}${this.manager.currentEmployee ? ", L" : ""}`;
+ ? `${V.nurseryBabies}/${V.nursery} babies, ${this.hostedSlaves}/${V.nurseryNannies} nannies${this.manager.currentEmployee ? `, ${this.manager.desc.position}` : ""}`
+ : `${V.nurseryBabies}/${V.nursery}, ${this.hostedSlaves}/${V.nurseryNannies}${this.manager.currentEmployee ? ", L" : ""}`;
}
};
diff --git a/src/gui/Encyclopedia/encyclopediaDialog.js b/src/gui/Encyclopedia/encyclopediaDialog.js
index b6f5521a71e1df351a856ead8ad5a36c283b9a07..379d4f575f1c715259d7282ea5d83e82b9a86e39 100644
--- a/src/gui/Encyclopedia/encyclopediaDialog.js
+++ b/src/gui/Encyclopedia/encyclopediaDialog.js
@@ -1,5 +1,5 @@
App.Encyclopedia.Dialog = (function() {
- /** Create a link to an encylopedia dialog for a given article with the given text
+ /** Create a link to an encyclopedia dialog for a given article with the given text
* @param {string} text Text for link
* @param {string} article Encyclopdia article to link to
* @returns {string} SugarCube link markup
@@ -8,7 +8,7 @@ App.Encyclopedia.Dialog = (function() {
return App.UI.link(text, () => showArticleInDialog(article));
}
- /** Create a link to an encylopedia dialog for a given article with the given text
+ /** Create a link to an encyclopedia dialog for a given article with the given text
* @param {string} text Text for link
* @param {string} article Encyclopdia article to link to
* @returns {HTMLElement} DOM link element
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 5493e5cf9691a9baa64f5179e003eb620725c523..a3f1295362eeaf0ae9ba8ffcaa5ddef4c685d0e8 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -89,7 +89,7 @@ App.UI.quickMenu = (function() {
Dispensary: () => !V.dispensary,
edicts: () => V.secExpEnabled <= 0,
Farmyard: () => !V.farmyard,
- Firebase: () => !V.SF.Toggle || V.SF.Toggle < 1,
+ Firebase: () => !V.SF.Toggle || V.SF.Toggle < 1 || V.SF.Active < 1,
"Future Society": () => !V.FSAnnounced,
"Gene Lab": () => !V.geneticMappingUpgrade,
"Head Girl Suite": () => !V.HGSuite,
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 9aa9560067b09220357b15590088ebf8824e817e..b97674baaa0da8c76dccc5452ac654ad4a279026 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -314,7 +314,12 @@ App.UI.SlaveList.render = function() {
if (slave.subTarget === -1) {
assignment.innerText += ", serving as your Stud";
} else if (slave.subTarget !== 0) {
- assignment.innerText += ", serving " + SlaveFullName(slaves[V.slaveIndices[slave.subTarget]]) + " exclusively";
+ const domSlave = getSlave(slave.subTarget);
+ if (domSlave) {
+ assignment.innerText += ", serving " + SlaveFullName(domSlave) + " exclusively";
+ } else {
+ slave.subTarget = 0;
+ }
}
}
assignment.innerText += ".";
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 194396d4952f9b5a39d4d651658321d3d957dba9..3bf52cf63aff857dbc9bd9e65df377da3023267e 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18129,7 +18129,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<setNonlocalPronouns $seeDicks>>
<<replace "#result">>
<<set _pussy = App.Entity.facilities.arcade.employees().some(s => s.vagina > 0)>>
- <<set _balls = App.Entity.facilities.arcade.employees().some(s => s.balls > 0)
+ <<set _balls = App.Entity.facilities.arcade.employees().some(s => s.balls > 0)>>
You order $him to explain further. "<<Master>>," $he <<say>>s carefully, "it'<<s>> $arcadeName. There'<<s>> a <<s>>pe<<c>>ific pla<<c>>e there, and, well, I can't de<<s>>cribe it. It'<<s>> in the <<s>>ervi<<c>>e area under $arcadeName. Can I <<sh>>ow you what I mean?" Intrigued, you order $him to show you the place $he's talking about, and lead $him to $arcadeName through the access hallway. $He points to the service tunnel under one of the rows of inmates, which allows trusted slaves to clean up and perform maintenance.
<<if $activeSlave.belly >= 100000>>
Once you've managed to shove the massive slut
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index b395aa8a853a39e487cd386823b1dc53d46e859f..ef5ea69333c6194d2abf625782db428cdf16226f 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -82,7 +82,7 @@
<<set _purgedSlaves = false>>
<<for _slave range _slaves>>
<<if (_slave.anus < 3)>>
- <<setLocalPronouns _slave>
+ <<setLocalPronouns _slave>>
_slave.slaveName's milking machine ejects $him, since it cannot fit its massive anal dildo up $his tight asshole.
<<= removeJob(_slave, Job.DAIRY)>>
<<set _purgedSlaves = true>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index e13e2bbe922b916f0b0c1d748a200d7e7da7cb29..180a47096060cc06d7e1e1699b070e0bd304c53c 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -1,15 +1,5 @@
:: Neighbor Interact [nobr jump-to-safe jump-from-safe]
-<<if def $buyArcologyDirection>>
- <<run delete $buyArcologyDirection>>
-<</if>>
-<<if def $sellArcologyDirection>>
- <<run delete $sellArcologyDirection>>
-<</if>>
-<<if def $transaction>>
- <<run delete $transaction>>
-<</if>>
-
<<set $averageProsperity = 0>>
<<set _neighboringArcologyCount = 0>>
<<for $i = 0; $i < $arcologies.length; $i++>>
diff --git a/src/uncategorized/reBusyArcade.tw b/src/uncategorized/reBusyArcade.tw
index cf3504175da09fcba2c593f132ca59a81e0c6d35..dbfb67e9cea4ad1ae8e9229ed5b22ffb2f19383f 100644
--- a/src/uncategorized/reBusyArcade.tw
+++ b/src/uncategorized/reBusyArcade.tw
@@ -1,6 +1,6 @@
:: RE busy arcade [nobr]
-<<set $activeSlave = App.Entity.facilities.arcade.employees().filter(s => hasAnyArms(s) && s.fetish !== "mindbroken" && s.devotion <45).random()>>
+<<set $activeSlave = App.Entity.facilities.arcade.employees().filter(s => hasAnyArms(s) && s.fetish !== "mindbroken" && s.devotion < 45).random()>>
<<if (ndef $activeSlave)>>
<<goto "RIE Eligibility Check">>