diff --git a/bin/.gitignore b/bin/.gitignore
index 40637012bb08e4c73341c2e057c87733bd7cb881..40fa129742fc35b00e1419c6bbee8d9dd229163d 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,4 +1,5 @@
# Ignore everything in this directory
*
-# Except this file
+# Except the following:
!.gitignore
+!resources/vector/*
\ No newline at end of file
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 2ad88f23cb6a3dca0115c6621f624567d71fafb4..df7599ecd8c7ad1ade74bc1b73a0f970a6455fcc 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -434,7 +434,6 @@
<<set $arcologies[0].FSSupremacistSMR = 0>>
<<set $arcologies[0].FSSubjugationistLawME = 0>>
<<set $arcologies[0].FSSubjugationistSMR = 0>>
-<<set $arcologies[0].FSGenderRadicalistLawDicks = 0>>
<<set $arcologies[0].FSGenderRadicalistLawFuta = 0>>
<<set $arcologies[0].FSGenderRadicalistLawBeauty = 0>>
<<set $arcologies[0].FSGenderFundamentalistLawBimbo = 0>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index a2cab360b2e57d1cc0604bddd780531738fc59f3..505f069b3d1b8be51212ac732b48bb63340b51dd 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -398,7 +398,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.faceShape = "sensual">>
<<set $activeSlave.oralSkill = random(35,75), $activeSlave.analSkill = random(35,75)>>
<<if $activeSlave.vagina > -1>>
- <<if $activeSlave.vagina = 0>><<set $activeSlave.vagina++>><</if>>
+ <<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
<<set $activeSlave.vaginalSkill = random(35,75)>>
<</if>>
<<set $activeSlave.entertainSkill = random(15,35)>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c5681df7d26e4a57e0fefeee61d08f70420f54c5..75e47b99cda1c7f6b6a2f0d8783b2a6e47c99675 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1697,6 +1697,10 @@ Setting missing slave variables:
<<set $slaves[_i] to _Slave>>
<</for>>
+
+<<if ndef $slavesOriginal>>
+ <<set $slavesOriginal = $slaves>>
+<</if>>
Done!
<<set $ver = "0.10.0">>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index b747f9dd964f07bc05e2344ff7d31d76c68437c7..b365a5951a82a9337f7180749c262f26aacc4545 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -27,6 +27,7 @@
<<case "work a glory hole">>
<<include "SA work a glory hole">>
<<case "get milked">>
+ <<set $servantMilkersMultiplier = 1>>
<<include "SA get milked">>
<<case "take classes">>
<<include "SA take classes">>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 246bd705aef7ef7a44eebbfe92d7332831ff93da..bc8613f49ed864c42f42cfce31483a89c6a11c8d 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -101,6 +101,76 @@
a pinup of herself to its plating: she's cutely hugging a rifle to her flat chest.
<<case "preggololi">>
a pinup of herself to its plating: she's flashing her lewd preggo loli pussy.
+ <<case "angel">>
+ a pinup of herself to its plating: she's depicted wielding a flaming sword and golden shield.
+ <<case "cherub">>
+ a pinup of herself to its plating: she's depicted hugging a bow to her chest.
+ <<case "incubus">>
+ a pinup of herself to its plating: she's depicted mid-orgasm, a bullet rocketing from her dick amidst a blast of cum.
+ <<case "succubus">>
+ a pinup of herself to its plating:
+ <<switch $assistantFSAppearance>>
+ <<case "paternalist">>
+ she's depicted hiking her skirt to flash her crotch.
+ <<case "degradationist">>
+ she's depicted striking a pose showing off her countless piercings.
+ <<case "roman revivalist">>
+ she's depicted in a stola, flashing her tits.
+ <<case "egyptian revivalist">>
+ she's depicted groping her perfect bronze breasts while blowing a kiss.
+ <<case "edo revivalist">>
+ she's depicted in a kimono, pulled open to flash her lovely breasts.
+ <<case "arabian revivalist">>
+ she's depicted wearing fine silks and striking a sexy pose, though they fail to cover anything on her.
+ <<case "chinese revivalist">>
+ she's depicted wearing colorful silk robes; she's pulled them open to flash her lovely body.
+ <<case "chattel religionist">>
+ she's depicted striking a sexy pose, chosen specifically to draw attention to the symbols of your relgion that adorn her nipples.
+ <<case "repopulation focus">>
+ she's depicted strinking a sexy pose made to draw the eye to her pregnant belly.
+ <<case "eugenics">>
+ she's depicted striking a sexy pose; she's so stunning you can't look away.
+ <<case "physical idealist">>
+ she's depicted flexing her tremendous musculature intimidatingly.
+ <<case "gender radicalist">>
+ she's depicted facing away from you, looking over her shoulder suggestively and presenting
+ <<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
+ her rear. A pair of balls hangs beneath her tight pussy.
+ <<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
+ her anus. A pair of heavy balls hangs from her crotch.
+ <<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
+ her gigantic ass.
+ <<else>>
+ her rear.
+ <</if>>
+ <<case "gender fundamentalist">>
+ she's depicted with one hand on her supple breast and the other tracing the curve of her child-bearing hips.
+ <<case "asset expansionist">>
+ she's depicted cradling her own pair of ballistics; her gigantic breasts are painted like atom bombs.
+ <<case "transformation fetishist">>
+ she's depicted striking a pose with one arm supporting her enormous implants.
+ <<case "pastoralist">>
+ she's depicted striking a sexy pose, hands trying to relieve the pressure of her quarter of milk filled breasts.
+ <<case "maturity preferentialist">>
+ she's depicted in a pose not unlike something you'd see on a 60's pinup calander.
+ <<case "youth preferentialist">>
+ she's depicted in a pose fresh out of a popluar idol's newest video.
+ <<case "slimness enthusiast">>
+ she's depicted striking a sexy pose while running her hands across her
+ <<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
+ flat chest.
+ <<else>>
+ slim assets.
+ <</if>>
+ <<case "body purist">>
+ she's depicted striking a sexy pose that shows off every flawless inch of her body.
+ <</switch>>
+ <<case "imp">>
+ a pinup of herself to its plating: she's depicted straddling a trident; pussy juices running down its shaft.
+ <<case "witch">>
+ a pinup of herself to its plating: she's depicted straddling a broom, winking.
+ <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+ a pinup of herself to its plating: you have no idea what to make of it. Whatenver it is, it is devouring your enemies on one end and popping out proper slaves from the other.
<<case "schoolgirl">>
a pinup of herself to its plating: she's depicted up on tiptoe, back turned, with her schoolgirl skirt riding up to bare her bottom.
<<default>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index f53f6a8e0e4a46977135c76a0e9b72b2b4914030..9addb6f29905dea254c9f669cf8f8e9930eb5996 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -336,7 +336,7 @@
<</if>>
<<if ndef $arcologies[0].FSGenderFundamentalistLawBimbo>><<set $arcologies[0].FSGenderFundamentalistLawBimbo = 0>><</if>>
-<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderRadicalistLawDicks + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR) > 0 + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0) || ($CulturalOpenness != 0)>>
+<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR) > 0 + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0) || ($CulturalOpenness != 0)>>
<br>__Future Society Policies__
<<if $CulturalOpenness == 1>>
@@ -404,10 +404,10 @@
[[Repeal|Policies][$arcologies[0].FSGenderRadicalistLawFuta = 0]]
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
<br>''Cock and Balls Focused Radicalism:'' you are encouraging Gender Radicalism towards an appreciation for stiff dicks and swinging balls.
- [[Repeal|Policies][$arcologies[0].FSGenderRadicalistLawDicks = 0]]
+ [[Repeal|Policies][$arcologies[0].FSGenderRadicalistLawFuta = 0]]
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
<br>''Bottom Heavy Radicalism:'' you are encouraging an appreciation for broad hips, plush asses, big buttholes, and skilled sphincters.
- [[Repeal|Policies][$arcologies[0].FSGenderRadicalistLawDicks = 0]]
+ [[Repeal|Policies][$arcologies[0].FSGenderRadicalistLawFuta = 0]]
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty == 1>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 664cfb3b1efeedbe3af5be1450235b2079bfb21a..6337aed8bf3e53320b610c27921a03ea9abf6bf5 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -401,9 +401,9 @@ waist.
[[Liposuction|Surgery Degradation][$activeSlave.waist -= 20,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType to "lipo"]]
<</if>>
<</if>>
-<<if ($activeSlave.waist == 1) && ($seeExtreme == 1)>>
+<<if ($activeSlave.waist >= -95) && ($activeSlave.waist < -75) && ($seeExtreme == 1)>>
<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
- [[Remove ribs to severely narrow her waist|Surgery Degradation][$activeSlave.waist = 100,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType to "ribs"]]
+ [[Remove ribs to severely narrow her waist|Surgery Degradation][$activeSlave.waist = -100,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType to "ribs"]]
<</if>>
<</if>>
@@ -1982,15 +1982,17 @@ $pronounCap has doorway-jamming hips.
<br>
<<if ($seeExtreme == 1)>>
-<<if $activeSlave.fetish != "mindbroken">>
- $pronounCap is mentally competent.
-<<elseif $activeSlave.fetish == "mindbroken">>
- $possessiveCap mind is gone; $pronoun has either been chemically lobotomized, or has lost $possessive mind due to extreme abuse.
-<</if>>
-<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
-<<if $activeSlave.fetish != "mindbroken">>
- [[Chemically lobotomize|Surgery Degradation][$activeSlave.fetish = "mindbroken",$activeSlave.fetishKnown = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "mindbreak"]]
- //Warning: this is permanent and irreversible. It will destroy $possessive will and $possessive ability to remember anything but the simplest skills.//
-<</if>>
-<</if>>
+ <<if $activeSlave.fetish != "mindbroken">>
+ $pronounCap is mentally competent.
+ <<elseif $activeSlave.fetish == "mindbroken">>
+ $possessiveCap mind is gone; $pronoun has either been chemically lobotomized, or has lost $possessive mind due to extreme abuse.
+ <</if>>
+ <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.fetish != "mindbroken">>
+ [[Chemically lobotomize|Surgery Degradation][$activeSlave.fetish = "mindbroken",$activeSlave.fetishKnown = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "mindbreak"]]
+ //Warning: this is permanent and irreversible. It will destroy $possessive will and $possessive ability to remember anything but the simplest skills.//
+ <</if>>
+ <</if>>
<</if>>
+
+<br><br>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index 9759ca5488c3f16958f250e2651a015bfcd354d3..99ccd7e399eb2fb4f7f6c9136655e8510ac5a953 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -263,6 +263,5 @@ You pause for a moment, and she plunges on: "<<if $PC.title == 1>>Sir<<else>>Ma'
<</if>>
"Ahem. I have stored the confirmation code, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she notes. "If you wish to take advantage of this promotion, use the slave buying menu to navigate to the appropriate school next week. I have appended a note to that school's entry to remind you."
<</if>>
-<</if>>
<</nobr>>\
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 37894bba63075fbb347b772ff9e64623a9c04d60..290c0b9382f949c8bd43e1f359aa338364b533c9 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -467,17 +467,29 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
<</if>>
<</if>>
<</if>>
-<<if $arcologies[0].FSGenderRadicalistLawDicks != 0>>
- <<if $activeSlave.dick > 0>>
- <<if $activeSlave.balls > 0>>
- Slaves with cocks and balls appraise quite well, thanks to your leadership on gender.
- <</if>>
- <</if>>
-<<elseif $arcologies[0].FSGenderRadicalistLawFuta != 0>>
- <<if $activeSlave.dick > 0>>
- <<if $activeSlave.vagina > -1>>
- Futas appraise better than ever, thanks to your leadership on gender.
- <</if>>
+<<if $arcologies[0].FSGenderRadicalistLawFuta != 0>>
+ <<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
+ <<if $activeSlave.dick > 0>>
+ <<if $activeSlave.vagina > -1>>
+ Futas appraise better than ever, thanks to your leadership on gender.
+ <</if>>
+ <</if>>
+ <<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
+ <<if $activeSlave.dick > 0>>
+ <<if $activeSlave.balls > 0>>
+ Slaves with cocks and balls appraise quite well, thanks to your leadership on gender.
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.butt >= 5>>
+ <<if $activeSlave.anus >= 2>>
+ <<if $activeSlave.hips >= 1>>
+ <<if $activeSlave.analSkill > 60>>
+ Slaves with big butts and skilled anuses appraise quite well, thanks to your leadership on gender.
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist > 50>>
@@ -1004,7 +1016,7 @@ __Bids Received__\
<br>''¤<<print 500*Math.trunc(($slaveCost*1.35)/500)>>'' from a prominent citizen whose friends never let him hear the end of his incorrigibly romantic treatment of his apartment full of amazons.
<<link "Accept bid">>
<<set $cash += 500*Math.trunc(($slaveCost*1.35)/500)>>
- <<set $buyer = "D shorty breeder">>
+ <<set $buyer = "D amazon hunter">>
<<goto "Slave Sold">>
<</link>>
<</if>>
@@ -1022,7 +1034,7 @@ __Bids Received__\
<br>''¤<<print 500*Math.trunc(($slaveCost*1.35)/500)>>'' from an prominent citizen who keeps a large harem of lithe, muscular girls to bear him children.
<<link "Accept bid">>
<<set $cash += 500*Math.trunc(($slaveCost*1.35)/500)>>
- <<set $buyer = "D amazon hunter">>
+ <<set $buyer = "D shorty breeder">>
<<goto "Slave Sold">>
<</link>>
<</if>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index bcd2dbff5f6940d5363167577ace4ca03a2da021..8f1ff691fefffdabe4db26f85955ce42780563fb 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -25,11 +25,11 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $origins.push("It's not clear why her previous owner cut her arms and legs off.")>>
<<set $origins.push("Her owner purposely blinded her by dumping boiling water into her eyes.")>>
<</if>>
-<<if _num > $seeDicks>>
+<<if _num < $seeDicks>>
<<set $origins.push("Her previous owner gelded her and used her for anal abuse.")>>
<<set $origins.push("Her background is obscure, but seems to have involved terrible abuse of her huge cock and balls.")>>
<</if>>
-<<if _num < $seeDicks>>
+<<if _num > $seeDicks>>
<<set $origins.push("Her holes were cruelly stretched by constant plug use.")>>
<<set $origins.push("Her previous owner discarded her after many pregnancies.")>>
<<set $origins.push("She was worn out by twenty years of brothel service.")>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index afb067208f7f0d58ef0038b8b6eae7ea1bdf956b..01c24e00f1731f9191416320c3b9d03511ba31f4 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -444,7 +444,7 @@
<<set $beauty += 2*$args[0].dick>>
<</if>>
<</if>>
-<<elseif $arcologies[0].FSGenderRadicalistLawDicks == 2>>
+<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
<<if $args[0].dick > 0>>
<<if $args[0].balls > 0>>
<<set $beauty += $args[0].dick+$args[0].balls>>