diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 30aa181eee457bdc04e8d9421a93a0258985279b..748964e35e40b7dfdb3bf3b81a5c8b8f3bb23e2e 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -411,7 +411,7 @@ window.generateGenetics = (function() {
break;
case "milky white":
case "implant":
- hEyeColor = jsEither(["blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue"]);
+ hEyeColor = jsEither(["blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green"]);
break;
}
return jsEither(eyeColorArray);
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b9e8ac1cee1ff546314a8ff8e506a1dd0dcf9a6d..e29552e7d9482a2803491568ce24f62bb9552bd4 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -98,7 +98,7 @@
<<set _meanGirl.attrXY = random(60,90)>>
<<set _meanGirl.attrXX = random(10,20)>>
<<set _meanGirl.behavioralFlaw = either("arrogant", "bitchy")>>
- <<set _meanGirl.clothes = either("conservative clothing", "a mini dress", "sport shorts and a t-shirt", "a t-shirt and jeans")>>
+ <<set _meanGirl.clothes = either("a mini dress", "a t-shirt and jeans", "conservative clothing", "sport shorts and a t-shirt")>>
<<set _newSlaves.push(_meanGirl)>>
<</for>>
<span id="artFrame">
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
index 57c2aaf511fb437d0d361f47b9e28e4e0a3d4958..0796bf023277958262d604b043f6e3814b0124c7 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
@@ -29,7 +29,7 @@ They arrive hand-in-hand and don't let go of each other until the end of the ens
<<set _secondSlave.relationshipTarget = $activeSlave.ID>>
-<<set _secondSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
+<<set _secondSlave.hStyle = either("ass-length", "long", "shaved bald", "short", "shoulder-length", "very short")>>
<<if (_secondSlave.actualAge <= 22)>>
<<set _secondSlave.career = setup.youngCareers.random()>>
<<elseif (_secondSlave.intelligenceImplant >= 15)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 1dd06ee05cd078cd0faeca8ae5bf9e82112cdf90..8ecf60d36cbda4931941ed104a55dc30c4162c4c 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1490,40 +1490,40 @@ Alter $his race:
<<if $activeSlave.indentureRestrictions < 1>>
$He is $activeSlave.race<<if $activeSlave.race != $activeSlave.origRace>>, but was originally $activeSlave.origRace<</if>>. Surgically alter $him to look more:
<<if $activeSlave.race != "white">>
- [[White|Surgery Degradation][$activeSlave.race = "white",$activeSlave.skin = either("fair", "light", "pale"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[White|Surgery Degradation][$activeSlave.race = "white", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "latina">>
- [[Latina|Surgery Degradation][$activeSlave.race = "latina",$activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tan"),$activeSlave.hColor = either("black", "black", "brown", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Latina|Surgery Degradation][$activeSlave.race = "latina", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "black">>
- [[Black|Surgery Degradation][$activeSlave.race = "black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Black|Surgery Degradation][$activeSlave.race = "black", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "asian">>
- [[Asian|Surgery Degradation][$activeSlave.race = "asian",$activeSlave.skin = either("dark olive", "light olive", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Asian|Surgery Degradation][$activeSlave.race = "asian", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "middle eastern">>
- [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "indo-aryan">>
- [[Indo-Aryan|Surgery Degradation][$activeSlave.race = "indo-aryan",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Indo-Aryan|Surgery Degradation][$activeSlave.race = "indo-aryan", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "pacific islander">>
- [[Pacific Islander|Surgery Degradation][$activeSlave.race = "pacific islander",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Pacific Islander|Surgery Degradation][$activeSlave.race = "pacific islander", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "malay">>
- [[Malay|Surgery Degradation][$activeSlave.race = "malay",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Malay|Surgery Degradation][$activeSlave.race = "malay", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "amerindian">>
- [[Amerindian|Surgery Degradation][$activeSlave.race = "amerindian",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Amerindian|Surgery Degradation][$activeSlave.race = "amerindian", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "southern european">>
- [[Southern European|Surgery Degradation][$activeSlave.race = "southern european",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Southern European|Surgery Degradation][$activeSlave.race = "southern european", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "semitic">>
- [[Semitic|Surgery Degradation][$activeSlave.race = "semitic",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Semitic|Surgery Degradation][$activeSlave.race = "semitic", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "mixed race">>
- [[Mixed Race|Surgery Degradation][$activeSlave.race = "mixed race",$activeSlave.skin = either("dark", "light", "pale"),$activeSlave.hColor = either("black", "black", "black", "black", "blonde", "brown", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]]
+ [[Mixed Race|Surgery Degradation][$activeSlave.race = "mixed race", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]]
<</if>>
<<else>>
//$His indenture forbids elective surgery//
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 102c4f96836e8694a1230225cf4ab92a2f9c03c8..3691494b8ea2f3f8ab7b2e12343c56f231bebcbb 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -297,7 +297,7 @@ The room containing all the clothes and accessories you have available to dress
<tr>
<td>
-<<set _model.clothes = either("battlearmor", "a military uniform", "a red army uniform", "battledress")>>
+<<set _model.clothes = either("a military uniform", "a red army uniform", "battlearmor", "battledress")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -312,7 +312,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a biyelgee costume", "a dirndl", "lederhosen", "a mounty outfit", "a hanbok")>>
+<<set _model.clothes = either("a biyelgee costume", "a dirndl", "a hanbok", "a mounty outfit", "lederhosen")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -344,7 +344,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a button-up shirt and panties", "a button-up shirt", "cutoffs", "jeans", "leather pants and a tube top", "leather pants", "an oversized t-shirt", "a sweater and cutoffs", "a sweater and panties", "a sweater", "a t-shirt and jeans", "a t-shirt and panties", "a t-shirt", "a tank-top and panties", "a tank-top", "a tube top")>>
+<<set _model.clothes = either("a button-up shirt and panties", "a button-up shirt", "a sweater and cutoffs", "a sweater and panties", "a sweater", "a t-shirt and jeans", "a t-shirt and panties", "a t-shirt", "a tank-top and panties", "a tank-top", "a tube top", "an oversized t-shirt", "cutoffs", "jeans", "leather pants and a tube top", "leather pants")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -361,7 +361,7 @@ The room containing all the clothes and accessories you have available to dress
<tr>
<td>
-<<set _model.clothes = either("a police uniform", "nice business attire", "a nice nurse outfit")>>
+<<set _model.clothes = either("a nice nurse outfit", "a police uniform", "nice business attire")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -376,7 +376,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a gothic lolita dress", "a ball gown")>>
+<<set _model.clothes = either("a ball gown", "a gothic lolita dress")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -408,7 +408,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("boyshorts", "a bra", "kitty lingerie", "panties and pasties", "a skimpy loincloth", "a thong", "pasties")>>
+<<set _model.clothes = either("a bra", "a skimpy loincloth", "a thong", "boyshorts", "kitty lingerie", "panties and pasties", "pasties")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -425,7 +425,7 @@ The room containing all the clothes and accessories you have available to dress
<tr>
<td>
-<<set _model.clothes = either("sport shorts and a sports bra", "sport shorts", "a sports bra")>>
+<<set _model.clothes = either("a sports bra", "sport shorts and a sports bra", "sport shorts")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -440,7 +440,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a one-piece swimsuit", "a monokini")>>
+<<set _model.clothes = either("a monokini", "a one-piece swimsuit")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -472,7 +472,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a klan robe", "a slutty klan robe", "a schutzstaffel uniform", "a slutty schutzstaffel uniform")>>
+<<set _model.clothes = either("a klan robe", "a schutzstaffel uniform", "a slutty klan robe", "a slutty schutzstaffel uniform")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -504,7 +504,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("striped panties","a striped bra", "striped underwear")>>
+<<set _model.clothes = either("a striped bra", "striped panties", "striped underwear")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 04488ce8388bb3c27ca9250fc17f404ec20c0dc1..28e873985db1729472ce5401c29a26862705a6fd 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1214,7 +1214,7 @@ $He's got a
<<if $arcologies[0].FSSlimnessEnthusiast > 20 && $arcologies[0].FSHedonisticDecadence == "unset">>
<<print either("fashionable", "sleek and attractive", "small and enticing")>>
<<else>>
- <<print either("small, sleek", "small but rounded", "rounded, small")>>
+ <<print either("rounded, small", "small but rounded", "small, sleek")>>
<</if>>
rear end.
<<elseif $activeSlave.butt <= 3>><<print either("big and healthy", "curved and plump", "healthy and plump")>> derrière.