From 5edb40323ca197deb3ffb0324c5f01cf03ed08d7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 8 Nov 2017 03:19:23 -0500
Subject: [PATCH] Minor stuff.
---
resources/vector/hair/eary back.svg | 31 +++++++++++++-------------
src/uncategorized/remoteSurgery.tw | 2 ++
src/uncategorized/salon.tw | 2 ++
src/uncategorized/slaveInteract.tw | 6 +++--
src/uncategorized/wardrobeUse.tw | 2 +-
src/utility/descriptionWidgetsStyle.tw | 1 -
6 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/resources/vector/hair/eary back.svg b/resources/vector/hair/eary back.svg
index a252d0bf799..9e93a8f10a0 100644
--- a/resources/vector/hair/eary back.svg
+++ b/resources/vector/hair/eary back.svg
@@ -9,22 +9,23 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 600 600"
version="1.1"
- id="svg702"
+ id="svg3170"
sodipodi:docname="eary back.svg"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
<metadata
- id="metadata708">
+ id="metadata3176">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
- id="defs706" />
+ id="defs3174" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -34,25 +35,25 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview704"
+ inkscape:window-width="1680"
+ inkscape:window-height="987"
+ id="namedview3172"
showgrid="false"
- inkscape:zoom="0.39333333"
- inkscape:cx="299.31356"
- inkscape:cy="300"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg702" />
+ inkscape:zoom="1.8985546"
+ inkscape:cx="371.4777"
+ inkscape:cy="354.00771"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg3170" />
<path
opacity=".99"
fill="#474E62"
d="M306.95 38.47l-4.053.677-3.868 2.222-3.766 3.112-3.394 3.487s-2.992 3.764-2.992 4.18c0 .42-3.19 5.44-3.19 5.44l-1.933 5.113-1.16 3.207-.387 3.21-.674 6.785s.576 5.02.576 5.53c0 .512-.186 5.02 0 5.44.195.37.87 3.58.968 3.95 1.996 9.11 2.375 18.14 6.172 26.915 3.42 7.902 8.357 9.375 16.512 10.508 4.05.562 8.852 1.124 12.924.248 4.225-.906 7.496-3.782 10.512-6.762 5.068-5.016 8.22-10.52 9.31-17.534.957-6.14 2.028-12.21 3.794-18.083 1.562-5.19-.05-10.872.394-16.162l-1.487-6.276-3.023-7.67-2.046-4.09-3.53-3.72-4.37-5.207-8.69-3.486-5.485-.976h-3.95l-3.158-.062-.007.002z"
- id="path2" />
+ id="path2470" />
<path
opacity=".99"
fill="#595F6D"
d="M334.634 50.138l.772 5.327.093 7.54v9.668l-.19 3.672-.872 2.51-4.836 13.928-1.16 5.507-2.124 3.534s-2.807 1.72-2.807 2.323c0 .558-1.933 3.254-1.933 3.254l-3.763 3.767-1.842 2.324-1.256-3.58-3.19 1.257-1.814-3.672.604 2.882-2.512-5.997-2.51 3.253-2.418-3.02-2.695-3.3-2.228-2.233-3.58-8.692-2.603-5.532-3.488-11.713.093-8.6-1.813-6.46-.28-1.86-.79 1.256-1.95 5.16-1.163 3.205s-.37 3.155-.373 3.16c-.385 3.274-1.126 6.05-1.76 9.246-1.575 7.943 2.604 15.43 2.998 23.487.382 7.82-2.6 15.174-4.656 22.574-1.677 6.036-4.907 11.13 1.154 15.205 12.25 8.234 24.813 7.47 39.002 7.485 5.266.008 10.41-.43 14.942-3.242 3.554-2.204 4.974-5.43 7.55-8.456 3.99-4.685 4.56-7.83 5.493-14.05.606-4.048 1.346-7.635.296-11.64-1.215-4.634-1.612-9.492-1.78-14.305-.373-10.578.32-21.992-3.607-32.06l-2.976-7.67-2.046-4.09-1.988-1.35h.004z"
- id="path4" />
+ id="path2472" />
</svg>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index a84dfeef84a..e678ccc0efe 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -4,6 +4,8 @@
<<set $surgeryType = 0, $showEncyclopedia = 1, $encyclopedia = "The Remote Surgery">>
+<h1>The Remote Surgery</h1>
+
//$activeSlave.slaveName is lying strapped down on the table in your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery.<<else>>remote surgery.<</if>> The surgical equipment reads <<if $activeSlave.health < -20>>@@.red;SLAVE UNHEALTHY, SURGERY NOT RECOMMENDED.@@<<elseif $activeSlave.health <= 20>>@@.yellow;SLAVE HEALTHY, SURGERY SAFE.@@<<else>>@@.green;SLAVE HEALTHY, SURGERY ENCOURAGED.@@<</if>><<if $PC.medicine >= 100>> The remote surgery mechanisms that allow a surgeon to be brought in by telepresence are inactive, and the autosurgery is ready for your control inputs. Surgery on your slaves is a challenge and a pleasure you wouldn't dream of sharing.<</if>>//
<br><br>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index b117fe75367..ca98c4f5778 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -4,6 +4,8 @@
<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Auto Salon">>
+<h1>The Auto Salon</h1>
+
//$activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your artistic pleasure.//
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 656cb07248a..089c1f69fce 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1280,8 +1280,10 @@ Hormones: <strong><span id="hormones">
<<if $activeSlave.voice != 0>>
<br>Speech rules: ''<span id="speechRules">$activeSlave.speechRules</span>.''
<<link "Restrictive">><<set $activeSlave.speechRules = "restrictive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> |
- <<link "Permissive">><<set $activeSlave.speechRules = "permissive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> |
- <<if $activeSlave.accent > 0 && $activeSlave.accent < 4>><<link "Accent elimination">><<set $activeSlave.speechRules = "accent elimination">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><<elseif $activeSlave.accent > 3>><<link "Language lessons">><<set $activeSlave.speechRules = "language lessons">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><</if>>
+ <<link "Permissive">><<set $activeSlave.speechRules = "permissive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
+ <<if $activeSlave.accent > 0 && $activeSlave.accent < 4>>| <<link "Accent elimination">><<set $activeSlave.speechRules = "accent elimination">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
+ <<elseif $activeSlave.accent > 3>><<link "Language lessons">>| <<set $activeSlave.speechRules = "language lessons">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
+ <</if>>
<</if>>
<br>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 21d16787370..cfe83341548 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -5,7 +5,7 @@
<<set $showEncyclopedia = 1>>
<<set $encyclopedia = "The Wardrobe">>
-
+<h1>The Wardrobe</h1>
//$activeSlave.slaveName <<if $activeSlave.amp != 1>>stands on<<else>>has been placed on a cushion atop<</if>> a small platform surrounded by mirrors and an array of clothing options. $pronounCap is awaiting your fashion choices.//
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 9ef413244e4..76a4c080d53 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -216,7 +216,6 @@ $activeSlave.slaveName is
consisting of a short red leather corset, an even shorter skirt of the same material, and
<<footwearDescription>>
<</if>>
- <<clothingCorsetDescription>>
<<case "a fallen nuns habit">>
a kinky latex affair that manages to look enough like traditional religious garb to be thoroughly sacrilegious.
--
GitLab