diff --git a/code/citadel/races.dm b/code/citadel/races.dm
index 18dd713421..f70da17210 100644
--- a/code/citadel/races.dm
+++ b/code/citadel/races.dm
@@ -278,8 +278,6 @@ datum
adjective="scaled"
taur="naga"
tail=1
-
-
murid // i have no idea what this is
//name="murid"
id="murid"
@@ -556,16 +554,9 @@ datum
adjective="rocky"
restricted=2
zombie
- //name="zombie"
+ //name = "High Functioning Zombie"
id="zombie"
- generic="undead"
- adjective="rotten"
- restricted=2
- cosmetic_zombie // considering renaming to zombie/cosmetic
- //name="zombie"
- id="zombie"
- generic="undead"
- adjective="particularly rotten"
+ say_mod="moans"
restricted=2
plasmaman
//name="Plasmabone"
@@ -612,6 +603,19 @@ datum
tail=0
eyes="jelleyes"
restricted=2
+ synth
+ //name = "Synth" //inherited from the real species, for health scanners and things
+ id = "synth"
+ say_mod = "beep boops" //inherited from a user's real species
+ restricted=2
+ synth/military
+ //name = "Military Synth"
+ id = "military_synth"
+ restricted=2
+ corporate
+ //name = "Corporate Agent"
+ id = "agent"
+ restricted=2
/*
var/list/kpcode_race_list
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 62441e5f59..1ff1e29ba5 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -1,4 +1,4 @@
-//Configuraton defines //TODO: Move all yes/no switches into bitflags
+f//Configuraton defines //TODO: Move all yes/no switches into bitflags
//Used by jobs_have_maint_access
#define ASSISTANTS_HAVE_MAINT_ACCESS 1
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d9b89d82e2..cd5c8cf123 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -289,7 +289,7 @@ var/list/preferences_datums = list()
dat += ""
- if(config.mutant_races) //We don't allow mutant bodyparts for humans either unless this is true.
+ /*if(config.mutant_races) //We don't allow mutant bodyparts for humans either unless this is true.
if((MUTCOLORS in pref_species.specflags) || (MUTCOLORS_PARTSONLY in pref_species.specflags))
@@ -382,7 +382,7 @@ var/list/preferences_datums = list()
dat += "[features["wings"]]
"
- dat += ""
+ dat += ""*/
dat += ""
@@ -1019,6 +1019,7 @@ var/list/preferences_datums = list()
//if("be_taur")
// be_taur = !be_taur
+ /*
if("tail_lizard")
var/new_tail
new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in tails_list_lizard
@@ -1072,6 +1073,7 @@ var/list/preferences_datums = list()
new_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in body_markings_list
if(new_body_markings)
features["body_markings"] = new_body_markings
+ */
if("s_tone")
var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference") as null|anything in skin_tones
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 959890e109..ed2d5c2b1a 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -413,6 +413,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
eye_color = sanitize_hexcolor(eye_color, 3, 0)
skin_tone = sanitize_inlist(skin_tone, skin_tones)
backbag = sanitize_inlist(backbag, backbaglist, initial(backbag))
+ /*
features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0)
features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], tails_list_lizard)
features["tail_human"] = sanitize_inlist(features["tail_human"], tails_list_human, "None")
@@ -421,7 +422,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["ears"] = sanitize_inlist(features["ears"], ears_list, "None")
features["frills"] = sanitize_inlist(features["frills"], frills_list)
features["spines"] = sanitize_inlist(features["spines"], spines_list)
- features["body_markings"] = sanitize_inlist(features["body_markings"], body_markings_list)
+ features["body_markings"] = sanitize_inlist(features["body_markings"], body_markings_list)*/
+
+ mutant_tail = sanitize_text(mutant_tail, initial(mutant_tail))
+ mutant_wing = sanitize_text(mutant_wing, initial(mutant_wing))
+ wingcolor = sanitize_hexcolor(wingcolor, 3, 0)
+ character_size = sanitize_text(character_size, initial(character_size))
+// mutant_color = sanitize_hexcolor(mutant_color, 3, 0)
vore_ability=sanitize_vore_list(vore_ability)
if(isnull(vore_banned_methods))vore_banned_methods=0
diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi
index 53d85d3abc..8c508fc181 100644
Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index be12e23f03..242d566ce9 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ