diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 414ca82016e054785daaac5738a36c725e45cea9..afefaeeb7dd1ab3c72a77384b26cba28e471a45c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4737,4 +4737,29 @@ Pregmod 0.10.3.0
-some minor tweaks
167
- -SecEx battle prestige
\ No newline at end of file
+ -SecEx battle prestige
+
+ 168
+ -disabled broken vector
+ -escorts now have a slight edge when it comes to teaching slaves sex skills
+
+ 11/30/17
+
+ 169
+ -SFanon's fixes
+ -Doubled non size related bonuses in GR's big butt policy for slimness societies to offset the negative of big butts
+
+ 170
+ -added vector art anon's bushy pits
+ -tweaked childgen
+
+ 12/01/17
+
+ 171
+ -fixed .pregSource not handling ng+
+ -tweaked childgen
+
+ 172
+ -SFanon's stuff
+ -anon's slave self impregnation
+ -fixes
\ No newline at end of file
diff --git a/resources/vector/hair/underArm bushy left.svg b/resources/vector/hair/underArm bushy left.svg
new file mode 100644
index 0000000000000000000000000000000000000000..552a8a8f241972a7fea0c1a70b9670fb98764693
--- /dev/null
+++ b/resources/vector/hair/underArm bushy left.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="Layer_1"
+ viewBox="0 0 1000 1000"
+ version="1.1"
+ sodipodi:docname="underArm bushy left.svg"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+ <metadata
+ id="metadata4148">
+ <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="defs4146" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1680"
+ inkscape:window-height="987"
+ id="namedview4144"
+ showgrid="false"
+ inkscape:zoom="0.788"
+ inkscape:cx="500"
+ inkscape:cy="630.24332"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="layer14"
+ inkscape:snap-global="false" />
+ <style
+ id="style2">.st0{fill:#010101;} .st1{fill:#F6E0E8;}</style>
+ <style
+ id="style4208"
+ type="text/css">
+ .st0{fill:#010101;}
+ .st1{fill:#F6E0E8;}
+</style>
+ <g
+ inkscape:groupmode="layer"
+ id="layer14"
+ inkscape:label="Layer 3" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer12"
+ inkscape:label="Layer 1" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer13"
+ inkscape:label="Layer 2">
+ <g
+ transform="matrix(-1.3230272,0,0,0.60512313,1228.2585,-15.297203)"
+ style="stroke-width:0.1;stroke-linecap:round"
+ id="layer2-4">
+ <path
+ style="fill:#9497a2"
+ inkscape:connector-curvature="0"
+ d="m 495.4,468.64 -1.5,1.78 -0.37,-2.72 -2.7,1.5 -1.6,-3.65 -4.5,-1.97 -2.25,-3.18 5.53,2.25 -5.5,-4.4 2.2,-0.38 -3.9,-3 -3.2,-4.3 5.4,3 -4.9,-6.47 4.4,1.78 -3.8,-7.86 2.6,2.34 -4.31,-6.36 5.06,2 -2.2,-3.9 -3.5,-3.2 4.2,1.1 -3.86,-8.6 -0.63,-5.4 4.2,10.3 -0.32,-9.9 3,10.2 2.64,-10.5 0.8,6.2 0.2,5.5 7.1,-10.2 -3,6.95 6.3,-3.4 -5.5,5.1 -2.9,3 11.2,-4 -4.7,4.1 8.2,-1.9 -10.7,5 8.4,1.02 -6.5,3.72 5.6,-0.1 -5.3,3.1 3.7,1.4 -4.4,1.7 6.4,-1.4 2.1,-2.1 -4.8,5.2 4.3,-1.2 -7,5.9 5.4,-2 -4.2,4.2 -2.9,3.7 6,-2.1 -3.3,5 5.5,-0.8 -5,2.3 3.2,1.8 -3.8,0.3 2.5,3.6 z"
+ id="path4488-3" />
+ <path
+ style="fill:#b4b3b7"
+ inkscape:connector-curvature="0"
+ d="m 485.05,423.03 z m 0,0 -0.16,0.97 v 1.05 c -0.1,0.42 0,0.83 0.1,1.24 0.1,0.4 0.1,0.3 0.1,0.8 0,0.4 0.1,0.9 0.1,1.3 -0.1,-0.4 -0.1,-0.7 -0.1,-1.1 l -0.9,0.4 c 0,0.3 0.1,0.7 0.1,1 l 0.3,1.4 c 0.1,0.3 0.1,0.7 0.2,1.1 l 0.4,-0.3 v 0.2 -0.3 l 0.3,-0.2 c 0,-0.4 -0.1,-0.8 -0.2,-1.1 0,-0.1 0,-0.2 -0.1,-0.3 0,-0.3 -0.1,-0.6 -0.1,-0.8 0,-0.9 -0.1,-1.8 -0.2,-2.6 0,-0.2 0,-0.3 -0.1,-0.4 -0.1,-0.6 -0.3,-1.1 -0.2,-1.7 v -1 z m -8.48,0.45 -0.12,0.98 c 0.1,0.33 0.27,0.65 0.4,0.97 0.2,0.44 0.35,0.88 0.5,1.33 0.16,0.46 0.2,0.94 0.3,1.4 0.12,0.46 0.2,0.92 0.3,1.37 0.04,0.24 0.13,0.47 0.24,0.7 l 0.1,-0.96 c -0.1,-0.18 -0.2,-0.38 -0.2,-0.58 0,0 0.1,0.1 0.1,0.2 l 0.6,1.3 0.5,1.2 v 0.1 c 0.1,0.3 -0.1,-0.1 0.1,0.3 l 0.2,0.4 0.1,0.2 -1.2,-0.6 c -0.6,-0.2 -1.1,-0.4 -1.7,-0.6 -0.3,-0.1 -0.6,-0.1 -0.8,-0.1 v 1 c 0.2,-0.1 0.5,0 0.8,0 l 1.2,0.3 v 0.4 c 0.2,-0.1 0.5,0 0.7,0.1 l 0.3,0.1 -0.2,0.1 1,1 c 0.4,0.3 0.9,0.7 1.4,1.1 0.2,0.1 0.1,0 0.2,0.2 l 0.4,-0.2 c 0.1,0.1 0.3,0.3 0.4,0.5 0.2,0.3 0.5,0.5 0.7,0.8 l 0.5,0.6 0.4,0.6 c 0.2,0.3 0.5,0.6 0.7,0.9 l 0.7,0.8 0.8,-0.5 -0.7,-0.9 c -0.2,-0.3 -0.5,-0.6 -0.7,-1 l -0.5,-0.7 -0.6,-0.6 -0.7,-0.8 -0.7,-0.7 c -0.2,-0.1 -0.4,-0.2 -0.6,-0.2 l -0.2,0.1 -0.6,-0.5 0.1,-0.4 c 0.6,0.2 1.3,0.5 1.9,0.7 0.3,0.1 0.6,0.3 0.8,0.4 l 0.3,0.2 c 0.2,0.3 0.3,0.5 0.5,0.8 l 0.8,-0.4 c -0.2,-0.4 -0.4,-0.7 -0.5,-1.1 -0.1,-0.4 -0.3,-0.7 -0.6,-0.9 l 0.4,-0.2 c -0.2,-0.4 -0.4,-0.7 -0.6,-1 -0.5,-0.7 -0.9,-1.3 -1.4,-1.9 l -0.4,-0.4 0.3,-0.9 0.7,-2.3 c 0.2,-0.4 0.4,-0.9 0.5,-1.4 l -0.1,-0.9 c -0.1,0.5 -0.3,1 -0.5,1.5 -0.2,0.8 -0.5,1.5 -0.7,2.3 -0.1,0.2 -0.1,0.4 -0.2,0.6 v -0.3 c -0.1,-0.3 -0.2,-0.6 -0.4,-0.8 l -0.5,-0.9 -0.6,-0.9 c -0.2,-0.3 -0.4,-0.6 -0.4,-0.9 l -0.1,-0.2 c 0.1,-0.2 0.1,-0.4 0.2,-0.6 l -0.1,-1 c -0.2,0.2 -0.2,0.5 -0.3,0.7 -0.1,0.5 -0.1,1 0,1.5 v 0.4 c 0.2,0.3 0.4,0.8 0.5,1.2 l 0.6,1.6 c 0.1,0.1 0.1,0.3 0.2,0.5 l -0.7,0.4 c 0.4,0.3 0.7,0.7 1.1,1 l 0.1,0.1 v 0.7 c -0.4,-0.3 -0.8,-0.6 -1.1,-1 l -0.9,0.5 c 0.4,0.4 0.9,0.7 1.4,1.1 0.6,0.4 1.2,0.8 1.8,1.3 -0.8,-0.3 -1.6,-0.6 -2.5,-1 l -0.8,-0.3 v -0.7 c -0.1,-0.2 -0.2,-0.4 -0.4,-0.7 l -0.3,-0.9 -0.6,-1.2 -0.7,-1.3 c -0.2,-0.3 -0.3,-0.6 -0.4,-0.9 l -0.1,0.4 v -0.2 c -0.1,-0.5 -0.1,-1 -0.3,-1.4 -0.1,-0.5 -0.3,-0.9 -0.5,-1.4 -0.1,-0.3 -0.3,-0.6 -0.4,-1 z m 13.57,1.1 -0.15,0.95 c 0,-0.2 0,-0.42 -0.1,-0.64 l -0.1,0.2 -0.2,0.9 c -0.2,0.7 -0.5,1.5 -0.7,2.2 -0.3,0.2 -0.5,0.5 -0.7,0.8 -0.1,0.1 -0.2,0.3 -0.3,0.5 -0.1,0.1 -0.2,0.1 -0.2,0.2 -0.5,0.4 -0.9,0.9 -1.2,1.5 -0.2,0.3 -0.3,0.7 -0.4,1.1 v 0.1 l 0.9,-0.4 v -0.1 c 0,-0.4 0.2,-0.8 0.4,-1.1 0.1,-0.3 0.3,-0.6 0.6,-0.9 v 0.5 -0.2 l 0.1,0.7 c 0,-0.1 0.1,-0.3 0.1,-0.4 l 0.6,-1.6 v -0.1 l 0.1,-0.2 c 0.4,-0.3 0.8,-0.6 1.3,-0.9 0.5,-0.3 1,-0.6 1.7,-0.6 h 0.8 v -1 h -0.8 c -0.7,0 -1.2,0.3 -1.8,0.6 l -1,0.6 0.3,-1 c 0.1,-0.4 0.2,-0.7 0.2,-1 v -1.5 z m -8.2,4.34 0.22,0.4 c 0.12,0.18 0.2,0.4 0.25,0.6 l -0.2,-0.4 -0.2,-0.6 z m 2.34,0.4 -0.87,0.45 0.2,0.84 0.2,0.5 0.9,-0.4 -0.1,-0.4 c 0,-0.3 -0.1,-0.5 -0.1,-0.8 z m 11.02,1.14 c -0.43,0.1 -0.85,0.23 -1.27,0.37 -0.53,0.2 -1.05,0.42 -1.55,0.68 l -0.42,0.2 -1.28,0.6 -0.6,0.3 -0.23,0.2 -0.1,0.1 c -0.23,0.2 -0.46,0.3 -0.7,0.5 l 0.53,-0.2 -0.1,0.2 -0.06,0.2 v 0.1 c -0.4,0.2 -0.8,0.4 -1.2,0.7 l 0.9,-0.3 c -1.5,0.9 -0.42,0.2 -0.05,0.1 l 0.2,-0.1 -0.2,0.2 c -0.17,0.2 -0.32,0.4 -0.44,0.6 l 0.9,-0.4 v 0.2 l 0.08,-0.2 0.2,-0.2 0.8,-0.4 0.9,-0.5 v 0.1 l 0.2,-0.1 -0.2,0.2 -0.2,0.2 c -0.2,0.2 -0.5,0.5 -0.8,0.7 0,0.1 0,0.1 -0.1,0.1 v -0.2 l -0.3,0.5 -0.1,0.6 c 0,0.3 -0.1,0.5 -0.2,0.8 l -0.1,0.3 0.1,1 0.2,-0.3 c 0.1,-0.2 0.2,-0.4 0.2,-0.7 0.1,-0.2 0.2,-0.3 0.2,-0.6 0.1,-0.1 0.2,-0.3 0.3,-0.4 v -0.6 l 0.2,-0.1 h 0.1 v 0.1 l 0.9,-0.4 c 0,0 0.1,-0.1 0.1,-0.2 1.1,-0.6 1.2,-0.7 2.2,-1.2 0.7,-0.4 1.4,-0.7 2.1,-1 0.5,-0.1 0.8,-0.3 1.2,-0.6 v -0.1 h -0.1 c 0.1,0 0,0 0,0 h -0.1 l 0.1,-0.1 -0.5,0.2 -0.9,0.3 v -0.6 h 0.1 -0.1 z m -0.53,1.22 c -0.14,0.06 -0.3,0.12 -0.42,0.2 l -0.33,0.18 0.3,-0.23 z m -12.28,0.03 0.9,1.3 -1,-0.6 v -0.3 l -0.1,-0.1 v -0.1 z m 10.8,0.7 -1.7,1 0.4,-0.4 0.4,-0.3 h 0.1 l 0.6,-0.2 z m 0.9,3.7 h -0.7 c -0.3,0.1 -0.7,0.1 -1,0.1 -0.5,0 -0.9,0.1 -1.3,0.2 -0.3,0.1 -0.5,0.1 -0.8,0.2 l -0.1,0.1 -0.8,0.6 c 0.2,-0.1 0.4,-0.2 0.7,-0.2 0.4,-0.1 0.8,-0.1 1.2,-0.2 h 1.6 z m -0.5,0.6 -0.6,0.2 c -0.3,0.1 -0.6,0.1 -0.8,0.2 -0.1,0 -0.1,0.1 -0.1,0.1 0,0 -0.1,0 -0.1,0.1 h -0.5 c -0.3,0 -0.5,0 -0.7,0.1 l -0.6,0.3 c -0.2,0.1 -0.4,0.2 -0.4,0.5 l 0.1,0.1 -0.5,0.3 0.5,-0.2 -0.3,0.2 0.4,-0.2 h 0.1 l -0.1,0.1 0.2,-0.1 -0.1,0.1 -0.3,0.3 -0.1,0.1 0.9,-0.4 v -0.1 h 0.1 l -0.8,0.4 c 0,0.1 -0.2,0.4 -0.2,0.5 l 0.1,0.1 0.1,0.1 c 0.1,0.1 0.3,0 0.4,0 l -0.1,0.1 c -0.4,0.3 -0.7,0.6 -1.1,1 l -0.7,1 v 0.1 c 0,0.2 0.3,0.1 0.5,-0.1 l -0.2,0.4 0.9,-0.4 c 0.1,-0.2 0.1,-0.4 0.3,-0.6 l 0.2,-0.3 v 0.7 c 0,0.1 0.1,0.1 0.1,0 v -0.1 l 0.1,-0.1 c 0.1,-0.2 0.3,-0.3 0.4,-0.5 v 0.1 l 0.2,-0.2 c 0.3,-0.3 0.8,-0.6 1.2,-0.9 0.5,-0.3 1,-0.6 1.6,-0.8 0.1,-0.1 0.4,-0.2 0.5,-0.2 h 0.2 v -0.2 h 1.2 l 0.8,-0.5 h -0.9 l 0.3,-0.2 -0.1,-0.1 h -0.2 v 0.1 l 0.1,-0.1 -1.2,0.1 h -0.6 v -0.2 c -0.3,0.1 -0.7,0.1 -1.1,0.1 z m -16.2,1 v 1 h 0.8 c 0.4,0 0.8,0.1 1.1,0.3 l -0.4,0.3 c 0.2,0 0.5,0 0.8,0.1 0.3,0.1 0.6,0.4 0.8,0.6 l 0.4,0.5 -0.2,0.2 0.4,0.5 -0.4,0.3 c 0.2,0 0.3,0 0.5,0.1 l 0.9,1.3 0.9,1.5 0.2,0.5 0.8,-0.4 -0.3,-0.5 c -0.3,-0.4 -0.5,-0.8 -0.8,-1.2 l 1.4,1 0.6,0.6 0.8,-0.5 -0.6,-0.5 c -0.5,-0.3 -1.1,-0.6 -1.6,-1 -0.5,-0.3 -1,-0.7 -1.5,-0.9 -0.1,0 -0.2,-0.1 -0.3,-0.1 v -0.1 l -0.3,-0.4 0.7,0.5 c 0.3,0.2 0.6,0.3 0.9,0.5 l 0.4,0.3 c 0.4,0.3 0.8,0.5 1.2,0.8 l 0.8,0.6 0.1,-0.9 -0.9,-0.6 -1.3,-0.8 c -0.4,-0.2 -0.9,-0.4 -1.3,-0.7 -0.4,-0.2 -0.7,-0.4 -1,-0.6 v 0.5 l -0.2,-0.2 c -0.3,-0.2 -0.6,-0.5 -0.9,-0.6 l -0.2,-0.1 v -0.2 c -0.2,-0.2 -0.5,-0.3 -0.7,-0.4 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -0.3,-0.1 -0.6,-0.2 -0.9,-0.2 h -0.8 z m 15.9,0.1 -0.1,0.1 -0.3,0.1 h -0.3 c 0.2,0 0.4,-0.1 0.6,-0.1 z m -3.1,0.2 h -0.1 z m 1.2,0 z m -0.1,0.2 c 0,0.1 -0.1,0.1 -0.1,0.2 l -0.1,0.1 c 0,0.1 -0.1,0.1 -0.1,0.1 l 0.1,-0.3 z m 5.3,2.6 c -0.6,0.2 -1.2,0.4 -1.7,0.7 h -0.1 c 0.1,-0.1 0.3,-0.2 0.2,-0.4 l -0.1,-0.1 h -0.1 l -0.6,0.2 c -0.2,0 -0.4,0.1 -0.5,0.2 -0.4,0.3 -0.9,0.5 -1.3,0.8 -0.2,0.2 -0.4,0.5 -0.6,0.7 -0.1,0.2 -0.2,0.4 -0.4,0.6 l 0.7,-0.3 c -0.2,0.2 -0.3,0.4 -0.4,0.6 l -0.1,0.1 -0.8,0.6 0.2,-0.1 c 0.1,-0.1 0.2,-0.2 0.4,-0.2 l -0.1,0.2 h -0.1 l -0.2,0.3 c -0.1,0.1 -0.3,0.4 -0.4,0.5 l -0.3,0.5 c 0,0.1 -0.1,0.2 -0.1,0.3 -0.1,0.2 -0.3,0.7 -0.3,1 v 0.1 l 0.1,0.1 c 0.4,-0.3 0.8,-0.4 1.1,-0.7 0.1,-0.1 0.1,-0.2 0.2,-0.3 0.1,-0.1 0.1,-0.3 0.2,-0.4 l 0.2,-0.5 0.4,-0.6 c 0.2,-0.4 0.5,-0.7 0.7,-1.1 v -0.1 l 0.2,-0.1 0.8,-0.4 c 0.6,-0.3 1.2,-0.5 1.7,-0.9 v -0.1 h -0.1 c -0.2,0 -0.3,0.1 -0.5,0.1 h -0.3 c -0.4,0.1 -0.8,0.6 -1.1,0.6 h -0.1 l 0.4,-0.4 1.6,-0.6 z m -2.4,0.8 -0.1,0.1 -0.3,0.3 -0.7,0.4 -0.5,0.3 0.2,-0.3 0.3,-0.4 c 0,0 0.1,0 0.1,-0.1 l 0.2,-0.1 c 0.2,0 0.4,-0.2 0.7,-0.2 z m 0.5,0.7 -0.6,0.3 -0.6,0.3 0.2,-0.1 0.4,-0.3 0.2,-0.1 h 0.4 z m -15.9,0.3 -0.1,1 0.6,0.3 1,0.7 c 0.1,0.1 0.2,0.1 0.3,0.2 l -0.3,0.2 c 0.2,0.2 0.5,0.3 0.9,0.4 0.1,0.1 0.3,0.1 0.5,0.2 l 0.5,0.5 c 0.1,0.2 0.2,0.3 0.3,0.5 l 0.1,-0.9 c 0.2,0.1 0.5,0.2 0.7,0.4 l 0.2,0.2 v 0.1 c 0.2,0.4 0.3,0.7 0.4,1.1 -0.3,-0.1 -0.6,-0.2 -0.9,-0.4 l -0.8,0.6 c 0.3,0.1 0.7,0.3 1,0.4 0.4,0.2 0.9,0.5 1.3,0.7 0.2,0.4 0.3,0.7 0.6,1 l 0.6,0.5 0.8,-0.5 h -0.1 l 0.3,-0.2 c -0.1,0 -0.1,-0.1 -0.2,-0.1 -0.3,-0.3 -0.7,-0.7 -1.1,-0.9 -0.1,0 -0.1,0 -0.2,-0.1 l -0.2,-0.3 -0.2,-0.3 c -0.2,-0.3 -0.2,-0.4 -0.3,-0.7 l 0.1,0.1 0.6,0.5 0.8,-0.5 -0.7,-0.5 c -0.3,-0.2 -0.5,-0.3 -0.8,-0.4 l -0.6,-0.3 v -0.1 l -0.1,-0.1 -0.2,-0.3 -0.3,-0.6 -0.7,0.5 c -0.1,0 -0.2,-0.1 -0.3,-0.1 -0.2,-0.1 -0.5,-0.2 -0.7,-0.2 l -0.2,0.1 -0.5,-0.3 c -0.4,-0.3 -0.8,-0.5 -1.2,-0.8 l -1,-0.7 -0.6,-0.3 z m 17,1.5 c -0.3,0.1 -0.6,0.1 -0.9,0.2 l -0.3,0.1 h -0.4 c -0.2,0 -0.4,0 -0.6,0.1 -0.2,0.1 -0.3,0.2 -0.4,0.2 l -0.3,0.3 -0.1,0.2 c -0.7,0.4 -1.3,0.8 -2,1.3 l 0.9,-0.3 c 0.3,-0.2 0.6,-0.4 0.8,-0.5 h 0.1 l 0.2,-0.1 v 0.2 c 0,0.1 0,0.2 -0.1,0.3 v 0.1 l -1,0.7 c -0.4,0.3 -0.8,0.6 -1.1,1 -0.2,0.3 -0.4,0.6 -0.5,0.8 l 0.1,1 c 0.1,-0.3 0.2,-0.6 0.4,-0.8 0.3,-0.4 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.5 1.2,-0.7 v -0.2 l 0.2,-0.6 c 0,-0.1 0,-0.2 0.1,-0.2 0.1,0 0.2,-0.1 0.4,-0.2 0.2,-0.1 0.3,-0.1 0.5,-0.1 h 2.2 v -1 h -0.8 l 0.3,-0.2 h -0.2 z m 2.3,2.3 c -0.3,0.2 -0.7,0.2 -1,0.3 l 0.1,-0.1 c -0.4,0.1 -0.7,0.1 -1.1,0.1 -0.5,0 -0.9,0.1 -1.3,0.3 -0.5,0.3 -1,0.5 -1.3,0.9 l -0.2,0.2 -0.2,0.1 c -0.5,0.3 -0.8,0.8 -1.2,1.3 -0.3,0.4 -0.5,0.8 -0.8,1.2 l 0.8,-0.4 0.5,-0.8 v 0.1 l 0.9,-0.4 v -0.2 c 0.1,-0.3 0.2,-0.5 0.4,-0.8 h 0.3 -0.1 l 0.1,0.9 0.2,-0.3 c 0.1,-0.1 0.1,-0.2 0.2,-0.3 0.1,-0.2 0.4,-0.2 0.5,-0.3 0.5,-0.2 1,-0.3 1.5,-0.4 0.5,-0.1 0.9,-0.1 1.3,-0.2 z m -3.3,0.9 c -0.1,0 -0.1,0 -0.1,0.1 h -0.4 c 0,-0.1 0,-0.1 0.1,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 z m 2.7,1 h -0.1 l -0.3,0.1 -0.7,0.2 c -0.4,0.1 -0.8,0.2 -1.1,0.4 l -0.7,0.2 -0.7,0.4 -0.4,0.2 -0.4,0.2 -0.1,-0.9 c -0.3,0.1 -0.5,0.3 -0.7,0.5 -0.4,0.4 -0.6,0.8 -0.9,1.3 l -0.2,0.5 -0.1,0.1 c -0.1,0.1 -0.2,0.2 -0.3,0.4 l 0.1,-0.1 -0.1,0.1 v 0.4 c -0.1,0.1 0,0.1 -0.1,0.2 l 0.1,-0.1 v 0.3 l 0.2,-0.5 0.5,-0.2 0.1,-0.1 0.6,-0.6 c 0.1,-0.1 0.2,-0.3 0.4,-0.4 l 0.2,-0.1 0.2,-0.1 1.5,-0.6 1.8,-0.6 c 0.4,0 0.7,-0.1 1.1,-0.1 v -1 c -0.4,0 -0.8,0.2 -1.1,0.2 l -0.3,0.1 z m -16.6,0.3 -0.8,0.5 c 0.3,0 0.5,0.2 0.7,0.3 l 0.9,0.6 0.8,0.6 -0.6,0.4 h 0.4 l -0.2,0.2 0.6,0.4 0.8,0.5 c 0,0.3 0.1,0.5 0.3,0.7 0.3,0.6 -0.1,-0.1 0.3,0.6 0.3,0.6 0.7,1.2 1.1,1.8 l -0.3,-0.2 -0.6,-0.2 c -0.4,-0.1 -0.7,-0.3 -1,-0.5 l -1.3,-0.8 c -0.3,-0.2 -0.6,-0.3 -0.9,-0.5 l -0.4,0.3 v -0.9 l -0.2,-0.1 c -0.4,-0.2 -0.8,-0.4 -1.3,-0.5 l -0.7,-0.3 -0.1,1 0.7,0.3 c 0.5,0.1 0.8,0.3 1.2,0.5 l 0.2,0.1 -0.4,0.3 c 0.3,0.1 0.6,0.3 0.9,0.5 l 1.3,0.8 c 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.3,0.2 0.5,0.3 l 0.2,0.3 0.8,-0.5 0.1,0.1 c 0.2,0.5 0.5,0.9 0.8,1.3 l 0.2,0.3 0.8,-0.5 -0.2,-0.2 c -0.3,-0.4 -0.6,-0.8 -0.9,-1.3 l -1,-1.7 0.6,0.3 c 0.4,0.2 0.7,0.5 1,0.8 0.3,0.4 0.5,0.8 0.7,1.2 l 0.3,0.9 0.8,-0.4 -0.3,-0.9 c 0,-0.2 -0.1,-0.3 -0.2,-0.5 v -0.1 l 0.4,-0.2 c -0.2,-0.2 -0.5,-0.4 -0.7,-0.7 -0.1,-0.1 -0.2,-0.2 -0.3,-0.2 l -0.7,-0.6 c -0.3,-0.2 -0.5,-0.5 -0.8,-0.7 v -0.1 l -0.2,-0.1 -0.4,-0.3 -1.1,-0.6 c -0.3,-0.2 -0.5,-0.3 -0.8,-0.5 l -1.1,-0.8 c -0.3,-0.2 -0.6,-0.5 -0.9,-0.6 l -0.8,-0.3 z m 11.3,2.6 v 0.3 c -0.1,0.1 -0.2,0.1 -0.4,0.2 l -0.2,0.1 v -0.1 l 0.2,-0.3 0.2,-0.3 z m 3.8,1.2 -0.9,0.4 c -0.3,0.2 -0.6,0.4 -0.8,0.6 -0.3,0.2 -0.5,0.4 -0.7,0.6 l -0.8,0.4 c -0.4,0.3 -0.7,0.6 -1,0.9 -0.2,0.2 -0.3,0.5 -0.4,0.7 l 0.6,-0.2 v 0.1 c -0.2,0.3 -0.3,0.7 -0.4,1.1 l -0.6,0.4 c -0.5,0.4 -1,0.8 -1.5,1.3 l 0.9,-0.3 c 0.4,-0.4 0.8,-0.7 1.3,-1.1 v 0.5 c -0.2,0.3 -0.4,0.7 -0.5,1.1 l 0.8,-0.4 c 0.1,-0.4 0.3,-0.8 0.5,-1.1 v 0.1 c 0,0.3 -0.1,0.6 -0.1,0.8 v 0.1 l 0.8,-0.4 c 0,-0.3 0.1,-0.6 0.1,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 l 0.2,-0.2 c 0.4,-0.1 0.7,-0.2 1.1,-0.2 l 0.8,-0.6 c -0.5,0.1 -1,0.2 -1.4,0.3 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.6,-0.3 0.6,-0.3 0.9,-0.5 l -0.9,0.4 c -0.1,0 -0.1,0.1 -0.1,0.1 l 0.7,-0.4 -0.1,0.1 c -0.1,0 -0.1,0.1 -0.2,0.1 l -1.1,0.6 c -0.1,0.1 -0.1,0.1 -0.2,0.1 -0.2,0.1 -0.3,0.3 -0.5,0.4 l -0.2,0.2 0.1,-0.4 1.3,-0.9 c 0.4,-0.2 0.8,-0.4 1.3,-0.6 0.3,-0.1 0.5,-0.1 0.8,-0.2 v -1 l -0.8,0.3 c -0.4,0.1 -0.7,0.3 -1.1,0.5 l -0.5,0.2 0.5,-0.4 0.9,-0.7 z m -11,0.5 z m 8.3,1.5 -0.2,0.2 c -0.2,0.1 -0.4,0.3 -0.6,0.5 0,-0.1 0,-0.1 0.1,-0.1 0.2,-0.3 0.4,-0.5 0.6,-0.6 z m -0.6,1.7 c 0,0.1 -0.1,0.2 -0.1,0.2 l -0.3,0.2 v -0.1 l 0.3,-0.3 z m -0.1,0.4 c 0,0.1 0,0.1 -0.1,0.1 -0.3,0.2 -0.5,0.4 -0.6,0.7 l -0.2,0.2 c 0,-0.2 0.1,-0.4 0.2,-0.6 v -0.1 c 0.1,0 0.3,-0.1 0.4,-0.2 z m -8,1.4 -0.7,0.1 v 1.3 h 0.7 c 0.3,0 0.6,0.1 0.8,0.1 v -0.2 l 1.1,0.6 c 0.4,0.3 0.7,0.7 0.9,1.1 l 0.8,-0.5 c -0.3,-0.5 -0.6,-0.9 -1,-1.2 -0.4,-0.3 -0.9,-0.6 -1.3,-0.8 -0.3,-0.2 -0.5,-0.3 -0.8,-0.3 l -0.2,0.1 -0.5,-0.1 h -0.1 z m 12,0 -1.4,1 -0.8,0.5 0.1,-0.1 0.2,-0.2 c 0.2,-0.2 0.2,-0.2 -0.1,0 l 0.7,-0.6 c -0.6,0.2 -1.2,0.6 -1.7,1 -0.3,0.2 -0.6,0.6 -0.8,0.9 -0.2,0.1 -0.4,0.3 -0.5,0.5 v 0.3 l -0.2,0.5 v 0.1 l 0.3,-0.2 v 0.1 l 0.1,-0.1 0.6,-0.2 v -0.1 l 0.1,-0.4 c 0.2,-0.1 0.3,-0.2 0.6,-0.4 0.5,-0.3 1,-0.6 1.5,-1 0.5,-0.3 0.9,-0.6 1.4,-0.9 z m -1.1,2.8 -0.9,0.6 -0.3,0.3 -0.6,0.7 c -0.5,0.6 -0.9,1.2 -1.2,1.8 -0.1,0.2 -0.3,0.4 -0.4,0.6 l 0.8,-0.4 0.1,-0.1 v 0.3 l -0.5,0.3 v 0.1 c 0,0 0.2,-0.1 0.3,-0.1 v -0.1 l 0.1,-0.1 0.9,-0.6 0.1,-0.1 c 0.1,-0.1 0.3,-0.2 0.4,-0.2 0.4,-0.2 0.9,-0.3 1.3,-0.3 v -0.3 l 0.5,-0.4 -0.2,0.1 0.7,-0.6 -0.9,0.5 v -0.3 c -0.5,0.1 -1,0.2 -1.5,0.4 -0.4,0.1 -0.7,0.2 -1,0.4 0.3,-0.5 0.6,-1 1,-1.5 l 0.6,-0.7 c 0.3,-0.2 0.9,-0.6 -0.5,0.2 z m -10.6,1.4 c -0.2,0 -0.4,0 -0.5,0.1 l -0.8,0.6 h 1.3 c 0.3,0.1 0.6,0.1 0.9,0.2 l 1,0.4 0.5,0.2 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.1 l -0.8,0.6 0.9,0.2 0.6,0.1 -0.3,0.2 h 0.5 c 0.1,0 0.3,0.1 0.4,0.1 l 0.2,-0.1 c 0.4,0.1 0.8,0.2 1.2,0.5 l 0.2,0.2 h 0.1 l -0.1,0.5 v 1.6 l 0.1,-0.9 v -0.5 c 0.1,-0.2 0.1,-0.4 0.2,-0.5 v -0.4 l 0.4,-0.3 -0.2,-0.1 -0.3,-0.1 v -0.1 0.1 c -0.4,-0.2 -0.7,-0.3 -1,-0.4 l -0.6,-0.1 0.6,-0.3 c -0.1,-0.1 -0.2,-0.1 -0.2,-0.2 l -0.7,-0.3 -1.1,-0.4 c -0.3,-0.1 -0.6,-0.2 -0.9,-0.2 h -0.8 z"
+ id="path4490-5" />
+ <path
+ style="fill:#525767"
+ inkscape:connector-curvature="0"
+ d="m 484.52,430.5 -0.12,0.97 c 0.3,0.55 0.57,1.1 0.84,1.66 0.1,0.18 0.17,0.37 0.26,0.56 l 0.15,0.4 c 0.5,1.4 1.03,2.9 1.5,4.3 v 1.1 l -0.3,-0.9 c -0.1,-0.2 -0.18,-0.4 -0.26,-0.6 l -0.5,-1 -0.5,-0.8 -0.1,-0.2 -0.1,0.3 -0.5,-0.9 c -0.4,-0.7 -0.8,-1.4 -1.2,-2 l -0.5,-0.6 c -0.2,-0.3 -0.5,-0.5 -0.7,-0.7 l -0.1,0.9 c 0.4,0.3 0.8,0.8 1.1,1.2 0.4,0.6 0.8,1.3 1.1,1.9 v 0.1 l -0.1,-0.1 -0.1,0.9 c 0.5,0.6 0.9,1.3 1.4,2 l 0.9,1.4 0.6,1.9 v 0.9 l -0.1,-0.1 c 0,-0.1 0,-0.1 -0.1,-0.1 v -0.5 c -0.1,-0.3 -0.1,-0.7 -0.2,-1 l -0.2,1 c -0.7,-1.2 -1.5,-2.3 -2.2,-3.4 -0.5,-0.7 -1,-1.4 -1.4,-2.1 l -0.1,0.9 1.3,1.9 c 0.6,0.8 1.1,1.7 1.7,2.5 l 0.7,1.2 v 0.7 l -0.7,-1.1 -0.9,-1.8 c -0.2,-0.4 -0.3,-0.6 -0.6,-1 l -0.3,-0.5 -1.1,-1.7 -0.1,0.9 c 0.4,0.5 0.8,1.1 1.2,1.6 l 0.3,0.4 0.6,1 0.9,1.6 -0.3,-0.2 c -0.2,-0.1 -0.4,-0.3 -0.6,-0.3 v 0.8 l -1.1,-1.7 -0.1,1 1.2,1.8 c 0.6,0.9 1.3,1.8 1.9,2.7 l 0.5,0.9 -0.1,0.6 0.1,0.2 -0.1,0.4 c -0.5,-0.8 -1,-1.5 -1.4,-2.3 -0.4,-0.7 -0.8,-1.4 -0.9,-2.2 l -0.2,0.9 c 0.1,0.7 0.6,1.4 0.9,2.1 l 1.5,2.5 0.3,0.4 c -0.3,-0.4 -0.6,-0.7 -1,-1 l -0.2,-0.3 c -0.3,-0.6 -0.7,-1.1 -1,-1.7 l -0.1,0.7 -0.1,-0.2 c -0.3,-0.6 -0.7,-1.1 -1,-1.7 l -0.1,0.9 1,1.5 v 0.1 l -0.3,-0.3 c -0.3,-0.2 -0.6,-0.4 -0.9,-0.7 l -0.1,1 0.9,0.6 c 0.2,0.2 0.5,0.3 0.7,0.5 0.3,0.3 0.6,0.6 0.9,1 0.6,0.7 1.1,1.5 1.6,2.3 v 0.3 l -0.3,-0.5 c -0.3,-0.4 -0.6,-0.7 -1,-1 l -0.5,-0.4 c -0.1,0 -0.1,0 -0.2,-0.1 v 1 l 0.1,0.1 c 0.2,0.1 0.3,0.1 0.4,0.3 0.3,0.2 0.5,0.4 0.7,0.7 v 0.6 l 0.3,0.2 v 0.2 l -0.1,-0.1 v 1 l 0.3,0.3 -0.8,-0.5 -1,-0.9 v 0.2 l -1.1,-0.6 c -0.6,-0.2 -1.1,-0.5 -1.7,-0.5 v 1 c 0.6,-0.1 1.1,0.1 1.7,0.3 0.5,0.2 1,0.5 1.5,0.8 l 0.6,0.4 1,0.72 v 0.4 c -0.3,-0.3 -0.6,-0.6 -0.8,-0.95 l -0.1,1 c 0.3,0.3 0.6,0.6 0.8,1 v 0.1 -0.18 l 0.3,0.3 c 0.5,0.7 0.9,1.4 1.4,2.1 l -0.3,-0.3 c -0.6,-0.4 -1.2,-0.7 -1.8,-1.1 -0.3,-0.2 -0.7,-0.4 -1.1,-0.4 v 1 c 0.4,0 0.7,0.2 1.1,0.3 l 1.1,0.7 v 0.3 l 0.9,1.2 0.2,0.35 -2.1,-0.7 c -0.4,-0.2 -0.8,-0.4 -1.1,-0.6 l -0.1,1 h 0.1 c 0.1,0.1 0,0 0.3,0.1 l 0.8,0.3 2.2,0.7 c -0.1,0.13 -0.1,0.3 -0.2,0.4 l 0.1,1 c 0.1,-0.2 0.2,-0.4 0.2,-0.66 0,-0.2 0.1,-0.4 0.1,-0.6 v -0.1 0.5 -0.5 l 0.1,0.1 -0.1,0.4 v 0.4 h 0.2 l 0.1,0.6 v -1.2 l 0.2,0.35 v 0.1 l 0.1,0.9 c 0,-0.2 0.1,-0.3 0.2,-0.5 v -0.2 l 0.1,0.3 -0.1,0.2 0.1,1 0.1,-0.1 0.1,0.5 0.1,-0.2 0.6,-1 0.3,-0.32 0.1,0.1 0.1,0.4 v 0.1 -0.4 l 0.4,0.2 c 0.04,0.1 0.1,0.2 0.1,0.3 l 0.1,0.3 v 0.3 -0.8 l 0.2,0.9 c 0,-0.5 0,-0.9 -0.1,-1.4 l 0.2,0.1 0.6,0.2 0.22,0.1 v -1 l -0.2,-0.1 c -0.3,-0.35 -0.66,-0.6 -1,-0.9 0.1,-0.05 0.14,-0.1 0.24,-0.1 v -0.2 c 0.1,0 0.1,-0.03 0.2,-0.04 0.3,0 0.6,0 0.8,0.1 v -0.9 h -0.9 c -0.4,0.1 -0.8,0.2 -1.2,0.4 v 0.3 l -0.55,-0.5 -0.3,-1 v -0.6 l 0.1,-0.1 c 0,0.1 0.1,0.2 0.1,0.3 l 0.05,-0.4 0.5,-0.5 c 0.4,-0.2 0.7,-0.4 1.1,-0.7 l -0.1,-1 c -0.3,0.3 -0.7,0.5 -1,0.7 l -0.7,0.5 -0.7,-1.1 c 0.1,-0.3 0.2,-0.6 0.32,-0.9 0.2,-0.4 0.4,-0.9 0.72,-1.2 l 0.6,-0.7 -0.1,-1 c -0.2,0.3 -0.4,0.52 -0.6,0.8 -0.2,0.2 -0.4,0.5 -0.56,0.7 l -0.24,0.53 c -0.1,0.4 -0.3,0.9 -0.4,1.4 l 0.03,-0.4 0.3,-1.5 c 0.1,-0.3 0.2,-0.5 0.4,-0.6 l -0.1,-1 -0.3,0.4 -0.2,0.2 c -0.2,0.5 -0.3,1 -0.4,1.5 l -0.1,0.8 c 0,0 -0.1,0 -0.1,-0.1 l -0.2,-0.8 -0.1,-0.3 0.1,-0.4 0.1,-0.8 0.2,-1.6 v 0.3 -1.4 c 0.06,-0.2 0.1,-0.3 0.2,-0.4 l 0.26,-0.5 c 0.2,-0.4 0.5,-0.6 0.8,-0.9 0.3,-0.2 0.6,-0.5 1,-0.6 l -0.08,-1 c -0.4,0.2 -0.7,0.4 -1,0.7 l -0.1,0.1 0.1,-0.2 0.1,-0.1 V 449 l -0.2,1 c 0,-1.3 0.1,-1 -0.16,-0.6 l -0.5,0.8 c -0.2,0.3 -0.4,0.7 -0.5,1 V 448 c 0.04,-0.03 0.1,-0.1 0.1,-0.2 l -0.1,-0.8 v -0.93 l -0.1,0.92 v 0.1 c -0.2,0.4 -0.3,0.8 -0.5,1.2 -0.3,0.9 -0.46,1.8 -0.5,2.7 l -0.26,-0.9 v -0.4 c 0,-0.6 0,-1.1 -0.1,-1.6 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.1 0.08,-0.3 0.1,-0.4 0.1,-0.5 0.3,-1 0.48,-1.6 l 0.3,-0.9 0.1,-0.3 v -1.1 l -0.1,0.9 v -0.8 0.3 l -0.3,0.9 c -0.1,0.5 -0.34,1 -0.5,1.6 0,0.1 0,0.2 -0.1,0.3 0,0.3 -0.1,0.7 -0.1,1 l -0.4,-1.7 0.2,-0.5 0.1,0.8 0.2,-0.8 c 0,-0.2 0.1,-0.7 0.2,-0.9 l 0.3,-1.4 c 0.3,-0.5 0.6,-0.9 0.9,-1.4 0.3,-0.4 0.6,-0.9 1,-1.4 l -0.1,-1 -0.5,0.9 -0.1,-0.7 -0.3,0.6 -0.04,-0.4 -0.2,0.6 v -0.8 l -0.18,1 v -0.9 l -0.1,0.2 -0.1,0.3 -0.4,1.1 c -0.3,0.8 -0.6,1.6 -0.8,2.5 0,0.2 -0.1,0.5 -0.1,0.7 v -2 c 0.1,-0.1 0.1,-0.2 0.1,-0.3 0.03,-0.1 0.1,-0.4 0.1,-0.5 v -1 l -0.1,0.9 v -0.8 l -0.07,0.2 c 0,0 0,0.1 -0.1,0.1 v -0.6 l -0.2,1 v 0.2 c -0.1,0.2 -0.1,0.4 -0.2,0.6 -0.1,0.3 -0.2,0.6 -0.2,0.9 l -0.2,-1 c -0.1,-0.2 -0.1,-0.4 -0.1,-0.6 v -0.1 c 0.4,-1.2 0.9,-2.4 1.5,-3.5 l 0.34,-0.7 0.3,-0.5 v -0.6 l 0.3,-0.5 -0.1,-1 -0.6,1.4 c -0.3,0.6 -0.6,1.1 -0.9,1.7 l -0.5,0.9 c -0.3,0.6 -0.5,1.3 -0.8,1.9 l -0.1,-0.4 v -0.6 l 0.1,-0.6 -0.1,-0.3 c 0,-1.1 -0.1,-2.1 -0.1,-3.2 v -4.2 l -0.1,1 v 4.1 c 0,0.6 0.1,1.2 0.1,1.8 l -0.6,-1.6 c 0,-0.3 0,-0.7 0.1,-1.1 0.1,-0.4 0.1,-0.7 0.2,-1.1 l 0.2,-0.5 c 0,-0.1 0.1,-0.1 0.1,-0.2 l -0.2,-0.9 c -0.04,0.4 -0.2,0.8 -0.23,1.1 -0.1,0.4 -0.1,0.4 -0.1,0.8 -0.1,0.6 -0.1,1.1 -0.1,1.6 -0.1,-0.4 -0.3,-0.7 -0.43,-1.1 l -1,-2.6 c -0.2,-0.6 -0.4,-1.3 -0.5,-2 l -0.1,0.7 -0.43,-1 z m 3,7.97 c 0.12,0.33 0.25,0.66 0.36,1 0.1,0.27 0.1,0.32 0.12,0.4 V 440 c -0.16,-0.52 -0.3,-1.04 -0.48,-1.55 z m -0.22,0.4 c 0.25,0.8 0.5,1.6 0.72,2.4 v 0.1 l -0.25,-0.48 -0.1,-0.3 c -0.07,-0.3 -0.17,-0.5 -0.26,-0.7 0,-0.3 -0.1,-0.6 -0.1,-0.9 v -0.2 z m 2.24,0.33 c -0.26,0.66 -0.52,1.34 -0.76,2.02 0,0.04 -0.03,0.1 -0.04,0.13 0,-0.1 -0.03,-0.2 -0.04,-0.3 l 0.46,-1.13 z m -0.87,1.93 -0.1,0.72 c -0.03,-0.05 -0.06,-0.18 -0.08,-0.22 0,-0.17 0.1,-0.33 0.1,-0.5 z m 2.43,1.03 -0.05,0.16 -0.1,0.17 0.15,-0.4 z m -2.46,0.56 0.15,0.84 0.1,0.86 v 0.2 l -0.2,-0.48 c 0,-0.1 0,-0.2 -0.1,-0.32 l -0.2,-0.93 v -0.2 z m 2.14,0.2 -0.12,0.36 -0.3,0.93 -0.12,0.3 c 0.13,-0.4 0.28,-0.9 0.46,-1.3 l 0.08,-0.2 z m -1.25,0.55 v 2.26 l -0.26,-1.3 0.2,-0.75 0.06,-0.2 z m -1.52,0.03 0.1,0.13 v 0.3 -0.13 l 0.1,-0.3 z m 0.2,0.7 c 0.1,0.16 0.1,0.32 0.1,0.48 0,-0.1 -0.1,-0.18 -0.1,-0.27 l 0.1,-0.1 v -0.1 z m 0.4,0.36 0.1,0.3 v 0.18 -0.48 z m -0.8,0.1 0.1,0.1 v 0.26 l 0.1,-0.22 v 0.6 -0.74 z m 1.4,0.47 0.3,1.42 v 0.02 -0.38 c 0,-0.4 -0.1,-0.6 -0.2,-1 v -0.2 z m -1.1,0 0.6,0.96 c 0,0.1 0.1,0.3 0.1,0.4 -0.1,-0.1 -0.2,-0.2 -0.3,-0.4 l -0.2,-0.4 v -0.7 l 0.1,-0.2 z m -2,0.07 c 0.2,0.07 0.3,0.15 0.5,0.25 0.3,0.14 0.5,0.34 0.7,0.54 0.3,0.2 0.4,0.5 0.6,0.8 l 0.5,0.9 c 0.2,0.4 0.3,0.8 0.4,1.2 l 0.1,0.1 c -0.1,-0.4 -0.3,-0.7 -0.6,-1.1 l -1.8,-2.7 -0.1,-0.1 z m 3,1.7 0.2,0.34 v 0.02 l -0.1,-0.15 v -0.2 z m -0.5,0.4 0.3,0.32 0.1,0.53 V 448 l -0.2,-0.7 z m 1.2,0.38 c 0.2,0.75 0.4,1.5 0.5,2.26 v 0.16 l -0.1,-0.7 c -0.1,-0.45 -0.1,-0.72 -0.2,-1.16 v -0.53 z m -0.7,0.23 0.1,0.4 -0.1,0.3 v -0.6 z m 0.3,1 v 1.4 c 0,0.2 0.1,0.3 0,0.4 v -0.3 1.1 c -0.1,-0.1 -0.1,-0.3 -0.2,-0.5 v -0.6 c 0,0.1 0,0.1 0.1,0.2 l 0.1,-0.9 0.2,-0.4 z m 0.1,0.5 c 0,0.1 0.1,0.1 0.1,0.2 v 0.6 l 0.2,1 v -0.5 l 0.1,0.7 0.1,1.6 -0.3,-1 v -2.3 z m 2.3,0.2 v 0.8 l 0.1,2.2 v 1.3 l -0.3,0.9 c -0.3,0.6 -0.4,1.3 -0.5,2 l -0.1,-0.7 v -0.1 c 0,-0.5 0,-1 0.1,-1.4 0.1,0.3 0.2,0.7 0.2,1 v 0.4 l 0.2,-0.9 v -0.4 c 0,-0.4 -0.1,-0.8 -0.2,-1.2 0.1,-0.9 0.2,-1.7 0.5,-2.6 0.1,-0.3 0.3,-0.6 0.4,-0.9 z m -1.9,0.7 0.1,0.7 0.2,0.8 v 1.9 -0.2 c 0,-1 -0.1,-2 -0.2,-3 z m -1.1,0.8 0.2,0.4 v 0.2 c 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 0.1,-0.1 0.1,-0.2 z m 1.6,1.4 0.2,0.7 0.1,-0.5 0.2,0.9 v 1.7 c -0.2,-0.8 -0.3,-1.6 -0.4,-2.4 v -0.3 z m -1,1.7 z m 0.7,0.2 z m -0.5,0.1 c 0,0.1 0,0.1 0.1,0.2 v 0.1 l -0.1,-0.1 z m 0,1.6 0.4,0.7 0.2,0.5 v 0.2 c -0.2,-0.3 -0.4,-0.7 -0.6,-1 v -0.3 z m 2.3,0.1 -0.1,1.3 -0.1,0.9 -0.2,-0.4 v -0.4 c 0.1,-0.4 0.1,-0.9 0.2,-1.3 v 0.5 l 0.2,1 v -0.1 c 0,-0.3 0.1,-0.7 0.1,-1 l 0.1,-0.4 z m -1.6,1.3 0.2,0.4 -0.1,-0.3 v -0.1 z m 0.8,1 0.1,0.1 0.1,0.6 -0.1,-0.3 -0.1,-0.2 0.1,-0.2 z m -1.4,1.6 0.3,0.2 0.7,0.7 0.1,0.1 v 0.1 c 0,0.1 0.1,0.1 0.1,0.2 l 0.3,0.7 0.1,0.3 v 0.1 l 0.1,0.2 0.2,0.6 -0.7,-1.2 -0.5,-0.8 -0.2,-0.4 -0.2,-0.2 v -0.5 z m 2.6,3.2 0.3,0.5 0.1,0.3 v 0.2 l -0.4,-0.8 0.1,-0.1 z m -0.5,0.2 0.1,0.2 0.2,0.4 v 0.1 l -0.3,-0.4 z m 1.2,1.2 c 0.1,0.1 0.1,0.2 0.1,0.4 l -0.1,-0.3 0.1,-0.1 z m -0.6,0.2 0.3,1.3 0.1,0.2 -0.6,-0.2 v -0.9 c 0,0.1 0.1,0.1 0.1,0.2 v -0.3 l 0.1,0.4 0.1,-0.7 z m -0.9,0.2 c 0.1,0.1 0.2,0.2 0.3,0.4 l 0.1,0.1 0.1,0.2 c -0.1,-0.2 -0.3,-0.4 -0.4,-0.6 z m 0.5,0.5 0.1,0.1 0.1,0.2 v 0.2 l -0.1,-0.2 v -0.2 z m 1.3,0.8 0.1,0.1 v 0.1 -0.1 z m 0.4,0.3 0.1,0.3 h -0.1 v -0.2 z m -0.2,0.1 0.1,0.2 h -0.1 v -0.1 z m -0.1,1.2 v 0.1 z"
+ id="path4653-3" />
+ </g>
+ </g>
+</svg>
diff --git a/resources/vector/hair/underArm bushy right.svg b/resources/vector/hair/underArm bushy right.svg
new file mode 100644
index 0000000000000000000000000000000000000000..049aac903c8b222d56892487e549bac38886630a
--- /dev/null
+++ b/resources/vector/hair/underArm bushy right.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="Layer_1"
+ viewBox="0 0 1000 1000"
+ version="1.1"
+ sodipodi:docname="underArm bushy right.svg"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+ <metadata
+ id="metadata4148">
+ <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="defs4146" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1680"
+ inkscape:window-height="987"
+ id="namedview4144"
+ showgrid="false"
+ inkscape:zoom="0.788"
+ inkscape:cx="500"
+ inkscape:cy="630.24332"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="layer13"
+ inkscape:snap-global="false" />
+ <style
+ id="style2">.st0{fill:#010101;} .st1{fill:#F6E0E8;}</style>
+ <style
+ id="style4208"
+ type="text/css">
+ .st0{fill:#010101;}
+ .st1{fill:#F6E0E8;}
+</style>
+ <g
+ inkscape:groupmode="layer"
+ id="layer14"
+ inkscape:label="Layer 3">
+ <g
+ transform="matrix(0.32825958,0.34029125,-0.21729162,0.51740458,407.60151,-162.98551)"
+ style="stroke-width:0.1;stroke-linecap:round"
+ id="layer2-4-3"
+ inkscape:transform-center-x="5.1605772"
+ inkscape:transform-center-y="-2.3165394">
+ <path
+ style="fill:#9497a2"
+ inkscape:connector-curvature="0"
+ d="m 495.4,468.64 -1.5,1.78 -0.37,-2.72 -2.7,1.5 -1.6,-3.65 -4.5,-1.97 -2.25,-3.18 5.53,2.25 -5.5,-4.4 2.2,-0.38 -3.9,-3 -3.2,-4.3 5.4,3 -4.9,-6.47 4.4,1.78 -3.8,-7.86 2.6,2.34 -4.31,-6.36 5.06,2 -2.2,-3.9 -3.5,-3.2 4.2,1.1 -3.86,-8.6 -0.63,-5.4 4.2,10.3 -0.32,-9.9 3,10.2 2.64,-10.5 0.8,6.2 0.2,5.5 7.1,-10.2 -3,6.95 6.3,-3.4 -5.5,5.1 -2.9,3 11.2,-4 -4.7,4.1 8.2,-1.9 -10.7,5 8.4,1.02 -6.5,3.72 5.6,-0.1 -5.3,3.1 3.7,1.4 -4.4,1.7 6.4,-1.4 2.1,-2.1 -4.8,5.2 4.3,-1.2 -7,5.9 5.4,-2 -4.2,4.2 -2.9,3.7 6,-2.1 -3.3,5 5.5,-0.8 -5,2.3 3.2,1.8 -3.8,0.3 2.5,3.6 z"
+ id="path4488-3-1" />
+ <path
+ style="fill:#b4b3b7"
+ inkscape:connector-curvature="0"
+ d="m 485.05,423.03 z m 0,0 -0.16,0.97 v 1.05 c -0.1,0.42 0,0.83 0.1,1.24 0.1,0.4 0.1,0.3 0.1,0.8 0,0.4 0.1,0.9 0.1,1.3 -0.1,-0.4 -0.1,-0.7 -0.1,-1.1 l -0.9,0.4 c 0,0.3 0.1,0.7 0.1,1 l 0.3,1.4 c 0.1,0.3 0.1,0.7 0.2,1.1 l 0.4,-0.3 v 0.2 -0.3 l 0.3,-0.2 c 0,-0.4 -0.1,-0.8 -0.2,-1.1 0,-0.1 0,-0.2 -0.1,-0.3 0,-0.3 -0.1,-0.6 -0.1,-0.8 0,-0.9 -0.1,-1.8 -0.2,-2.6 0,-0.2 0,-0.3 -0.1,-0.4 -0.1,-0.6 -0.3,-1.1 -0.2,-1.7 v -1 z m -8.48,0.45 -0.12,0.98 c 0.1,0.33 0.27,0.65 0.4,0.97 0.2,0.44 0.35,0.88 0.5,1.33 0.16,0.46 0.2,0.94 0.3,1.4 0.12,0.46 0.2,0.92 0.3,1.37 0.04,0.24 0.13,0.47 0.24,0.7 l 0.1,-0.96 c -0.1,-0.18 -0.2,-0.38 -0.2,-0.58 0,0 0.1,0.1 0.1,0.2 l 0.6,1.3 0.5,1.2 v 0.1 c 0.1,0.3 -0.1,-0.1 0.1,0.3 l 0.2,0.4 0.1,0.2 -1.2,-0.6 c -0.6,-0.2 -1.1,-0.4 -1.7,-0.6 -0.3,-0.1 -0.6,-0.1 -0.8,-0.1 v 1 c 0.2,-0.1 0.5,0 0.8,0 l 1.2,0.3 v 0.4 c 0.2,-0.1 0.5,0 0.7,0.1 l 0.3,0.1 -0.2,0.1 1,1 c 0.4,0.3 0.9,0.7 1.4,1.1 0.2,0.1 0.1,0 0.2,0.2 l 0.4,-0.2 c 0.1,0.1 0.3,0.3 0.4,0.5 0.2,0.3 0.5,0.5 0.7,0.8 l 0.5,0.6 0.4,0.6 c 0.2,0.3 0.5,0.6 0.7,0.9 l 0.7,0.8 0.8,-0.5 -0.7,-0.9 c -0.2,-0.3 -0.5,-0.6 -0.7,-1 l -0.5,-0.7 -0.6,-0.6 -0.7,-0.8 -0.7,-0.7 c -0.2,-0.1 -0.4,-0.2 -0.6,-0.2 l -0.2,0.1 -0.6,-0.5 0.1,-0.4 c 0.6,0.2 1.3,0.5 1.9,0.7 0.3,0.1 0.6,0.3 0.8,0.4 l 0.3,0.2 c 0.2,0.3 0.3,0.5 0.5,0.8 l 0.8,-0.4 c -0.2,-0.4 -0.4,-0.7 -0.5,-1.1 -0.1,-0.4 -0.3,-0.7 -0.6,-0.9 l 0.4,-0.2 c -0.2,-0.4 -0.4,-0.7 -0.6,-1 -0.5,-0.7 -0.9,-1.3 -1.4,-1.9 l -0.4,-0.4 0.3,-0.9 0.7,-2.3 c 0.2,-0.4 0.4,-0.9 0.5,-1.4 l -0.1,-0.9 c -0.1,0.5 -0.3,1 -0.5,1.5 -0.2,0.8 -0.5,1.5 -0.7,2.3 -0.1,0.2 -0.1,0.4 -0.2,0.6 v -0.3 c -0.1,-0.3 -0.2,-0.6 -0.4,-0.8 l -0.5,-0.9 -0.6,-0.9 c -0.2,-0.3 -0.4,-0.6 -0.4,-0.9 l -0.1,-0.2 c 0.1,-0.2 0.1,-0.4 0.2,-0.6 l -0.1,-1 c -0.2,0.2 -0.2,0.5 -0.3,0.7 -0.1,0.5 -0.1,1 0,1.5 v 0.4 c 0.2,0.3 0.4,0.8 0.5,1.2 l 0.6,1.6 c 0.1,0.1 0.1,0.3 0.2,0.5 l -0.7,0.4 c 0.4,0.3 0.7,0.7 1.1,1 l 0.1,0.1 v 0.7 c -0.4,-0.3 -0.8,-0.6 -1.1,-1 l -0.9,0.5 c 0.4,0.4 0.9,0.7 1.4,1.1 0.6,0.4 1.2,0.8 1.8,1.3 -0.8,-0.3 -1.6,-0.6 -2.5,-1 l -0.8,-0.3 v -0.7 c -0.1,-0.2 -0.2,-0.4 -0.4,-0.7 l -0.3,-0.9 -0.6,-1.2 -0.7,-1.3 c -0.2,-0.3 -0.3,-0.6 -0.4,-0.9 l -0.1,0.4 v -0.2 c -0.1,-0.5 -0.1,-1 -0.3,-1.4 -0.1,-0.5 -0.3,-0.9 -0.5,-1.4 -0.1,-0.3 -0.3,-0.6 -0.4,-1 z m 13.57,1.1 -0.15,0.95 c 0,-0.2 0,-0.42 -0.1,-0.64 l -0.1,0.2 -0.2,0.9 c -0.2,0.7 -0.5,1.5 -0.7,2.2 -0.3,0.2 -0.5,0.5 -0.7,0.8 -0.1,0.1 -0.2,0.3 -0.3,0.5 -0.1,0.1 -0.2,0.1 -0.2,0.2 -0.5,0.4 -0.9,0.9 -1.2,1.5 -0.2,0.3 -0.3,0.7 -0.4,1.1 v 0.1 l 0.9,-0.4 v -0.1 c 0,-0.4 0.2,-0.8 0.4,-1.1 0.1,-0.3 0.3,-0.6 0.6,-0.9 v 0.5 -0.2 l 0.1,0.7 c 0,-0.1 0.1,-0.3 0.1,-0.4 l 0.6,-1.6 v -0.1 l 0.1,-0.2 c 0.4,-0.3 0.8,-0.6 1.3,-0.9 0.5,-0.3 1,-0.6 1.7,-0.6 h 0.8 v -1 h -0.8 c -0.7,0 -1.2,0.3 -1.8,0.6 l -1,0.6 0.3,-1 c 0.1,-0.4 0.2,-0.7 0.2,-1 v -1.5 z m -8.2,4.34 0.22,0.4 c 0.12,0.18 0.2,0.4 0.25,0.6 l -0.2,-0.4 -0.2,-0.6 z m 2.34,0.4 -0.87,0.45 0.2,0.84 0.2,0.5 0.9,-0.4 -0.1,-0.4 c 0,-0.3 -0.1,-0.5 -0.1,-0.8 z m 11.02,1.14 c -0.43,0.1 -0.85,0.23 -1.27,0.37 -0.53,0.2 -1.05,0.42 -1.55,0.68 l -0.42,0.2 -1.28,0.6 -0.6,0.3 -0.23,0.2 -0.1,0.1 c -0.23,0.2 -0.46,0.3 -0.7,0.5 l 0.53,-0.2 -0.1,0.2 -0.06,0.2 v 0.1 c -0.4,0.2 -0.8,0.4 -1.2,0.7 l 0.9,-0.3 c -1.5,0.9 -0.42,0.2 -0.05,0.1 l 0.2,-0.1 -0.2,0.2 c -0.17,0.2 -0.32,0.4 -0.44,0.6 l 0.9,-0.4 v 0.2 l 0.08,-0.2 0.2,-0.2 0.8,-0.4 0.9,-0.5 v 0.1 l 0.2,-0.1 -0.2,0.2 -0.2,0.2 c -0.2,0.2 -0.5,0.5 -0.8,0.7 0,0.1 0,0.1 -0.1,0.1 v -0.2 l -0.3,0.5 -0.1,0.6 c 0,0.3 -0.1,0.5 -0.2,0.8 l -0.1,0.3 0.1,1 0.2,-0.3 c 0.1,-0.2 0.2,-0.4 0.2,-0.7 0.1,-0.2 0.2,-0.3 0.2,-0.6 0.1,-0.1 0.2,-0.3 0.3,-0.4 v -0.6 l 0.2,-0.1 h 0.1 v 0.1 l 0.9,-0.4 c 0,0 0.1,-0.1 0.1,-0.2 1.1,-0.6 1.2,-0.7 2.2,-1.2 0.7,-0.4 1.4,-0.7 2.1,-1 0.5,-0.1 0.8,-0.3 1.2,-0.6 v -0.1 h -0.1 c 0.1,0 0,0 0,0 h -0.1 l 0.1,-0.1 -0.5,0.2 -0.9,0.3 v -0.6 h 0.1 -0.1 z m -0.53,1.22 c -0.14,0.06 -0.3,0.12 -0.42,0.2 l -0.33,0.18 0.3,-0.23 z m -12.28,0.03 0.9,1.3 -1,-0.6 v -0.3 l -0.1,-0.1 v -0.1 z m 10.8,0.7 -1.7,1 0.4,-0.4 0.4,-0.3 h 0.1 l 0.6,-0.2 z m 0.9,3.7 h -0.7 c -0.3,0.1 -0.7,0.1 -1,0.1 -0.5,0 -0.9,0.1 -1.3,0.2 -0.3,0.1 -0.5,0.1 -0.8,0.2 l -0.1,0.1 -0.8,0.6 c 0.2,-0.1 0.4,-0.2 0.7,-0.2 0.4,-0.1 0.8,-0.1 1.2,-0.2 h 1.6 z m -0.5,0.6 -0.6,0.2 c -0.3,0.1 -0.6,0.1 -0.8,0.2 -0.1,0 -0.1,0.1 -0.1,0.1 0,0 -0.1,0 -0.1,0.1 h -0.5 c -0.3,0 -0.5,0 -0.7,0.1 l -0.6,0.3 c -0.2,0.1 -0.4,0.2 -0.4,0.5 l 0.1,0.1 -0.5,0.3 0.5,-0.2 -0.3,0.2 0.4,-0.2 h 0.1 l -0.1,0.1 0.2,-0.1 -0.1,0.1 -0.3,0.3 -0.1,0.1 0.9,-0.4 v -0.1 h 0.1 l -0.8,0.4 c 0,0.1 -0.2,0.4 -0.2,0.5 l 0.1,0.1 0.1,0.1 c 0.1,0.1 0.3,0 0.4,0 l -0.1,0.1 c -0.4,0.3 -0.7,0.6 -1.1,1 l -0.7,1 v 0.1 c 0,0.2 0.3,0.1 0.5,-0.1 l -0.2,0.4 0.9,-0.4 c 0.1,-0.2 0.1,-0.4 0.3,-0.6 l 0.2,-0.3 v 0.7 c 0,0.1 0.1,0.1 0.1,0 v -0.1 l 0.1,-0.1 c 0.1,-0.2 0.3,-0.3 0.4,-0.5 v 0.1 l 0.2,-0.2 c 0.3,-0.3 0.8,-0.6 1.2,-0.9 0.5,-0.3 1,-0.6 1.6,-0.8 0.1,-0.1 0.4,-0.2 0.5,-0.2 h 0.2 v -0.2 h 1.2 l 0.8,-0.5 h -0.9 l 0.3,-0.2 -0.1,-0.1 h -0.2 v 0.1 l 0.1,-0.1 -1.2,0.1 h -0.6 v -0.2 c -0.3,0.1 -0.7,0.1 -1.1,0.1 z m -16.2,1 v 1 h 0.8 c 0.4,0 0.8,0.1 1.1,0.3 l -0.4,0.3 c 0.2,0 0.5,0 0.8,0.1 0.3,0.1 0.6,0.4 0.8,0.6 l 0.4,0.5 -0.2,0.2 0.4,0.5 -0.4,0.3 c 0.2,0 0.3,0 0.5,0.1 l 0.9,1.3 0.9,1.5 0.2,0.5 0.8,-0.4 -0.3,-0.5 c -0.3,-0.4 -0.5,-0.8 -0.8,-1.2 l 1.4,1 0.6,0.6 0.8,-0.5 -0.6,-0.5 c -0.5,-0.3 -1.1,-0.6 -1.6,-1 -0.5,-0.3 -1,-0.7 -1.5,-0.9 -0.1,0 -0.2,-0.1 -0.3,-0.1 v -0.1 l -0.3,-0.4 0.7,0.5 c 0.3,0.2 0.6,0.3 0.9,0.5 l 0.4,0.3 c 0.4,0.3 0.8,0.5 1.2,0.8 l 0.8,0.6 0.1,-0.9 -0.9,-0.6 -1.3,-0.8 c -0.4,-0.2 -0.9,-0.4 -1.3,-0.7 -0.4,-0.2 -0.7,-0.4 -1,-0.6 v 0.5 l -0.2,-0.2 c -0.3,-0.2 -0.6,-0.5 -0.9,-0.6 l -0.2,-0.1 v -0.2 c -0.2,-0.2 -0.5,-0.3 -0.7,-0.4 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -0.3,-0.1 -0.6,-0.2 -0.9,-0.2 h -0.8 z m 15.9,0.1 -0.1,0.1 -0.3,0.1 h -0.3 c 0.2,0 0.4,-0.1 0.6,-0.1 z m -3.1,0.2 h -0.1 z m 1.2,0 z m -0.1,0.2 c 0,0.1 -0.1,0.1 -0.1,0.2 l -0.1,0.1 c 0,0.1 -0.1,0.1 -0.1,0.1 l 0.1,-0.3 z m 5.3,2.6 c -0.6,0.2 -1.2,0.4 -1.7,0.7 h -0.1 c 0.1,-0.1 0.3,-0.2 0.2,-0.4 l -0.1,-0.1 h -0.1 l -0.6,0.2 c -0.2,0 -0.4,0.1 -0.5,0.2 -0.4,0.3 -0.9,0.5 -1.3,0.8 -0.2,0.2 -0.4,0.5 -0.6,0.7 -0.1,0.2 -0.2,0.4 -0.4,0.6 l 0.7,-0.3 c -0.2,0.2 -0.3,0.4 -0.4,0.6 l -0.1,0.1 -0.8,0.6 0.2,-0.1 c 0.1,-0.1 0.2,-0.2 0.4,-0.2 l -0.1,0.2 h -0.1 l -0.2,0.3 c -0.1,0.1 -0.3,0.4 -0.4,0.5 l -0.3,0.5 c 0,0.1 -0.1,0.2 -0.1,0.3 -0.1,0.2 -0.3,0.7 -0.3,1 v 0.1 l 0.1,0.1 c 0.4,-0.3 0.8,-0.4 1.1,-0.7 0.1,-0.1 0.1,-0.2 0.2,-0.3 0.1,-0.1 0.1,-0.3 0.2,-0.4 l 0.2,-0.5 0.4,-0.6 c 0.2,-0.4 0.5,-0.7 0.7,-1.1 v -0.1 l 0.2,-0.1 0.8,-0.4 c 0.6,-0.3 1.2,-0.5 1.7,-0.9 v -0.1 h -0.1 c -0.2,0 -0.3,0.1 -0.5,0.1 h -0.3 c -0.4,0.1 -0.8,0.6 -1.1,0.6 h -0.1 l 0.4,-0.4 1.6,-0.6 z m -2.4,0.8 -0.1,0.1 -0.3,0.3 -0.7,0.4 -0.5,0.3 0.2,-0.3 0.3,-0.4 c 0,0 0.1,0 0.1,-0.1 l 0.2,-0.1 c 0.2,0 0.4,-0.2 0.7,-0.2 z m 0.5,0.7 -0.6,0.3 -0.6,0.3 0.2,-0.1 0.4,-0.3 0.2,-0.1 h 0.4 z m -15.9,0.3 -0.1,1 0.6,0.3 1,0.7 c 0.1,0.1 0.2,0.1 0.3,0.2 l -0.3,0.2 c 0.2,0.2 0.5,0.3 0.9,0.4 0.1,0.1 0.3,0.1 0.5,0.2 l 0.5,0.5 c 0.1,0.2 0.2,0.3 0.3,0.5 l 0.1,-0.9 c 0.2,0.1 0.5,0.2 0.7,0.4 l 0.2,0.2 v 0.1 c 0.2,0.4 0.3,0.7 0.4,1.1 -0.3,-0.1 -0.6,-0.2 -0.9,-0.4 l -0.8,0.6 c 0.3,0.1 0.7,0.3 1,0.4 0.4,0.2 0.9,0.5 1.3,0.7 0.2,0.4 0.3,0.7 0.6,1 l 0.6,0.5 0.8,-0.5 h -0.1 l 0.3,-0.2 c -0.1,0 -0.1,-0.1 -0.2,-0.1 -0.3,-0.3 -0.7,-0.7 -1.1,-0.9 -0.1,0 -0.1,0 -0.2,-0.1 l -0.2,-0.3 -0.2,-0.3 c -0.2,-0.3 -0.2,-0.4 -0.3,-0.7 l 0.1,0.1 0.6,0.5 0.8,-0.5 -0.7,-0.5 c -0.3,-0.2 -0.5,-0.3 -0.8,-0.4 l -0.6,-0.3 v -0.1 l -0.1,-0.1 -0.2,-0.3 -0.3,-0.6 -0.7,0.5 c -0.1,0 -0.2,-0.1 -0.3,-0.1 -0.2,-0.1 -0.5,-0.2 -0.7,-0.2 l -0.2,0.1 -0.5,-0.3 c -0.4,-0.3 -0.8,-0.5 -1.2,-0.8 l -1,-0.7 -0.6,-0.3 z m 17,1.5 c -0.3,0.1 -0.6,0.1 -0.9,0.2 l -0.3,0.1 h -0.4 c -0.2,0 -0.4,0 -0.6,0.1 -0.2,0.1 -0.3,0.2 -0.4,0.2 l -0.3,0.3 -0.1,0.2 c -0.7,0.4 -1.3,0.8 -2,1.3 l 0.9,-0.3 c 0.3,-0.2 0.6,-0.4 0.8,-0.5 h 0.1 l 0.2,-0.1 v 0.2 c 0,0.1 0,0.2 -0.1,0.3 v 0.1 l -1,0.7 c -0.4,0.3 -0.8,0.6 -1.1,1 -0.2,0.3 -0.4,0.6 -0.5,0.8 l 0.1,1 c 0.1,-0.3 0.2,-0.6 0.4,-0.8 0.3,-0.4 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.5 1.2,-0.7 v -0.2 l 0.2,-0.6 c 0,-0.1 0,-0.2 0.1,-0.2 0.1,0 0.2,-0.1 0.4,-0.2 0.2,-0.1 0.3,-0.1 0.5,-0.1 h 2.2 v -1 h -0.8 l 0.3,-0.2 h -0.2 z m 2.3,2.3 c -0.3,0.2 -0.7,0.2 -1,0.3 l 0.1,-0.1 c -0.4,0.1 -0.7,0.1 -1.1,0.1 -0.5,0 -0.9,0.1 -1.3,0.3 -0.5,0.3 -1,0.5 -1.3,0.9 l -0.2,0.2 -0.2,0.1 c -0.5,0.3 -0.8,0.8 -1.2,1.3 -0.3,0.4 -0.5,0.8 -0.8,1.2 l 0.8,-0.4 0.5,-0.8 v 0.1 l 0.9,-0.4 v -0.2 c 0.1,-0.3 0.2,-0.5 0.4,-0.8 h 0.3 -0.1 l 0.1,0.9 0.2,-0.3 c 0.1,-0.1 0.1,-0.2 0.2,-0.3 0.1,-0.2 0.4,-0.2 0.5,-0.3 0.5,-0.2 1,-0.3 1.5,-0.4 0.5,-0.1 0.9,-0.1 1.3,-0.2 z m -3.3,0.9 c -0.1,0 -0.1,0 -0.1,0.1 h -0.4 c 0,-0.1 0,-0.1 0.1,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 z m 2.7,1 h -0.1 l -0.3,0.1 -0.7,0.2 c -0.4,0.1 -0.8,0.2 -1.1,0.4 l -0.7,0.2 -0.7,0.4 -0.4,0.2 -0.4,0.2 -0.1,-0.9 c -0.3,0.1 -0.5,0.3 -0.7,0.5 -0.4,0.4 -0.6,0.8 -0.9,1.3 l -0.2,0.5 -0.1,0.1 c -0.1,0.1 -0.2,0.2 -0.3,0.4 l 0.1,-0.1 -0.1,0.1 v 0.4 c -0.1,0.1 0,0.1 -0.1,0.2 l 0.1,-0.1 v 0.3 l 0.2,-0.5 0.5,-0.2 0.1,-0.1 0.6,-0.6 c 0.1,-0.1 0.2,-0.3 0.4,-0.4 l 0.2,-0.1 0.2,-0.1 1.5,-0.6 1.8,-0.6 c 0.4,0 0.7,-0.1 1.1,-0.1 v -1 c -0.4,0 -0.8,0.2 -1.1,0.2 l -0.3,0.1 z m -16.6,0.3 -0.8,0.5 c 0.3,0 0.5,0.2 0.7,0.3 l 0.9,0.6 0.8,0.6 -0.6,0.4 h 0.4 l -0.2,0.2 0.6,0.4 0.8,0.5 c 0,0.3 0.1,0.5 0.3,0.7 0.3,0.6 -0.1,-0.1 0.3,0.6 0.3,0.6 0.7,1.2 1.1,1.8 l -0.3,-0.2 -0.6,-0.2 c -0.4,-0.1 -0.7,-0.3 -1,-0.5 l -1.3,-0.8 c -0.3,-0.2 -0.6,-0.3 -0.9,-0.5 l -0.4,0.3 v -0.9 l -0.2,-0.1 c -0.4,-0.2 -0.8,-0.4 -1.3,-0.5 l -0.7,-0.3 -0.1,1 0.7,0.3 c 0.5,0.1 0.8,0.3 1.2,0.5 l 0.2,0.1 -0.4,0.3 c 0.3,0.1 0.6,0.3 0.9,0.5 l 1.3,0.8 c 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.3,0.2 0.5,0.3 l 0.2,0.3 0.8,-0.5 0.1,0.1 c 0.2,0.5 0.5,0.9 0.8,1.3 l 0.2,0.3 0.8,-0.5 -0.2,-0.2 c -0.3,-0.4 -0.6,-0.8 -0.9,-1.3 l -1,-1.7 0.6,0.3 c 0.4,0.2 0.7,0.5 1,0.8 0.3,0.4 0.5,0.8 0.7,1.2 l 0.3,0.9 0.8,-0.4 -0.3,-0.9 c 0,-0.2 -0.1,-0.3 -0.2,-0.5 v -0.1 l 0.4,-0.2 c -0.2,-0.2 -0.5,-0.4 -0.7,-0.7 -0.1,-0.1 -0.2,-0.2 -0.3,-0.2 l -0.7,-0.6 c -0.3,-0.2 -0.5,-0.5 -0.8,-0.7 v -0.1 l -0.2,-0.1 -0.4,-0.3 -1.1,-0.6 c -0.3,-0.2 -0.5,-0.3 -0.8,-0.5 l -1.1,-0.8 c -0.3,-0.2 -0.6,-0.5 -0.9,-0.6 l -0.8,-0.3 z m 11.3,2.6 v 0.3 c -0.1,0.1 -0.2,0.1 -0.4,0.2 l -0.2,0.1 v -0.1 l 0.2,-0.3 0.2,-0.3 z m 3.8,1.2 -0.9,0.4 c -0.3,0.2 -0.6,0.4 -0.8,0.6 -0.3,0.2 -0.5,0.4 -0.7,0.6 l -0.8,0.4 c -0.4,0.3 -0.7,0.6 -1,0.9 -0.2,0.2 -0.3,0.5 -0.4,0.7 l 0.6,-0.2 v 0.1 c -0.2,0.3 -0.3,0.7 -0.4,1.1 l -0.6,0.4 c -0.5,0.4 -1,0.8 -1.5,1.3 l 0.9,-0.3 c 0.4,-0.4 0.8,-0.7 1.3,-1.1 v 0.5 c -0.2,0.3 -0.4,0.7 -0.5,1.1 l 0.8,-0.4 c 0.1,-0.4 0.3,-0.8 0.5,-1.1 v 0.1 c 0,0.3 -0.1,0.6 -0.1,0.8 v 0.1 l 0.8,-0.4 c 0,-0.3 0.1,-0.6 0.1,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 l 0.2,-0.2 c 0.4,-0.1 0.7,-0.2 1.1,-0.2 l 0.8,-0.6 c -0.5,0.1 -1,0.2 -1.4,0.3 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.6,-0.3 0.6,-0.3 0.9,-0.5 l -0.9,0.4 c -0.1,0 -0.1,0.1 -0.1,0.1 l 0.7,-0.4 -0.1,0.1 c -0.1,0 -0.1,0.1 -0.2,0.1 l -1.1,0.6 c -0.1,0.1 -0.1,0.1 -0.2,0.1 -0.2,0.1 -0.3,0.3 -0.5,0.4 l -0.2,0.2 0.1,-0.4 1.3,-0.9 c 0.4,-0.2 0.8,-0.4 1.3,-0.6 0.3,-0.1 0.5,-0.1 0.8,-0.2 v -1 l -0.8,0.3 c -0.4,0.1 -0.7,0.3 -1.1,0.5 l -0.5,0.2 0.5,-0.4 0.9,-0.7 z m -11,0.5 z m 8.3,1.5 -0.2,0.2 c -0.2,0.1 -0.4,0.3 -0.6,0.5 0,-0.1 0,-0.1 0.1,-0.1 0.2,-0.3 0.4,-0.5 0.6,-0.6 z m -0.6,1.7 c 0,0.1 -0.1,0.2 -0.1,0.2 l -0.3,0.2 v -0.1 l 0.3,-0.3 z m -0.1,0.4 c 0,0.1 0,0.1 -0.1,0.1 -0.3,0.2 -0.5,0.4 -0.6,0.7 l -0.2,0.2 c 0,-0.2 0.1,-0.4 0.2,-0.6 v -0.1 c 0.1,0 0.3,-0.1 0.4,-0.2 z m -8,1.4 -0.7,0.1 v 1.3 h 0.7 c 0.3,0 0.6,0.1 0.8,0.1 v -0.2 l 1.1,0.6 c 0.4,0.3 0.7,0.7 0.9,1.1 l 0.8,-0.5 c -0.3,-0.5 -0.6,-0.9 -1,-1.2 -0.4,-0.3 -0.9,-0.6 -1.3,-0.8 -0.3,-0.2 -0.5,-0.3 -0.8,-0.3 l -0.2,0.1 -0.5,-0.1 h -0.1 z m 12,0 -1.4,1 -0.8,0.5 0.1,-0.1 0.2,-0.2 c 0.2,-0.2 0.2,-0.2 -0.1,0 l 0.7,-0.6 c -0.6,0.2 -1.2,0.6 -1.7,1 -0.3,0.2 -0.6,0.6 -0.8,0.9 -0.2,0.1 -0.4,0.3 -0.5,0.5 v 0.3 l -0.2,0.5 v 0.1 l 0.3,-0.2 v 0.1 l 0.1,-0.1 0.6,-0.2 v -0.1 l 0.1,-0.4 c 0.2,-0.1 0.3,-0.2 0.6,-0.4 0.5,-0.3 1,-0.6 1.5,-1 0.5,-0.3 0.9,-0.6 1.4,-0.9 z m -1.1,2.8 -0.9,0.6 -0.3,0.3 -0.6,0.7 c -0.5,0.6 -0.9,1.2 -1.2,1.8 -0.1,0.2 -0.3,0.4 -0.4,0.6 l 0.8,-0.4 0.1,-0.1 v 0.3 l -0.5,0.3 v 0.1 c 0,0 0.2,-0.1 0.3,-0.1 v -0.1 l 0.1,-0.1 0.9,-0.6 0.1,-0.1 c 0.1,-0.1 0.3,-0.2 0.4,-0.2 0.4,-0.2 0.9,-0.3 1.3,-0.3 v -0.3 l 0.5,-0.4 -0.2,0.1 0.7,-0.6 -0.9,0.5 v -0.3 c -0.5,0.1 -1,0.2 -1.5,0.4 -0.4,0.1 -0.7,0.2 -1,0.4 0.3,-0.5 0.6,-1 1,-1.5 l 0.6,-0.7 c 0.3,-0.2 0.9,-0.6 -0.5,0.2 z m -10.6,1.4 c -0.2,0 -0.4,0 -0.5,0.1 l -0.8,0.6 h 1.3 c 0.3,0.1 0.6,0.1 0.9,0.2 l 1,0.4 0.5,0.2 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.1 l -0.8,0.6 0.9,0.2 0.6,0.1 -0.3,0.2 h 0.5 c 0.1,0 0.3,0.1 0.4,0.1 l 0.2,-0.1 c 0.4,0.1 0.8,0.2 1.2,0.5 l 0.2,0.2 h 0.1 l -0.1,0.5 v 1.6 l 0.1,-0.9 v -0.5 c 0.1,-0.2 0.1,-0.4 0.2,-0.5 v -0.4 l 0.4,-0.3 -0.2,-0.1 -0.3,-0.1 v -0.1 0.1 c -0.4,-0.2 -0.7,-0.3 -1,-0.4 l -0.6,-0.1 0.6,-0.3 c -0.1,-0.1 -0.2,-0.1 -0.2,-0.2 l -0.7,-0.3 -1.1,-0.4 c -0.3,-0.1 -0.6,-0.2 -0.9,-0.2 h -0.8 z"
+ id="path4490-5-3" />
+ <path
+ style="fill:#525767"
+ inkscape:connector-curvature="0"
+ d="m 484.52,430.5 -0.12,0.97 c 0.3,0.55 0.57,1.1 0.84,1.66 0.1,0.18 0.17,0.37 0.26,0.56 l 0.15,0.4 c 0.5,1.4 1.03,2.9 1.5,4.3 v 1.1 l -0.3,-0.9 c -0.1,-0.2 -0.18,-0.4 -0.26,-0.6 l -0.5,-1 -0.5,-0.8 -0.1,-0.2 -0.1,0.3 -0.5,-0.9 c -0.4,-0.7 -0.8,-1.4 -1.2,-2 l -0.5,-0.6 c -0.2,-0.3 -0.5,-0.5 -0.7,-0.7 l -0.1,0.9 c 0.4,0.3 0.8,0.8 1.1,1.2 0.4,0.6 0.8,1.3 1.1,1.9 v 0.1 l -0.1,-0.1 -0.1,0.9 c 0.5,0.6 0.9,1.3 1.4,2 l 0.9,1.4 0.6,1.9 v 0.9 l -0.1,-0.1 c 0,-0.1 0,-0.1 -0.1,-0.1 v -0.5 c -0.1,-0.3 -0.1,-0.7 -0.2,-1 l -0.2,1 c -0.7,-1.2 -1.5,-2.3 -2.2,-3.4 -0.5,-0.7 -1,-1.4 -1.4,-2.1 l -0.1,0.9 1.3,1.9 c 0.6,0.8 1.1,1.7 1.7,2.5 l 0.7,1.2 v 0.7 l -0.7,-1.1 -0.9,-1.8 c -0.2,-0.4 -0.3,-0.6 -0.6,-1 l -0.3,-0.5 -1.1,-1.7 -0.1,0.9 c 0.4,0.5 0.8,1.1 1.2,1.6 l 0.3,0.4 0.6,1 0.9,1.6 -0.3,-0.2 c -0.2,-0.1 -0.4,-0.3 -0.6,-0.3 v 0.8 l -1.1,-1.7 -0.1,1 1.2,1.8 c 0.6,0.9 1.3,1.8 1.9,2.7 l 0.5,0.9 -0.1,0.6 0.1,0.2 -0.1,0.4 c -0.5,-0.8 -1,-1.5 -1.4,-2.3 -0.4,-0.7 -0.8,-1.4 -0.9,-2.2 l -0.2,0.9 c 0.1,0.7 0.6,1.4 0.9,2.1 l 1.5,2.5 0.3,0.4 c -0.3,-0.4 -0.6,-0.7 -1,-1 l -0.2,-0.3 c -0.3,-0.6 -0.7,-1.1 -1,-1.7 l -0.1,0.7 -0.1,-0.2 c -0.3,-0.6 -0.7,-1.1 -1,-1.7 l -0.1,0.9 1,1.5 v 0.1 l -0.3,-0.3 c -0.3,-0.2 -0.6,-0.4 -0.9,-0.7 l -0.1,1 0.9,0.6 c 0.2,0.2 0.5,0.3 0.7,0.5 0.3,0.3 0.6,0.6 0.9,1 0.6,0.7 1.1,1.5 1.6,2.3 v 0.3 l -0.3,-0.5 c -0.3,-0.4 -0.6,-0.7 -1,-1 l -0.5,-0.4 c -0.1,0 -0.1,0 -0.2,-0.1 v 1 l 0.1,0.1 c 0.2,0.1 0.3,0.1 0.4,0.3 0.3,0.2 0.5,0.4 0.7,0.7 v 0.6 l 0.3,0.2 v 0.2 l -0.1,-0.1 v 1 l 0.3,0.3 -0.8,-0.5 -1,-0.9 v 0.2 l -1.1,-0.6 c -0.6,-0.2 -1.1,-0.5 -1.7,-0.5 v 1 c 0.6,-0.1 1.1,0.1 1.7,0.3 0.5,0.2 1,0.5 1.5,0.8 l 0.6,0.4 1,0.72 v 0.4 c -0.3,-0.3 -0.6,-0.6 -0.8,-0.95 l -0.1,1 c 0.3,0.3 0.6,0.6 0.8,1 v 0.1 -0.18 l 0.3,0.3 c 0.5,0.7 0.9,1.4 1.4,2.1 l -0.3,-0.3 c -0.6,-0.4 -1.2,-0.7 -1.8,-1.1 -0.3,-0.2 -0.7,-0.4 -1.1,-0.4 v 1 c 0.4,0 0.7,0.2 1.1,0.3 l 1.1,0.7 v 0.3 l 0.9,1.2 0.2,0.35 -2.1,-0.7 c -0.4,-0.2 -0.8,-0.4 -1.1,-0.6 l -0.1,1 h 0.1 c 0.1,0.1 0,0 0.3,0.1 l 0.8,0.3 2.2,0.7 c -0.1,0.13 -0.1,0.3 -0.2,0.4 l 0.1,1 c 0.1,-0.2 0.2,-0.4 0.2,-0.66 0,-0.2 0.1,-0.4 0.1,-0.6 v -0.1 0.5 -0.5 l 0.1,0.1 -0.1,0.4 v 0.4 h 0.2 l 0.1,0.6 v -1.2 l 0.2,0.35 v 0.1 l 0.1,0.9 c 0,-0.2 0.1,-0.3 0.2,-0.5 v -0.2 l 0.1,0.3 -0.1,0.2 0.1,1 0.1,-0.1 0.1,0.5 0.1,-0.2 0.6,-1 0.3,-0.32 0.1,0.1 0.1,0.4 v 0.1 -0.4 l 0.4,0.2 c 0.04,0.1 0.1,0.2 0.1,0.3 l 0.1,0.3 v 0.3 -0.8 l 0.2,0.9 c 0,-0.5 0,-0.9 -0.1,-1.4 l 0.2,0.1 0.6,0.2 0.22,0.1 v -1 l -0.2,-0.1 c -0.3,-0.35 -0.66,-0.6 -1,-0.9 0.1,-0.05 0.14,-0.1 0.24,-0.1 v -0.2 c 0.1,0 0.1,-0.03 0.2,-0.04 0.3,0 0.6,0 0.8,0.1 v -0.9 h -0.9 c -0.4,0.1 -0.8,0.2 -1.2,0.4 v 0.3 l -0.55,-0.5 -0.3,-1 v -0.6 l 0.1,-0.1 c 0,0.1 0.1,0.2 0.1,0.3 l 0.05,-0.4 0.5,-0.5 c 0.4,-0.2 0.7,-0.4 1.1,-0.7 l -0.1,-1 c -0.3,0.3 -0.7,0.5 -1,0.7 l -0.7,0.5 -0.7,-1.1 c 0.1,-0.3 0.2,-0.6 0.32,-0.9 0.2,-0.4 0.4,-0.9 0.72,-1.2 l 0.6,-0.7 -0.1,-1 c -0.2,0.3 -0.4,0.52 -0.6,0.8 -0.2,0.2 -0.4,0.5 -0.56,0.7 l -0.24,0.53 c -0.1,0.4 -0.3,0.9 -0.4,1.4 l 0.03,-0.4 0.3,-1.5 c 0.1,-0.3 0.2,-0.5 0.4,-0.6 l -0.1,-1 -0.3,0.4 -0.2,0.2 c -0.2,0.5 -0.3,1 -0.4,1.5 l -0.1,0.8 c 0,0 -0.1,0 -0.1,-0.1 l -0.2,-0.8 -0.1,-0.3 0.1,-0.4 0.1,-0.8 0.2,-1.6 v 0.3 -1.4 c 0.06,-0.2 0.1,-0.3 0.2,-0.4 l 0.26,-0.5 c 0.2,-0.4 0.5,-0.6 0.8,-0.9 0.3,-0.2 0.6,-0.5 1,-0.6 l -0.08,-1 c -0.4,0.2 -0.7,0.4 -1,0.7 l -0.1,0.1 0.1,-0.2 0.1,-0.1 V 449 l -0.2,1 c 0,-1.3 0.1,-1 -0.16,-0.6 l -0.5,0.8 c -0.2,0.3 -0.4,0.7 -0.5,1 V 448 c 0.04,-0.03 0.1,-0.1 0.1,-0.2 l -0.1,-0.8 v -0.93 l -0.1,0.92 v 0.1 c -0.2,0.4 -0.3,0.8 -0.5,1.2 -0.3,0.9 -0.46,1.8 -0.5,2.7 l -0.26,-0.9 v -0.4 c 0,-0.6 0,-1.1 -0.1,-1.6 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.1 0.08,-0.3 0.1,-0.4 0.1,-0.5 0.3,-1 0.48,-1.6 l 0.3,-0.9 0.1,-0.3 v -1.1 l -0.1,0.9 v -0.8 0.3 l -0.3,0.9 c -0.1,0.5 -0.34,1 -0.5,1.6 0,0.1 0,0.2 -0.1,0.3 0,0.3 -0.1,0.7 -0.1,1 l -0.4,-1.7 0.2,-0.5 0.1,0.8 0.2,-0.8 c 0,-0.2 0.1,-0.7 0.2,-0.9 l 0.3,-1.4 c 0.3,-0.5 0.6,-0.9 0.9,-1.4 0.3,-0.4 0.6,-0.9 1,-1.4 l -0.1,-1 -0.5,0.9 -0.1,-0.7 -0.3,0.6 -0.04,-0.4 -0.2,0.6 v -0.8 l -0.18,1 v -0.9 l -0.1,0.2 -0.1,0.3 -0.4,1.1 c -0.3,0.8 -0.6,1.6 -0.8,2.5 0,0.2 -0.1,0.5 -0.1,0.7 v -2 c 0.1,-0.1 0.1,-0.2 0.1,-0.3 0.03,-0.1 0.1,-0.4 0.1,-0.5 v -1 l -0.1,0.9 v -0.8 l -0.07,0.2 c 0,0 0,0.1 -0.1,0.1 v -0.6 l -0.2,1 v 0.2 c -0.1,0.2 -0.1,0.4 -0.2,0.6 -0.1,0.3 -0.2,0.6 -0.2,0.9 l -0.2,-1 c -0.1,-0.2 -0.1,-0.4 -0.1,-0.6 v -0.1 c 0.4,-1.2 0.9,-2.4 1.5,-3.5 l 0.34,-0.7 0.3,-0.5 v -0.6 l 0.3,-0.5 -0.1,-1 -0.6,1.4 c -0.3,0.6 -0.6,1.1 -0.9,1.7 l -0.5,0.9 c -0.3,0.6 -0.5,1.3 -0.8,1.9 l -0.1,-0.4 v -0.6 l 0.1,-0.6 -0.1,-0.3 c 0,-1.1 -0.1,-2.1 -0.1,-3.2 v -4.2 l -0.1,1 v 4.1 c 0,0.6 0.1,1.2 0.1,1.8 l -0.6,-1.6 c 0,-0.3 0,-0.7 0.1,-1.1 0.1,-0.4 0.1,-0.7 0.2,-1.1 l 0.2,-0.5 c 0,-0.1 0.1,-0.1 0.1,-0.2 l -0.2,-0.9 c -0.04,0.4 -0.2,0.8 -0.23,1.1 -0.1,0.4 -0.1,0.4 -0.1,0.8 -0.1,0.6 -0.1,1.1 -0.1,1.6 -0.1,-0.4 -0.3,-0.7 -0.43,-1.1 l -1,-2.6 c -0.2,-0.6 -0.4,-1.3 -0.5,-2 l -0.1,0.7 -0.43,-1 z m 3,7.97 c 0.12,0.33 0.25,0.66 0.36,1 0.1,0.27 0.1,0.32 0.12,0.4 V 440 c -0.16,-0.52 -0.3,-1.04 -0.48,-1.55 z m -0.22,0.4 c 0.25,0.8 0.5,1.6 0.72,2.4 v 0.1 l -0.25,-0.48 -0.1,-0.3 c -0.07,-0.3 -0.17,-0.5 -0.26,-0.7 0,-0.3 -0.1,-0.6 -0.1,-0.9 v -0.2 z m 2.24,0.33 c -0.26,0.66 -0.52,1.34 -0.76,2.02 0,0.04 -0.03,0.1 -0.04,0.13 0,-0.1 -0.03,-0.2 -0.04,-0.3 l 0.46,-1.13 z m -0.87,1.93 -0.1,0.72 c -0.03,-0.05 -0.06,-0.18 -0.08,-0.22 0,-0.17 0.1,-0.33 0.1,-0.5 z m 2.43,1.03 -0.05,0.16 -0.1,0.17 0.15,-0.4 z m -2.46,0.56 0.15,0.84 0.1,0.86 v 0.2 l -0.2,-0.48 c 0,-0.1 0,-0.2 -0.1,-0.32 l -0.2,-0.93 v -0.2 z m 2.14,0.2 -0.12,0.36 -0.3,0.93 -0.12,0.3 c 0.13,-0.4 0.28,-0.9 0.46,-1.3 l 0.08,-0.2 z m -1.25,0.55 v 2.26 l -0.26,-1.3 0.2,-0.75 0.06,-0.2 z m -1.52,0.03 0.1,0.13 v 0.3 -0.13 l 0.1,-0.3 z m 0.2,0.7 c 0.1,0.16 0.1,0.32 0.1,0.48 0,-0.1 -0.1,-0.18 -0.1,-0.27 l 0.1,-0.1 v -0.1 z m 0.4,0.36 0.1,0.3 v 0.18 -0.48 z m -0.8,0.1 0.1,0.1 v 0.26 l 0.1,-0.22 v 0.6 -0.74 z m 1.4,0.47 0.3,1.42 v 0.02 -0.38 c 0,-0.4 -0.1,-0.6 -0.2,-1 v -0.2 z m -1.1,0 0.6,0.96 c 0,0.1 0.1,0.3 0.1,0.4 -0.1,-0.1 -0.2,-0.2 -0.3,-0.4 l -0.2,-0.4 v -0.7 l 0.1,-0.2 z m -2,0.07 c 0.2,0.07 0.3,0.15 0.5,0.25 0.3,0.14 0.5,0.34 0.7,0.54 0.3,0.2 0.4,0.5 0.6,0.8 l 0.5,0.9 c 0.2,0.4 0.3,0.8 0.4,1.2 l 0.1,0.1 c -0.1,-0.4 -0.3,-0.7 -0.6,-1.1 l -1.8,-2.7 -0.1,-0.1 z m 3,1.7 0.2,0.34 v 0.02 l -0.1,-0.15 v -0.2 z m -0.5,0.4 0.3,0.32 0.1,0.53 V 448 l -0.2,-0.7 z m 1.2,0.38 c 0.2,0.75 0.4,1.5 0.5,2.26 v 0.16 l -0.1,-0.7 c -0.1,-0.45 -0.1,-0.72 -0.2,-1.16 v -0.53 z m -0.7,0.23 0.1,0.4 -0.1,0.3 v -0.6 z m 0.3,1 v 1.4 c 0,0.2 0.1,0.3 0,0.4 v -0.3 1.1 c -0.1,-0.1 -0.1,-0.3 -0.2,-0.5 v -0.6 c 0,0.1 0,0.1 0.1,0.2 l 0.1,-0.9 0.2,-0.4 z m 0.1,0.5 c 0,0.1 0.1,0.1 0.1,0.2 v 0.6 l 0.2,1 v -0.5 l 0.1,0.7 0.1,1.6 -0.3,-1 v -2.3 z m 2.3,0.2 v 0.8 l 0.1,2.2 v 1.3 l -0.3,0.9 c -0.3,0.6 -0.4,1.3 -0.5,2 l -0.1,-0.7 v -0.1 c 0,-0.5 0,-1 0.1,-1.4 0.1,0.3 0.2,0.7 0.2,1 v 0.4 l 0.2,-0.9 v -0.4 c 0,-0.4 -0.1,-0.8 -0.2,-1.2 0.1,-0.9 0.2,-1.7 0.5,-2.6 0.1,-0.3 0.3,-0.6 0.4,-0.9 z m -1.9,0.7 0.1,0.7 0.2,0.8 v 1.9 -0.2 c 0,-1 -0.1,-2 -0.2,-3 z m -1.1,0.8 0.2,0.4 v 0.2 c 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 0.1,-0.1 0.1,-0.2 z m 1.6,1.4 0.2,0.7 0.1,-0.5 0.2,0.9 v 1.7 c -0.2,-0.8 -0.3,-1.6 -0.4,-2.4 v -0.3 z m -0.8,2 c 0,0.1 0,0.1 0.1,0.2 v 0.1 l -0.1,-0.1 z m 0,1.6 0.4,0.7 0.2,0.5 v 0.2 c -0.2,-0.3 -0.4,-0.7 -0.6,-1 v -0.3 z m 2.3,0.1 -0.1,1.3 -0.1,0.9 -0.2,-0.4 v -0.4 c 0.1,-0.4 0.1,-0.9 0.2,-1.3 v 0.5 l 0.2,1 v -0.1 c 0,-0.3 0.1,-0.7 0.1,-1 l 0.1,-0.4 z m -1.6,1.3 0.2,0.4 -0.1,-0.3 v -0.1 z m 0.8,1 0.1,0.1 0.1,0.6 -0.1,-0.3 -0.1,-0.2 0.1,-0.2 z m 39.15278,1.79231 -40.25278,0.008 0.7,0.7 0.1,0.1 v 0.1 c 0,0.1 0.1,0.1 0.1,0.2 l 0.3,0.7 0.1,0.3 v 0.1 l 0.1,0.2 0.2,0.6 -0.7,-1.2 -0.5,-0.8 -0.2,-0.4 -0.2,-0.2 v -0.5 z M 492.31,463.31 l 0.3,0.5 0.1,0.3 v 0.2 l -0.4,-0.8 0.1,-0.1 z m -0.5,0.2 0.1,0.2 0.2,0.4 v 0.1 l -0.3,-0.4 z m 1.2,1.2 c 0.1,0.1 0.1,0.2 0.1,0.4 l -0.1,-0.3 0.1,-0.1 z m -0.6,0.2 0.3,1.3 0.1,0.2 -0.6,-0.2 v -0.9 c 0,0.1 0.1,0.1 0.1,0.2 v -0.3 l 0.1,0.4 0.1,-0.7 z m -0.9,0.2 c 0.1,0.1 0.2,0.2 0.3,0.4 l 0.1,0.1 0.1,0.2 c -0.1,-0.2 -0.3,-0.4 -0.4,-0.6 z m 0.5,0.5 0.1,0.1 0.1,0.2 v 0.2 l -0.1,-0.2 v -0.2 z m 1.3,0.8 0.1,0.1 v 0.1 -0.1 z m 0.4,0.3 0.1,0.3 h -0.1 v -0.2 z m -0.2,0.1 0.1,0.2 h -0.1 v -0.1 z m -0.1,1.2 v 0.1 z"
+ id="path4653-3-1"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccscccccccccccccscccccccccccccccsccccccccsccccccccccccccccccccccccccccccccccccsccccccccccccccccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccscsscccccccccccccccccccccccccccccccccccscccccccccccscccccccccccccccsccsccscccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccsccccccccccccccccccccccccccccccccccccccccsccccccccccscccccccccccccccscsccscsccccccscccccsccccccccccccccccccccccccccccccscccccccccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer12"
+ inkscape:label="Layer 1" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer13"
+ inkscape:label="Layer 2" />
+</svg>
diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw
index b62ce04d863e77227d9acab83aeacc32e994ce94..0a63bae58cb6579a3b1fbd03abc44131b407be19 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -141,46 +141,41 @@ vector art added later is drawn over previously added art
/% Shoulder width and arm or no arm %/
<<if $args[0].amp != 1>>
-<<if $args[0].devotion > 50>>
- <<set _leftArmType = "high">>
- <<set _rightArmType = "high">>
-<<elseif $args[0].trust >= -20>>
- <<if $args[0].devotion < -20>>
- <<set _leftArmType = "rebel">>
- <<set _rightArmType = "low">>
- <<elseif $args[0].devotion <= 20>>
- <<set _leftArmType = "low">>
- <<set _rightArmType = "low">>
+ <<if $args[0].devotion > 50>>
+ <<set _leftArmType = "high">>
+ <<set _rightArmType = "high">>
+ <<elseif $args[0].trust >= -20>>
+ <<if $args[0].devotion < -20>>
+ <<set _leftArmType = "rebel">>
+ <<set _rightArmType = "low">>
+ <<elseif $args[0].devotion <= 20>>
+ <<set _leftArmType = "low">>
+ <<set _rightArmType = "low">>
+ <<else>>
+ <<set _leftArmType = "mid">>
+ <<set _rightArmType = "high">>
+ <</if>>
<<else>>
<<set _leftArmType = "mid">>
- <<set _rightArmType = "high">>
+ <<set _rightArmType = "mid">>
<</if>>
-<<else>>
- <<set _leftArmType = "mid">>
- <<set _rightArmType = "mid">>
-<</if>>
-<<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit">>
- <<if _leftArmType == "high">>
+ <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit">>
<<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm right " + _rightArmType + ".svg'" + " style='"+ _skinFilter + "'>">>
<<if $args[0].underArmHStyle == "bushy">>
- <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underarm " + _underArmHStyle + ".svg' style='" + _underArmFilter + "'/>">>
+ <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " right.svg'" + " style='" + _underArmFilter + "'/>">>
<</if>>
<<else>>
- <<if $args[0].underArmHStyle == "bushy">>
- <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underarm " + _underArmHStyle + ".svg' style='" + _underArmFilter + "'/>">>
+ <<if $args[0].fuckdoll != 0>>
+ <<set _rightArmType = "mid">>
<</if>>
- <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm right " + _rightArmType + ".svg'" + " style='"+ _skinFilter + "'>">>
+ <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm right " + _rightArmType + " latex.svg'" + "/>">>
<</if>>
- <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">>
+
<<else>>
- <<if $args[0].fuckdoll != 0>>
- <<set _leftArmType = "mid">>
- <<set _rightArmType = "mid">>
+ <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit" && $args[0].underArmHStyle == "bushy">>
+ <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " right.svg'" + " style='" + _underArmFilter + "'/>">>
<</if>>
- <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm left " + _leftArmType + " latex.svg'" + "/>">>
- <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm right " + _rightArmType + " latex.svg'" + "/>">>
-<</if>>
<</if>>
/% Hair Aft %/
@@ -301,6 +296,32 @@ vector art added later is drawn over previously added art
<<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/torso " + _torsoSize + _torsoOutfit + ".svg'" + "/>">>
<</if>>
+<<if $args[0].amp != 1>>
+ <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit">>
+ <<if _leftArmType == "high">>
+ <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">>
+ <<if $args[0].underArmHStyle == "bushy">>
+ <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " left.svg'" + " style='" + _underArmFilter + "'/>">>
+ <</if>>
+ <<else>>
+ <<if $args[0].underArmHStyle == "bushy">>
+ <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " left.svg'" + " style='" + _underArmFilter + "'/>">>
+ <</if>>
+ <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">>
+ <</if>>
+ <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">>
+ <<else>>
+ <<if $args[0].fuckdoll != 0>>
+ <<set _leftArmType = "mid">>
+ <</if>>
+ <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm left " + _leftArmType + " latex.svg'" + "/>">>
+ <</if>>
+<<else>>
+ <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit" && $args[0].underArmHStyle == "bushy">>
+ <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " left.svg'" + " style='" + _underArmFilter + "'/>">>
+ <</if>>
+<</if>>
+
/% Vagina %/
<<if $args[0].vagina >= 0>>
<<print "<img class='paperdoll' src=" + _imgSkinLoc + "/vagina.svg'" + " style='"+ _skinFilter + "'>">>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index f1849e9954dcbb36811e41196852ca93498efe6a..3836653606aa345d93df883225498b4d6aac3fc7 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1522,12 +1522,13 @@
<<widget BellyTab>>
<br><br>
- ''Belly Implant( 0= No Implant, 1-35000 = Capacity of the Implant ):''
- <<if $tempSlave.bellyImplant >= 32000>> @@.yellow;hyperpregnant 2@@
- <<elseif $tempSlave.bellyImplant >= 16000>> @@.yellow;hyperpregnant 1@@
- <<elseif $tempSlave.bellyImplant >= 8000>> @@.yellow;looks full term@@
- <<elseif $tempSlave.bellyImplant >= 4000>> @@.yellow;looks pregnant@@
- <<elseif $tempSlave.bellyImplant >= 2000>> @@.yellow;looks like early pregnancy@@
+ ''Belly Implant( 0= No Implant, 1-700000 = Capacity of the Implant ):''
+ <<if $tempSlave.bellyImplant >= 300000>> @@.yellow;hyperpregnant@@
+ <<elseif $tempSlave.bellyImplant >= 150000>> @@.yellow;inhumanly pregnant@@
+ <<elseif $tempSlave.bellyImplant >= 15000>> @@.yellow;looks full term@@
+ <<elseif $tempSlave.bellyImplant >= 10000>> @@.yellow;looks hugely pregnant@@
+ <<elseif $tempSlave.bellyImplant >= 5000>> @@.yellow;looks pregnant@@
+ <<elseif $tempSlave.bellyImplant >= 1500>> @@.yellow;looks like early pregnancy@@
<<elseif $tempSlave.bellyImplant >= 0 >> @@.yellow;Implanted but unfilled@@
<<elseif $tempSlave.bellyImplant == 1 >> @@.yellow;No Implant@@
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 6f03572fb22f473cbd63879069dc00af3c6f12c4..5ce945be2d01fb1bf392d87c1f20054789845db7 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2586,12 +2586,13 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''onithyr'' for various little tweaks and additions.
<br>''anonNeo'' for spellchecking.
<br>''Utopia'' for dirty dealings gang leader focus and updates to it.
-<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, and the Security Expansion Mod (not yet added).
+<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, the Hippolyta Academy, and the Security Expansion Mod.
<br>''laziestman'' for sexy spats.
<br>''SFanon (blank)'' for SF related work and the joint Eugenics bad end rework.
<br>''anon'' for extending FCGudder's economy reports to the other facilities.
<br>''MilkAnon'' for his contributions to FCTV and the FC world in general.
<br>''valen102938'' for dealing with vector art, both creating new art and utilising unused art.
+<br>''anon'' for making slaves seed their own fields.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
<br>''Qotsafan'' submitted bugfixes.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index ea53fb80f4f8c077ce3f3e3e73a585dfadb532a9..21136a889a237c5ea2d50b117209e94324a9d18e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -78,6 +78,13 @@ You should have received a copy of the GNU General Public License along with thi
<<set $slaves[_i].sisters += 1>>
<</if>>
<</for>>
+ <<if $slaves[_k].pregSource > 0>>
+ <<set $slaves[_k].pregSource += 1200000>>
+ <<set _getFather = $slaves.findIndex(function(s) { return s.ID == $slaves[_k].pregSource; })>>
+ <<if _getFather == -1>>
+ <<set $slaves[_k].pregSource = 0>>
+ <</if>>
+ <</if>>
<</for>>
<<set $genePool = ngUpdateGenePool($genePool)>>
/*
diff --git a/src/pregmod/FSlaveSelfImplreg.tw b/src/pregmod/FSlaveSelfImplreg.tw
new file mode 100644
index 0000000000000000000000000000000000000000..521cf9934211bb14961fef65bc73f49e4b2b4b07
--- /dev/null
+++ b/src/pregmod/FSlaveSelfImplreg.tw
@@ -0,0 +1,199 @@
+:: FSlaveSelfImpreg [nobr]
+
+<<ClearSummaryCache $activeSlave>>
+
+<<set _pfh = ($activeSlave.fetish == "pregnancy" && $activeSlave.fetishStrength > 50)>>
+<<set _pfk = (_pfh && $activeSlave.fetishKnown == 1) || $activeSlave.sexualFlaw == "breeder">>
+<<set _coop = true, _enjoy = true>>
+
+<<if ($activeSlave.fetish == "mindbroken")>>
+<<else>>
+ <<if ($activeSlave.devotion < 20)>>
+ <<if ($activeSlave.devotion <= -20)>>
+ $activeSlave.slaveName despises you, and tends to resent everything you do on principle,
+ <<elseif ($activeSlave.devotion < 20)>>
+ $activeSlave.slaveName dislikes you,
+ <</if>>
+ <<if ($activeSlave.sexualFlaw == "breeder" || (_pfh && $activeSlave.fetishStrength > 90))>>
+ but the idea of simultaneously impregnating and being impregnated is @@.hotpink;so tempting@@ that she's @@.mediumaquamarine;grateful@@ to you despite herself.
+ <<set $activeSlave.devotion += 2, $activeSlave.trust += 1>>
+ <<elseif (_pfk)>>
+ but her obvious predilection for being pregnant significantly lessens the @@.mediumorchid;indignity@@ of the situation.
+ <<set _coop = false>>
+ <<set $activeSlave.devotion -= 2>>
+ <<elseif (_pfh)>>
+ but, despite the @@;indignity@@ of the situation, her resistance seems strangely muted. It's fairly obvious that something about the idea of being impregnated is @@.hotpink;strangely appealing@@ to her.
+ <<set _coop = false>>
+ <<set $activeSlave.devotion -= 4>>
+ <<else>>
+ <<if ($activeSlave.amp == 1)>>
+ and this @@.gold;uniquely degrading@@ violation of her person only reinforces her @@.mediumorchid;hatred@@ towards you. The fact that she is @@.gold;utterly immobile@@ makes a terrifying situation @@.mediumorchid;even worse@@.
+ <<set $activeSlave.devotion -= 1, $activeSlave.trust -= 1>>
+ <<else>>
+ and this @@.gold;uniquely degrading@@ violation of her person only reinforces her @@.mediumorchid;hatred@@ towards you. She resists so violently that you must @@.red;physically coerce her@@ into cooperating with the procedure.
+ <</if>>
+ <<set _coop = false, _enjoy = false>>
+ <<set $activeSlave.devotion -= 5, $activeSlave.trust -= 6>>
+ <</if>>
+ <<elseif (_pfk)>>
+ $activeSlave.slaveName @@.hotpink;genuinely enjoys@@ impregnation and pregnancy, so she is @@.mediumaquamarine;grateful@@ that you're giving her a chance to become so intimately acquainted with both aspects of her fetish at the same time.
+ <<set $activeSlave.devotion += 4, $activeSlave.trust += 2>>
+ <<if ($activeSlave.devotion > 50 && $arcologies[0].FSRepopulationFocus > 10)>>
+ She also feels @@.hotpink;proud@@ that she can be a @@.mediumaquamarine;self-sustaining@@ source of offspring to support your vision of the future.
+ <<set $activeSlave.devotion += 1, $activeSlave.trust += 1>>
+ <</if>>
+ <<else>>
+ <<if (_pfh)>>
+ Even though you aren't aware of any special fondness for pregnancy, $activeSlave.slaveName seems @@.hotpink;oddly eager@@ to cooperate with you. It quickly becomes obvious that she is @@.lightcoral;fascinated with pregnancy@@ and you've @@.mediumaquamarine;helped her discover this@@ about herself.
+ <<set $activeSlave.devotion += 1, $activeSlave.trust += 1, $activeSlave.fetishKnown = 1>>
+ <<elseif ($activeSlave.behavioralQuirk == "perverted")>>
+ Despite having no particular interest in pregnancy, the @@.hotpink;sheer perversity@@ of impregnating herself is palpably arousing to $activeSlave.slaveName.
+ <<set $activeSlave.trust += 1>>
+ <<elseif ($activeSlave.energy > 90)>>
+ Despite having no particular interest in pregnancy, $activeSlave.slaveName's overwhelming sex drive causes her to be aroused at the prospect of any sex, even if it happens to be with herself.
+ <<elseif ($activeSlave.devotion > 50)>>
+ Despite having no particular interest in pregnancy, $activeSlave.slaveName is eager to @@.hotpink;submit to your vision@@ of her.
+ <<set $activeSlave.trust += 1>>
+ <<if ($activeSlave.devotion > 50 && $arcologies[0].FSRepopulationFocus > 10)>>
+ She also feels @@.hotpink;proud@@ that she can be a @@.mediumaquamarine;self-sustaining@@ source of offspring to support your vision of the future.
+ <<set $activeSlave.devotion += 1, $activeSlave.trust += 1>>
+ <</if>>
+ <<set _enjoy = false>>
+ <<else>>
+ $activeSlave.slaveName cooperates without any protest. She may not particularly enjoy pregnancy or impregnation, but she's too well-broken to resist or speak against you.
+ <<set _enjoy = false>>
+ <</if>>
+ <</if>>
+<</if>>
+
+<<if ($activeSlave.fetish == "mindbroken")>>
+ $activeSlave.slaveName is dully cooperative as you ensure she is positioned conveniently on a bench to give you access to both aspects of her genitalia. A quick dose of vasodilators ensures that she is ready to perform, even if she is unable to fully comprehend what is about to happen. Once she is fully erect, your personal assistant uses a mechanical toy to efficiently stimulate her to climax, while you hold a small container in place to collect her emission. Moments later, you've loaded $activeSlave.slaveName's seed into a syringe and dispensed the contents deep within her vagina.
+<<elseif ($activeSlave.amp == 1)>>
+ <<if (_coop && _enjoy)>>
+ Although $activeSlave.slaveName is unable to do much to help, her expression is visibly excited as you place her on a bench, and produce a sample container and syringe.
+ <<elseif (_enjoy)>>
+ A maelstrom of emotions fill $activeSlave.slaveName's face as you carry her to a bench, and produce a sample cup and syringe.
+ <<if ($activeSlave.dick > 6)>>
+ You can't tell if she's relieved or disappointed when her excessive size interferes, as usual, with her erection, but an injection of vasodilators quickly makes the question moot.
+ <</if>>
+ At your instruction, your personal assistant descends with a selection of toys to ensure quick ejaculation. Pleasure, lust, terror, and loathing play across $activeSlave.slaveName's face as her arousal mounts and her hips begin to buck. By the time she begins to ejaculate, pleasure and lust have won out and she throws her head back in abandon as her emission fills the cup in your hands. <<if ($activeSlave.eyes == -2)>>Although she cannot see what you are doing, her expression is rapt, almost dreamlike,<<else>>She watches with rapt fascination<</if>> as you load the syringe with her sperm, slide it into her vagina, and shoot the contents home, deep against her waiting cervix.
+ <<elseif (_coop)>>
+ $activeSlave.slaveName is calm and docile as you place her on a bench, and produce a sample container and syringe. With no other option, she throws back her head and enjoys the stimulation as your personal assistant, at your instruction, begins stimulating her to orgasm. When she ejaculates, you carefully catch every drop in the sample cup, load the syringe, and inject the contents directly against her cervix.
+ <<else>>
+ Although $activeSlave.slaveName frantically squirms in a futile attempt to resist as you place her on a bench, and produce a sample cup and syringe. Without limbs to aid her escape, she can only <<if ($activeSlave.eyes == -2)>>blindly wait<<else>>watch<</if>> in helpless horror as the vasodilators you inject bring her manhood to complete erectness and your personal assistant, at your instruction, begins stimulating her. She sobs in helpless despair as her rigid shaft begins to throb, filling the cup with a terribly potent load of her seed; she frantically shakes her head, face streaked with tears, as you dip the syringe into the cup, withdraw the plunger, insert it into her exposed vagina, and shoot the contents directly against the opening to her womb.
+ <</if>>
+<<elseif (_coop)>>
+ <<if (_enjoy)>>
+ <<if ($activeSlave.dick > 6 && $activeSlave.balls <= 4)>>
+ Although she is aroused by the idea of impregnating herself, $activeSlave.slaveName's cock is simply too large to easily become erect. A quick injection of vasodilators later, and she's ready to go. Because she's so eager, you simply stand back and let the magic happen.
+ <<if ($activeSlave.vagina == 0)>>
+ As ways to lose one's virginity go, this is one hell of a way to do it. Without needing any instruction, $activeSlave.slaveName grasps her massive shaft in both hands and feeds it around so the head is nestled between her own labia. She shows only the tiniest hesitation before easing her cock inside her own body, @@.lime;past her maidenhead@@, until you can tell the head is nestled snugly against her own cervix.
+ <<set $activeSlave.vagina = 1>>
+ <<else>>
+ Without needing any instruction, $activeSlave.slaveName grasps her massive shaft in both hands and feeds it around so the head is nestled between her own labia. She works it up and down for a second, relishing the sensation, and then plunges her cock into her own body until you can tell the tip is wedged against her own cervix.
+ <</if>>
+ Without another partner to rut against, $activeSlave.slaveName has to rely on her own hands, bucking her hips up against them to drive the impressively curved shaft into her own body with increasing desperation until her whole body shudders; her cock throbs as her vagina eagerly drinks up her own seed.
+ <<else>>
+ <<if ($activeSlave.trust < -20)>>
+ Although she is aroused by the idea of impregnating herself, $activeSlave.slaveName is too terrified to achieve an erection without assistance. It takes an injection of vasodilators to overcome her nerves and restore her manhood to proper functioning.
+ <<else>>
+ Merely thinking about what you're about to do has $activeSlave.slaveName fully erect, with a small bead of precum running down her shaft and blending with the feminine wetness dripping from between her legs.
+ <</if>>
+ <!-- todo: if slave has lover/wife, let them "do the honors" -->
+ <<if ($activeSlave.balls > 4)>>
+ Since her balls are too large to permit any other options, you produce a special toy for $activeSlave.slaveName - an onahole attached by a flexible tube to a dildo, with an embedded micro-pump to ensure any fluid in the onahole makes its way out of the dildo.
+ <<else>>
+ Since she's not large enough to simply fuck herself, you produce a special toy for $activeSlave.slaveName - an onahole attached by a flexible tube to a dildo, with an embedded micro-pump to ensure any fluid in the onahole makes its way out of the dildo.
+ <</if>>
+ <<if ($activeSlave.vagina == 0)>>
+ As ways to lose one's virginity go, this is one hell of a way to do it. $activeSlave.slaveName trembles with excitement as she brings the synthetic shaft between her legs and slowly works it @@.lime;into her virgin pussy@@.
+ <<set $activeSlave.vagina = 1>>
+ <<else>>
+ $activeSlave.slaveName eagerly rams the synthetic shaft as deeply into her pussy as it will go, obviously fantasizing that she's driving her own dick into her dripping pussy.
+ <</if>>
+ You help her keep the dildo in place while she works the onahole onto her cock and begins stroking up and down. The stimulation of being filled and having her dick stroked don't give her much time to enjoy what she's doing before her hips buck wildly and you see semen travelling from the pump, along the clear plastic tub, and into the base of the dildo embedded deeply in $activeSlave.slaveName's throbbing vagina.
+ <</if>>
+ <<else>>
+ <<if ($activeSlave.devotion > 50)>>
+ <<if ($activeSlave.dick > 6)>>
+ No matter how hard she tries, $activeSlave.slaveName's dick is simply too large for her to achieve erection on her own. You're about to inject her with a vasodilator to remedy the problem, when she tries to take the syringe from your hand. Normally such impudence would be a grave violation, but it's obvious that her actions are only motivated by loyalty - she wants to fix this problem herself so she can feel like she isn't failing you because of a physical inadequacy that is, admittedly, not her fault. You relinquish the syringe and watch as she injects herself with the drugs necessary to achieve a full erection.
+ <<else>>
+ Despite a complete lack of sexual interest in the procedure, $activeSlave.slaveName is able to quickly bring herself to full erectness without any help.
+ <</if>>
+ <<else>>
+ <<if ($activeSlave.dick > 6)>>
+ $activeSlave.slaveName doesn't try all that hard to achieve erection, but it's obvious that the sheer size of her cock would make it impossible anyway. She silently cooperates as you inject her with vasodilators to forcibly make her erect.
+ <<else>>
+ Despite a complete lack of sexual interest in the procedure, $activeSlave.slaveName is able to eventually bring herself to full erectness without any help.
+ <</if>>
+ <</if>>
+ <!-- todo: if slave has lover/wife, let them "do the honors" -->
+ You produce a sample container and syringe; $activeSlave.slaveName gets the idea and immediately begins jacking off. When she ejaculates, she carefully holds the cup with one hand to catch every drop of her virile seed. A moment later she dips the syringe into the container and withdraws the plunger.
+ <<if ($activeSlave.devotion > 50)>>
+ She blushes a bit, hands you the syringe, and lies back on the bench, spreading her legs invitingly. You insert the syringe carefully into her vagina as far as it will go, and spray her sperm directly against her waiting cervix.
+ <<else>>
+ You take the syringe from her and gesture for her to lie back; once she's in position, you insert the syringe carefully into her vagina and spray her sperm directly against her waiting cervix.
+ <</if>>
+ <</if>>
+<<else>>
+ <<if (_enjoy)>>
+ Although $activeSlave.slaveName is anything but eager to cooperate, you don't have to drag her. It's obvious that her resistance is conflicting with the raw desire to fill herself with her own seed.
+ <<if ($activeSlave.dick > 6 && $activeSlave.balls <= 4)>>
+ While the size of her cock makes it necessary for you to inject her with vasodilators for her to become properly erect, her resistance is minimal.
+ <<if $activeSlave.vagina == 0>>
+ You instruct her to fuck herself; by this point, she's too far gone to object, even though obeying will rob her of her virginity. Her hands shake with roiling emotions as she lines her cock up with her own opening and gingerly works it into her @@.lime;virgin pussy@@.
+ <<else>>
+ You instruct her to fuck herself; by this point, she's too far gone to object. Her hands shake as she lines her cock up with her own opening; she lets out a sound halfway between a sob and a moan as she penetrates herself.
+ <</if>>
+ Without another partner to thrust against, $activeSlave.slaveName has to use her remarkable shaft like a dildo, sliding it in and out of her increasingly dripping sex. The potent mix of shame and arousal drives her to orgasm quickly, and only a couple of minutes pass before you see her shaft throbbing as she fucks a baby into her own belly.
+ <<else>>
+ <<if ($activeSlave.dick > 6)>>
+ $activeSlave.slaveName's balls are too large to make any other options possible, but she is still too large to achieve erection easily. You can't tell if she is disappointed, or relieved, by this fact, but a quick injection of vasodilators makes the question moot either way.
+ <<else>>
+ Her cock is rigidly erect almost immediately, a fact which brings a confusing mixture of shame and arousal to her face.
+ <</if>>
+ You produce a sample container and syringe; $activeSlave.slaveName gets the idea and reluctantly begins jacking off. When she ejaculates, she carefully holds the cup with one hand to catch every drop of her seed. A moment later she dips the syringe into the container and withdraws the plunger. She hesitates, likely because the release has restored some of her self control to her, but before she can do anything to escape, you press her down with one hand and feed the syringe into her pussy, depressing the plunger as soon as it's deeply inside her.
+ <!-- possible todo: allow head girl to do this part?-->
+ <</if>>
+ <<else>>
+ The repulsion $activeSlave.slaveName feels toward both you and what you're about to force her to do make her cooperation entirely out of the question. You are forced to restrain her with straps, kicking and sobbing; the sobbing only gets louder when she feels the prick of a needle shooting vasodilators into her crotch. Moments later, despite her best efforts, she is painfully erect and ready for you to proceed. Since she's guaranteed to make this as difficult as possible, you opt for the simplest solution: you take a condom and apply it to her penis; once she's sheathed, you instruct your personal assistant, using toys, to forcibly stimulate her until she ejaculates and remove the condom. Loading the contents into a syringe and injecting them into her vagina is a simple matter, because of the straps, and moments later she sobs in despair as her sperm begins racing into her waiting womb.
+ <</if>>
+<</if>>
+
+<<set _actCount = random(2,8)+1>>
+<<set $activeSlave.penetrativeCount += _actCount, $penetrativeTotal += _actCount>>
+<<if $activeSlave.mpreg == 1>>
+ <<set $activeSlave.analCount += _actCount, $analTotal += _actCount>>
+<<else>>
+ <<set $activeSlave.vaginalCount += _actCount, $vaginalTotal += _actCount>>
+<</if>>
+
+You repeat this ritual throughout the week, ensuring that $activeSlave.slaveName is carrying her own child.
+
+<<KnockMeUp $activeSlave 100 2 $activeSlave.ID 1>>
+
+<<if $arcologies[0].FSRestart != "unset">>
+ <<if $activeSlave.breedingMark != 1>>
+ Rumors spread about you having your slaves breed; the Societal Elite are @@.red; very displeased@@ by these rumors.
+ <<set $failedElite += 5>>
+ <</if>>
+<</if>>
+
+<<if ($arcologies[0].FSRepopulationFocus != "unset" && ($arcologies[0].FSGenderFundamentalist == "unset" || $arcologies[0].FSRepopulationFocus >= $arcologies[0].FSGenderFundamentalist))>>
+ <!-- seems logical that repop would trump anything else if it's equal-or-more advanced than fundamentalism.-->
+ <<if $arcologies[0].FSGenderFundamentalist != "unset">>
+ <<set _delt = $arcologies[0].FSRepopulationFocus - $arcologies[0].FSGenderFundamentalist>>
+ <<else>>
+ <<set _delt = $arcologies[0].FSRepopulationFocus>>
+ <</if>>
+ <<if _delt > 0>>
+ Society is @@.green;pleased@@ by the addition of a new slave, no matter the means by which it was produced.
+ <<set $rep += $FSSingleSlaveRep*($arcologies[0]._delt/$FSLockinLevel)>>
+ <<else>>
+ The traditional elements of your society disapprove of this degenerate form of reproduction, but their complaints are countered by those who believe producing more slaves by any means necessary.
+ <</if>>
+<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
+ Society @@.red;is disgusted@@ by this degenerate form of reproduction.
+ <<set $rep -= $FSSingleSlaveRep*($arcologies[0].FSGenderFundamentalist/$FSLockinLevel)>>
+ <<set $arcologies[0].FSGenderFundamentalist -= 0.05*$FSSingleSlaveRep>>
+<</if>>
\ No newline at end of file
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index c7435e9cf2e718f729403cd4551ab0d48b06bd2c..d0270e5429ad11ad6ec8057b82fa028f3f89333e 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -362,14 +362,6 @@
<</if>>
<<if $mergeMom.origHColor == $mergeDad.origHColor>>
<<set $activeSlave.hColor = $mergeMom.origHColor>>
- <<elseif $mergeMom.origHColor == "black">>
- <<set $activeSlave.hColor = $mergeMom.origHColor>>
- <<elseif $mergeDad.origHColor == "black">>
- <<set $activeSlave.hColor = $mergeDad.origHColor>>
- <<elseif $mergeMom.origHColor == "brown">>
- <<set $activeSlave.hColor = $mergeMom.origHColor>>
- <<elseif $mergeDad.origHColor == "brown">>
- <<set $activeSlave.hColor = $mergeDad.origHColor>>
<<elseif $mergeMom.origHColor == "white">>
<<if random(1,100) == 69>>
<<set $activeSlave.hColor = $mergeMom.origHColor>>
@@ -382,6 +374,14 @@
<<else>>
<<set $activeSlave.hColor = $mergeMom.origHColor>>
<</if>>
+ <<elseif $mergeMom.origHColor == "black">>
+ <<set $activeSlave.hColor = either($mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeDad.origHColor)>>
+ <<elseif $mergeDad.origHColor == "black">>
+ <<set $activeSlave.hColor = either($mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeMom.origHColor)>>
+ <<elseif $mergeMom.origHColor == "brown">>
+ <<set $activeSlave.hColor = either($mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeDad.origHColor)>>
+ <<elseif $mergeDad.origHColor == "brown">>
+ <<set $activeSlave.hColor = either($mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeMom.origHColor)>>
<<else>>
<<set $activeSlave.hColor = either($mergeMom.origHColor, $mergeDad.origHColor)>>
<</if>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index ea81e4e39a18b697350051755f2ff37cdec9dba5..e3847d70f46fa69ad9466dade8f7ed6790329eaa 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -1,4 +1,5 @@
:: SFM Barracks [nobr]
+
<<if ndef $securityForceUpgradeTokenReset>>
<<set $securityForceUpgradeTokenReset = 0>>
<</if>>
@@ -8,7 +9,7 @@
<<set _N1 = 2>>
<<set _N2 = 2>>
-<<set _N3 = 2>>
+<<set _N3 = 2>>
<<set _Name = "<<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>">>
<<if $economy == .5>>
@@ -64,7 +65,7 @@ securityForceX */
<<set _Armoury = $securityForceInfantryPower>>
<<set _ArmouryMax = 11>>
-<<set _StimulantLab = $securityForceVehiclePower>>
+<<set _StimulantLab = $securityForceStimulantPower>>
<<set _StimulantLabMax = 9>>
<<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
@@ -81,14 +82,13 @@ securityForceX */
<<set _LaunchBayO = $securityForceSatalitePower>>
<<set _LaunchBayOMax = 17>>
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
<<set _SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO>>
<<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax>>
<<set _SFO = 0>>
- <<set _NavalYard = 0>>
+ <<set _NavalYard = 0>>
<<set _NavalYardMax = 0>>
-<</if>>
-<<if $terrain == "oceanic" || $terrain == "marine">>
+<<elseif $terrain == "oceanic" || $terrain == "marine">>
<<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>>
<<set _NavalYardMax = 12>>
<<set _SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard>>
@@ -144,7 +144,7 @@ securityForceX */
The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 160 inch pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added VR support to the kill house.
<</if>>
-
+
<br><br>
<div style="margin-left:1em">
@@ -165,7 +165,7 @@ securityForceX */
''Armory:''
<br>
-/* 11 upgrades */
+/* 11 upgrades */
<<if $securityForceInfantryPower == 0>>
The armory is well-stocked with high-quality personal weapons and light armour, but contains little in the way of exceptional armament.
<<elseif $securityForceInfantryPower == 1>>
@@ -301,7 +301,7 @@ securityForceX */
Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit.
<<elseif $securityForceSpacePlanePower == 11>>
Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
- <</if>>
+ <</if>>
<</if>>
<<if $securityForceFortressZeppelin > 0>>
<br>
@@ -338,10 +338,10 @@ securityForceX */
Modernized the heavy transport's armor.
<<elseif $securityForceHeavyTransport == 3>>
Modernized the armor and engines of the heavy transport.
+ <</if>>
<</if>>
<</if>>
-<</if>>
-
+
<<if $securityForceArcologyUpgrades >= 2>>
<br><br>
''Drone Bay:''
@@ -375,7 +375,7 @@ securityForceX */
<<elseif $securityForceSatalitePower == 2>>
Modernized the satalite's electronics.
<<elseif $securityForceSatalitePower == 3>>
- Modernized the satalite's electronics, wiring and circuitry.
+ Modernized the satalite's electronics, wiring and circuitry.
<<elseif $securityForceSatalitePower == 4>>
Modernized the satalite's electronics, wiring and circuitry.Installed a basic localized communications jammer to the satalite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
<<elseif $securityForceSatalitePower == 5>>
@@ -429,7 +429,7 @@ securityForceX */
Upgraded the giant robot's wiring, circuitry, power efficiency,battery capacity,armour,weapons to include heat seeking missiles plus a massive long sword in addition to quad 140 inch back mounted electromagnetic cannons and the amount of pilot's to two via a synced neural link.Improved the life support systems, allowing for longer operational time.
<<elseif $securityForceGiantRobot == 10>>
Upgraded the giant robot's wiring, circuitry, power efficiency,battery capacity,armour,weapons to include heat seeking missiles plus a massive long sword in addition to quad 140 inch back mounted electromagnetic cannons and the amount of pilot's to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
- <</if>>
+ <</if>>
<</if>>
<<if $securityForceMissileSilo > 0>>
<br>
@@ -462,7 +462,7 @@ securityForceX */
<</if>>
<<if $securityForceSubmarine > 0>>
<br>
- /* 5 upgrades */
+ /* 5 upgrades */
<<if $securityForceSubmarine == 1>>
A basic submarine has been 'borrowed' from the old world.
<<elseif $securityForceSubmarine == 2>>
@@ -477,8 +477,8 @@ securityForceX */
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
<br>
- /* 3 upgrades */
- <<if $securityForceHeavyAmphibiousTransport == 1>>
+ /* 3 upgrades */
+ <<if $securityForceHeavyAmphibiousTransport == 1>>
A basic heavy amphibious transport has been 'borrowed' from the old world.
<<elseif $securityForceHeavyAmphibiousTransport == 2>>
Modernized the heavy amphibious transport's armor.
@@ -553,7 +553,7 @@ securityForceX */
The amenities are staffed by menial slaves, captured by the soldiers on their excursions.
<</if>>
</div>
-
+
<br>
//In the middle of the common area is a pile of supply crates with a pavilion on top - The Colonel's personal throne and open quarters, the result of her preferring to live an extreme lifestyle amongst her soldiers rather than in her empty quarters on the upper levels. It's draped with the 'flag' of $securityForceName, one of her inventions. Sprawled all around it is an immense quantity of; alcohol, hard drugs,clothes, electronic devices, huge amounts of cash, jewels and precious metals looted from the outside world.//
@@ -629,13 +629,12 @@ securityForceX */
<<if $securityForceUpgradeToken == 1 && (_SFNO < _max || _SFO < _max)>>
//_Name is working to improve $securityForceName this week.//
-<</if>>
-<<if _SFNO >= _max || _SFO >= _max>>
+<<elseif _SFNO >= _max || _SFO >= _max>>
//$securityForceName is fully equipped and upgraded - nothing else can be done.//
<</if>>
-
+
<<if $securityForceGiftToken == 1>>
- //_Name has already provided you with extra tribute this week.//
+ <br>//_Name has already provided you with extra tribute this week.//
<</if>>
<<if $CurrentTradeShowAttendance == 0 && ($securityForceColonelToken == 1 || $securityForceSexedColonelToken == 1)>>
<br>//The Colonel has already spent time with you this week or is unable able to find time in her busy week to <<if $securityForceSexedColonelToken == 1>>'relax'<<elseif $securityForceColonelToken == 1>>relax<</if>> with you.//
@@ -643,7 +642,7 @@ securityForceX */
<<set _securityForceUpgradeResetTokenCurrentCost = $cash*.05>>
<<if $securityForceUpgradeToken == 1 && $securityForceUpgradeTokenReset >= 0>>
- _Name "says certainly <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, it is possible to upgrade $securityForceName more than once per week however it will cost you."
+ <br><br>_Name "says certainly <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, it is possible to upgrade $securityForceName more than once per week, however, it will cost you."
<br>
<<link "Would you like to discus upgrading $securityForceName again?">>
<<set $securityForceUpgradeToken = 0>>
@@ -656,18 +655,18 @@ securityForceX */
<br><br>So far, you have currently discussed increasing the frequency of upgrading $securityForceName per week _Name <<if $securityForceUpgradeTokenReset == 1>>once<<else>>$securityForceUpgradeTokenReset times<</if>>.
<</if>>
-<<if $securityForceUpgradeToken == 0 && _SFNO < _max || _SFO < _max>>
+<<if (_SFNO < _max || _SFO < _max) && $securityForceUpgradeToken == 0>>
<span id="resultX">
<br><br>Which facility or equipment do you wish _Name to upgrade this week?
- <<if _Barracks < 5>>
+ <<if $securityForceUpgradeToken == 0 && _Barracks < 5>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 100000*_Env>> //
- <<elseif $securityForceArcologyUpgrades < 16 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < 16 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>>
<<if $securityForceArcologyUpgrades == 5>>
<<set _arcCost = 15000000>>
<<elseif $securityForceArcologyUpgrades == 6>>
@@ -697,14 +696,14 @@ securityForceX */
<<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*_Env>>
<</replace>>
<</link>> // Costs ¤<<print _arcCost*_Env>> //
- <<elseif $securityForceArcologyUpgrades == 12 && _Armoury >= 11 && _StimulantLab >= 7 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 12 && _Armoury >= 11 && _StimulantLab >= 7 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*_Env>>
<</replace>>
<</link>> // Costs ¤<<print _arcCost*_Env>> //
- <<elseif $securityForceArcologyUpgrades == 13>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
@@ -715,9 +714,9 @@ securityForceX */
<<if _Barracks == 5 || _Barracks == 16>>
<br>//$securityForceName has fully upgraded the barracks to support it's activities//
<</if>>
-
+
/*
- <<if _Barracks >= 1 && $FacilitySupport == 0>>
+ <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
<br><<link "Facility Support">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone."
@@ -726,15 +725,15 @@ securityForceX */
<</link>> // Costs ¤<<print 150000000*_Env*(_SFNO/100 || _SFO/100)>> //
<</if>>
*/
-
- <<if _Armoury < 5>>
+
+ <<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
<br><<link "Armoury">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "The boys'll like having some new guns and armour to help them out there." She laughs. "Don't think the poor bastards they'll be shooting will thank you though." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 40000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 40000*_Env>> //
- <<elseif _Armoury > 5 && _Armoury < 11 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>>
+ <<elseif $securityForceUpgradeToken == 0 && _Armoury > 5 && _Armoury < 11 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>>
<br><<link "Armoury">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "The boys'll like having some new guns and armour to help them out there." She laughs. "Don't think the poor bastards they'll be shooting will thank you though." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -745,16 +744,15 @@ securityForceX */
<<if _Armoury == 5 || _Armoury == 11>>
<br>//$securityForceName has fully upgraded the armoury to support it's activities.//
<</if>>
-
- <<if _StimulantLab < 5>>
- <br>
- <<link "Stimulant Lab">>
+
+ <<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
+ <br><<link "Stimulant Lab">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= 40000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 40000*_Env>> //
- <<elseif _StimulantLab > 5 && _StimulantLab < 9 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
+ <<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < 9 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
<<if _StimulantLab == 6>>
<<set _drugCost = 2265000>>
<<elseif _StimulantLab == 7>>
@@ -762,14 +760,14 @@ securityForceX */
<<elseif _StimulantLab == 8>>
<<set _drugCost = 250000000000>>
<</if>>
- <<link "Stimulant Lab">>
+ <br><<link "Stimulant Lab">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*_Env>>
<</replace>>
<</link>> // Costs ¤<<print _drugCost*_Env>> //
- <<elseif _StimulantLab == 7 && _Armoury >= 11 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16 && _Barracks >= 13>>
- <<link "Stimulant Lab">>
+ <<elseif $securityForceUpgradeToken == 0 && _StimulantLab == 7 && _Armoury >= 11 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16 && _Barracks >= 13>>
+ <br><<link "Stimulant Lab">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*_Env>>
@@ -777,28 +775,26 @@ securityForceX */
<</link>> // Costs ¤<<print _drugCost*_Env>> //
<</if>>
<<if _StimulantLab == 5 || _StimulantLab == 9>>
- //$securityForceName has fully upgraded the stimulant lab to support it's activities.//
+ <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
<</if>>
-
- <<if _Barracks >= 1 && _Garage < _GarageMax>>
- <br>
- <<link "Garage">>
+
+ <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>>
+ <br><<link "Garage">>
<<replace "#resultX">>
<span id="resultB">
<br><br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
- <</link>>
-
- <<if $securityForceVehiclePower < 5>>
- <br>
- <<link "Light and medium vehicles">>
+ <</link>>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 5>>
+ <br><<link "Light and medium vehicles">>
<<replace "#resultB">><br><br>
"Sure, boss." she says, nodding. "Some new wheels should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= 60000*_Env>>
<</replace>>
<</link>>// Costs ¤<<print 60000*_Env>> //
- <<elseif $securityForceVehiclePower < 7 && _Barracks >= 5 && $securityForceAircraftPower >= 5 && _DroneBay >= 5 && _StimulantLab >= 5 && _Armoury >= 5>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 7 && _Barracks >= 5 && $securityForceAircraftPower >= 5 && _DroneBay >= 5 && _StimulantLab >= 5 && _Armoury >= 5>>
<<if $securityForceVehiclePower < 6>>
<<set _vehCost = 2500000>>
<<elseif $securityForceVehiclePower == 6>>
@@ -812,26 +808,25 @@ securityForceX */
<</link>> // Costs ¤<<print _vehCost*_Env>> //
<</if>>
<<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == 7>>
- //$securityForceName has fully upgraded the vehicle fleet to support it's activities.//
+ <br>//$securityForceName has fully upgraded the vehicle fleet to support it's activities.//
<<else>>
- //More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
+ <br>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
<</if>>
-
- <<if $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>>
- <br>
- <<link "A heavy battle tank">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>>
+ <br><<link "A heavy battle tank">>
<<replace "#resultB">><br><br>
"Sure, boss." she says, nodding. "A heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 60000000*_Env>>
<</replace>>
<</link>>// Costs ¤<<print 60000000*_Env>> //
- <<elseif $securityForceHeavyBattleTank >= 1 && $securityForceHeavyBattleTank < 3>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank >= 1 && $securityForceHeavyBattleTank < 3>>
<<if $securityForceHeavyBattleTank < 2>>
<<set _hbtCost = 75000000>>
<<elseif $securityForceHeavyBattleTank == 2>>
<<set _hbtCost = 8500000>>
<</if>>
- <<link "heavy battle tank">>
+ <br><<link "heavy battle tank">>
<<replace "#resultB">><br><br>
"Sure, boss." she says, nodding. "Upgrading the heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= _hbtCost*_Env>>
@@ -841,40 +836,38 @@ securityForceX */
<<if $securityForceHeavyBattleTank == 3>>
<br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.//
<</if>>
-
+
</span>
<</replace>>
<</link>>
<</if>>
<<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>>
-
- <<if _Barracks >= 4 && _Hangar < _HangarMax>>
- <br>
- <<link "Hangar">>
+
+ <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>>
+ <br><<link "Hangar">>
<<replace "#resultX">>
<span id="resultY">
<br><br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
-
- <<if $securityForceAircraftPower < 5>>
- <br>
- <<link "Light and medium aircraft">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 5>>
+ <br><<link "Light and medium aircraft">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= 70000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 70000*_Env>> //
- <<elseif $securityForceAircraftPower < 8 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 8 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>>
<<if $securityForceAircraftPower == 5>>
<<set _airCost = 2750000>>
<<elseif $securityForceAircraftPower == 6>>
<<set _airCost = 3250000>>
<<elseif $securityForceAircraftPower == 7>>
- <<set _airCost = 5750000>>
+ <<set _airCost = 5750000>>
<</if>>
- <<link "Light and medium aircraft">>
+ <br><<link "Light and medium aircraft">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= _airCost*_Env>>
@@ -882,19 +875,19 @@ securityForceX */
<</link>> // Costs ¤<<print _airCost*_Env>> //
<</if>>
<<if $securityForceAircraftPower == 5 || $securityForceAircraftPower == 8>>
- $securityForceName has fully upgraded the air fleet to support it's activities.//
+ <br>//$securityForceName has fully upgraded the air fleet to support it's activities.//
<<else>>
- //More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
+ <br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
<</if>>
-
- <<if $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>>
<br><<link "A space plane">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "A orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 4750000*_Env>> //
- <<elseif $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < 11>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < 11>>
<<if $securityForceSpacePlanePower < 4>>
<<set _spCost = 50000000>>
<<elseif $securityForceSpacePlanePower == 4>>
@@ -922,15 +915,15 @@ securityForceX */
<<if $securityForceSpacePlanePower == 11>>
<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
<</if>>
-
- <<if $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>>
<br><<link "A fortress zeppelin">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "A fortress zeppelin would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 30000000*_Env>>
<</replace>><</link>> // Costs ¤<<print 30000000*_Env>> //
- <<elseif $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < 3>>
- <br><<link "Fortress zeppelin">>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < 3>>
+ <<link "Fortress zeppelin">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Upgrading the Fortress Zeppelin, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 20000000*_Env>>
@@ -941,7 +934,7 @@ securityForceX */
<br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.//
<</if>>
- <<if $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceAC130 < 1>>
+ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceAC130 < 1>>
<br><<link "An AC-130">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "An AC-130 would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -959,14 +952,14 @@ securityForceX */
<<if $securityForceAC130 == 5>>
<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
<</if>>
-
- <<if $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>>
<br><<link "A heavy transport">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "A heavy transport would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 40000000*_Env>>
<</replace>><</link>> // Costs ¤<<print 40000000*_Env>> //
- <<elseif $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < 3>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < 3>>
<br><<link "Heavy transport">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Upgrading the heavy transport, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
@@ -977,25 +970,25 @@ securityForceX */
<<if $securityForceHeavyTransport == 3>>
<br>//$securityForceName has fully upgraded the heavy transport to support it's activities.//
<</if>>
-
+
</span>
<</replace>>
<</link>>
<</if>>
<<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>>
-
- <<if _DroneBay < 5 && _Barracks >= 2>>
+
+ <<if $securityForceUpgradeToken == 0 && _DroneBay < 5 && _Barracks >= 2>>
<br><<link "Drone bay">>
<<replace "#resultX">>
"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, _DroneBay++, $cash -= 45000*_Env>>
+ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 45000*_Env>> //
- <<elseif _DroneBay < 6 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>>
+ <<elseif $securityForceUpgradeToken == 0 && _DroneBay < 6 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>>
<br><<link "Drone bay">>
<<replace "#resultX">>
"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, _DroneBay++, $cash -= 2000000*_Env>>
+ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 2000000*_Env>> //
<</if>>
@@ -1006,7 +999,7 @@ securityForceX */
<</if>>
<<if _Barracks >= 4>>
- <<if _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>>
+ <<if $securityForceUpgradeToken == 0 && _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>>
<br><<link "Launch Bay">>
<<replace "#resultX">>
<span id="resultZ">
@@ -1014,15 +1007,15 @@ securityForceX */
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
-
- <<if _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatalitePower < 1>>
+
+ <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatalitePower < 1>>
<br><<link "A satalite">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "A satalite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceSatalitePower++, $cash -= 3750000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 3750000*_Env>> //
- <<elseif $securityForceSatalitePower >= 1 && $securityForceSatalitePower < 17>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSatalitePower >= 1 && $securityForceSatalitePower < 17>>
<<if $securityForceSatalitePower < 11>>
<<set _satCost = 2350000>>
<<elseif $securityForceSatalitePower == 11>>
@@ -1048,15 +1041,15 @@ securityForceX */
<<if $securityForceSatalitePower == 17>>
<br>//$securityForceName has fully upgraded the satalite to support it's activities.//
<</if>>
-
- <<if $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && $terrain != "oceanic">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && $terrain != "oceanic">>
<br><<link "A giant robot">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 50000000*_Env>> //
- <<elseif $securityForceGiantRobot >= 1 && $securityForceGiantRobot < 10>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < 10>>
<<if $securityForceGiantRobot < 3>>
<<set _robCost = 25000000>>
<<elseif $securityForceGiantRobot == 3>>
@@ -1081,18 +1074,18 @@ securityForceX */
<</replace>>
<</link>> // Costs ¤<<print _robCost*_Env>> //
<</if>>
- <<if $securityForceGiantRobot == 10>>
+ <<if $securityForceGiantRobot == 10 && $terrain != "oceanic" || $terrain != "marine">>
<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
<</if>>
-
- <<if $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && $terrain != "oceanic">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && $terrain != "oceanic">>
<br><<link "A missile silo">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "A missile silo would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 200000000*_Env>> //
- <<elseif $securityForceMissileSilo >= 1 && $securityForceMissileSilo < 3>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < 3>>
<<if $securityForceMissileSilo == 1>>
<<set _msCost = 250000000>>
<<elseif $securityForceMissileSilo == 2>>
@@ -1105,8 +1098,8 @@ securityForceX */
<</replace>>
<</link>> // Costs ¤<<print _msCost*_Env>> //
<</if>>
- <<if $securityForceMissileSilo == 3>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
-
+ <<if $securityForceMissileSilo == 3 && $terrain != "oceanic" || $terrain != "marine">><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
+
</span>
<</replace>>
<</link>>
@@ -1114,27 +1107,24 @@ securityForceX */
<</if>>
<<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>>
- <<if $terrain == "oceanic" || $terrain == "marine" && (_NavalYard < _NavalYardMax)>>
- <br>
- <<link "Naval Yard">>
+ <<if $securityForceUpgradeToken == 0 && $terrain == "oceanic" || $terrain == "marine" && (_NavalYard < _NavalYardMax)>>
+ <br><<link "Naval Yard">>
<<replace "#resultX">>
<span id="resultA">
<br><br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
-
- <<if $securityForceAircraftCarrier < 1>>
- <br>
- <<link "An aircraft carrier">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier < 1>>
+ <br><<link "An aircraft carrier">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "An aircraft carrier would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 1500000*_Env>> //
- <<elseif $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < 4>>
- <br>
- <<link "Aircraft carrier">>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < 4>>
+ <br><<link "Aircraft carrier">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "Upgrading the aircraft carrier should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*_Env>>
@@ -1144,47 +1134,43 @@ securityForceX */
<<if $securityForceAircraftCarrier == 4>>
<br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
<</if>>
-
- <<if $securityForceSubmarine < 1>>
- <br>
- <<link "A submarine">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>>
+ <br><<link "A submarine">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "A submarine would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 1500000*_Env>> //
- <<elseif $securityForceSubmarine >= 1 && $securityForceSubmarine < 5>>
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < 5>>
<<if $securityForceSubmarine < 4>>
<<set _subCost = 25000000>>
<<elseif $securityForceSubmarine == 4>>
<<set _subCost = 85000000>>
<</if>>
- <br>
- <<link "Submarine">>
+ <br><<link "Submarine">>
<<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
+ "Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*_Env>>
<</replace>>
<</link>> // Costs ¤<<print _subCost*_Env>> //
<</if>>
<<if $securityForceSubmarine == 5>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
-
- <<if $securityForceHeavyAmphibiousTransport < 1>>
- <br>
- <<link "A heavy amphibious transport">>
+
+ <<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>>
+ <br><<link "A heavy amphibious transport">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "A heavy amphibious transport would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceHeavyAmphibiousTransport++, $cash -= 1500000*_Env>>
<</replace>>
<</link>> // Costs ¤<<print 1500000*_Env>> //
- <<elseif $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < 3>>
+ <<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < 3>>
<<if $securityForceHeavyAmphibiousTransport == 1>>
<<set _hatCost = 150000000>>
<<elseif $securityForceHeavyAmphibiousTransport == 2>>
<<set _hatCost = 250000000>>
<</if>>
- <br>
- <<link "Heavy amphibious transport">>
+ <br><<link "Heavy amphibious transport">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "Upgrading the heavy amphibious transport, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceHeavyAmphibiousTransport++, $cash -= _hatCost*_Env>>
@@ -1192,20 +1178,20 @@ securityForceX */
<</link>> // Costs ¤<<print _hatCost*_Env>> //
<</if>>
<<if $securityForceHeavyAmphibiousTransport == 3>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>>
-
+
</span>
<</replace>>
<</link>>
<</if>>
<<if $terrain == "oceanic" || $terrain == "marine" && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
-
+
</span>
<</if>>
<<nobr>>
<<if $securityForceColonelToken == 0 && $securityForceSexedColonelToken == 0 && $CurrentTradeShowAttendance == 0>>
<br><br>
- <span id="result3">
+ <span id="result3">
Where do you want to spend time with The Colonel this week?
<br>
<<link "Up on the surface, along with an escort of course.">>
@@ -1263,7 +1249,7 @@ securityForceX */
Your total lack of medical skill causes the death of the citizen.
<<set $arcologies[0].prosperity -= .25>>
<<elseif $PC.medicine >= 100 && $career == "medicine">>
- Your expertness of medicine ensures that the citizen is probably the best they have ever been. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained archology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
+ Your expertness of medicine ensures that the citizen is probably the best they have ever been. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained archology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
<<if $economy == 0.5>>
<<set $rep += 10, $cash += 100>>
<<elseif $economy == 1>>
@@ -1272,7 +1258,7 @@ securityForceX */
<<set $rep += 10, $cash += 200>>
<</if>>
<<elseif $PC.medicine >= 100>>
- Your expertness of medicine ensures that the citizen is probably the best they have ever been. Word quickly spreads of the kindly archology owner who took the time to heal a citizen.
+ Your expertness of medicine ensures that the citizen is probably the best they have ever been. Word quickly spreads of the kindly archology owner who took the time to heal a citizen.
<<set $rep += 5>>
<<elseif $PC.medicine >= 60>>
Your mastery of medicine ensures that the citizen's condition is noticeably better.
@@ -1292,7 +1278,7 @@ securityForceX */
<<set $choice = 3>>
<<replace "#result10">>
<<set $securityForceColonelToken = 1>>
- "Sure, boss." she says, nodding. "I can use a break from all of this." She laughs.
+ "Sure, boss." she says, nodding. "I can use a break from all of this." She laughs.
She can try teaching you a bit about;
<span id="result4">
<<link "field medicine">>
@@ -1358,7 +1344,7 @@ securityForceX */
<<elseif $PC.engineering >= 100>>
//Time to for you to out there and building something.
<<elseif $PC.engineering >= 60>>
- //Feel free to 'nail' me any time.
+ //Feel free to 'nail' me any time.
<<elseif $PC.engineering >= 30>>
//Yes that is the correct hammering position.
<<elseif $PC.engineering >= 10>>
@@ -1396,12 +1382,12 @@ securityForceX */
<</link>>
</span>
<</replace>>
- <</link>>
-
+ <</link>>
+
<br><<link "Have some fun">>
<<set $choice = 3>>
<<replace "#result10">>
- <<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1>>
+ <<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1>>
<span id="result11">
Where should this fun take place?
<br><<link "In private">>
@@ -1559,7 +1545,7 @@ securityForceX */
Inset sex noises here.
<</if>>
<</replace>>
- <</link>>
+ <</link>>
<br>
<<link "Ass">>
<<replace "#result6">>
@@ -1631,7 +1617,7 @@ securityForceX */
Inset sex noises here.
<</if>>
<</replace>>
- <</link>>
+ <</link>>
<br>
<<link "All three holes">>
<<replace "#result6">>
@@ -1658,7 +1644,7 @@ securityForceX */
<</link>>
</span>
<</replace>>
- <</link>>
+ <</link>>
</span>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index df561ebaec354e8817f48d29927fcd31042867aa..47fff02d3b477bfe1cc77f289bea4653a33a9e46 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -108,6 +108,7 @@
<<set $activeSlave.balls = 0>>
<<set $activeSlave.scrotum = 0>>
<<set $activeSlave.ovaries = 0>>
+ <<set $activeSlave.labia = 0>>
<<set $activeSlave.makeup = 0>>
<<set $activeSlave.nails = 0>>
<<set $activeSlave.earPiercing = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 882dc4c621742d143856ee3dfd4b4a9f15c43011..018e2fbde0351f7a73d64addbcb8db71c794103b 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2332,7 +2332,7 @@
<<if $slaves[$i].lactation == 0>>
However, she is @@.gold;reduced to a state of sheer panic@@ over her dried up breasts.
<<set $slaves[$i].trust -= 10>>
- <<elseif $slaves[$i].pregKnown == 0 || $slaves[$i].bellyImplant < 2000>>
+ <<elseif $slaves[$i].pregKnown == 0 && $slaves[$i].bellyImplant < 2000>>
However, she is @@.gold;reduced to a state of panic@@ that her milk will dry up if she doesn't get pregnant again soon.
<<set $slaves[$i].trust -= 2>>
<</if>>
@@ -5761,9 +5761,11 @@
<</if>>
<<if $slaves[$i].health > 90>>
- <<if $slaves[$i].energy <= 70>>
- $possessiveCap outstanding health produces a @@.green;slow improvement in libido.@@
- <<set $slaves[$i].energy += 1>>
+ <<if $slaves[$i].need <= $slaves[$i].energy/2>>
+ <<if $slaves[$i].energy <= 70>>
+ $possessiveCap outstanding health produces a @@.green;slow improvement in libido.@@
+ <<set $slaves[$i].energy += 1>>
+ <</if>>
<</if>>
<<if $slaves[$i].face > 80>>
<<if $slaves[$i].face <= 95>>
@@ -5788,9 +5790,11 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].health > 60)>>
- <<if ($slaves[$i].energy <= 50)>>
- $possessiveCap good health produces a @@.green;slow improvement in libido.@@
- <<set $slaves[$i].energy += 1>>
+ <<if $slaves[$i].need <= $slaves[$i].energy/2>>
+ <<if ($slaves[$i].energy <= 50)>>
+ $possessiveCap good health produces a @@.green;slow improvement in libido.@@
+ <<set $slaves[$i].energy += 1>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index aafd066e4e374b8a026f1d84b1b7a82a1d4eaabb..575117bd6556644041a4a8f9214ae15b2a78af55 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -41,9 +41,9 @@ securityForceX
*/
<<set _Barracks = $securityForceArcologyUpgrades>>
<<set _Armoury = $securityForceInfantryPower>>
-<<set _StimulantLab = $securityForceInfantryPower>>
+<<set _StimulantLab = $securityForceStimulantPower>>
<<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
-<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130>>
+<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
<<set _DroneBay = $securityForceDronePower>>
<<set _LaunchBayNO = $securityForceSatalitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
<<set _LaunchBayO = $securityForceSatalitePower>>
@@ -150,7 +150,7 @@ securityForceX
<<set $securityForceRecruit += ($securityForceGiantRobot)>> <</if>>
<</if>>
- <<if $terrain == "oceanic"
+ <<if $terrain == "oceanic" || $terrain == "marine">>
<<if $securityForceAircraftCarrier > 0>>
<<set $securityForceRecruit += ($securityForceAircraftCarrier)>> <</if>>
<<if $securityForceSubmarine > 0>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 3d88dbd491596bf34b2f0989f197d3ecea635a88..49c2fa75ea15fc80315fbfc7238740d2d9d1109f 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -696,9 +696,9 @@ __Bids Received__
<<if $activeSlave.face >= 55>>
<<if $activeSlave.faceShape != "masculine">>
<<if random(1,100) > 90>>
- <br>''¤<<print 500*Math.trunc(($slaveCost*1.05)/500)>>'' from a fellow arcology owner seeking a smart, pretty slave to use as a breeder to produce superior children.
+ <br>''¤<<print 500*Math.trunc(($slaveCost*1.1)/500)>>'' from a fellow arcology owner seeking a smart, pretty slave to use as a breeder to produce superior children.
<<link "Accept bid">>
- <<set $cash += 500*Math.trunc(($slaveCost*2.05)/500)>>
+ <<set $cash += 500*Math.trunc(($slaveCost*1.1)/500)>>
<<set $buyer = "eugenics arcology">>
<<goto "Slave Sold">>
<</link>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index fe7d39229b8e1e62d90e57b1dc8bca0e897a1856..f43b5f41e34ec94e166bc8d26133f5436a7b2948 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -119,6 +119,9 @@
<<if ($PC.dick != 0 && $activeSlave.eggType == "human")>>
| <<link "Impregnate her yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
+ <<if canImpreg($activeSlave, $activeSlave)>>
+ | <<link "Use her own seed to impregnate her">><<replace "#miniscene">><<include "FSlaveSelfImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
| [[Use another slave to impregnate her|FSlaveImpreg]]
<</if>>
<<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade">>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index bf4158fc7fb440f7a6937784d1a6aca1615e5ceb..b90a9edc64300b873fea458c29c0844b04195d85 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -352,9 +352,15 @@
<</if>>
<<if $args[0].hips >= 1>>
<<set $beauty += 4*($args[0].hips-1)>> /*8*/
+ <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
+ <<set $beauty += 4*($args[0].hips-1)>> /*8*/ /* offsets the malus for big butts */
+ <</if>>
<</if>>
<<if $args[0].analSkill > 60 && $args[0].anus >= 2>>
<<set $beauty += 2*($args[0].anus-2)>> /*6*/
+ <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
+ <<set $beauty += 2*($args[0].anus-2)>> /*6*/ /* offsets the malus for big butts */
+ <</if>>
<</if>>
<<elseif ($arcologies[0].FSGenderRadicalistLawFuta == 4)>>
<<if $args[0].dick > 0 && $args[0].vagina == -1 && $args[0].faceShape != "masculine">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 029c4303666b450fdc2d244e9fe4c33f17a1135b..dbf1943bc373387929a03a7c64bc9d378725cae6 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -383,6 +383,9 @@
<<if ($PC.dick != 0 && $activeSlave.eggType == "human")>>
| <<link "Impregnate her yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
+ <<if canImpreg($activeSlave, $activeSlave)>>
+ | <<link "Use her own seed to impregnate her">><<replace "#miniscene">><<include "FSlaveSelfImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
| [[Use another slave to impregnate her|FSlaveImpreg]]
<</if>>
<<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade">>