diff --git a/src/art/vector/Set_Colour_Skin_JS.tw b/src/art/vector/Set_Colour_Skin_JS.tw
index c22b55f469cc992fb6cc08bffdec7223e249a2e9..d28a99f1975b21805757b433392296224ddcb828 100644
--- a/src/art/vector/Set_Colour_Skin_JS.tw
+++ b/src/art/vector/Set_Colour_Skin_JS.tw
@@ -17,7 +17,27 @@ var s = {
skinColour: undefined
};
-if (artSlave.race == "white" || artSlave.race == "surgically altered to look white") {
+if (artSlave.skin == "camouflage patterned") {
+ s.skinColour = "#78875a";
+ s.areolaStyle = "fill:#939F7A;";
+ s.labiaStyle = "fill:#F977A3;";
+ } else if (artSlave.skin == "dyed red") {
+ s.skinColour = "#bc4949";
+ s.areolaStyle = "fill:#C96D6D;";
+ s.labiaStyle = "fill:#F977A3;";
+ } else if (artSlave.skin == "dyed green") {
+ s.skinColour = "#A6C373";
+ s.areolaStyle = "fill:#B7CF8F;";
+ s.labiaStyle = "fill:#F977A3;";
+ } else if (artSlave.skin == "dyed blue") {
+ s.skinColour = "#5b8eb7";
+ s.areolaStyle = "fill:#7BA4C5;";
+ s.labiaStyle = "fill:#F977A3;";
+ } else if (artSlave.skin == "tiger striped") {
+ s.skinColour = "#e2d75d";
+ s.areolaStyle = "fill:#E7DF7D;";
+ s.labiaStyle = "fill:#F977A3;";
+} else if (artSlave.race == "white" || artSlave.race == "surgically altered to look white") {
if (artSlave.skin == "pure white") {
s.skinColour = "#F4EAF0";
s.areolaStyle = "fill:#FCCCDC;";
@@ -102,38 +122,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
@@ -221,38 +209,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#4A3A33";
s.areolaStyle = "fill:#332B27;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
@@ -340,38 +296,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#634F45";
s.areolaStyle = "fill:#4D3A2E;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
@@ -459,38 +383,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
@@ -578,38 +470,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
@@ -697,38 +557,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
@@ -816,38 +644,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
@@ -935,38 +731,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
@@ -1054,38 +818,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
@@ -1173,38 +905,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#6B5449";
s.areolaStyle = "fill:#473C37;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
@@ -1292,38 +992,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#583E2F";
s.areolaStyle = "fill:#3F3A38;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
@@ -1411,38 +1079,6 @@ if (artSlave.race == "white" || artSlave.race == "surgically altered to look whi
s.skinColour = "#634F45";
s.areolaStyle = "fill:#4E3C32;";
s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "red dyed") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "green dyed") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "blue dyed") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
}
}
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index 1990d8d266f2a4f691c67d34273c2c2ba3cc3c46..2755f392e09d2c704cf8eb43604fa5a8763307e1 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -204,11 +204,8 @@ class ArtStyleControl {
["brown", "#714536"],
["black", "#403030"],
["camouflage patterned", "#708050"],
- ["red dyed", "#b04040"],
["dyed red", "#b04040"],
- ["green dyed", "#A0C070"],
["dyed green", "#A0C070"],
- ["blue dyed", "#5080b0"],
["dyed blue", "#5080b0"],
["tiger striped", "#e0d050"]
];
@@ -236,20 +233,17 @@ class ArtStyleControl {
["pale", "#f9ebf0"],
["tanned", "#e8b693"],
["natural", "#e8b693"],
+ ["olive", "#a46237"]
["light olive", "#d4c6bb"],
["dark", "#a46237"],
["brown", "#845c44"],
["dark brown", "#845c44"],
["black", "#463a3a"],
["camouflage patterned", "#78875a"],
- ["red dyed", "#bc4949"],
["dyed red", "#bc4949"],
- ["green dyed", "#A6C373"],
["dyed green", "#A6C373"],
- ["blue dyed", "#5b8eb7"],
["dyed blue", "#5b8eb7"],
["tiger striped", "#e2d75d"],
- ["olive", "#a46237"]
];
var skinPaletteMap = new Map(skinPalette);
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 34445bc3f7c274a9aff6ae21b4609cf7c9d4c61b..488ba75c4624f7f95302f636fe3b2742754d2210 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2122,7 +2122,7 @@ Setting missing global variables:
<<if ndef $PhysicalRetirementAgePolicy>>
<<set $PhysicalRetirementAgePolicy = 0>>
<</if>>
-<<if ndef $CumMilestoneRetirement>
+<<if ndef $CumMilestoneRetirement>>
<<set $CumMilestoneRetirement = 0>>
<</if>>
<<if ndef $BioreactorRetirement>>
@@ -2319,6 +2319,16 @@ Setting missing slave variables:
<<set _Slave.race = "southern european">>
<</if>>
+<<if _Slave.skin == "red dyed">>
+ <<set _Slave.skin = "dyed red">>
+<</if>>
+<<if _Slave.skin == "green dyed">>
+ <<set _Slave.skin = "dyed green">>
+<</if>>
+<<if _Slave.skin == "blue dyed">>
+ <<set _Slave.skin = "dyed blue">>
+<</if>>
+
<<if ndef _Slave.aphrodisiacs>>
<<set _Slave.aphrodisiacs = 0>>
<</if>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 8de1af9918a7de5e6d45b8bd4722d18f419d818c..985607397862065bb1e6980636d3632fa0a87a14 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -408,7 +408,7 @@ Treat nails:
<<set $lightenableSkin = ["natural", "dark", "dark olive", "black", "brown", "dark brown", "tanned"]>>
<<set $bleachableSkin = ["natural", "lightened", "pale", "fair", "light"]>>
<<set $darkenableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale", "light olive", "tanned", "brown", "dark brown"]>>
-<<set $dyedSkin = ["red dyed", "green dyed", "blue dyed", "dyed red", "dyed green", "dyed blue", "tiger striped", "camouflage patterned"]>>
+<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "tiger striped", "camouflage patterned"]>>
<br><br>