diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index 4d9d096c8c95c70901d4f084b6d7f01a269f70ca..f0efe538759c4534504db9f2f87c4caee79c0d5c 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -350,7 +350,7 @@ div.organContainer {
grid-template-columns: max-content auto;
}
div.tab {
- margin-left: 20px;
+ margin-left: 2em;
}
div.indent {
text-indent: 2em;
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index c8eb0493d0cd3ea1b0f0475dfac14af1e4c892ce..1de056d8b4e573d535cbbfce2d02e51a540fc539 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -19,15 +19,20 @@
/* base screen START */
<h1>Prosthetic Configuration</h1>
-This room is lined with shelves and cabinets; it could be easily mistaken for a storage room if it were not for the examination table in its center.<br>
+<div style="padding-bottom:1em">
+This room is lined with shelves and cabinets; it could be easily mistaken for a storage room if it were not for the examination table in its center.
+<div>
<<if hasBothLegs($activeSlave)>>
$activeSlave.slaveName is obediently waiting for your instructions.
<<else>>
$activeSlave.slaveName is lying on the table, waiting for your instructions.
<</if>>
+</div>
+</div>
<<if hasAnyCyberneticEyes($activeSlave)>>
<h2>Eyes</h2>
+ <div class="tab"> /* tab works better with links */
$He has <<if hasBothCyberneticEyes($activeSlave)>> ocular implants <<else>> an ocular implant <</if>> installed. You can change <<if hasBothCyberneticEyes($activeSlave)>>their<<else>>its<</if>> settings:
<style>
@@ -40,7 +45,7 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<div class="eyeContainer">
<<set _on = 0, _blur = 0, _off = 0>>
<<if getLeftEyeType($activeSlave) === 3>>
- <div> Left:</div>
+ <div>Left:</div>
<div>
<<if getLeftEyeVision($activeSlave) !== 2>>
<<set _on++>>
@@ -65,7 +70,7 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
</div>
<</if>>
<<if getRightEyeType($activeSlave) === 3>>
- <div> Right:</div>
+ <div>Right:</div>
<div>
<<if getRightEyeVision($activeSlave) !== 2>>
<<set _on++>>
@@ -90,7 +95,7 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
</div>
<</if>>
<<if hasBothCyberneticEyes($activeSlave)>>
- <div> Both:</div>
+ <div>Both:</div>
<div>
<<if _on > 0>>
[["[ON]"|Prosthetics Configuration][eyeSurgery($activeSlave, "both", "fix")]]
@@ -113,11 +118,15 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<</if>>
</div>
- <br>$He has <<print App.Desc.eyesColor($activeSlave)>>. To change $his eye color visit the auto salon.
+ <div style="padding-top:1em">
+ $He has <<print App.Desc.eyesColor($activeSlave)>>. To change $his eye color visit the [[auto salon|Salon][$degradation = 0, $primaryHairColor = "", $secondaryHairColor = "", $primaryEarColor = "", $secondaryEarColor = "", $primaryTailColor = "", $secondaryTailColor = "", $artificialEyeColor = "", $artificialEyeShape = "",$artificialEyeFill = "", $tattooChoice = "", $piercingLevel = ""]].
+ </div>
+ </div>
<</if>>
-<<if $activeSlave.earImplant == 1>><br><br>
+<<if $activeSlave.earImplant == 1>>
<h2>Ears</h2>
+ <div class="indent">
$He has cochlear implants installed.
<<if $activeSlave.hears == 0>>
They are operating normally.
@@ -126,20 +135,26 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<<else>>
They are turned off.
<</if>>
- <br><br>
+ <div style="padding-top:1em">
<<if $activeSlave.hears != 0>>
[[Restore hearing|Prosthetics Configuration][$activeSlave.hears = 0, $prostheticsConfig = "hearing"]] |
<</if>>
<<if $activeSlave.hears != -1>>
- [[Muffle|Prosthetics Configuration][$activeSlave.hears = -1, $prostheticsConfig = "hearing"]] |
+ [[Muffle|Prosthetics Configuration][$activeSlave.hears = -1, $prostheticsConfig = "hearing"]]
+ <<if $activeSlave.hears != -2>>
+ |
+ <</if>>
<</if>>
<<if $activeSlave.hears != -2>>
[[Disable|Prosthetics Configuration][$activeSlave.hears = -2, $prostheticsConfig = "hearing"]]
<</if>>
+ </div>
+ </div>
<</if>>
-<<if $activeSlave.electrolarynx == 1>><br><br>
+<<if $activeSlave.electrolarynx == 1>>
<h2>Voice</h2>
+ <div class="indent">
$He has an electrolarynx installed.
<<if $activeSlave.voice == 0>>
It is turned off.
@@ -150,7 +165,7 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<<elseif $activeSlave.voice == 3>>
It is set to its "high voice" setting.
<</if>>
- <br><br>
+ <div style="padding-top:1em">
<<if $activeSlave.voice != 0>>
[[Disable|Prosthetics Configuration][$activeSlave.voice = 0, $prostheticsConfig = "voice"]] |
<</if>>
@@ -158,46 +173,67 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
[[Deep voice setting|Prosthetics Configuration][$activeSlave.voice = 1, $prostheticsConfig = "voice"]] |
<</if>>
<<if $activeSlave.voice != 2>>
- [[Standard voice setting|Prosthetics Configuration][$activeSlave.voice = 2, $prostheticsConfig = "voice"]] |
+ [[Standard voice setting|Prosthetics Configuration][$activeSlave.voice = 2, $prostheticsConfig = "voice"]]
+ <<if $activeSlave.voice != 3>>
+ |
+ <</if>>
<</if>>
<<if $activeSlave.voice != 3>>
[[High voice setting|Prosthetics Configuration][$activeSlave.voice = 3, $prostheticsConfig = "voice"]]
<</if>>
+ </div>
+ </div>
<</if>>
-<br><br>
<h2>Limbs</h2>
+<div class="tab">
<<= App.Desc.limbChange().selector($activeSlave, App.Desc.limbChange().currentLimbs($activeSlave))>>
+</div>
-<br><br>
<h2>Tail</h2>
+<div class="indent">
<<if $activeSlave.PTail == 1>>
+ <div>
$He has a neural tail interface installed. You can assign and adjust $his tail here.
- <<if $activeSlave.tail != "none">><br>
- $He currently has a tail attached, if you wish to change it you will first need to detach it.<br>
+ </div>
+ <div class="double-indent">
+ <<if $activeSlave.tail != "none">>
+ $He currently has a tail attached, if you wish to change it you will first need to detach it.
+ <div>
[[Detach|Prosthetics Configuration][$prostheticsConfig = "detachTail",$nextButton = "Continue", $nextLink = "Prosthetics Configuration"]]
- <<else>><br>
+ </div>
+ <<else>>
<<if isProstheticAvailable($activeSlave, "modT")>>
- Attach a modular tail designed to look like a:<br>
+ <div>
+ Attach a modular tail designed to look like a:
+ </div>
+ <div>
[[Cat's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "neko", $activeSlave.tailColor = $activeSlave.hColor]]
| [[Dog's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "inu", $activeSlave.tailColor = $activeSlave.hColor]]
| [[Fox's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "kit", $activeSlave.tailColor = $activeSlave.hColor]]
| [[Kitsune's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "kitsune", $activeSlave.tailColor = $activeSlave.hColor]]
| [[Tanuki's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "tanuki", $activeSlave.tailColor = $activeSlave.hColor]]
| [[Cow's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "ushi", $activeSlave.tailColor = $activeSlave.hColor]]
- <br>
+ </div>
<</if>>
+ <div>
<<if isProstheticAvailable($activeSlave, "combatT")>>
[[Attach Combat Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black"]]
+ <<if isProstheticAvailable($activeSlave, "sexT")>>
+ |
+ <</if>>
<</if>>
<<if isProstheticAvailable($activeSlave, "sexT")>>
- | [[Attach Pleasure Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink"]]
+ [[Attach Pleasure Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink"]]
<</if>>
+ </div>
<</if>>
+ </div>
<<else>>
//$He does not have a neural tail interface installed so you cannot attach a tail.//
<</if>>
-<<if $activeSlave.tail == "mod">><br>
+<<if $activeSlave.tail == "mod">>
+ <div>
$He currently has a modular tail, styled to look like
<<if $activeSlave.tailShape == "neko">>
a long, slender cat tail.
@@ -212,19 +248,24 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<<elseif $activeSlave.tailShape == "ushi">>
a long cow tail.
<</if>>
- <br>
+ </div>
- Modify $his tail's appearance:<br>
+ <div class="double-indent">
+ Modify $his tail's appearance:
+ <div>
[[Cat|Prosthetics Configuration][$activeSlave.tailShape = "neko", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Dog|Prosthetics Configuration][$activeSlave.tailShape = "inu", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Fox|Prosthetics Configuration][$activeSlave.tailShape = "kit", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Kitsune|Prosthetics Configuration][$activeSlave.tailShape = "kitsune", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Tanuki|Prosthetics Configuration][$activeSlave.tailShape = "tanuki", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Bovine|Prosthetics Configuration][$activeSlave.tailShape = "ushi", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ </div>
+ </div>
<</if>>
+</div> /* indent */
-<br><br>
<h2>Prosthetics</h2>
+<div class="tab">
//Fit prosthetics to $him://
<style>
@@ -320,6 +361,8 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<</for>>
</div>
+</div> /* tab */
+
/* base screen END */
/*
diff --git a/src/npc/descriptions/limbs.js b/src/npc/descriptions/limbs.js
index 960873ce585ba186034e0175768fe1008c7d976f..19f34af4f6613adca180909c272a4608b6f06267 100644
--- a/src/npc/descriptions/limbs.js
+++ b/src/npc/descriptions/limbs.js
@@ -182,7 +182,7 @@ App.Desc.limbChange = function() {
}
}
- r = `<br><br><<set _newState = [${state}]>>` +
+ r = `<<set _newState = [${state}]>>` +
"<style> .selector{display: grid; grid-template-columns: 200px 100px 100px 100px 100px;}" +
".cyber {grid-column-start: 1; grid-column-end: 6;</style>" +
`<div class='selector'>${r}</div>${apply()}`;
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 84a3e52bc53d718b3a83b650e86a1ff1eba19c49..b22334b432769400981aa9e71f6de40d145b040a 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -331,7 +331,6 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
<</if>>
- /*<<run eyeSurgery($activeSlave, "both", "remove")>>*/
<<case "ocular implant">>
<<if getBestVision($activeSlave) > 0>>
@@ -362,7 +361,6 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
<</if>>
- /*<<run eyeSurgery($activeSlave, "both", "cybernetic")*/
<<case "newEyes">>
The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as $he is allowed to open $his eyes and look around, $he notices nothing has changed; though the next time $he looks in the mirror, $he'll see a pair of familiar <<= App.Desc.eyesColor($activeSlave)>> peering back at $him.