diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 2a74057e92f190a2aa3ddebf16fdb120482377a5..605ef161e877a5c0c4b70e60ac2030926c365478 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -246,6 +246,13 @@ SoftenBehavioralFlaw(slave) - Replaces the slave's behavioral flaw with the corr
SoftenSexualFlaw(slave) - Replaces the slave's sexual flaw with the corresponding quirk.
+SkillIncrease.Oral(slave, value)
+SkillIncrease.Vaginal(slave, value)
+SkillIncrease.Anal(slave, value)
+SkillIncrease.Whore(slave, value)
+SkillIncrease.Entertain(slave, value)
+- Increases the slave's skill by value or 1. Returns a string if the skill is boosted over a threshold.
+
UtilJS [script]
Height.mean(nationality, race, genes, age) - returns the mean height for the given combination and age in years (>=2).
Height.mean(nationality, race, genes) - returns the mean adult height for the given combination.
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index de2fb790e89bf1f85012fe462bf9e5506b49e3e0..8b751810777ccfc3ecf3313a757e06c808623190 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -5,6 +5,7 @@ Pregmod
9
-unified cybermod with vanilla
-slave assignment links improved
+ -facility transfer tab added to facility assignment
-breast implants now impact milk production based on % implant
-many new names added to lacking name pools
-fixes
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 6f9e1ec35c5bc29378cf24e4da56e2ff1089f3bc..ce107fe63906013ef8c77f0c9801fb77887f765f 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -264,9 +264,8 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<_dump = saWorkTheFarm($slaves[$i])>>
- $He <<= saWorkTheFarm($slaves[$i])>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ <<run saWorkTheFarm($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index 8adf96ded21aaefbe941ae791974bec0dbe595b8..aa35b8d37c9754c83f52387f6d7f70b8d6b7d0bd 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -184,8 +184,8 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
- <<set _dump = saRest($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
+ <<run saRest($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 3ce93df56ec0bd35a54e11432029e601a6ee40e4..7f0a12977557a9b1005b7c68c4abc1c9b465494c 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2548,7 +2548,7 @@ LORE: INTERVIEWS
<br>''Wahn'' wrote numerous generic recruitment events.
<br>''PregModder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, an expansion to the hostage corruption event chain, slave specific player titles, gagging and several basic gags, extended family mode, oversized sex toys, buttplug attachment system, and other, likely forgotten, things. (And that's just the vanilla added stuff!)
<br>''Lolimodder'' your loli expertise will be missed.
- <br>''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Revamped pregnancy tracking as well. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed).
+ <br>''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Revamped pregnancy tracking as well then further expanded it. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed).
<br>''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching, new shelter slaves, some crazy ass shit with vector art, fixing seDeath, coding jquery in ui support and likely one to two of these other anon credits.
<br>''family mod anon'' for extending extended family mode.
<br>''anon'' for lolimod content, new slave careers, new pubestyles, and general improvements.
@@ -2615,7 +2615,10 @@ LORE: INTERVIEWS
<br>''DCoded'' for creating the favicon and adding animals to the Pit, as well as nursery and bestiality content, scenes, facilities and fixes. Also added a pussy licking scene and created and fixed a number of bugs.
<br>''HiveBro'' for giving hyperpregnant slaves some serious loving.
<br>''Quin2k'' for overwriting save function and expired tweak via Vrelnir & co.
- <br>''ezsh'' for bugfixing and creating a tool to build twineJS for me.
+ <br>''ezsh'' for bugfixing and creating a tool to build twineJS for me. Has contributed massive revisions to the game's structure.
+ <br>''Sonofrevvan'' for fDance and fBeg.
+ <br>''skriv'' for fixes and endless code cleaning.
+ <br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics.
<br>''git contributors lost to time'' for their submissions and work through pregmod's git.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
@@ -2634,8 +2637,8 @@ LORE: INTERVIEWS
<br>''freecitiesbandit'' wrote a number of recruitment, future society, mercenary and random events, provided tailed buttplugs, new eyes and tattoos, and contributed the code for the mercenary raiders policy.
<br>''DrNoOne'' wrote the bulk slave purchase and persistent summary code.
<br>''Mauve'' provided vector art for chastity belts and limp dicks.
- <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing and aprons. Also the hearing overhaul. Has declared war on bad spelling, grammar and formatting.
- <br>''lowercasedonkey'' for various additions, not limited to the budget overhaul.
+ <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing, overalls and aprons. Also the hearing overhaul. Has declared war on bad spelling, grammar and formatting.
+ <br>''lowercasedonkey'' for various additions, not limited to the budget overhaul. Set up all the tabs too.
<br>''amomynous0'' for bug reports and testing in addition to SFmod unit descriptions.
<br>''wepsrd'' for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes.
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index de66de914037c76a2659885650f5aeffdaa866c8..457182669062dc7ad0c76f663dfd02daf44fd252 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -183,7 +183,7 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<</link>>
<br>
<</if>>
- <<if $activeSlave.amp != -3 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "beauty"}) != -1>>
+ <<if $activeSlave.amp != -3 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "beautyL"}) != -1>>
<<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>" "Prosthetics Config">>
<<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
<</link>>
@@ -263,7 +263,7 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<br><br>
These prosthetics are in storage or already equipped by $him:<br>
<<for _p range $activeSlave.readyProsthetics>>
- <<= capitalizeFirstLetter(setup.prosthetics[_p.id].name)>> <br>
+ <<= capFirstChar(setup.prosthetics[_p.id].name)>> <br>
<</for>>
<</if>>
@@ -272,7 +272,7 @@ Fit prosthetics to $him:
<<for _p range setup.prostheticIDs>>
<<if _p != "erectile">> /* exclude erectile implant */
<<if $adjustProsthetics.findIndex(function(p) {return p.id == _p && p.slaveID == $activeSlave.ID}) != -1 || $researchLab.tasks.findIndex(function(p) {return p.type == "craftFit" && p.id == _p && p.slaveID == $activeSlave.ID}) != -1>><br>
- //<<= capitalizeFirstLetter(addA(setup.prosthetics[_p].name))>> is already being fitted to $him.//
+ //<<= capFirstChar(addA(setup.prosthetics[_p].name))>> is already being fitted to $him.//
<<elseif setup.prosthetics[_p].level > $prostheticsUpgrade>><br>
//You need better contracts to buy <<= addA(setup.prosthetics[_p].name)>>.//
<<elseif $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == _p}) == -1>>
@@ -442,4 +442,67 @@ Fit prosthetics to $him:
<<elseif $activeSlave.tail == "sex">>accidentally engages the vibrating and lube functions, startling $him and making quite a mess.
<<else>>admires $his new tail.
<</if>>
+
+<<case "interface">>
+ <span id="attach">
+ <<set _first = 1>>
+ /*TODO save .legsTat and .armsTat / link them to prosthetic*/
+ <<if $activeSlave.amp != -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "basicL"}) != -1>>
+ <<if _first>>
+ <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br>
+ <<set _first = 0>>
+ <</if>>
+ <<link "Attach <<= addA(setup.prosthetics.basicL.name)>>">>
+ <<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
+ <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <</link>>
+ <br>
+ <</if>>
+ <<if $activeSlave.amp != -2 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "sexL"}) != -1>>
+ <<if _first>>
+ <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br>
+ <<set _first = 0>>
+ <</if>>
+ <<link "Attach <<= addA(setup.prosthetics.sexL.name)>>">>
+ <<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
+ <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <</link>>
+ <br>
+ <</if>>
+ <<if $activeSlave.amp != -3 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "beautyL"}) != -1>>
+ <<if _first>>
+ <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br>
+ <<set _first = 0>>
+ <</if>>
+ <<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>">>
+ <<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
+ <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <</link>>
+ <br>
+ <</if>>
+ <<if $activeSlave.amp != -4 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "combatL"}) != -1>>
+ <<if _first>>
+ <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br>
+ <<set _first = 0>>
+ <</if>>
+ <<link "Attach <<= addA(setup.prosthetics.combatL.name)>>">>
+ <<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
+ <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <</link>>
+ <br>
+ <</if>>
+ <<if $activeSlave.amp != -5 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "cyberneticL"}) != -1>>
+ <<if $activeSlave.amp == 2>>
+ <<if _first>>
+ <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br>
+ <<set _first = 0>>
+ <</if>>
+ <<link "Attach <<= addA(setup.prosthetics.basicL.name)>>" "Prosthetics Config">>
+ <<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
+ <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <</link>>
+ <</if>>
+ <</if>>
+ </span>
+
<</switch>>
diff --git a/src/interaction/prothesticLab.tw b/src/interaction/prothesticLab.tw
index 1c2fce6741cbe997593e7a408a716783ea3f91f1..ab4a487381298f41a2707462054b4c015365d5d9 100644
--- a/src/interaction/prothesticLab.tw
+++ b/src/interaction/prothesticLab.tw
@@ -10,7 +10,7 @@ Prosthetic Lab
<<if $adjustProsthetics.length > 0>>
Currently adjusting these prosthetics:<br>
<<for _p range $adjustProsthetics>>
- <<= capitalizeFirstLetter(setup.prosthetics[_p.id].name)>> for <<= SlaveFullName($slaves[$slaveIndices[_p.slaveID]])>><br>
+ <<= capFirstChar(setup.prosthetics[_p.id].name)>> for <<= SlaveFullName($slaves[$slaveIndices[_p.slaveID]])>><br>
<</for>>
<<else>>
//Currently there are no prosthetics being fit to a slave.//
@@ -147,7 +147,7 @@ Prosthetic Lab
@@.red;Error: Unknown $$researchLab.tasks[].type: $researchLab.tasks[_i].type@@
<</switch>>
<<set _j += $researchLab.tasks[_i].workLeft>>
- @@.yellow;<<= capitalizeFirstLetter(setup.prosthetics[$researchLab.tasks[_i].id].name)>>@@.
+ @@.yellow;<<= capFirstChar(setup.prosthetics[$researchLab.tasks[_i].id].name)>>@@.
<<if $researchLab.speed > 0>>
Finished in approximately <<= (Math.floor(_j / $researchLab.speed) + 1)>> week(s).
<</if>>
@@ -184,13 +184,13 @@ Prosthetic Lab
<<if setup.prosthetics[_p].level <= $prostheticsUpgrade>>
<<capture _p>>
- <<link "Reverse engineer <<= capitalizeFirstLetter(setup.prosthetics[_p].name)>>" "Prosthetic Lab">>
+ <<link "Reverse engineer <<= capFirstChar(setup.prosthetics[_p].name)>>" "Prosthetic Lab">>
<<set cashX(forceNeg(setup.prosthetics[_p].costs), "lab"), $prosthetics[_p].research = -1, $researchLab.tasks.push({type: "research", id: _p, workLeft: setup.prosthetics[_p].research})>>
<</link>>
<</capture>>
//Costs <<= cashFormat(setup.prosthetics[_p].costs)>> of initial investment.//
<<else>>
- //You need better contracts to get the needed research material for researching <<= capitalizeFirstLetter(setup.prosthetics[_p].name)>>.//
+ //You need better contracts to get the needed research material for researching <<= capFirstChar(setup.prosthetics[_p].name)>>.//
<</if>>
<br>
<</if>>
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 074ae80a31132dd6defb7362c93d7de9802348d8..e4cd0bf6b6cff293dc96fdfd31d5a42fde119df2 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -5150,7 +5150,7 @@ App.UI.slaveSummaryList = function(passageName) {
if (passageName === "Main" && V.useSlaveSummaryTabs === 1) {
if (tabName === "overview") {
if (V.showOneSlave === "Head Girl" && _Slave.assignment !== App.Data.Facilities.headGirlSuite.manager.assignment) continue;
- if (V.showOneSlave === "recruit girls" && _Slave.assignment !== App.Entity.facilities.penthouse.manager.assignment) continue;
+ if (V.showOneSlave === "recruit girls" && _Slave.assignment !== App.Data.Facilities.penthouse.manager.assignment) continue;
if (V.showOneSlave === "guard you" && _Slave.assignment !== App.Data.Facilities.armory.manager.assignment) continue;
} else {
if (tabName === "resting") {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 5e992379286b4036c2b1a5f8ba358ff5d62a687a..784f2aa881229e64ed4bf7d6c5d4da37c1675d48 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1740,8 +1740,4 @@ window.addA = function(word) {
return "an " + word;
}
return "a " + word;
-}
-
-window.capitalizeFirstLetter = function(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
-}
+};
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 0ef97d7ccfe0b15f13bd193e965a7ca21ddf75c3..931f2019d0c12d9d1344c7084df71749009938bd 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -94,7 +94,7 @@
<<else>>
surprisingly resilient, tight little pussy,
<</if>>
- <<set _dump = VaginalVCheck()>>
+ <<run VaginalVCheck()>>
<<else>>
clench your legs around $his slutty head as $he drives your pussy over the edge with $his tongue,
<<set $activeSlave.counter.oral++, $oralTotal++>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 2b2d3cde64e0bc9b8d0cb0409778e0b503111a1d..0444fc2aa337f7d1013e7f392219384d071c6532 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -22,6 +22,7 @@
<<set $args[0].origSkin = $args[1].origSkin>>
<<set $args[0].markings = $args[1].markings>>
<<set $args[0].eyes = $args[1].eyes>>
+<<set $args[0].eyesImplant = $args[1].eyesImplant>>
<<set $args[0].origEye = $args[1].origEye>>
<<set $args[0].eyeColor = $args[1].eyeColor>>
<<set $args[0].hears = $args[1].hears>>
@@ -46,6 +47,7 @@
<<set $args[0].corsetPiercing = $args[1].corsetPiercing>>
<<set $args[0].amp = $args[1].amp>>
<<set $args[0].PLimb = $args[1].PLimb>>
+<<set $args[0].readyProsthetics = $args[1].readyProsthetics>>
<<set $args[0].heels = $args[1].heels>>
<<set $args[0].voice = $args[1].voice>>
<<set $args[0].voiceImplant = $args[1].voiceImplant>>
@@ -203,7 +205,6 @@
<<set $args[0].cervixImplant = $args[1].cervixImplant>>
<<set $args[0].scars = $args[1].scars>>
<<set $args[0].pregControl = $args[1].pregControl>>
- <<set $args[0].readyLimbs = $args[1].readyLimbs>>
<</if>>
/*
<<if def $args[2]>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 6c6646c06f2f4054ab299a8d828b2404bafcb904..5ee020d75dd215af039e1bf082f780351a77ad60 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -76,11 +76,11 @@
<<else>>
is confined in $arcadeName.
<</if>>
- <br> $He <<print saWorkAGloryHole($slaves[$i])>>
+ <br> $He <<= saWorkAGloryHole($slaves[$i])>>
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<print saWorkAGloryHole($slaves[$i])>>
+ <<run saWorkAGloryHole($slaves[$i])>>
<</silently>>
<</if>>
<<if ($arcadeUpgradeCollectors > 0)>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index c6040da558787fa90d4e74f88f295b6b5b035806..9d678966a9b442e0dddd7aa36c08737fa0ec6de4 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -197,7 +197,7 @@
<<if $showEWD != 0>>
<br> $He <<= saWhore($slaves[$i])>>
<<else>>
- <<set _dump = saWhore($slaves[$i])>>
+ <<run saWhore($slaves[$i])>>
<</if>>
<<set _seed = $cash-_oldCash, _cashX += Math.trunc(0.5*_seed), _seed = Math.trunc(1.5*_seed), _profits += _seed>>
<<run cashX(_cashX, "whore", $Madam)>>
@@ -355,8 +355,8 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<set _dump = saWhore($slaves[$i])>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ <<run saWhore($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 63778fa3315b0e6d1bf36564976762d1fe1e097f..b3d5d40ff90c6eb5e8f9642275587dad28a4aa8b 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -265,7 +265,7 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<set _dump = saStayConfined($slaves[$i])>>
+ <<run saStayConfined($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index bd774af0ecfbbd122f5f2b52104a0eb16dab7aa6..93d5e51cb5a0c8814022df89e7856abaf6590140 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -318,8 +318,8 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<set _dump = saRest($slaves[$i])>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ <<run saRest($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index b601dbea3161905611f877b1fa9a594f1ca77c6c..48cc7bbde6aae880a3c679004238347b3467e370 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -100,7 +100,7 @@
<<if $showEWD != 0>>
<br> $He <<= saServeThePublic($slaves[$i])>>
<<else>>
- <<set _dump = saServeThePublic($slaves[$i])>>
+ <<run saServeThePublic($slaves[$i])>>
<</if>>
<<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].skill.entertainment))*0.1*0.5), "club", $slaves[_FLs])>>
<</if>>
@@ -245,8 +245,8 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<set _dump = saServeThePublic($slaves[$i])>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ <<run saServeThePublic($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 60b6e3fe2edbe8e62ebaefded3f38e0b4efff46d..82cd23ccd10f8a9a87a4ee0a4261193872b0d79d 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -18,7 +18,7 @@
<<case "serve the public">>
<<= saServeThePublic($slaves[$i])>>
<<case "work a glory hole">>
- <<print saWorkAGloryHole($slaves[$i])>>
+ <<= saWorkAGloryHole($slaves[$i])>>
<<case "get milked">>
<<set $servantMilkersMultiplier = 1>>
<<include "SA get milked">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 0e4a9bc17958288db6a616e4bbeeb1cf136ab964..88fbc7338e0f46bdb346156fb7cc7b1e34d7cead 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1444,19 +1444,19 @@ $He has
<</if>>
<<if $activeSlave.geneticQuirks.gigantomastia >= 2>>
<br>
- [[Corret gigantomastia|Surgery Degradation][$activeSlave.geneticQuirks.gigantomastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Correct gigantomastia|Surgery Degradation][$activeSlave.geneticQuirks.gigantomastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<</if>>
<<if $activeSlave.geneticQuirks.macromastia >= 2>>
<br>
- [[Corret macromastia|Surgery Degradation][$activeSlave.geneticQuirks.macromastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Correct macromastia|Surgery Degradation][$activeSlave.geneticQuirks.macromastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<</if>>
<<if $activeSlave.geneticQuirks.rearLipedema == 2>>
<br>
- [[Corret lipedema|Surgery Degradation][$activeSlave.geneticQuirks.rearLipedema = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Correct lipedema|Surgery Degradation][$activeSlave.geneticQuirks.rearLipedema = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<</if>>
<<if $activeSlave.geneticQuirks.wellHung == 2>>
<br>
- [[Corret genetic predisposition for large genitals|Surgery Degradation][$activeSlave.geneticQuirks.wellHung = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Correct genetic predisposition for large genitals|Surgery Degradation][$activeSlave.geneticQuirks.wellHung = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<</if>>
<</if>>
<br><br>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 78d674f0edd2e4ef2cfe623c5eab55359c2482cf..31f0c5f89a0e36798588619156a064c8c7ffafd9 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -39,7 +39,7 @@
<<set _oldRepGain = hashSum($lastWeeksRepIncome)>>
<<set $pure = 0>>
- <<set _dump = saServeThePublic($slaves[$i])>>
+ <<run saServeThePublic($slaves[$i])>>
<<set _influence = Math.clamp((hashSum($lastWeeksRepIncome)-_oldRepGain)*0.01,1,3)>>
<<if $arcologies[0].FSSubjugationist != "unset">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index f37ada6591a4c2023fd96701cd5b85989ef4dc40..72d3b2c3bd9bacf063f73b3975625c8291103392 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -202,7 +202,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -281,12 +281,12 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<_dump = saServant($slaves[$i])>>
+ <<run saServant($slaves[$i])>>
<<if ($servantMilkers == 1) && ($slaves[$i].lactation > 0)>>
<<include "SA get milked">>
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 6f2182e93dedbbe8ba9e097b47e7e47b3502f95e..c7a5f00650f1018dd466b9d23a449c08d3baead8 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -321,8 +321,8 @@
<<else>>
<<silently>>
<<include "SA chooses own job">>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
- <<set _dump = saRest($slaves[$i])>>
+ <<run saChoosesOwnClothes($slaves[$i])>>
+ <<run saRest($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 4b0c0fc2b4a1306a3f392be39f4a31208c884660..0147d967a51a9e6f29f394f72ca613660497783c 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -1858,21 +1858,6 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.trust -= 40, $activeSlave.devotion -= 40>>
<</if>>
-<<case "prostheticInterface">>
- When $he is carried out of surgery $he <<if canSee($activeSlave)>>cranes $his neck to better see the ports<<else>>wiggles $his stumps trying to feel the ports<</if>> installed in $his stumps. Recovery will be @@.red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve impulse detectors constituted major surgery.
- <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
- <<if $activeSlave.devotion > 20>>
- Nevertheless, $he's @@.hotpink;overwhelmed with gratitude,@@ and thanks you profusely the first chance $he gets. $He follows the acclimation program diligently, doing $his best to learn how to be a good slave despite, or sometimes even because of, $his disability. $He @@.mediumaquamarine;places more trust in you,@@ too, since you obviously have $his best interests at heart.
- <<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
- <<elseif $activeSlave.devotion >= -20>>
- $He's @@.hotpink;overwhelmed with gratitude,@@ in part because $he didn't think you'd do something like this for $him. $He thanks you profusely the first chance $he gets, and follows the acclimation program diligently, trying to deserve the expense you went to. $He @@.mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for $him.
- <<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
- <<else>>
- Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be $hers, but at least $he has an indication that you're not toying with $him.
- <<set $activeSlave.trust += 5>>
- <</if>>
- <</if>>
-
<<case "amp1">>
<<set $nextLink = "Surgery Degradation", $surgeryType = "amp">>
Since you have already have a prosthetic interface prepared for this slave you can install it during the operation.<br>
@@ -1897,6 +1882,11 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 50>>
<</if>>
+ <<set $prostheticsConfig = "interface">>
+ <<include "Prosthetics Config">>
+ <<set $nextLink = "Remote Surgery">>
+
+
<<case "PLimb interface1">>
When $he is carried out of surgery $he <<if canSee($activeSlave)>>cranes $his neck to better see the ports<<else>>wiggles $his stumps trying to feel the ports<</if>> installed in $his stumps. Recovery will be @@.red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve impulse detectors constituted major surgery.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
@@ -1912,6 +1902,10 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
+ <<set $prostheticsConfig = "interface">>
+ <<include "Prosthetics Config">>
+ <<set $nextLink = "Remote Surgery">>
+
<<case "PLimb interface2">>
When $he is carried out of surgery $he <<if canSee($activeSlave)>>cranes $his neck to better see the ports<<else>>wiggles $his stumps trying to feel the ports<</if>> installed in $his stumps. $His stumps twitch slightly as the software begins configuring. Recovery will be @@.red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve bridges constituted major surgery.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
@@ -1927,6 +1921,10 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
+ <<set $prostheticsConfig = "interface">>
+ <<include "Prosthetics Config">>
+ <<set $nextLink = "Remote Surgery">>
+
<<case "PLimb interface3">>
When $he is carried out of surgery $he <<if canSee($activeSlave)>>cranes $his neck to better see the ports<<else>>wiggles $his stumps trying to feel the ports<</if>> installed in $his stumps. $His stumps twitch slightly as the software begins configuring. Since $he already had anchors installed in previous surgery this procedure was less invasive and thus @@.red;$his health has been only slightly affected.@@
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
@@ -1942,6 +1940,10 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
+ <<set $prostheticsConfig = "interface">>
+ <<include "Prosthetics Config">>
+ <<set $nextLink = "Remote Surgery">>
+
/* This was moved to prostheticsConfig.tw
<<case "basicPLimbs">>
$He exits the surgery hesitantly, the software of $his prosthetic limbs and the wetware of $his brain working together to figure out how to walk together under the tutelage of a prescribed tutorial. Recovery will be @@.red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve impulse detectors constituted major surgery.