diff --git a/devNotes/Deepmurk_Vector_Art_Changelog.txt b/devNotes/Deepmurk_Vector_Art_Changelog.txt
index 2745b613a4b53b4702c9bf9f86fe213cc61fbde8..396ceca7edc38bd05beaf0bce9797389d5699927 100644
--- a/devNotes/Deepmurk_Vector_Art_Changelog.txt
+++ b/devNotes/Deepmurk_Vector_Art_Changelog.txt
@@ -78,7 +78,7 @@ v1.6 (11/18/2018)
-shibari rope outfit is now red for better contrast on some skins
-fixed hair showing when ability to grow hair was surgically removed
-fixed muscles showing on amputated slave limbs
- -fixed faces showing on fuckdolls
+ -fixed faces showing on Fuckdolls
-fixed "mixed race" skin tone/face issues
-fixed some issues related to belly outfits
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c875e4b541b79541b98fe7e6417ced2cccb88851..7c2fa1b93dc7a843fe4d67c2d92504f7f7891920 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -50,7 +50,7 @@ Pregmod
04/09/2019
0
- -Arcade overhualed
+ -Arcade overhauled
-population now affects demand
-added superfetation genetic quirk
-added rear lipedema genetic quirk (constant ass growth)
@@ -1916,7 +1916,7 @@ Pregmod
-new means to add, remove, and locate slaves via index map
40
- -added fuckdoll impregnation
+ -added Fuckdoll impregnation
-preglocke's fSlaveSlaveVagConsumate cleanup and content addition
4/10/2018
@@ -1931,7 +1931,7 @@ Pregmod
37
-added ability to give slaves your surname during marriage
- -unbound slaveInteract impreg block from fuckdoll suit (it now checks .fuckdoll instead)
+ -unbound slaveInteract impreg block from Fuckdoll suit (it now checks .fuckdoll instead)
-more fixes and typo corrections
-Stuffedanon's tweaks now only apply to refreshed passages and not first visits
-fixed engineering start not giving secExp proper drone counts
@@ -3949,7 +3949,7 @@ Pregmod
52
-fixed reported problems
- -arcade will no longer convert slaves sentenced to it into fuckdolls
+ -arcade will no longer convert slaves sentenced to it into Fuckdolls
51
-added SFanon's merge request
@@ -3960,7 +3960,7 @@ Pregmod
-fixed creating SF event
49
- -fixed, Milf tourist event and decline politely.
+ -fixed, MILF tourist event and decline politely.
-pregmodfan's continued RA tweaking
09/29/17
diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index 50288a37e6e4d1b765d32ad3456ed5d6f22a1f62..a7d7b943d94dea630d361bccf193f7cb190d224e 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1092,7 +1092,7 @@ window.VectorArt = (function () {
/* BEGIN SKIN COLOR OVERRIDES FOR LATEX CLOTHING EMULATION */
if (slave.clothes === "a Fuckdoll suit") {
- /* slave is a fuckdoll - display all skin as if it was black rubber */
+ /* slave is a Fuckdoll - display all skin as if it was black rubber */
T.skinColour = outfitBaseColour;
T.areolaStyle = "fill:rgba(81,83,81,1);";
T.labiaStyle = T.areolaStyle;
@@ -2146,7 +2146,7 @@ window.VectorArt = (function () {
r += jsInclude("Art_Vector_Lip_Heavy");
/* ADDONS */
- if (slave.fuckdoll === 0) { /* fuckdolls cannot be decorated */
+ if (slave.fuckdoll === 0) { /* Fuckdolls cannot be decorated */
if (slave.collar === "dildo gag")
r += jsInclude("Art_Vector_Dildo_Gag");
else if (slave.collar === "ball gag")
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index d74792c418d306a5dfa4178c1f74ccd30e597b65..5e357596254fe22059acbc92a63d71d28fce8797 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -911,7 +911,7 @@ window.generateGenetics = (function() {
}
}
}
-
+
//gigantomastia
if (father !== 0) {
if (mother.geneticQuirks.gigantomastia >= 2 && father.geneticQuirks.gigantomastia >= 2) {
@@ -942,7 +942,7 @@ window.generateGenetics = (function() {
}
}
}
-
+
//macromastia
if (father !== 0) {
if (mother.geneticQuirks.macromastia >= 2 && father.geneticQuirks.macromastia >= 2) {
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index b9f4c00eed4a4142503c7a4b69967c462b7d1fe0..d770f1a5ce538284ad48d60d21e5170af7e7e57b 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -787,7 +787,7 @@
<<set _model.boobs = 0>>
<<set _model.hLength = 10>>
<<set _model.hColor = "black">>
-
+
<<set _model2 = BaseSlave()>>
<<set _model2.devotion = 0>>
<<set _model2.trust = 0>>
@@ -846,7 +846,7 @@
<<set _model.hips = 3>>
<<set _model.clothes = "a ball gown">>
<<set _model.shoes = "heels">>
-
+
<<set _model2 = BaseSlave()>>
<<set _model2.dick = 4>>
<<set _model2.boobs = 0>>
@@ -920,7 +920,7 @@
<<set _mindy.butt = 3>>
<<set _mindy.hips = 3>>
<<set _mindy.clothes = "a string bikini">>
-
+
<<set _mike = BaseSlave()>>
<<set _mike.dick = 7>>
<<set _mike.faceShape = "masculine">>
diff --git a/src/pregmod/seFCTVwatch.tw b/src/pregmod/seFCTVwatch.tw
index c9734cc524680d91f1198cead25687f986d226db..fa2429872f8f75a3880c56a8e096ce77ba4e6b9b 100644
--- a/src/pregmod/seFCTVwatch.tw
+++ b/src/pregmod/seFCTVwatch.tw
@@ -45,20 +45,20 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<tr><th>
<<link 0>>
<<set $randShow = 0>>
- <<replace "#show">>
- <<include "SE FCTV Shows">>
- <</replace>>
+ <<replace "#show">>
+ <<include "SE FCTV Shows">>
+ <</replace>>
<</link>>
<<link 1>>
<<set $randShow = 1>>
- <<replace "#show">>
- <<include "SE FCTV Shows">>
- <</replace>>
+ <<replace "#show">>
+ <<include "SE FCTV Shows">>
+ <</replace>>
<</link>>
<<link 2>>
<<set $randShow = 2>>
- <<replace "#show">>
- <<include "SE FCTV Shows">>
+ <<replace "#show">>
+ <<include "SE FCTV Shows">>
<</replace>>
<</link>>
<<if $cheatMode == 1 || $debugMode == 1>> /* Disable the home slave shopping network for normies because exploits. */
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5c2e77ec34b145be3e835aa82ebe55282f6d93a8..b88d1eda80fce7b177dfac19718e49d2b233d8a4 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3539,9 +3539,9 @@ Updating gene pool records:
<<set _Slave.eyeColor = _Slave.origEye>>
<<set _Slave.eyes = -4>>
<</if>>
-
+
<<if ndef _Slave.custom>>
- <<set _Slave.custom = {tattoo: _Slave.customTat}>> /* should be the only thing needed */
+ <<set _Slave.custom = {tattoo: _Slave.customTat}>> /* should be the only thing needed */
<</if>>
<<run App.Entity.Utils.GenePoolRecordCleanup(_Slave)>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index f0b0ff337eafdf0f475e01a01180a98cee16ec59..449c99cf56b86ec73dd17700f63836be8a47ca35 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -95,7 +95,7 @@ $arcadeNameCaps
<</if>>
<<if $arcade > $arcadeSlaves && $fuckdolls > 0>>
<<set _fuckdollRoom = $arcade - $arcadeSlaves>>
- <br>There is room in the arcade for <<print _fuckdollRoom>> menial fuckdolls. <<if $fuckdolls > 1>>They'll be more efficient in the arcade so you restrain them here.<<else>>Your fuckdoll will be more efficient serving in the arcade so you send her here.<</if>>
+ <br>There is room in the arcade for <<print _fuckdollRoom>> menial Fuckdolls. <<if $fuckdolls > 1>>They'll be more efficient in the arcade, so you restrain them here.<<else>>Your Fuckdoll will be more efficient serving in the arcade, so you send it here.<</if>>
<</if>>
<<set _Tmult0 = Math.trunc($arcade*1000*$upgradeMultiplierArcology)>>
[[Expand the arcade|Arcade][cashX(forceNeg(_Tmult0), "capEx"), $arcade += 10]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 37f67e3fb921f16a638309550a048d1c6d9c770d..c343906e52c29d5e5051fb1f564e5a0649aa4d68 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1202,7 +1202,7 @@ You own
<</if>>
-<<if $fuckdolls > 0>>
+<<if $fuckdolls > 0>>
<<if ($fuckdolls > $arcade - $arcadeSlaves) && ($arcade > $arcadeSlaves)>>
<<set _fuckdollsArcade = $arcade - $arcadeSlaves>>
<<elseif $fuckdolls < $arcade - $arcadeSlaves>>
@@ -1218,18 +1218,18 @@ You own
<<set _arcadeUpgradeInjectors = 1.5>>
<</if>>
<<set _fuckdollsEarnings = Math.trunc((($fuckdolls - _fuckdollsArcade) * 140 + _fuckdollsArcade * (175 + 35 * _arcadeUpgradeInjectors)) * ($arcadePrice - 0.5) / 10)>> /*The "/ 10" at the end is just there to keep the price in line with other current prices, hopefully prices will get to a spot where this can be dropped*/
- <<if $fuckdolls > 1>> <<print num($fuckdolls)>> standard fuckdolls,<<elseif $fuckdolls == 1>>one fuckdoll,<</if>><<if _fuckdollsArcade > 1>> <<print num(_fuckdollsArcade)>> of them are stationed in the arcade,<<elseif _fuckdollsArcade == 1 && $fuckdolls > 1>>one of them is stationed in the arcade,<<elseif _fuckdollsArcade == 1>>it is stationed in the arcade,<</if>>
+ <<if $fuckdolls > 1>> <<print num($fuckdolls)>> standard Fuckdolls,<<elseif $fuckdolls == 1>>one Fuckdoll,<</if>><<if _fuckdollsArcade > 1>> <<print num(_fuckdollsArcade)>> of which are stationed in the arcade,<<elseif _fuckdollsArcade == 1 && $fuckdolls > 1>>one of which is stationed in the arcade,<<elseif _fuckdollsArcade == 1>>which is stationed in the arcade,<</if>>
<<if $publicFuckdolls == 1>>
<<run repX(_fuckdollsEarnings / 5, "fuckdolls")>>
- <<set _fuckdollsEarnings = Math.trunc($fuckdolls * -0.5)>> /*The upkeep of a fuckdoll*/
+ <<set _fuckdollsEarnings = Math.trunc($fuckdolls * -0.5)>> /*The upkeep of a Fuckdoll*/
<</if>>
<<run cashX(_fuckdollsEarnings, "fuckdolls")>>
<</if>>
<<if _menialEarnings + _bioreactorEarnings + _fuckdollsEarnings > 0>>
-earning you @@.yellowgreen;<<print cashFormat(_menialEarnings + _bioreactorEarnings + _fuckdollsEarnings)>>.@@
+ earning you @@.yellowgreen;<<print cashFormat(_menialEarnings + _bioreactorEarnings + _fuckdollsEarnings)>>.@@
<<else>>
-costing you @@.red;<<print cashFormat(_menialEarnings + _bioreactorEarnings + _fuckdollsEarnings)>>@@ on account of your free fuckdoll policy.
+ costing you @@.red;<<print cashFormat(_menialEarnings + _bioreactorEarnings + _fuckdollsEarnings)>>@@ on account of your free Fuckdoll policy.
<</if>>
<</if>>
diff --git a/src/uncategorized/arcologyOpinion.tw b/src/uncategorized/arcologyOpinion.tw
index 010b2780402d22934d07dd212e15204e619d5f5c..e10421c7df15abe7a16f55e4b2b96cc8397cccda 100644
--- a/src/uncategorized/arcologyOpinion.tw
+++ b/src/uncategorized/arcologyOpinion.tw
@@ -7,179 +7,179 @@
<<if $activeArcology.FSSubjugationist != "unset">>
<<if $targetArcology.FSSubjugationist != "unset">>
- <<if $targetArcology.FSSubjugationistRace == $activeArcology.FSSubjugationistRace>>
- <<set $opinion += $activeArcology.FSSubjugationist>>
- <<set $opinion += $targetArcology.FSSubjugationist>>
- <<else>>
- <<set $opinion -= $activeArcology.FSSubjugationist>>
- <<set $opinion -= $targetArcology.FSSubjugationist>>
- <</if>>
+ <<if $targetArcology.FSSubjugationistRace == $activeArcology.FSSubjugationistRace>>
+ <<set $opinion += $activeArcology.FSSubjugationist>>
+ <<set $opinion += $targetArcology.FSSubjugationist>>
+ <<else>>
+ <<set $opinion -= $activeArcology.FSSubjugationist>>
+ <<set $opinion -= $targetArcology.FSSubjugationist>>
+ <</if>>
<<elseif $targetArcology.FSSupremacist != "unset">>
- <<if $targetArcology.FSSupremacistRace == $activeArcology.FSSubjugationistRace>>
- <<set $opinion -= $activeArcology.FSSubjugationist>>
- <<set $opinion -= $targetArcology.FSSupremacist>>
- <</if>>
+ <<if $targetArcology.FSSupremacistRace == $activeArcology.FSSubjugationistRace>>
+ <<set $opinion -= $activeArcology.FSSubjugationist>>
+ <<set $opinion -= $targetArcology.FSSupremacist>>
+ <</if>>
<</if>>
<</if>>
<<if $activeArcology.FSSupremacist != "unset">>
<<if $targetArcology.FSSupremacist != "unset">>
- <<if $targetArcology.FSSupremacistRace == $activeArcology.FSSupremacistRace>>
- <<set $opinion += $activeArcology.FSSupremacist>>
- <<set $opinion += $targetArcology.FSSupremacist>>
- <<else>>
- <<set $opinion -= $activeArcology.FSSupremacist>>
- <<set $opinion -= $targetArcology.FSSupremacist>>
- <</if>>
+ <<if $targetArcology.FSSupremacistRace == $activeArcology.FSSupremacistRace>>
+ <<set $opinion += $activeArcology.FSSupremacist>>
+ <<set $opinion += $targetArcology.FSSupremacist>>
+ <<else>>
+ <<set $opinion -= $activeArcology.FSSupremacist>>
+ <<set $opinion -= $targetArcology.FSSupremacist>>
+ <</if>>
<<elseif $targetArcology.FSSubjugationist != "unset">>
- <<if $targetArcology.FSSubjugationistRace == $activeArcology.FSSupremacistRace>>
- <<set $opinion -= $activeArcology.FSSupremacist>>
- <<set $opinion -= $targetArcology.FSSubjugationist>>
- <</if>>
+ <<if $targetArcology.FSSubjugationistRace == $activeArcology.FSSupremacistRace>>
+ <<set $opinion -= $activeArcology.FSSupremacist>>
+ <<set $opinion -= $targetArcology.FSSubjugationist>>
+ <</if>>
<</if>>
<</if>>
<<if $activeArcology.FSRepopulationFocus != "unset">>
<<if $targetArcology.FSRepopulationFocus != "unset">>
- <<set $opinion += $activeArcology.FSRepopulationFocus>>
- <<set $opinion += $targetArcology.FSRepopulationFocus>>
+ <<set $opinion += $activeArcology.FSRepopulationFocus>>
+ <<set $opinion += $targetArcology.FSRepopulationFocus>>
<<elseif $targetArcology.FSRestart != "unset">>
- <<set $opinion -= $activeArcology.FSRepopulationFocus>>
- <<set $opinion -= $targetArcology.FSRestart>>
+ <<set $opinion -= $activeArcology.FSRepopulationFocus>>
+ <<set $opinion -= $targetArcology.FSRestart>>
<</if>>
<<elseif $activeArcology.FSRestart != "unset">>
<<if $targetArcology.FSRestart != "unset">>
- <<set $opinion += $activeArcology.FSRestart>>
- <<set $opinion += $targetArcology.FSRestart>>
+ <<set $opinion += $activeArcology.FSRestart>>
+ <<set $opinion += $targetArcology.FSRestart>>
<<elseif $targetArcology.FSRepopulationFocus != "unset">>
- <<set $opinion -= $activeArcology.FSRestart>>
- <<set $opinion -= $targetArcology.FSRepopulationFocus>>
+ <<set $opinion -= $activeArcology.FSRestart>>
+ <<set $opinion -= $targetArcology.FSRepopulationFocus>>
<</if>>
<</if>>
<<if $activeArcology.FSGenderRadicalist != "unset">>
<<if $targetArcology.FSGenderRadicalist != "unset">>
- <<set $opinion += $activeArcology.FSGenderRadicalist>>
- <<set $opinion += $targetArcology.FSGenderRadicalist>>
+ <<set $opinion += $activeArcology.FSGenderRadicalist>>
+ <<set $opinion += $targetArcology.FSGenderRadicalist>>
<<elseif $targetArcology.FSGenderFundamentalist != "unset">>
- <<set $opinion -= $activeArcology.FSGenderRadicalist>>
- <<set $opinion -= $targetArcology.FSGenderFundamentalist>>
+ <<set $opinion -= $activeArcology.FSGenderRadicalist>>
+ <<set $opinion -= $targetArcology.FSGenderFundamentalist>>
<</if>>
<<elseif $activeArcology.FSGenderFundamentalist != "unset">>
<<if $targetArcology.FSGenderFundamentalist != "unset">>
- <<set $opinion += $activeArcology.FSGenderFundamentalist>>
- <<set $opinion += $targetArcology.FSGenderFundamentalist>>
+ <<set $opinion += $activeArcology.FSGenderFundamentalist>>
+ <<set $opinion += $targetArcology.FSGenderFundamentalist>>
<<elseif $targetArcology.FSGenderRadicalist != "unset">>
- <<set $opinion -= $activeArcology.FSGenderFundamentalist>>
- <<set $opinion -= $targetArcology.FSGenderRadicalist>>
+ <<set $opinion -= $activeArcology.FSGenderFundamentalist>>
+ <<set $opinion -= $targetArcology.FSGenderRadicalist>>
<</if>>
<</if>>
<<if $activeArcology.FSPaternalist != "unset">>
<<if $targetArcology.FSPaternalist != "unset">>
- <<set $opinion += $activeArcology.FSPaternalist>>
- <<set $opinion += $targetArcology.FSPaternalist>>
+ <<set $opinion += $activeArcology.FSPaternalist>>
+ <<set $opinion += $targetArcology.FSPaternalist>>
<<elseif $targetArcology.FSDegradationist != "unset">>
- <<set $opinion -= $activeArcology.FSPaternalist>>
- <<set $opinion -= $targetArcology.FSDegradationist>>
+ <<set $opinion -= $activeArcology.FSPaternalist>>
+ <<set $opinion -= $targetArcology.FSDegradationist>>
<</if>>
<<elseif $activeArcology.FSDegradationist != "unset">>
<<if $targetArcology.FSDegradationist != "unset">>
- <<set $opinion += $activeArcology.FSDegradationist>>
- <<set $opinion += $targetArcology.FSDegradationist>>
+ <<set $opinion += $activeArcology.FSDegradationist>>
+ <<set $opinion += $targetArcology.FSDegradationist>>
<<elseif $targetArcology.FSPaternalist != "unset">>
- <<set $opinion -= $activeArcology.FSDegradationist>>
- <<set $opinion -= $targetArcology.FSPaternalist>>
+ <<set $opinion -= $activeArcology.FSDegradationist>>
+ <<set $opinion -= $targetArcology.FSPaternalist>>
<</if>>
<</if>>
<<if $activeArcology.FSBodyPurist != "unset">>
<<if $targetArcology.FSBodyPurist != "unset">>
- <<set $opinion += $activeArcology.FSBodyPurist>>
- <<set $opinion += $targetArcology.FSBodyPurist>>
+ <<set $opinion += $activeArcology.FSBodyPurist>>
+ <<set $opinion += $targetArcology.FSBodyPurist>>
<<elseif $targetArcology.FSTransformationFetishist != "unset">>
- <<set $opinion -= $activeArcology.FSBodyPurist>>
- <<set $opinion -= $targetArcology.FSTransformationFetishist>>
+ <<set $opinion -= $activeArcology.FSBodyPurist>>
+ <<set $opinion -= $targetArcology.FSTransformationFetishist>>
<</if>>
<<elseif $activeArcology.FSTransformationFetishist != "unset">>
<<if $targetArcology.FSTransformationFetishist != "unset">>
- <<set $opinion += $activeArcology.FSTransformationFetishist>>
- <<set $opinion += $targetArcology.FSTransformationFetishist>>
+ <<set $opinion += $activeArcology.FSTransformationFetishist>>
+ <<set $opinion += $targetArcology.FSTransformationFetishist>>
<<elseif $targetArcology.FSBodyPurist != "unset">>
- <<set $opinion -= $activeArcology.FSTransformationFetishist>>
- <<set $opinion -= $targetArcology.FSBodyPurist>>
+ <<set $opinion -= $activeArcology.FSTransformationFetishist>>
+ <<set $opinion -= $targetArcology.FSBodyPurist>>
<</if>>
<</if>>
<<if $activeArcology.FSYouthPreferentialist != "unset">>
<<if $targetArcology.FSYouthPreferentialist != "unset">>
- <<set $opinion += $activeArcology.FSYouthPreferentialist>>
- <<set $opinion += $targetArcology.FSYouthPreferentialist>>
+ <<set $opinion += $activeArcology.FSYouthPreferentialist>>
+ <<set $opinion += $targetArcology.FSYouthPreferentialist>>
<<elseif $targetArcology.FSMaturityPreferentialist != "unset">>
- <<set $opinion -= $activeArcology.FSYouthPreferentialist>>
- <<set $opinion -= $targetArcology.FSMaturityPreferentialist>>
+ <<set $opinion -= $activeArcology.FSYouthPreferentialist>>
+ <<set $opinion -= $targetArcology.FSMaturityPreferentialist>>
<</if>>
<<elseif $activeArcology.FSMaturityPreferentialist != "unset">>
<<if $targetArcology.FSMaturityPreferentialist != "unset">>
- <<set $opinion += $activeArcology.FSMaturityPreferentialist>>
- <<set $opinion += $targetArcology.FSMaturityPreferentialist>>
+ <<set $opinion += $activeArcology.FSMaturityPreferentialist>>
+ <<set $opinion += $targetArcology.FSMaturityPreferentialist>>
<<elseif $targetArcology.FSYouthPreferentialist != "unset">>
- <<set $opinion -= $activeArcology.FSMaturityPreferentialist>>
- <<set $opinion -= $targetArcology.FSYouthPreferentialist>>
+ <<set $opinion -= $activeArcology.FSMaturityPreferentialist>>
+ <<set $opinion -= $targetArcology.FSYouthPreferentialist>>
<</if>>
<</if>>
<<if $activeArcology.FSSlimnessEnthusiast != "unset">>
<<if $targetArcology.FSSlimnessEnthusiast != "unset">>
- <<set $opinion += $activeArcology.FSSlimnessEnthusiast>>
- <<set $opinion += $targetArcology.FSSlimnessEnthusiast>>
+ <<set $opinion += $activeArcology.FSSlimnessEnthusiast>>
+ <<set $opinion += $targetArcology.FSSlimnessEnthusiast>>
<<elseif $targetArcology.FSAssetExpansionist != "unset">>
- <<set $opinion -= $activeArcology.FSSlimnessEnthusiast>>
- <<set $opinion -= $targetArcology.FSAssetExpansionist>>
+ <<set $opinion -= $activeArcology.FSSlimnessEnthusiast>>
+ <<set $opinion -= $targetArcology.FSAssetExpansionist>>
<</if>>
<<elseif $activeArcology.FSAssetExpansionist != "unset">>
<<if $targetArcology.FSAssetExpansionist != "unset">>
- <<set $opinion += $activeArcology.FSAssetExpansionist>>
- <<set $opinion += $targetArcology.FSAssetExpansionist>>
+ <<set $opinion += $activeArcology.FSAssetExpansionist>>
+ <<set $opinion += $targetArcology.FSAssetExpansionist>>
<<elseif $targetArcology.FSSlimnessEnthusiast != "unset">>
- <<set $opinion -= $activeArcology.FSAssetExpansionist>>
- <<set $opinion -= $targetArcology.FSSlimnessEnthusiast>>
+ <<set $opinion -= $activeArcology.FSAssetExpansionist>>
+ <<set $opinion -= $targetArcology.FSSlimnessEnthusiast>>
<</if>>
<</if>>
<<if $activeArcology.FSPastoralist != "unset">>
<<if $targetArcology.FSPastoralist != "unset">>
- <<set $opinion += $activeArcology.FSPastoralist>>
- <<set $opinion += $targetArcology.FSPastoralist>>
+ <<set $opinion += $activeArcology.FSPastoralist>>
+ <<set $opinion += $targetArcology.FSPastoralist>>
<<elseif $targetArcology.FSCummunism != "unset">>
- <<set $opinion -= $activeArcology.FSPastoralist>>
- <<set $opinion -= $targetArcology.FSCummunism>>
+ <<set $opinion -= $activeArcology.FSPastoralist>>
+ <<set $opinion -= $targetArcology.FSCummunism>>
<</if>>
<<elseif $activeArcology.FSCummunism != "unset">>
<<if $targetArcology.FSCummunism != "unset">>
- <<set $opinion += $activeArcology.FSCummunism>>
- <<set $opinion += $targetArcology.FSCummunism>>
+ <<set $opinion += $activeArcology.FSCummunism>>
+ <<set $opinion += $targetArcology.FSCummunism>>
<<elseif $targetArcology.FSPastoralist != "unset">>
- <<set $opinion -= $activeArcology.FSCummunism>>
- <<set $opinion -= $targetArcology.FSPastoralist>>
+ <<set $opinion -= $activeArcology.FSCummunism>>
+ <<set $opinion -= $targetArcology.FSPastoralist>>
<</if>>
<</if>>
<<if $activeArcology.FSPhysicalIdealist != "unset">>
<<if $targetArcology.FSPhysicalIdealist != "unset">>
- <<set $opinion += $activeArcology.FSPhysicalIdealist>>
- <<set $opinion += $targetArcology.FSPhysicalIdealist>>
+ <<set $opinion += $activeArcology.FSPhysicalIdealist>>
+ <<set $opinion += $targetArcology.FSPhysicalIdealist>>
<<elseif $targetArcology.FSHedonisticDecadence != "unset">>
- <<set $opinion -= $activeArcology.FSPhysicalIdealist>>
- <<set $opinion -= $targetArcology.FSHedonisticDecadence>>
+ <<set $opinion -= $activeArcology.FSPhysicalIdealist>>
+ <<set $opinion -= $targetArcology.FSHedonisticDecadence>>
<</if>>
<<elseif $activeArcology.FSHedonisticDecadence != "unset">>
<<if $targetArcology.FSHedonisticDecadence != "unset">>
- <<set $opinion += $activeArcology.FSHedonisticDecadence>>
- <<set $opinion += $targetArcology.FSHedonisticDecadence>>
+ <<set $opinion += $activeArcology.FSHedonisticDecadence>>
+ <<set $opinion += $targetArcology.FSHedonisticDecadence>>
<<elseif $targetArcology.FSPhysicalIdealist != "unset">>
- <<set $opinion -= $activeArcology.FSHedonisticDecadence>>
- <<set $opinion -= $targetArcology.FSPhysicalIdealist>>
+ <<set $opinion -= $activeArcology.FSHedonisticDecadence>>
+ <<set $opinion -= $targetArcology.FSPhysicalIdealist>>
<</if>>
<</if>>
<<if $activeArcology.FSChattelReligionist != "unset">>
<<if $targetArcology.FSChattelReligionist != "unset">>
- <<set $opinion += $activeArcology.FSChattelReligionist>>
- <<set $opinion += $targetArcology.FSChattelReligionist>>
+ <<set $opinion += $activeArcology.FSChattelReligionist>>
+ <<set $opinion += $targetArcology.FSChattelReligionist>>
<<elseif $targetArcology.FSNull != "unset">>
- <<set $opinion -= $activeArcology.FSChattelReligionist>>
- <<set $opinion -= $targetArcology.FSNull>>
+ <<set $opinion -= $activeArcology.FSChattelReligionist>>
+ <<set $opinion -= $targetArcology.FSNull>>
<</if>>
<<elseif $activeArcology.FSNull != "unset">>
<<if $targetArcology.FSNull != "unset">>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 3d8f5ce02ff58388ddd072f603656ce93b30dcdd..44505bc27a0de5433887d8f0e392b9f802f52567 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -357,7 +357,7 @@
<</if>>
<<if $publicFuckdolls == 1>>
- <br>''Free Fuckdolls:'' you are providing fuckdolls free of charge, such generosity increases your standing.
+ <br>''Free Fuckdolls:'' you are providing Fuckdolls free of charge, such generosity increases your standing.
[[Repeal|Policies][$publicFuckdolls = 0]]
<</if>>
@@ -1150,9 +1150,9 @@
<</if>>
<<if $publicFuckdolls == 0>>
- <br>''Free Fuckdolls:'' you will no longer charge money for restrained slave holes in your arcology, ranging from fuckdolls to the arcade.
+ <br>''Free Fuckdolls:'' you will no longer charge money for restrained slave holes in your arcology, ranging from Fuckdolls to the arcade.
[[Implement|Policies][$publicFuckdolls = 1]]
- <br> //Slaves assigned to these jobs will stop making money, fuckdolls will start costing money//
+ <br> //Slaves assigned to these jobs will stop making money, while Fuckdolls will start costing money//
<</if>>
<br><br>__Education Policy__
diff --git a/src/uncategorized/rulesAssistantSummary.tw b/src/uncategorized/rulesAssistantSummary.tw
index f37fb8f72aa20ff682297ec5f16be8b0c7f27faf..df249a6f606e561f3cb1bb67e848dcc2028b5818 100644
--- a/src/uncategorized/rulesAssistantSummary.tw
+++ b/src/uncategorized/rulesAssistantSummary.tw
@@ -11,7 +11,7 @@
border-collapse: separate;
border-spacing: 5px;
border-style: hidden;
- empty-cells: hide;
+ empty-cells: hide;
}
</style>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 7d6b2e115744aa189c2d258752b19615f5f03ad3..7eac09f5be8d34298af0c449266e0ecc04a0c6f9 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1030,7 +1030,7 @@
<<case "breast redistributors">>
<<set _gigantomastiaMod = $slaves[$i].geneticQuirks.gigantomastia == 2 ? ($slaves[$i].geneticQuirks.macromastia == 2 ? 3 : 2) : 1>>
- $He receives @@.lime;direct injections of fat redistributors right into $his
+ $He receives @@.lime;direct injections of fat redistributors right into $his
<<if _gigantomastiaMod != 3>>
breasts, causing $his body to begin moving fatty tissue from them to $his core<<if $slaves[$i].geneMods.NCS == 1>>, $his @@.orange;NCS@@ amplifies the effectiveness@@<</if>>.
<<set _factor = 0>>
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index d320dd96011c392dfc73f4d997df2596a5b8ff3e..59d252f342e37dfd355e6fbe816cb35b9828b704 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -79,7 +79,7 @@ gets milked this week.
<</if>>
<<if ($slaves[$i].boobsImplant > 0)>>
- However, $his
+ However, $his
<<if _implantEffect >= .90>>
breast implants are ill-suited for
<<elseif _implantEffect >= .75>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 7474ea9e101fe5e87e2b8127b3249cd4cb2063b8..164d59b7ba4fd0084380afe2922336c6dc356833 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -5486,4 +5486,4 @@
<</switch>>
<</if>> /* closes mindbreak exemption */
-<</if>> /* closes fuckdoll exemption */
+<</if>> /* closes Fuckdoll exemption */
diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw
index c2242ff398e8df1b43882a858d435f2c81c95761..3af3b19a953e36ae7b8e6578efc9639246115750 100644
--- a/src/uncategorized/seWeddingSingle.tw
+++ b/src/uncategorized/seWeddingSingle.tw
@@ -723,25 +723,25 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
$His slave dick is hidden by its chastity cage.
<<elseif canAchieveErection($slaves[_wedS])>>
<<if ($slaves[_wedS].dick > 4) && ($slaves[_wedS].belly >= 5000)>>
- $He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $slaves[_wedS].bellyPreg >= 3000>>pregnant <</if>>belly.
+ $He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $slaves[_wedS].bellyPreg >= 3000>>pregnant <</if>>belly.
<<elseif $slaves[_wedS].dick > 4>>
- $He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
+ $He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
<<else>>
- $His erection tents the front of $his lacy g-string.
+ $His erection tents the front of $his lacy g-string.
<</if>>
<<elseif ($slaves[_wedS].dick > 0)>>
<<if $slaves[_wedS].dick > 10>>
- $His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
+ $His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
<<elseif $slaves[_wedS].dick > 4>>
- $His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
+ $His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
<<else>>
- $His lacy g-string perfectly conceals $his soft dick.
+ $His lacy g-string perfectly conceals $his soft dick.
<</if>>
<<else>>
<<if $slaves[_wedS].clit > 1>>
- $His huge clit is quite hard, making $him shift uncomfortably as $his lacy g-string stimulates it.
+ $His huge clit is quite hard, making $him shift uncomfortably as $his lacy g-string stimulates it.
<<else>>
- $His lacy g-string covers $his womanhood demurely.
+ $His lacy g-string covers $his womanhood demurely.
<</if>>
<</if>>
There is no aisle for $him to <<if $slaves[_wedS].amp == 1>>be carried<<else>>walk<</if>> down, just a small space at the head of the room where you're standing alone, and there's no one to <<if $slaves[_wedS].amp == 1>>walk alongside the slave carrying<<else>>walk<</if>> $him there; this symbolizes $his submission to you
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 37d26f4d3fdd06d76ba46737325bd30a806162d3..a2c7afe77a068248571add2e7e204d7742c77407 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -8,7 +8,7 @@
/*We can add milk etc. to this as well, though this is a good that can be traded beyond the arcology and also needs its own market much like the slavemarket. TODO*/
/*In the default scenario these numbers indicate the amount of money each individual citizen of a particular class is looking to spend on sex (and milk) every week
Depending on the conditions they may derive more or less 'utility' out of their credits spent
-i.e. a highly paternalist arcology with little choice for its lower class but fuckdolls may still put money into them but not get the same satisfaction out of it*/
+i.e. a highly paternalist arcology with little choice for its lower class but Fuckdolls may still put money into them but not get the same satisfaction out of it*/
/*Low rent increases demand/available money for sexual services, high rent decreases it*/
<<set _LCRent = 1 + (20 - $LCRent) / 100,
_lowerClassSexDemand = Math.trunc($lowerClass * _LCRent) * 10,
@@ -624,13 +624,13 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
<<if $averageDick > 0>><<set $averageDick = $averageDick/$slavesWithWorkingDicks>><</if>>
<<set $freeSexualEnergy = $PC.sexualEnergy-$fuckSlaves>>
<<if $freeSexualEnergy > 0>>
-<<if $freeSexualEnergy > $slavesVisible/2>>
- <<set $freeSexualEnergy = 3>>
-<<elseif $freeSexualEnergy > $slavesVisible/4>>
- <<set $freeSexualEnergy = 2>>
-<<else>>
- <<set $freeSexualEnergy = 1>>
-<</if>>
+ <<if $freeSexualEnergy > $slavesVisible/2>>
+ <<set $freeSexualEnergy = 3>>
+ <<elseif $freeSexualEnergy > $slavesVisible/4>>
+ <<set $freeSexualEnergy = 2>>
+ <<else>>
+ <<set $freeSexualEnergy = 1>>
+ <</if>>
<</if>>
/** silent pass for any reassignments before generating reports */
@@ -664,22 +664,22 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
<</if>>
<<if $headGirlTrainsFlaws || $headGirlSoftensFlaws>>
- <<if _Slave.behavioralFlaw != "none" || (_Slave.sexualFlaw != "none" && !_hasParaphilia)>>
- <<if $headGirlSoftensFlaws>>
- <<if _Slave.devotion > 20>>
- <<if (_Slave.behavioralFlaw != "none" && _Slave.behavioralQuirk == "none") || (_Slave.sexualFlaw != "none" && _Slave.sexualQuirk == "none" && !_hasParaphilia)>>
- <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "soften"})>>
- <<else>>
- <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "flaw"})>>
+ <<if _Slave.behavioralFlaw != "none" || (_Slave.sexualFlaw != "none" && !_hasParaphilia)>>
+ <<if $headGirlSoftensFlaws>>
+ <<if _Slave.devotion > 20>>
+ <<if (_Slave.behavioralFlaw != "none" && _Slave.behavioralQuirk == "none") || (_Slave.sexualFlaw != "none" && _Slave.sexualQuirk == "none" && !_hasParaphilia)>>
+ <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "soften"})>>
+ <<else>>
+ <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "flaw"})>>
+ <</if>>
+ <<continue>>
<</if>>
+ <<elseif $headGirlTrainsFlaws>>
+ <<set _HGPossibleSlaves[2].push({ID: _Slave.ID, training: "flaw"})>>
<<continue>>
<</if>>
- <<elseif $headGirlTrainsFlaws>>
- <<set _HGPossibleSlaves[2].push({ID: _Slave.ID, training: "flaw"})>>
- <<continue>>
<</if>>
<</if>>
- <</if>>
<<if ($headGirlTrainsObedience && _Slave.devotion <= 20 && _Slave.trust >= -20)>>
<<set _HGPossibleSlaves[4].push({ID: _Slave.ID, training: "obedience"})>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 0c5851398a49547d17c87d6d05fb816e6ecce465..2cd546a1e6ace40669b1e980325ad82cf375ee8f 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -131,7 +131,7 @@
<<if $activeSlave.geneticQuirks.macromastia == 2 && $activeSlave.geneticQuirks.gigantomastia == 2>>
$He has an abnormal strain of gigantomastia and will experience constant excessive breast growth.
<<elseif $activeSlave.geneticQuirks.gigantomastia >= 2>>
- $He has
+ $He has
<<if $activeSlave.geneticQuirks.gigantomastia == 3>>
dormant gigantomastia. Hormonal effects may cause it to become active.
<<else>>