From ec081591e44e0ba8cb5867ae05005c65bab98ff9 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 16 Dec 2019 20:07:12 -0600
Subject: [PATCH] Miscs
---
player variables documentation - Pregmod.txt | 12 -----
src/gui/Encyclopedia/encyclopedia.tw | 4 +-
src/js/DefaultRules.js | 6 +--
src/js/rulesAssistantOptions.js | 6 +--
src/js/slaveGenerationJS.js | 2 +-
src/js/utilJS.js | 2 +-
src/npc/agent/agentCompany.tw | 2 +-
src/npc/descriptions/fButt.tw | 2 +-
src/player/actions/fondleDick.tw | 4 +-
src/player/electiveSurgery.tw | 2 +-
src/player/pcSurgeryDegradation.tw | 2 +-
src/pregmod/breederProposal.tw | 46 +++++++++----------
src/pregmod/csec.tw | 2 +-
src/pregmod/eliteTakeOver.tw | 3 +-
src/pregmod/eliteTakeOverFight.tw | 4 +-
src/pregmod/eliteTakeOverResult.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 3 --
src/uncategorized/RESS.tw | 4 +-
.../industrialDairyAssignmentScene.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 6 +--
src/uncategorized/reputation.tw | 2 +-
src/uncategorized/slaveAssignmentsReport.tw | 2 +-
src/utility/extendedFamilyWidgets.tw | 2 +-
23 files changed, 53 insertions(+), 69 deletions(-)
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 48b54feced0..9ccb208d258 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -137,18 +137,6 @@ births:
how many children you've had
accepts int
-boobsBonus:
-
-(rare in events)
-breast size
--3 - B-cup
--2 - C-cup
--1 - D-cup
- 0 - DD-cup
- 1 - F-cup
- 2 - G-cup
- 3 - H-cup
-
degeneracy:
How strong/are there rumors about you doing unsavory things with your slaves
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 4d850223cbf..4c0659fbaf1 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -318,9 +318,9 @@ BEING IN CHARGE
<br><br>The demand comes directly from the arcology's citizens and visiting tourists and traders. Growing your arcology is the most straightforward way of increasing the amount of sex demanded. The lower class are fairly easy to attract in large numbers, but their individual spending is limited and a good whore is wasted on them. The wealthiest citizens on the other hand have a lot more to spend, but also require whores that are up to their standards. You may want to choose your policies, future society and rent choices accordingly.
- <br><br>From the supply side you have to contend with competitors trying to gobble up large chunks of the sex market. You may choose to compete with them on somewhat even terms and let the free market sort it out, but you may also try your hand at nudging other suppliers into serving your purposes. You can either subsidize sexual services, making outside suppliers more willing to provide inside your arcology or use your influence and position to stiffle them by having to comply with bothersome rules and regulations to disuade them instead.
+ <br><br>From the supply side you have to contend with competitors trying to gobble up large chunks of the sex market. You may choose to compete with them on somewhat even terms and let the free market sort it out, but you may also try your hand at nudging other suppliers into serving your purposes. You can either subsidize sexual services, making outside suppliers more willing to provide inside your arcology or use your influence and position to stifle them by having to comply with bothersome rules and regulations to dissuade them instead.
- <br><br>Slaves assigned as whores can be used to satisfy any of the different classes of citizens, if they are desirable and skilled enough, that is. Slaves assigned to serve the public are suitable for the sexual relief of the lower half of your citizenry and the arcade generally only serves the very bottom of your arcology.
+ <br><br>Slaves assigned as whores can be used to satisfy any of the different classes of citizens, if they are desirable and skilled enough, that is. Slaves assigned to serve the public are suitable for the sexual relief of the lower half of your citizenry and the arcade generally only serves the very bottom of your arcology.
<<case "Sexual Energy">>
<<setPlayerPronouns>>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 40a4c6d7fa2..3b32ed806dd 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1520,17 +1520,17 @@ window.DefaultRules = (function() {
* @param {App.Entity.SlaveState} slave
* @param {App.RA.RuleSetters} rule
*/
-
+
function ProcessPit(slave,rule){
if (rule.pitRules !== undefined && rule.pitRules !== null){
if (V.pit > 0){
if (rule.pitRules === 0){
V.fighterIDs = V.fighterIDs.filter(e => e !== slave.ID);
- r += `<br>${slave.slaveName} has been removed from the pit.`;
+ r += `<br>${slave.slaveName} has been removed from the pit.`;
}else{
if (App.Entity.facilities.pit.job().checkRequirements(slave).length !== 0) {
V.fighterIDs = V.fighterIDs.filter(e => e !== slave.ID);
- r += `<br>${slave.slaveName} is not eligible to fight.`;
+ r += `<br>${slave.slaveName} is not eligible to fight.`;
} else{
if (!V.fighterIDs.includes(slave.ID)){
V.fighterIDs.push(slave.ID);
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 563025254a9..db452df01c2 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -4246,16 +4246,16 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.setAssignment = value;
}
}
-
+
class PitAssignmentList extends ListSelector{
constructor() {
const items =[["remove from pit",0],["assign to pit",1]]
- super("Pit assignment", items);
+ super("Pit assignment", items);
this.setValue(current_rule.set.pitRules);
this.onchange = (value) => current_rule.set.pitRules = value;
}
}
-
+
class BellyImplantList extends RadioSelector {
constructor() {
const items = [
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index 73e978efcb3..b18fbc749f3 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -420,7 +420,7 @@ window.nationalityToAccent = function nationalityToAccent(slave) {
break;
case "Curaçaoan":
if (V.language === "Dutch") {
- slave.accent = jsEither([0, 1, 1, 1, 2]);
+ slave.accent = jsEither([0, 1, 1, 1, 1, 2]);
} else if (V.language === "English") {
slave.accent = jsEither([0, 1, 2, 2, 2, 3, 3]);
} else if (V.language === "Portuguese") {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 9a3386042fa..251986164ae 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -964,7 +964,7 @@ window.num = function(x) {
"sixty", "seventy", "eighty", "ninety",
];
- const SCALES = ["thousand", "million", "billion", "trillion", "quadrillion", "quintillion"];
+ const SCALES = ["thousand", "million", "billion", "trillion", "quadrillion", "quintillion", "sextillion", "septillion", "octillion", "nonillion", "decillion"];
/**
* helper function for use with Array.filter
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 52a6281d873..2cfd63cb1ec 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -59,6 +59,6 @@ $subSlave.slaveName smiles back at $him, glowing with pleasure, and responds wit
<<case "masochist">>
"Can't wait to feel you hurt me again, babe," the masochistic
<<default>>
- "Babe, I can't wait to give you a hug and tell you about _neighborArcology.name," the loving
+ "Babe, I can't wait to <<if hasAnyArms($subSlave)>>give you a hug and <</if>>tell you about _neighborArcology.name," the loving
<</switch>>
leader of an entire arcology <<say>>s.
\ No newline at end of file
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 255722c9561..a5014c26c8a 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -29,7 +29,7 @@ You call $him over so you can
<</if>>
<<if ($activeSlave.vaginaPiercing > 1)>>
- $His pierced lips and clit have $his nice and wet.
+ $His pierced lips and clit have $him nice and wet.
<<if ($activeSlave.dick !== 0)>>
Metal glints all up and down $his cock.
<</if>>
diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw
index ba4af96d43d..38fb3315dfb 100644
--- a/src/player/actions/fondleDick.tw
+++ b/src/player/actions/fondleDick.tw
@@ -1,7 +1,7 @@
:: FondleDick [nobr]
You call $him over so you can fondle $his
-<<if $activeSlave.dick == 1>>
+<<if $activeSlave.dick <= 1>>
tiny dick
<<elseif $activeSlave.dick == 2>>
cute dick
@@ -27,7 +27,7 @@ You call $him over so you can fondle $his
<<if $activeSlave.scrotum > 0>>
and
- <<if $activeSlave.balls == 0>>
+ <<if $activeSlave.balls <= 0>>
soft scrotum.
<<elseif $activeSlave.balls == 1>>
tiny balls.
diff --git a/src/player/electiveSurgery.tw b/src/player/electiveSurgery.tw
index 38cd9accdd2..255c63d1a61 100644
--- a/src/player/electiveSurgery.tw
+++ b/src/player/electiveSurgery.tw
@@ -362,7 +362,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.title > 0>>
| [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.storedCum += 10, $PC.title = 0, generatePlayerPronouns($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2truefemale"]]
<<else>>
- | [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = -1, $PC.vaginaLube = 0, $PC.ovaries = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 100, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $PC.title = 1, generatePlayerPronouns($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2truemale"]]
+ | [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = -1, $PC.vaginaLube = 0, $PC.ovaries = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 100, $PC.boobsImplant = 0, $PC.title = 1, generatePlayerPronouns($PC), cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2truemale"]]
<</if>>
<<elseif $PC.dick != 0>>
You have @@.orange;male genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
diff --git a/src/player/pcSurgeryDegradation.tw b/src/player/pcSurgeryDegradation.tw
index 4dc627cad30..48515a7cec7 100644
--- a/src/player/pcSurgeryDegradation.tw
+++ b/src/player/pcSurgeryDegradation.tw
@@ -94,7 +94,7 @@
After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobs >= 1400>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice a new weight on your chest. Pulling the covers off yourself, you observe your new, soft C-cup boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your heaving breasts. "With these, you should be able to compete with any girls around you." _HeU begins groping your breasts, feeling the added mass for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your new tits. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick != 0>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
<<case "buttReductionImplant">>
- After a few hours, you awaken in the recovery wing, face-down in a bed made to accommodate as person with your body type, with a sore ass. You push yourself up and look at the mass under the cover behind you that is your rear, taking note of how much smaller it is now than when you arrived. "So do you like it?", asks the surgeon's assistant, seating _himselfU beside you and bringing _hisU hands to your butt. "Size isn't everything in an ass, shape is important too." _HeU begins groping your bottom, feeling around for any oddities. "I know you're still a little sore, but bear with it. There, everything feels good, now rest up and you'll be set! Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Groggy, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
+ After a few hours, you awaken in the recovery wing, face-down in a bed made to accommodate a person with your body type, with a sore ass. You push yourself up and look at the mass under the cover behind you that is your rear, taking note of how much smaller it is now than when you arrived. "So do you like it?", asks the surgeon's assistant, seating _himselfU beside you and bringing _hisU hands to your butt. "Size isn't everything in an ass, shape is important too." _HeU begins groping your bottom, feeling around for any oddities. "I know you're still a little sore, but bear with it. There, everything feels good, now rest up and you'll be set! Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Groggy, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
<<case "buttShrinkage">>
After a few hours, you awaken in the recovery wing, face-down in a bed made to accommodate a person with your body type, with a sore ass. You push yourself up and look at the mass under the cover behind you that is your rear, taking note of how much smaller it is now than when you arrived. "So do you like it?", asks the surgeon's assistant, seating _himselfU beside you and bringing _hisU hands to your butt. "Size isn't everything in an ass, shape is important too, though I think you've got a good balance. We didn't need to do much reshaping." _HeU begins groping your bottom, feeling around for any oddities. "I know you're still a little sore, but bear with it. There, everything feels good, now rest up and you'll be set! Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Groggy, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index 74544b71a80..99e59b87b98 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -46,21 +46,21 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
"An interesting proposal, given your lack of equipment, though we would be much more open to listen to your request if you were heavy with one of our children.
<span id="result">
<br><<link "Agree to being used as a breeder for the sake of your proposal">>
- <<replace "#result">>
- "Good choice, _girlP; your proposal is more important than your dignity after all, isn't it? A selection of eligible donors will be provided to you; take your pick and bear our children. Or use a test tube, if that's more to your tastes."
- <<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
- <<InitStandards>>
- <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
- <</replace>>
- <</link>>
- <<if $failedElite <= 0>>
- <br><<link "Decline being used as a breeder and leverage your standing">>
<<replace "#result">>
- "Yes, you have done much to further our cause. We respect the 'balls' on you, despite your lack of them. Very well, we shall set the standards for what shall qualify as breeding stock and our standards will be delivered to you shortly."
- <<set $propOutcome = 1>>
+ "Good choice, _girlP; your proposal is more important than your dignity after all, isn't it? A selection of eligible donors will be provided to you; take your pick and bear our children. Or use a test tube, if that's more to your tastes."
+ <<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
<<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<</replace>>
+ <</link>>
+ <<if $failedElite <= 0>>
+ <br><<link "Decline being used as a breeder and leverage your standing">>
+ <<replace "#result">>
+ "Yes, you have done much to further our cause. We respect the 'balls' on you, despite your lack of them. Very well, we shall set the standards for what shall qualify as breeding stock and our standards will be delivered to you shortly."
+ <<set $propOutcome = 1>>
+ <<InitStandards>>
+ <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+ <</replace>>
<</link>>
<<else>>
<br><<link "Decline being used as a breeder and withdraw your proposal">>
@@ -78,12 +78,12 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
"We have read your proposal and propose the following: You are not well liked among us, and your medical records show you are quite capable of carrying a child. If you will carry our children, we will grant your proposal, otherwise, leave and never ask us this again."
<span id="result">
<br><<link "Agree to being used as a breeder to complete the deal">>
- <<replace "#result">>
- "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
- <<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
- <<InitStandards>>
- <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
- <</replace>>
+ <<replace "#result">>
+ "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
+ <<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
+ <<InitStandards>>
+ <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+ <</replace>>
<</link>>
<br><<link "Decline being used as a breeder and withdraw your proposal">>
<<replace "#result">>
@@ -99,12 +99,12 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
Your medical records say you have working female sex organs, and we respect your choice to not use them. But have you considered carrying another member's child? It will be extremely lucrative for you and go a long way to furthering our objectives."
<span id="result">
<br><<link "Agree to being used as a breeder">>
- <<replace "#result">>
- "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
- <<set $playerBred = 1, $propOutcome = 1>>
- <<InitStandards>>
- <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
- <</replace>>
+ <<replace "#result">>
+ "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
+ <<set $playerBred = 1, $propOutcome = 1>>
+ <<InitStandards>>
+ <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+ <</replace>>
<</link>>
<br><<link "Decline being used as a breeder">>
<<replace "#result">>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 8e7b06e47f9..c88c20fd20f 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -128,7 +128,7 @@
/* normally fetuses before 34 week will not survive */
<</if>>
<</if>>
-<<set _afterSize = WombGetVolume($activeSlave)>> /* not really needed right now, but better to add alredy for future usage. To not forget later.*/
+<<set _afterSize = WombGetVolume($activeSlave)>> /* not really needed right now, but better to add already for future usage. To not forget later.*/
<<set $diffSize = _beforeSize / (1 + _afterSize)>> /* 1 used to avoid divide by zero error.*/
<<set _incubated = 0>>
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index 20762df4e7a..ae81330e42b 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -106,8 +106,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
give in.
<</replace>>
<</link>>
- <br>
- <br>
+ <br><br>
<<link "Confirm">>
<<goto "eliteTakeOverFight">>
<</link>>
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 841880527a4..dda107b70bf 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -52,7 +52,7 @@
<</switch>>
<<if $finalChoice == "give in">>
- <<if $PC.pregSource == -1 || $PC.pregSource == -6>> Screw their plans, you're out of here. <</if>>With a "Bang!" you drop dead.
+ <<if $PC.pregSource == -1 || $PC.pregSource == -6>>Screw their plans, you're out of here. <</if>>With a "Bang!" you drop dead.
<<set $ui = "start">>
<br><br>
''GAME OVER''
@@ -282,7 +282,7 @@
<</link>>
<<elseif $eliteLeft <= 9 && $rep >= 10000>>
Some of the citizens waiting outside your penthouse to see you hear the ruckus and rush inside, worried. Time seems to freeze for a few seconds, while the remaining Elite recover from their terror and the citizens digest the gory scene in front of them.
- The newcomers are quick to take your side. In little time the elites, outgunned and outnumbered, are neutralized.
+ The newcomers are quick to take your side. In little time the Elites, outgunned and outnumbered, are neutralized.
<br>One of the more courageous citizens approaches you and asks "<<= properTitle()>>, what should we do with them?"
<br>
<<link "Open fire">>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index fa416f5bbf9..6af38b3488a 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -20,7 +20,7 @@
<</if>>
<<case 1>>
<<if random(0,100) > 50>>
- An Elite bites down on a cyanide pill hidden in a false tooth and
+ An Elite bites down on a cyanide pill hidden in a false tooth and
<<if random(0,100) > 75>>
takes the coward's way out (how predictable), frothing at the mouth.
<<set $eliteDead += 1>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 364e97cf5c4..e391bb71f96 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -486,9 +486,6 @@
<<if ndef $PC.nationality>>
<<set $PC.nationality = "Stateless">>
<</if>>
- <<if $PC.boobsBonus == -0.5>>
- <<set $PC.boobsBonus = -1>>
- <</if>>
<<if ndef $PC.sclerae>>
<<set $PC.sclerae = "white">>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index fbeded4c595..4a65877a8da 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -19773,7 +19773,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
anal pain
<</if>>
- of your coupling. Judging by the empty look in $his eyes that persists past $his dismissal from your office, $he might @@.gold;not feel any better@@ about the age difference but you've definitely @@.hotpink;fucked $him into compliance.@@
+ of your coupling. Judging by the <<if !canSee($activeSlave)>>exceptionally <</if>>empty look in $his eyes that persists past $his dismissal from your office, $he might @@.gold;not feel any better@@ about the age difference but you've definitely @@.hotpink;fucked $him into compliance.@@
<<set $activeSlave.devotion += 4, $activeSlave.trust -= 4>>
<<if canDoVaginal($activeSlave)>>
<<= VCheck.Vaginal()>>
@@ -19824,7 +19824,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<</if>>
<</replace>>
- <</link>> //This option will render $activeSlave.slaveName pregnant//<<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>> // and take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //and take $his anal virginity//<</if>>
+ <</link>> //This option will render $activeSlave.slaveName pregnant//<<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>> //and take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //and take $his anal virginity//<</if>>
<</if>>
<<case "devoted educated slave">>
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index 11f85da6c30..87706ae8439 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -330,7 +330,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the <<if canSee($activ
<</if>>
A visor lowers onto $his face to keep $his mind at least minimally stimulated.
<<if canHear($activeSlave) && !canSee($activeSlave)>>
- It will play audio from
+ It will play audio from
<<else>>
It will display garish
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 26260c957d9..d815976acf3 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -2186,9 +2186,9 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<link "Threaten $him with the Industrial Dairy">>
<<setNonlocalPronouns $seeDicks>>
<<replace "#introResult">>
- You tell $him that it's in $his interests to be a good $girl. $He does not react immediately, perhaps wondering if you think such a trite statement will have a real impact, but then you <<if canSee($activeSlave)>>point at<<else>>direct $him towards<</if>> a wallscreen behind $him. $He turns, and beholds a live feed from the Industrial Dairy.
+ You tell $him that it's in $his interests to be a good $girl. $He does not react immediately, perhaps wondering if you think such a trite statement will have a real impact, but then you <<if canSee($activeSlave)>>point at<<else>>direct $him towards<</if>> a wallscreen behind $him. $He turns, and beholds a live feed from the Industrial Dairy.
<<if canSee($activeSlave)>>
- $He gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold $his fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen.
+ $He gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold $his fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen.
<<elseif canHear($activeSlave)>>
$He listens entranced by the steady rhythm of the machines collecting their occupants' bodily fluids. The muffled moans and groans of the restrained slaves hold $his fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen.
<<else>>
@@ -2300,7 +2300,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<link "Threaten $him with the Arcade">>
<<setNonlocalPronouns $seeDicks>>
<<replace "#introResult">>
- You tell $him that it's in $his best interests to be a good $girl. $He does not react immediately, perhaps wondering if you think such a trite statement will have a real impact, but then you <<if canSee($activeSlave)>>point at<<else>>direct $him towards<</if>> a wallscreen behind $him. $He turns, and beholds a live feed from $arcadeName.
+ You tell $him that it's in $his best interests to be a good $girl. $He does not react immediately, perhaps wondering if you think such a trite statement will have a real impact, but then you <<if canSee($activeSlave)>>point at<<else>>direct $him towards<</if>> a wallscreen behind $him. $He turns, and beholds a live feed from $arcadeName.
<<if canSee($activeSlave)>>
$He gazes at the row of butts sticking out of the wall at dick height, not quite realizing what $he's seeing. Then $he notices that there are citizens pumping away in front of two of the butts, and $he understands.
<<elseif canHear($activeSlave)>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 7b3b9d164b8..f419cba4aaa 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -358,7 +358,7 @@ _enduringRep = $enduringRep>>
<<elseif $arcologies[0].FSSlimnessEnthusiast != "unset">>
<<if $PC.boobs >= 1000>>
Society finds big breasts unsightly and you are no exception; your <<if $PC.boobsImplant > 0>>chest balloons<<else>>fat tits<</if>> @@.red;harm@@ your public image.
- <<run repX(forceNeg(10*$PC.boobsBonus), "PCappearance")>>
+ <<run repX(forceNeg(10*$PC.boobs), "PCappearance")>>
<</if>>
<<if $PC.butt >= 5>>
Society finds big butts unsightly and you are no exception; your <<if $PC.buttImplant > 0>>inflated ass<<else>>fat ass<</if>> @@.red;harms@@ your public image.
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 387f38d5c40..f82ba3678cd 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -291,7 +291,7 @@ $NPCMarketShare.topClass = Math.trunc(($NPCSexSupply.topClass * 1000) / _topClas
</td>
</tr>
<</if>>
-
+
<tr align="right">
<td>
Unsatisfied
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 1872c453e6c..c97e6f8bf09 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -240,7 +240,7 @@
<<set _uncles.push(_dadsiblings[$i])>>
<</if>>
<</for>>
-
+
<<if _aunts.length > 0>>
$He
<<if _aunts.length > 2>>
--
GitLab