From 6e7d371984e3e8fa76bd413fdb277e523dc7f7c3 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 27 Jul 2020 00:24:06 -0400
Subject: [PATCH] strip old globals
---
src/facilities/nursery/childInteract.tw | 2 +-
src/interaction/prostheticConfig.tw | 2 +-
src/interaction/slaveInteract.js | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index bc3f32b0195..6eb0fc88576 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -60,7 +60,7 @@
FIXME:
<br><br>__Take slave to another room:__
[[Wardrobe|Wardrobe Use][$degradation = 0]]
-| [[Auto salon|Salon][$degradation = 0, $primaryHairColor = "", $secondaryHairColor = "", $tattooChoice = "", $piercingLevel = ""]]
+| [[Auto salon|Salon][$degradation = 0, $tattooChoice = "", $piercingLevel = ""]]
| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
| [[Remote surgery|Remote Surgery][$degradation = 0]]
| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index 877537a1241..e44f47ea79b 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -115,7 +115,7 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
</p>
<p class="indent">
- $He has <<print App.Desc.eyesColor(getSlave($AS))>>. To change $his eye color visit the [[auto salon|Salon][$primaryHairColor = "", $secondaryHairColor = "", $primaryTailColor = "", $secondaryTailColor = ""]].
+ $He has <<print App.Desc.eyesColor(getSlave($AS))>>. To change $his eye color visit the [[auto salon|Salon][$primaryTailColor = "", $secondaryTailColor = ""]].
</p>
<</if>>
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 15a73929b24..75a12c844b3 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -61,8 +61,6 @@ App.UI.SlaveInteract.modify = function(slave) {
makeRoomLink(el, "Auto salon", "Salon", ' Modify hair (color, length, style), nails, and even skin color.',
() => {
V.activeSlave = slave;
- V.primaryHairColor = "";
- V.secondaryHairColor = "";
V.primaryTailColor = "";
V.secondaryTailColor = "";
}
--
GitLab