Merge pull request #9277 from Poojawa/are-those-horns-are-are-you-just-retarded

Adding Horn colors, Alternate Digi Leg framework, and species squash
2019-09-17 10:25:31 +12:00
parent 5a58ac6875 6668630649
commit adb3d6704b
71 changed files with 3253 additions and 3386 deletions
@@ -98,6 +98,13 @@
 #define DRINKSBLOOD		15
 #define NOEYES			16
 #define MARKINGS		17
+#define MUTCOLORS2		18
+#define MUTCOLORS3		19
+#define NOAROUSAL		20	//Stops all arousal effects
+#define NOGENITALS		21	//Cannot create, use, or otherwise have genitals
+#define MATRIXED		22	//if icon is color matrix'd
+#define SKINTONE		23	//uses skin tones
+#define HORNCOLOR		24

 #define ORGAN_SLOT_BRAIN "brain"
 #define ORGAN_SLOT_APPENDIX "appendix"
@@ -89,17 +89,6 @@
 //Damage stuffs
 #define AROUSAL "arousal"

-//DNA stuffs. Remember to change this if upstream adds more snowflake options
-
-
-//Species stuffs. Remember to change this if upstream updates species flags
-#define MUTCOLORS2		35
-#define MUTCOLORS3		36
-#define NOAROUSAL		37 //Stops all arousal effects
-#define NOGENITALS		38 //Cannot create, use, or otherwise have genitals
-#define MATRIXED		39	//if icon is color matrix'd
-#define SKINTONE		40	//uses skin tones
-
 //Citadel istypes
 #define isgenital(A) (istype(A, /obj/item/organ/genital))

@@ -56,7 +56,7 @@
 #define isslimeperson(A) (is_species(A, /datum/species/jelly/slime))
 #define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent))
 #define iszombie(A) (is_species(A, /datum/species/zombie))
-#define ismoth(A) (is_species(A, /datum/species/moth))
+#define ismoth(A) (is_species(A, /datum/species/insect))
 #define ishumanbasic(A) (is_species(A, /datum/species/human))
 #define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid) )

@@ -94,6 +94,12 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors
 		"Purple"	= "#e300ff"//purple
 		))

+GLOBAL_LIST_INIT(meat_types, list(
+	"Mammalian" = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal,
+	"Aquatic" = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic,
+	"Avian" = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian,
+	"Inesct" = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect))
+
 //Crew objective and miscreants stuff
 GLOBAL_VAR_INIT(miscreants_allowed, FALSE)

@@ -30,7 +30,8 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.r_wings_list,roundstart = TRUE)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_wings, GLOB.insect_wings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_fluff, GLOB.insect_fluffs_list)

 //CIT CHANGES START HERE, ADDS SNOWFLAKE BODYPARTS AND MORE
 	//mammal bodyparts (fucking furries)
@@ -44,6 +45,9 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_head, GLOB.xeno_head_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_tail, GLOB.xeno_tail_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list)
+	//ipcs
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/screen, GLOB.ipc_screens_list, roundstart = TRUE)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/antenna, GLOB.ipc_antennas_list, roundstart = TRUE)
 	//genitals
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
 	for(var/K in GLOB.cock_shapes_list)
@@ -53,7 +57,11 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
-	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")
+	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ",
+	"cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret",
+	"baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket",
+	"One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett",
+	"Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior")
 	for(var/K in GLOB.breasts_shapes_list)
 		var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K]
 		GLOB.breasts_shapes_icons[K] = value.icon_state
@@ -62,6 +70,7 @@
 	for(var/K in GLOB.balls_shapes_list)
 		var/datum/sprite_accessory/testicles/value = GLOB.balls_shapes_list[K]
 		GLOB.balls_shapes_icons[K] = value.icon_state
+
 //END OF CIT CHANGES

 	//Species
@@ -59,7 +59,7 @@
 	if(!GLOB.horns_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, GLOB.horns_list)
 	if(!GLOB.ears_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.horns_list)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.ears_list)
 	if(!GLOB.frills_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, GLOB.frills_list)
 	if(!GLOB.spines_list.len)
@@ -70,8 +70,10 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	if(!GLOB.wings_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)
-	if(!GLOB.moth_wings_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
+	if(!GLOB.insect_wings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_wings, GLOB.insect_wings_list)
+	if(!GLOB.insect_fluffs_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_fluff, GLOB.insect_fluffs_list)

 	//CIT CHANGES - genitals and such
 	if(!GLOB.cock_shapes_list.len)
@@ -130,22 +132,23 @@

 	//CIT CHANGE - changes this entire return to support cit's snowflake parts
 	return(list(
-		"mcolor" = color1,
-		"mcolor2" = color2,
-		"mcolor3" = color3,
-		"tail_lizard" = pick(GLOB.tails_list_lizard),
-		"tail_human" = "None",
-		"wings" = "None",
-		"snout" = pick(GLOB.snouts_list),
-		"horns" = pick(GLOB.horns_list),
-		"ears" = "None",
-		"frills" = pick(GLOB.frills_list),
-		"spines" = pick(GLOB.spines_list),
-		"body_markings" = pick(GLOB.body_markings_list),
-		"legs" = pick("Normal Legs","Digitigrade Legs"),
-		"caps" = pick(GLOB.caps_list),
-		"moth_wings" = pick(GLOB.moth_wings_list),
-		"taur" = "None",
+		"mcolor"			= color1,
+		"mcolor2"			= color2,
+		"mcolor3"			= color3,
+		"tail_lizard"		= pick(GLOB.tails_list_lizard),
+		"tail_human"		= "None",
+		"wings"				= "None",
+		"snout"				= pick(GLOB.snouts_list),
+		"horns"				= pick(GLOB.horns_list),
+		"ears"				= "None",
+		"frills"			= pick(GLOB.frills_list),
+		"spines"			= pick(GLOB.spines_list),
+		"body_markings"		= pick(GLOB.body_markings_list),
+		"legs"				= pick("Plantigrade","Digitigrade"),
+		"caps"				= pick(GLOB.caps_list),
+		"insect_wings"		= pick(GLOB.insect_wings_list),
+		"insect_fluff"		= "None",
+		"taur"				= "None",
 		"mam_body_markings" = pick(snowflake_markings_list),
 		"mam_ears" 			= pick(snowflake_ears_list),
 		"mam_snouts"		= pick(snowflake_mam_snouts_list),
@@ -201,9 +204,11 @@
 		"womb_cum_mult"		= CUM_RATE_MULT,
 		"womb_efficiency"	= CUM_EFFICIENCY,
 		"womb_fluid" 		= "femcum",
-		"ipc_screen" = "Sunburst",
-		"ipc_antenna" = "None",
-		"flavor_text"		= ""))
+		"ipc_screen"		= "Sunburst",
+		"ipc_antenna"		= "None",
+		"flavor_text"		= "",
+		"meat_type"			= "Mammalian"
+		))

 /proc/random_hair_style(gender)
 	switch(gender)
@@ -34,7 +34,8 @@ GLOBAL_LIST_EMPTY(ears_list)
 GLOBAL_LIST_EMPTY(wings_list)
 GLOBAL_LIST_EMPTY(wings_open_list)
 GLOBAL_LIST_EMPTY(r_wings_list)
-GLOBAL_LIST_EMPTY(moth_wings_list)
+GLOBAL_LIST_EMPTY(insect_wings_list)
+GLOBAL_LIST_EMPTY(insect_fluffs_list)
 GLOBAL_LIST_EMPTY(caps_list)

 GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list("ghost")) //stores the ghost forms that support directional sprites
@@ -27,8 +27,10 @@
 							"human",
 							"lizard",
 							"fly",
-							"moth",
+							"insect",
 							"plasmaman",
+							"mammal",
+							"xeno",
 							"other"
 							)

@@ -34,7 +34,8 @@
 	H.dna.features["frills"] = pick(GLOB.frills_list)
 	H.dna.features["spines"] = pick(GLOB.spines_list)
 	H.dna.features["body_markings"] = pick(GLOB.body_markings_list)
-	H.dna.features["moth_wings"] = pick(GLOB.moth_wings_list)
+	H.dna.features["insect_wings"] = pick(GLOB.insect_wings_list)
+	H.dna.features["insect_fluff"] = pick(GLOB.insect_fluffs_list)

 	H.update_body()
 	H.update_hair()
@@ -167,7 +167,7 @@
 /obj/item/organ/heart/gland/pop/activate()
 	to_chat(owner, "<span class='notice'>You feel unlike yourself.</span>")
 	randomize_human(owner)
-	var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/moth, /datum/species/fly))
+	var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/insect, /datum/species/fly))
 	owner.set_species(species)

 /obj/item/organ/heart/gland/ventcrawling
@@ -85,6 +85,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/facial_hair_color = "000"		//Facial hair color
 	var/skin_tone = "caucasian1"		//Skin color
 	var/eye_color = "000"				//Eye color
+	var/horn_color = "85615a"			//Horn color
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
 	var/list/features = list("mcolor" = "FFF",
 		"tail_lizard" = "Smooth",
@@ -96,8 +97,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"frills" = "None",
 		"spines" = "None",
 		"body_markings" = "None",
-		"legs" = "Normal Legs",
-		"moth_wings" = "Plain",
+		"legs" = "Plantigrade",
+		"insect_wings" = "Plain",
+		"insect_fluff" = "None",
 		"mcolor2" = "FFF",
 		"mcolor3" = "FFF",
 		"mam_body_markings" = "Plain",
@@ -157,7 +159,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"womb_fluid" = "femcum",
 		"ipc_screen" = "Sunburst",
 		"ipc_antenna" = "None",
-		"flavor_text" = ""
+		"flavor_text" = "",
+		"meat_type" = "Mammalian"
 		)

 	var/list/custom_names = list()
@@ -231,7 +234,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	return

 #define APPEARANCE_CATEGORY_COLUMN "<td valign='top' width='17%'>"
-#define MAX_MUTANT_ROWS 4
+#define MAX_MUTANT_ROWS 5

 /datum/preferences/proc/ShowChoices(mob/user)
 	if(!user || !user.client)
@@ -341,9 +344,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "[TextPreview(features["flavor_text"])]...<BR>"
 			dat += "<h2>Body</h2>"
 			dat += "<b>Gender:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]</a><BR>"
-			dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.id]</a><BR>"
+			dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
 			dat += "<b>Custom Species Name:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=custom_species;task=input'>[custom_species ? custom_species : "None"]</a><BR>"
-			dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Random Body</A><BR>"
+			dat += "<b>Random Body:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Randomize!</A><BR>"
 			dat += "<b>Always Random Body:</b><a href='?_src_=prefs;preference=all'>[be_random_body ? "Yes" : "No"]</A><BR>"
 			dat += "<br><b>Cycle background:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=cycle_bg;task=input'>[bgstate]</a><BR>"

@@ -438,6 +441,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=tail_human;task=input'>[features["tail_human"]]</a>"

+				mutant_category++
+				if(mutant_category >= MAX_MUTANT_ROWS)
+					dat += "</td>"
+					mutant_category = 0
+
+			if("meat_type" in pref_species.default_features)
+				if(!mutant_category)
+					dat += APPEARANCE_CATEGORY_COLUMN
+
+				dat += "<h3>Meat Type</h3>"
+
+				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=meats;task=input'>[features["meat_type"]]</a>"
+
 				mutant_category++
 				if(mutant_category >= MAX_MUTANT_ROWS)
 					dat += "</td>"
@@ -461,6 +477,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<h3>Horns</h3>"

 				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a>"
+				dat += "<span style='border:1px solid #161616; background-color: #[horn_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=horns_color;task=input'>Change</a><BR>"
+

 				mutant_category++
 				if(mutant_category >= MAX_MUTANT_ROWS)
@@ -527,6 +545,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if(mutant_category >= MAX_MUTANT_ROWS)
 					dat += "</td>"
 					mutant_category = 0
+
 			if("ears" in pref_species.default_features)
 				if(!mutant_category)
 					dat += APPEARANCE_CATEGORY_COLUMN
@@ -539,6 +558,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if(mutant_category >= MAX_MUTANT_ROWS)
 					dat += "</td>"
 					mutant_category = 0
+
 			if("mam_snouts" in pref_species.default_features)
 				if(!mutant_category)
 					dat += APPEARANCE_CATEGORY_COLUMN
@@ -563,14 +583,24 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if(mutant_category >= MAX_MUTANT_ROWS)
 					dat += "</td>"
 					mutant_category = 0
-			if("moth_wings" in pref_species.default_features)
+			if("insect_wings" in pref_species.default_features)
 				if(!mutant_category)
 					dat += APPEARANCE_CATEGORY_COLUMN

-				dat += "<h3>Moth wings</h3>"
+				dat += "<h3>Insect wings</h3>"

-				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=moth_wings;task=input'>[features["moth_wings"]]</a>"
+				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=insect_wings;task=input'>[features["insect_wings"]]</a>"
+				mutant_category++
+				if(mutant_category >= MAX_MUTANT_ROWS)
+					dat += "</td>"
+					mutant_category = 0
+			if("insect_fluff" in pref_species.default_features)
+				if(!mutant_category)
+					dat += APPEARANCE_CATEGORY_COLUMN

+				dat += "<h3>Insect Fluff</h3>"
+
+				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=insect_fluffs;task=input'>[features["insect_fluff"]]</a>"
 				mutant_category++
 				if(mutant_category >= MAX_MUTANT_ROWS)
 					dat += "</td>"
@@ -1471,9 +1501,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						eye_color = sanitize_hexcolor(new_eyes)

 				if("species")
-					var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
+					var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_race_names
 					if(result)
-						var/newtype = GLOB.species_list[result]
+						var/newtype = GLOB.species_list[GLOB.roundstart_race_names[result]]
 						pref_species = new newtype()
 						//let's ensure that no weird shit happens on species swapping.
 						custom_species = null
@@ -1601,6 +1631,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							features["tail_human"] = "None"
 							features["tail_lizard"] = "None"

+				if("meats")
+					var/new_meat
+					new_meat = input(user, "Choose your character's meat type:", "Character Preference") as null|anything in GLOB.meat_types
+					if(new_meat)
+						features["meat_type"] = new_meat
+
 				if("snout")
 					var/list/snowflake_snouts_list = list()
 					for(var/path in GLOB.snouts_list)
@@ -1636,6 +1672,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_horns)
 						features["horns"] = new_horns

+				if("horns_color")
+					var/new_horn_color = input(user, "Choose your character's horn colour:", "Character Preference","#"+horn_color) as color|null
+					if(new_horn_color)
+						horn_color = sanitize_hexcolor(new_horn_color)
+
 				if("wings")
 					var/new_wings
 					new_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.r_wings_list
@@ -1670,11 +1711,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["legs"] = new_legs
 						update_preview_icon()

-				if("moth_wings")
-					var/new_moth_wings
-					new_moth_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.moth_wings_list
-					if(new_moth_wings)
-						features["moth_wings"] = new_moth_wings
+				if("insect_wings")
+					var/new_insect_wings
+					new_insect_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.insect_wings_list
+					if(new_insect_wings)
+						features["insect_wings"] = new_insect_wings
+
+				if("insect_fluffs")
+					var/new_insect_fluff
+					new_insect_fluff = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.insect_fluffs_list
+					if(new_insect_fluff)
+						features["insect_fluff"] = new_insect_fluff

 				if("s_tone")
 					var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference")  as null|anything in GLOB.skin_tones
@@ -2194,6 +2241,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		organ_eyes.old_eye_color = eye_color
 	character.hair_color = hair_color
 	character.facial_hair_color = facial_hair_color
+	character.horn_color = horn_color

 	character.skin_tone = skin_tone
 	character.hair_style = hair_style
@@ -2234,7 +2282,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	if("xenotail" in pref_species.default_features)
 		character.dna.species.mutant_bodyparts |= "xenotail"

-	if(("legs" in character.dna.species.mutant_bodyparts) && character.dna.features["legs"] == "Digitigrade Legs")
+	if("meat_type" in pref_species.default_features)
+		character.type_of_meat = GLOB.meat_types[features["meat_type"]]
+
+	if(("legs" in character.dna.species.mutant_bodyparts) && (character.dna.features["legs"] == "Digitigrade" || character.dna.features["legs"] == "Avian"))
 		pref_species.species_traits |= DIGITIGRADE
 	else
 		pref_species.species_traits -= DIGITIGRADE
@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	21
+#define SAVEFILE_VERSION_MAX	22

 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -102,6 +102,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 						new_value = JP_LOW
 			if(new_value)
 				job_preferences[initial(J.title)] = new_value
+	if((current_version < 22) && features["meat_type"] && (features["meat_type"] == null))
+		features["meat_type"] = "Mammalian"

 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
@@ -299,6 +301,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	var/species_id
 	S["species"]			>> species_id
 	if(species_id)
+		if(species_id == "avian" || species_id == "aquatic")
+			species_id = "mammal"
+		else if(species_id == "moth")
+			species_id = "insect"
+
 		var/newtype = GLOB.species_list[species_id]
 		if(newtype)
 			pref_species = new newtype
@@ -307,28 +314,29 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		WRITE_FILE(S["features["mcolor"]"]	, "#FFF")

 	//Character
-	S["real_name"]			>> real_name
-	S["nameless"]			>> nameless
-	S["custom_species"]		>> custom_species
-	S["name_is_always_random"] >> be_random_name
-	S["body_is_always_random"] >> be_random_body
-	S["gender"]				>> gender
-	S["age"]				>> age
-	S["hair_color"]			>> hair_color
-	S["facial_hair_color"]	>> facial_hair_color
-	S["eye_color"]			>> eye_color
-	S["skin_tone"]			>> skin_tone
-	S["hair_style_name"]	>> hair_style
-	S["facial_style_name"]	>> facial_hair_style
-	S["underwear"]			>> underwear
-	S["undie_color"]		>> undie_color
-	S["undershirt"]			>> undershirt
-	S["shirt_color"]		>> shirt_color
-	S["socks"]				>> socks
-	S["socks_color"]		>> socks_color
-	S["backbag"]			>> backbag
-	S["jumpsuit_style"]		>> jumpsuit_style
-	S["uplink_loc"]			>> uplink_spawn_loc
+	S["real_name"]				>> real_name
+	S["nameless"]				>> nameless
+	S["custom_species"]			>> custom_species
+	S["name_is_always_random"]	>> be_random_name
+	S["body_is_always_random"]	>> be_random_body
+	S["gender"]					>> gender
+	S["age"]					>> age
+	S["hair_color"]				>> hair_color
+	S["facial_hair_color"]		>> facial_hair_color
+	S["eye_color"]				>> eye_color
+	S["skin_tone"]				>> skin_tone
+	S["hair_style_name"]		>> hair_style
+	S["facial_style_name"]		>> facial_hair_style
+	S["underwear"]				>> underwear
+	S["undie_color"]			>> undie_color
+	S["undershirt"]				>> undershirt
+	S["shirt_color"]			>> shirt_color
+	S["socks"]					>> socks
+	S["socks_color"]			>> socks_color
+	S["horn_color"]				>> horn_color
+	S["backbag"]				>> backbag
+	S["jumpsuit_style"]			>> jumpsuit_style
+	S["uplink_loc"]				>> uplink_spawn_loc
 	S["feature_mcolor"]					>> features["mcolor"]
 	S["feature_lizard_tail"]			>> features["tail_lizard"]
 	S["feature_lizard_snout"]			>> features["snout"]
@@ -337,17 +345,18 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_lizard_spines"]			>> features["spines"]
 	S["feature_lizard_body_markings"]	>> features["body_markings"]
 	S["feature_lizard_legs"]			>> features["legs"]
-	S["feature_moth_wings"]				>> features["moth_wings"]
 	S["feature_human_tail"]				>> features["tail_human"]
 	S["feature_human_ears"]				>> features["ears"]
+	S["feature_insect_wings"]			>> features["insect_wings"]
+	S["feature_insect_fluff"]			>> features["insect_fluff"]

 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		var/savefile_slot_name = custom_name_id + "_name" //TODO remove this
 		S[savefile_slot_name] >> custom_names[custom_name_id]

-	S["preferred_ai_core_display"] >> preferred_ai_core_display
-	S["prefered_security_department"] >> prefered_security_department
+	S["preferred_ai_core_display"]		>> preferred_ai_core_display
+	S["prefered_security_department"]	>> prefered_security_department

 	//Jobs
 	S["joblessrole"]		>> joblessrole
@@ -371,6 +380,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_mam_tail_animated"]		>> features["mam_tail_animated"]
 	S["feature_taur"]					>> features["taur"]
 	S["feature_mam_snouts"]				>> features["mam_snouts"]
+	S["feature_meat"]					>> features["meat_type"]
 	//Xeno features
 	S["feature_xeno_tail"]				>> features["xenotail"]
 	S["feature_xeno_dors"]				>> features["xenodorsal"]
@@ -420,11 +430,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car

 	//Sanitize

-	real_name = reject_bad_name(real_name)
-	gender = sanitize_gender(gender, TRUE, TRUE)
+	real_name	= reject_bad_name(real_name)
+	gender		= sanitize_gender(gender, TRUE, TRUE)
 	if(!real_name)
-		real_name = random_unique_name(gender)
-	custom_species = reject_bad_name(custom_species)
+		real_name	= random_unique_name(gender)
+	custom_species	= reject_bad_name(custom_species)
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		var/namedata = GLOB.preferences_custom_names[custom_name_id]
 		custom_names[custom_name_id] = reject_bad_name(custom_names[custom_name_id],namedata["allow_numbers"])
@@ -434,41 +444,43 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(!features["mcolor"] || features["mcolor"] == "#000")
 		features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")

-	nameless = sanitize_integer(nameless, 0, 1, initial(nameless))
+	nameless		= sanitize_integer(nameless, 0, 1, initial(nameless))
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	be_random_body	= sanitize_integer(be_random_body, 0, 1, initial(be_random_body))

 	if(gender == MALE)
-		hair_style			= sanitize_inlist(hair_style, GLOB.hair_styles_male_list)
+		hair_style					= sanitize_inlist(hair_style, GLOB.hair_styles_male_list)
 		facial_hair_style			= sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_male_list)
 	else
-		hair_style			= sanitize_inlist(hair_style, GLOB.hair_styles_female_list)
+		hair_style					= sanitize_inlist(hair_style, GLOB.hair_styles_female_list)
 		facial_hair_style			= sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_female_list)
-	underwear		= sanitize_inlist(underwear, GLOB.underwear_list)
-	undie_color		= sanitize_hexcolor(undie_color, 3, FALSE, initial(undie_color))
-	undershirt		= sanitize_inlist(undershirt, GLOB.undershirt_list)
-	shirt_color		= sanitize_hexcolor(shirt_color, 3, FALSE, initial(shirt_color))
-	socks			= sanitize_inlist(socks, GLOB.socks_list)
-	socks_color		= sanitize_hexcolor(socks_color, 3, FALSE, initial(socks_color))
-	age				= sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
-	hair_color			= sanitize_hexcolor(hair_color, 3, 0)
-	facial_hair_color			= sanitize_hexcolor(facial_hair_color, 3, 0)
-	eye_color		= sanitize_hexcolor(eye_color, 3, 0)
-	skin_tone		= sanitize_inlist(skin_tone, GLOB.skin_tones)
-	backbag			= sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
-	jumpsuit_style	= sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
-	uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
-	features["mcolor"]	= sanitize_hexcolor(features["mcolor"], 3, 0)
-	features["tail_lizard"]	= sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
-	features["tail_human"] 	= sanitize_inlist(features["tail_human"], GLOB.tails_list_human)
-	features["snout"]	= sanitize_inlist(features["snout"], GLOB.snouts_list)
-	features["horns"] 	= sanitize_inlist(features["horns"], GLOB.horns_list)
-	features["ears"]	= sanitize_inlist(features["ears"], GLOB.ears_list)
-	features["frills"] 	= sanitize_inlist(features["frills"], GLOB.frills_list)
-	features["spines"] 	= sanitize_inlist(features["spines"], GLOB.spines_list)
-	features["body_markings"] 	= sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
+	underwear						= sanitize_inlist(underwear, GLOB.underwear_list)
+	undie_color						= sanitize_hexcolor(undie_color, 3, FALSE, initial(undie_color))
+	undershirt						= sanitize_inlist(undershirt, GLOB.undershirt_list)
+	shirt_color						= sanitize_hexcolor(shirt_color, 6, FALSE, initial(shirt_color))
+	socks							= sanitize_inlist(socks, GLOB.socks_list)
+	socks_color						= sanitize_hexcolor(socks_color, 6, FALSE, initial(socks_color))
+	age								= sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
+	hair_color						= sanitize_hexcolor(hair_color, 3, 0)
+	facial_hair_color				= sanitize_hexcolor(facial_hair_color, 3, 0)
+	eye_color						= sanitize_hexcolor(eye_color, 3, 0)
+	skin_tone						= sanitize_inlist(skin_tone, GLOB.skin_tones)
+	horn_color						= sanitize_hexcolor(horn_color, 3, FALSE)
+	backbag							= sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
+	jumpsuit_style					= sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
+	uplink_spawn_loc				= sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
+	features["mcolor"]				= sanitize_hexcolor(features["mcolor"], 3, 0)
+	features["tail_lizard"]			= sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
+	features["tail_human"]			= sanitize_inlist(features["tail_human"], GLOB.tails_list_human)
+	features["snout"]				= sanitize_inlist(features["snout"], GLOB.snouts_list)
+	features["horns"]				= sanitize_inlist(features["horns"], GLOB.horns_list)
+	features["ears"]				= sanitize_inlist(features["ears"], GLOB.ears_list)
+	features["frills"]				= sanitize_inlist(features["frills"], GLOB.frills_list)
+	features["spines"]				= sanitize_inlist(features["spines"], GLOB.spines_list)
+	features["body_markings"]		= sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
 	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list)
-	features["moth_wings"] 	= sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list)
+	features["insect_wings"] 		= sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)
+	features["insect_fluff"]		= sanitize_inlist(features["insect_fluff"], GLOB.insect_fluffs_list)

 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
 	//Validate job prefs
@@ -477,9 +489,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			job_preferences -= j

 	all_quirks = SANITIZE_LIST(all_quirks)
+
 	positive_quirks = SANITIZE_LIST(positive_quirks)
 	negative_quirks = SANITIZE_LIST(negative_quirks)
-	neutral_quirks = SANITIZE_LIST(neutral_quirks)
+	neutral_quirks	= SANITIZE_LIST(neutral_quirks)

 	cit_character_pref_load(S)

@@ -501,31 +514,32 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["version"]			, SAVEFILE_VERSION_MAX)	//load_character will sanitize any bad data, so assume up-to-date.)

 	//Character
-	WRITE_FILE(S["real_name"]			, real_name)
-	WRITE_FILE(S["nameless"]			, nameless)
-	WRITE_FILE(S["custom_species"]		, custom_species)
-	WRITE_FILE(S["name_is_always_random"] , be_random_name)
-	WRITE_FILE(S["body_is_always_random"] , be_random_body)
-	WRITE_FILE(S["gender"]				, gender)
-	WRITE_FILE(S["age"]				, age)
-	WRITE_FILE(S["hair_color"]			, hair_color)
-	WRITE_FILE(S["facial_hair_color"]	, facial_hair_color)
-	WRITE_FILE(S["eye_color"]			, eye_color)
-	WRITE_FILE(S["skin_tone"]			, skin_tone)
-	WRITE_FILE(S["hair_style_name"]	, hair_style)
-	WRITE_FILE(S["facial_style_name"]	, facial_hair_style)
-	WRITE_FILE(S["underwear"]			, underwear)
-	WRITE_FILE(S["undie_color"]			, undie_color)
-	WRITE_FILE(S["undershirt"]			, undershirt)
-	WRITE_FILE(S["shirt_color"]			, shirt_color)
-	WRITE_FILE(S["socks"]				, socks)
-	WRITE_FILE(S["socks_color"]			, socks_color)
-	WRITE_FILE(S["backbag"]				, backbag)
-	WRITE_FILE(S["jumpsuit_style"]		, jumpsuit_style)
-	WRITE_FILE(S["uplink_loc"]			, uplink_spawn_loc)
-	WRITE_FILE(S["species"]			, pref_species.id)
+	WRITE_FILE(S["real_name"]				, real_name)
+	WRITE_FILE(S["nameless"]				, nameless)
+	WRITE_FILE(S["custom_species"]			, custom_species)
+	WRITE_FILE(S["name_is_always_random"]	, be_random_name)
+	WRITE_FILE(S["body_is_always_random"]	, be_random_body)
+	WRITE_FILE(S["gender"]					, gender)
+	WRITE_FILE(S["age"]						, age)
+	WRITE_FILE(S["hair_color"]				, hair_color)
+	WRITE_FILE(S["facial_hair_color"]		, facial_hair_color)
+	WRITE_FILE(S["eye_color"]				, eye_color)
+	WRITE_FILE(S["skin_tone"]				, skin_tone)
+	WRITE_FILE(S["hair_style_name"]			, hair_style)
+	WRITE_FILE(S["facial_style_name"]		, facial_hair_style)
+	WRITE_FILE(S["underwear"]				, underwear)
+	WRITE_FILE(S["undie_color"]				, undie_color)
+	WRITE_FILE(S["undershirt"]				, undershirt)
+	WRITE_FILE(S["shirt_color"]				, shirt_color)
+	WRITE_FILE(S["socks"]					, socks)
+	WRITE_FILE(S["socks_color"]				, socks_color)
+	WRITE_FILE(S["horn_color"]				, horn_color)
+	WRITE_FILE(S["backbag"]					, backbag)
+	WRITE_FILE(S["jumpsuit_style"]			, jumpsuit_style)
+	WRITE_FILE(S["uplink_loc"]				, uplink_spawn_loc)
+	WRITE_FILE(S["species"]					, pref_species.id)
 	WRITE_FILE(S["feature_mcolor"]					, features["mcolor"])
-	WRITE_FILE(S["feature_lizard_tail"]			, features["tail_lizard"])
+	WRITE_FILE(S["feature_lizard_tail"]				, features["tail_lizard"])
 	WRITE_FILE(S["feature_human_tail"]				, features["tail_human"])
 	WRITE_FILE(S["feature_lizard_snout"]			, features["snout"])
 	WRITE_FILE(S["feature_lizard_horns"]			, features["horns"])
@@ -533,16 +547,18 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["feature_lizard_frills"]			, features["frills"])
 	WRITE_FILE(S["feature_lizard_spines"]			, features["spines"])
 	WRITE_FILE(S["feature_lizard_body_markings"]	, features["body_markings"])
-	WRITE_FILE(S["feature_lizard_legs"]			, features["legs"])
-	WRITE_FILE(S["feature_moth_wings"]			, features["moth_wings"])
+	WRITE_FILE(S["feature_lizard_legs"]				, features["legs"])
+	WRITE_FILE(S["feature_insect_wings"]			, features["insect_wings"])
+	WRITE_FILE(S["feature_insect_fluff"]			, features["insect_fluff"])
+	WRITE_FILE(S["feature_meat"]					, features["meat_type"])

 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		var/savefile_slot_name = custom_name_id + "_name" //TODO remove this
 		WRITE_FILE(S[savefile_slot_name],custom_names[custom_name_id])

-	WRITE_FILE(S["preferred_ai_core_display"] ,  preferred_ai_core_display)
-	WRITE_FILE(S["prefered_security_department"] , prefered_security_department)
+	WRITE_FILE(S["preferred_ai_core_display"]		,  preferred_ai_core_display)
+	WRITE_FILE(S["prefered_security_department"]	, prefered_security_department)

 	//Jobs
 	WRITE_FILE(S["joblessrole"]		, joblessrole)
@@ -108,7 +108,7 @@
 	tastes = list("maggots" = 1, "the inside of a reactor" = 1)
 	foodtype = MEAT | RAW | GROSS

-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
 	icon_state = "mothmeat"
 	desc = "Unpleasantly powdery and dry. Kind of pretty, though."
 	filling_color = "#BF896B"
@@ -0,0 +1,53 @@
+/datum/sprite_accessory/mam_tails/shark/datashark
+	name = "DataShark"
+	icon_state = "datashark"
+	ckeys_allowed = list("rubyflamewing")
+
+/datum/sprite_accessory/mam_tails_animated/shark/datashark
+	name = "DataShark"
+	icon_state = "datashark"
+	ckeys_allowed = list("rubyflamewing")
+
+/datum/sprite_accessory/mam_body_markings/shark/datashark
+	name = "DataShark"
+	icon_state = "datashark"
+	ckeys_allowed = list("rubyflamewing")
+
+//Sabresune
+/datum/sprite_accessory/mam_ears/sabresune
+	name = "Sabresune"
+	icon_state = "sabresune"
+	ckeys_allowed = list("poojawa")
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_tails/sabresune
+	name = "Sabresune"
+	icon_state = "sabresune"
+	ckeys_allowed = list("poojawa")
+
+/datum/sprite_accessory/mam_tails_animated/sabresune
+	name = "Sabresune"
+	icon_state = "sabresune"
+	ckeys_allowed = list("poojawa")
+
+/datum/sprite_accessory/mam_body_markings/sabresune
+	name = "Sabresune"
+	icon_state = "sabresune"
+	ckeys_allowed = list("poojawa")
+
+//Lunasune
+/datum/sprite_accessory/mam_ears/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	ckeys_allowed = list("invader4352")
+
+/datum/sprite_accessory/mam_tails/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	ckeys_allowed = list("invader4352")
+
+/datum/sprite_accessory/mam_tails_animated/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	ckeys_allowed = list("invader4352")
@@ -61,6 +61,17 @@
 	var/dimension_y = 32
 	var/center = FALSE	//Should we center the sprite?

+	//Special / holdover traits for Citadel specific sprites.
+	var/extra = FALSE
+	var/extra_color_src = MUTCOLORS2						//The color source for the extra overlay.
+	var/extra_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	var/extra2 = FALSE
+	var/extra2_color_src = MUTCOLORS3
+	var/extra2_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+	//for snowflake/donor specific sprites
+	var/list/ckeys_allowed
+
 /datum/sprite_accessory/underwear
 	icon = 'icons/mob/underwear.dmi'
 	var/has_color = FALSE
@@ -0,0 +1,53 @@
+
+/******************************************
+*********** Xeno Dorsal Tubes *************
+*******************************************/
+/datum/sprite_accessory/xeno_dorsal
+	icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_dorsal/standard
+	name = "Standard"
+	icon_state = "standard"
+
+/datum/sprite_accessory/xeno_dorsal/royal
+	name = "Royal"
+	icon_state = "royal"
+
+/datum/sprite_accessory/xeno_dorsal/down
+	name = "Dorsal Down"
+	icon_state = "down"
+
+/******************************************
+************* Xeno Tails ******************
+*******************************************/
+/datum/sprite_accessory/xeno_tail
+	icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_tail/none
+	name = "None"
+
+/datum/sprite_accessory/xeno_tail/standard
+	name = "Xenomorph Tail"
+	icon_state = "xeno"
+
+/******************************************
+************* Xeno Heads ******************
+*******************************************/
+/datum/sprite_accessory/xeno_head
+	icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_head/standard
+	name = "Standard"
+	icon_state = "standard"
+
+/datum/sprite_accessory/xeno_head/royal
+	name = "royal"
+	icon_state = "royal"
+
+/datum/sprite_accessory/xeno_head/hollywood
+	name = "hollywood"
+	icon_state = "hollywood"
+
+/datum/sprite_accessory/xeno_head/warrior
+	name = "warrior"
+	icon_state = "warrior"
@@ -1,6 +1,6 @@
-//////////.//////////////////
-// MutantParts Definitions //
-/////////////////////////////
+/******************************************
+************* Lizard Markings *************
+*******************************************/

 /datum/sprite_accessory/body_markings
 	icon = 'icons/mob/mutant_bodyparts.dmi'
@@ -22,4 +22,271 @@
 /datum/sprite_accessory/body_markings/lbelly
 	name = "Light Belly"
 	icon_state = "lbelly"
-	gender_specific = 1
+	gender_specific = 1
+
+/******************************************
+************ Furry Markings ***************
+*******************************************/
+
+// These are all color matrixed and applied per-limb by default. you MUST comply with this if you want to have your markings work --Pooj
+// use the HumanScissors tool to break your sprite up into the zones easier.
+// Although Byond supposedly doesn't have an icon limit anymore of 512 states after 512.1478, just be careful about too many additions.
+
+/datum/sprite_accessory/mam_body_markings
+	extra = FALSE
+	extra2 = FALSE
+	color_src = MATRIXED
+	gender_specific = 0
+	icon = 'modular_citadel/icons/mob/mam_markings.dmi'
+
+/datum/sprite_accessory/mam_body_markings/none
+	name = "None"
+	icon_state = "none"
+	ckeys_allowed = list("yousshouldnteverbeseeingthisyoumeme")
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/plain
+	name = "Plain"
+	icon_state = "plain"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/redpanda
+	name = "Redpanda"
+	icon_state = "redpanda"
+
+/datum/sprite_accessory/mam_body_markings/bee
+	name = "Bee"
+	icon_state = "bee"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/belly
+	name = "Belly"
+	icon_state = "belly"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/bellyslim
+	name = "Bellyslim"
+	icon_state = "bellyslim"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/corgi
+	name = "Corgi"
+	icon_state = "corgi"
+
+/datum/sprite_accessory/mam_body_markings/cow
+	name = "Bovine"
+	icon_state = "bovine"
+
+/datum/sprite_accessory/mam_body_markings/corvid
+	name = "Corvid"
+	icon_state = "corvid"
+
+/datum/sprite_accessory/mam_body_markings/dalmation
+	name = "Dalmation"
+	icon_state = "dalmation"
+
+/datum/sprite_accessory/mam_body_markings/deer
+	name = "Deer"
+	icon_state = "deer"
+
+/datum/sprite_accessory/mam_body_markings/dog
+	name = "Dog"
+	icon_state = "dog"
+
+/datum/sprite_accessory/mam_body_markings/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+
+/datum/sprite_accessory/mam_body_markings/fennec
+	name = "Fennec"
+	icon_state = "Fennec"
+
+/datum/sprite_accessory/mam_body_markings/fox
+	name = "Fox"
+	icon_state = "fox"
+
+/datum/sprite_accessory/mam_body_markings/frog
+	name = "Frog"
+	icon_state = "frog"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/goat
+	name = "Goat"
+	icon_state = "goat"
+
+/datum/sprite_accessory/mam_body_markings/handsfeet
+	name = "Handsfeet"
+	icon_state = "handsfeet"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/hawk
+	name = "Hawk"
+	icon_state = "hawk"
+
+/datum/sprite_accessory/mam_body_markings/husky
+	name = "Husky"
+	icon_state = "husky"
+
+/datum/sprite_accessory/mam_body_markings/hyena
+	name = "Hyena"
+	icon_state = "hyena"
+
+/datum/sprite_accessory/mam_body_markings/lab
+	name = "Lab"
+	icon_state = "lab"
+
+/datum/sprite_accessory/mam_body_markings/insect
+	name = "Insect"
+	icon_state = "insect"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/otie
+	name = "Otie"
+	icon_state = "otie"
+
+/datum/sprite_accessory/mam_body_markings/otter
+	name = "Otter"
+	icon_state = "otter"
+
+/datum/sprite_accessory/mam_body_markings/orca
+	name = "Orca"
+	icon_state = "orca"
+
+/datum/sprite_accessory/mam_body_markings/panther
+	name = "Panther"
+	icon_state = "panther"
+
+/datum/sprite_accessory/mam_body_markings/possum
+	name = "Possum"
+	icon_state = "possum"
+
+/datum/sprite_accessory/mam_body_markings/raccoon
+	name = "Raccoon"
+	icon_state = "raccoon"
+
+/datum/sprite_accessory/mam_body_markings/pede
+	name = "Scolipede"
+	icon_state = "scolipede"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/shark
+	name = "Shark"
+	icon_state = "shark"
+
+/datum/sprite_accessory/mam_body_markings/skunk
+	name = "Skunk"
+	icon_state = "skunk"
+
+/datum/sprite_accessory/mam_body_markings/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_body_markings/shepherd
+	name = "Shepherd"
+	icon_state = "shepherd"
+
+/datum/sprite_accessory/mam_body_markings/tajaran
+	name = "Tajaran"
+	icon_state = "tajaran"
+
+/datum/sprite_accessory/mam_body_markings/tiger
+	name = "Tiger"
+	icon_state = "tiger"
+
+/datum/sprite_accessory/mam_body_markings/turian
+	name = "Turian"
+	icon_state = "turian"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/mam_body_markings/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+
+/datum/sprite_accessory/mam_body_markings/xeno
+	name = "Xeno"
+	icon_state = "xeno"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/******************************************
+************* Insect Markings *************
+*******************************************/
+
+/datum/sprite_accessory/insect_fluff
+	icon = 'icons/mob/wings.dmi'
+	color_src = 0
+
+/datum/sprite_accessory/insect_fluff/none
+	name = "None"
+	icon_state = "none"
+
+/datum/sprite_accessory/insect_fluff/plain
+	name = "Plain"
+	icon_state = "plain"
+
+/datum/sprite_accessory/insect_fluff/reddish
+	name = "Reddish"
+	icon_state = "redish"
+
+/datum/sprite_accessory/insect_fluff/royal
+	name = "Royal"
+	icon_state = "royal"
+
+/datum/sprite_accessory/insect_fluff/gothic
+	name = "Gothic"
+	icon_state = "gothic"
+
+/datum/sprite_accessory/insect_fluff/lovers
+	name = "Lovers"
+	icon_state = "lovers"
+
+/datum/sprite_accessory/insect_fluff/whitefly
+	name = "White Fly"
+	icon_state = "whitefly"
+
+/datum/sprite_accessory/insect_fluff/punished
+	name = "Burnt Off"
+	icon_state = "punished"
+
+/datum/sprite_accessory/insect_fluff/firewatch
+	name = "Firewatch"
+	icon_state = "firewatch"
+
+/datum/sprite_accessory/insect_fluff/deathhead
+	name = "Deathshead"
+	icon_state = "deathhead"
+
+/datum/sprite_accessory/insect_fluff/poison
+	name = "Poison"
+	icon_state = "poison"
+
+/datum/sprite_accessory/insect_fluff/ragged
+	name = "Ragged"
+	icon_state = "ragged"
+
+/datum/sprite_accessory/insect_fluff/moonfly
+	name = "Moon Fly"
+	icon_state = "moonfly"
+
+/datum/sprite_accessory/insect_fluff/snow
+	name = "Snow"
+	icon_state = "snow"
+
+/datum/sprite_accessory/insect_fluff/colored
+	name = "Colored (Hair)"
+	icon_state = "snow"
+	color_src = HAIR
+
+/datum/sprite_accessory/insect_fluff/colored1
+	name = "Colored (Primary)"
+	icon_state = "snow"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/insect_fluff/colored2
+	name = "Colored (Secondary)"
+	icon_state = "snow"
+	color_src = MUTCOLORS2
+
+/datum/sprite_accessory/insect_fluff/colored3
+	name = "Colored (Tertiary)"
+	icon_state = "snow"
+	color_src = MUTCOLORS3
@@ -5,8 +5,295 @@
 	name = "None"
 	icon_state = "none"

+/******************************************
+*************** Human Ears ****************
+*******************************************/
+
+/datum/sprite_accessory/ears/human/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/human/bear
+	name = "Bear"
+	icon_state = "bear"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/bigwolf
+	name = "Big Wolf"
+	icon_state = "bigwolf"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/bigwolfinner
+	name = "Big Wolf (ALT)"
+	icon_state = "bigwolfinner"
+	hasinner = 1
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/bigwolfdark
+	name = "Dark Big Wolf"
+	icon_state = "bigwolfdark"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/bigwolfinnerdark
+	name = "Dark Big Wolf (ALT)"
+	icon_state = "bigwolfinnerdark"
+	hasinner = 1
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
 /datum/sprite_accessory/ears/cat
 	name = "Cat"
 	icon_state = "cat"
 	hasinner = 1
-	color_src = HAIR
+	color_src = HAIR
+
+/datum/sprite_accessory/ears/human/cow
+	name = "Cow"
+	icon_state = "cow"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/curled
+	name = "Curled Horn"
+	icon_state = "horn1"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/ears/human/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/elf
+	name = "Elf"
+	icon_state = "elf"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = SKINTONE
+
+/datum/sprite_accessory/ears/fennec
+	name = "Fennec"
+	icon_state = "fennec"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/fox
+	name = "Fox"
+	icon_state = "fox"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/human/jellyfish
+	name = "Jellyfish"
+	icon_state = "jellyfish"
+	color_src = HAIR
+
+/datum/sprite_accessory/ears/lab
+	name = "Dog, Floppy"
+	icon_state = "lab"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/murid
+	name = "Murid"
+	icon_state = "murid"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/otie
+	name = "Otusian"
+	icon_state = "otie"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/human/pede
+	name = "Scolipede"
+	icon_state = "pede"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/rabbit
+    name = "Rabbit"
+    icon_state = "rabbit"
+    color_src = MATRIXED
+    icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/human/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/human/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/squirrel
+	name = "Squirrel"
+	icon_state = "squirrel"
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/ears/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+
+
+/******************************************
+*************** Furry Ears ****************
+*******************************************/
+
+/datum/sprite_accessory/mam_ears
+	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/mam_ears/none
+	name = "None"
+	icon_state = "none"
+
+/datum/sprite_accessory/mam_ears/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/mam_ears/bear
+	name = "Bear"
+	icon_state = "bear"
+
+/datum/sprite_accessory/mam_ears/bigwolf
+	name = "Big Wolf"
+	icon_state = "bigwolf"
+
+/datum/sprite_accessory/mam_ears/bigwolfinner
+	name = "Big Wolf (ALT)"
+	icon_state = "bigwolfinner"
+	hasinner = 1
+
+/datum/sprite_accessory/mam_ears/bigwolfdark
+	name = "Dark Big Wolf"
+	icon_state = "bigwolfdark"
+
+/datum/sprite_accessory/mam_ears/bigwolfinnerdark
+	name = "Dark Big Wolf (ALT)"
+	icon_state = "bigwolfinnerdark"
+	hasinner = 1
+
+/datum/sprite_accessory/mam_ears/cat
+	name = "Cat"
+	icon_state = "cat"
+	hasinner = 1
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_ears/catbig
+	name = "Cat, Big"
+	icon_state = "catbig"
+
+/datum/sprite_accessory/mam_ears/cow
+	name = "Cow"
+	icon_state = "cow"
+
+/datum/sprite_accessory/mam_ears/curled
+	name = "Curled Horn"
+	icon_state = "horn1"
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_ears/deer
+	name = "Deer"
+	icon_state = "deer"
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_ears/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+
+
+/datum/sprite_accessory/mam_ears/elf
+	name = "Elf"
+	icon_state = "elf"
+	color_src = MUTCOLORS3
+
+
+/datum/sprite_accessory/mam_ears/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+
+/datum/sprite_accessory/mam_ears/fennec
+	name = "Fennec"
+	icon_state = "fennec"
+
+/datum/sprite_accessory/mam_ears/fish
+	name = "Fish"
+	icon_state = "fish"
+
+/datum/sprite_accessory/mam_ears/fox
+	name = "Fox"
+	icon_state = "fox"
+
+/datum/sprite_accessory/mam_ears/husky
+	name = "Husky"
+	icon_state = "wolf"
+
+/datum/sprite_accessory/mam_ears/kangaroo
+	name = "kangaroo"
+	icon_state = "kangaroo"
+
+/datum/sprite_accessory/mam_ears/jellyfish
+	name = "Jellyfish"
+	icon_state = "jellyfish"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_ears/lab
+	name = "Dog, Long"
+	icon_state = "lab"
+
+/datum/sprite_accessory/mam_ears/murid
+	name = "Murid"
+	icon_state = "murid"
+
+/datum/sprite_accessory/mam_ears/otie
+	name = "Otusian"
+	icon_state = "otie"
+
+/datum/sprite_accessory/mam_ears/squirrel
+	name = "Squirrel"
+	icon_state = "squirrel"
+
+/datum/sprite_accessory/mam_ears/pede
+	name = "Scolipede"
+	icon_state = "pede"
+
+/datum/sprite_accessory/mam_ears/rabbit
+    name = "Rabbit"
+    icon_state = "rabbit"
+
+/datum/sprite_accessory/mam_ears/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_ears/skunk
+	name = "skunk"
+	icon_state = "skunk"
+
+/datum/sprite_accessory/mam_ears/wolf
+	name = "Wolf"
+	icon_state = "wolf"
@@ -86,4 +86,45 @@

 /datum/sprite_accessory/facial_hair/elvis
 	name = "Sideburns (Elvis)"
-	icon_state = "facial_elvis"
+	icon_state = "facial_elvis"
+
+#define VFACE(_name, new_state) /datum/sprite_accessory/facial_hair/##new_state/icon_state=#new_state;;/datum/sprite_accessory/facial_hair/##new_state/name= #_name + " (Virgo)"
+VFACE("Watson", facial_watson_s)
+VFACE("Chaplin", facial_chaplin_s)
+VFACE("Fullbeard", facial_fullbeard_s)
+VFACE("Vandyke", facial_vandyke_s)
+VFACE("Elvis", facial_elvis_s)
+VFACE("Abe", facial_abe_s)
+VFACE("Chin", facial_chin_s)
+VFACE("GT", facial_gt_s)
+VFACE("Hip", facial_hip_s)
+VFACE("Hogan", facial_hogan_s)
+VFACE("Selleck", facial_selleck_s)
+VFACE("Neckbeard", facial_neckbeard_s)
+VFACE("Longbeard", facial_longbeard_s)
+VFACE("Dwarf", facial_dwarf_s)
+VFACE("Sideburn", facial_sideburn_s)
+VFACE("Mutton", facial_mutton_s)
+VFACE("Moustache", facial_moustache_s)
+VFACE("Pencilstache", facial_pencilstache_s)
+VFACE("Goatee", facial_goatee_s)
+VFACE("Smallstache", facial_smallstache_s)
+VFACE("Volaju", facial_volaju_s)
+VFACE("3 O\'clock", facial_3oclock_s)
+VFACE("5 O\'clock", facial_5oclock_s)
+VFACE("7 O\'clock", facial_7oclock_s)
+VFACE("5 O\'clock Moustache", facial_5oclockmoustache_s)
+VFACE("7 O\'clock", facial_7oclockmoustache_s)
+VFACE("Walrus", facial_walrus_s)
+VFACE("Muttonmus", facial_muttonmus_s)
+VFACE("Wise", facial_wise_s)
+VFACE("Martial Artist", facial_martialartist_s)
+VFACE("Dorsalfnil", facial_dorsalfnil_s)
+VFACE("Hornadorns", facial_hornadorns_s)
+VFACE("Spike", facial_spike_s)
+VFACE("Chinhorns", facial_chinhorns_s)
+VFACE("Cropped Fullbeard", facial_croppedfullbeard_s)
+VFACE("Chinless Beard", facial_chinlessbeard_s)
+VFACE("Moonshiner", facial_moonshiner_s)
+VFACE("Tribearder", facial_tribearder_s)
+#undef VFACE
@@ -461,4 +461,163 @@

 /datum/sprite_accessory/hair/longestalt
 	name = "Very Long with Fringe"
-	icon_state = "hair_vlongfringe"
+	icon_state = "hair_vlongfringe"
+
+/*************** VIRGO PORTED HAIRS ****************************/
+#define VHAIR(_name, new_state) /datum/sprite_accessory/hair/##new_state/icon_state=#new_state;/datum/sprite_accessory/hair/##new_state/name = #_name + " (Virgo)"
+//VIRGO PORTED HAIRS
+VHAIR("Short Hair Rosa", hair_rosa_s)
+VHAIR("Short Hair 80s", hair_80s_s)
+VHAIR("Long Bedhead", hair_long_bedhead_s)
+VHAIR("Dave", hair_dave_s)
+VHAIR("Country", hair_country_s)
+VHAIR("Shy", hair_shy_s)
+VHAIR("Unshaven Mohawk", hair_unshaven_mohawk_s)
+VHAIR("Manbun", hair_manbun_s)
+VHAIR("Longer Bedhead", hair_longer_bedhead_s)
+VHAIR("Ponytail", hair_ponytail_s)
+VHAIR("Ziegler", hair_ziegler_s)
+VHAIR("Emo Fringe", hair_emofringe_s)
+VHAIR("Very Short Over Eye Alt", hair_veryshortovereyealternate_s)
+VHAIR("Shorthime", hair_shorthime_s)
+VHAIR("High Tight", hair_hightight_s)
+VHAIR("Thinning Front", hair_thinningfront_s)
+VHAIR("Big Afro", hair_bigafro_s)
+VHAIR("Afro", hair_afro_s)
+VHAIR("High Braid", hair_hbraid_s)
+VHAIR("Braid", hair_braid_s)
+VHAIR("Sargeant", hair_sargeant_s)
+VHAIR("Gelled", hair_gelled_s)
+VHAIR("Kagami", hair_kagami_s)
+VHAIR("ShortTail", hair_stail_s)
+VHAIR("Gentle", hair_gentle_s)
+VHAIR("Grande", hair_grande_s)
+VHAIR("Bobcurl", hair_bobcurl_s)
+VHAIR("Pompadeur", hair_pompadour_s)
+VHAIR("Plait", hair_plait_s)
+VHAIR("Long", hair_long_s)
+VHAIR("Rattail", hair_rattail_s)
+VHAIR("Tajspiky", hair_tajspiky_s)
+VHAIR("Messy", hair_messy_s)
+VHAIR("Bangs", hair_bangs_s)
+VHAIR("TBraid", hair_tbraid_s)
+VHAIR("Toriyama2", hair_toriyama2_s)
+VHAIR("CIA", hair_cia_s)
+VHAIR("Mulder", hair_mulder_s)
+VHAIR("Scully", hair_scully_s)
+VHAIR("Nitori", hair_nitori_s)
+VHAIR("Joestar", hair_joestar_s)
+VHAIR("Ponytail4", hair_ponytail4_s)
+VHAIR("Ponytail5", hair_ponytail5_s)
+VHAIR("Beehive2", hair_beehive2_s)
+VHAIR("Short Braid", hair_shortbraid_s)
+VHAIR("Reverse Mohawk", hair_reversemohawk_s)
+VHAIR("SHort Bangs", hair_shortbangs_s)
+VHAIR("Half Shaved", hair_halfshaved_s)
+VHAIR("Longer Alt 2", hair_longeralt2_s)
+VHAIR("Bun", hair_bun_s)
+VHAIR("Curly", hair_curly_s)
+VHAIR("Victory", hair_victory_s)
+VHAIR("Ponytail6", hair_ponytail6_s)
+VHAIR("Undercut3", hair_undercut3_s)
+VHAIR("Bobcut Alt", hair_bobcultalt_s)
+VHAIR("Fingerwave", hair_fingerwave_s)
+VHAIR("Oxton", hair_oxton_s)
+VHAIR("Poofy2", hair_poofy2_s)
+VHAIR("Fringe Tail", hair_fringetail_s)
+VHAIR("Bun3", hair_bun3_s)
+VHAIR("Wisp", hair_wisp_s)
+VHAIR("Undercut2", hair_undercut2_s)
+VHAIR("TBob", hair_tbob_s)
+VHAIR("Spiky Ponytail", hair_spikyponytail_s)
+VHAIR("Rowbun", hair_rowbun_s)
+VHAIR("Rowdualtail", hair_rowdualtail_s)
+VHAIR("Rowbraid", hair_rowbraid_s)
+VHAIR("Shaved Mohawk", hair_shavedmohawk_s)
+VHAIR("Topknot", hair_topknot_s)
+VHAIR("Ronin", hair_ronin_s)
+VHAIR("Bowlcut2", hair_bowlcut2_s)
+VHAIR("Thinning Rear", hair_thinningrear_s)
+VHAIR("Thinning", hair_thinning_s)
+VHAIR("Jade", hair_jade_s)
+VHAIR("Bedhead", hair_bedhead_s)
+VHAIR("Dreadlocks", hair_dreads_s)
+VHAIR("Very Long", hair_vlong_s)
+VHAIR("Jensen", hair_jensen_s)
+VHAIR("Halfbang", hair_halfbang_s)
+VHAIR("Kusangi", hair_kusangi_s)
+VHAIR("Ponytail", hair_ponytail_s)
+VHAIR("Ponytail3", hair_ponytail3_s)
+VHAIR("Halfbang Alt", hair_halfbang_alt_s)
+VHAIR("Bedhead V2", hair_bedheadv2_s)
+VHAIR("Long Fringe", hair_longfringe_s)
+VHAIR("Flair", hair_flair_s)
+VHAIR("Bedhead V3", hair_bedheadv3_s)
+VHAIR("Himecut", hair_himecut_s)
+VHAIR("Curls", hair_curls_s)
+VHAIR("Very Long Fringe", hair_vlongfringe_s)
+VHAIR("Longest", hair_longest_s)
+VHAIR("Father", hair_father_s)
+VHAIR("Emo Long", hair_emolong_s)
+VHAIR("Short Hair 3", hair_shorthair3_s)
+VHAIR("Double Bun", hair_doublebun_s)
+VHAIR("Sleeze", hair_sleeze_s)
+VHAIR("Twintail", hair_twintail_s)
+VHAIR("Emo 2", hair_emo2_s)
+VHAIR("Low Fade", hair_lowfade_s)
+VHAIR("Med Fade", hair_medfade_s)
+VHAIR("High Fade", hair_highfade_s)
+VHAIR("Bald Fade", hair_baldfade_s)
+VHAIR("No Fade", hair_nofade_s)
+VHAIR("Trim Flat", hair_trimflat_s)
+VHAIR("Shaved", hair_shaved_s)
+VHAIR("Trimmed", hair_trimmed_s)
+VHAIR("Tight Bun", hair_tightbun_s)
+VHAIR("Short Hair 4", hair_d_s)
+VHAIR("Short Hair 5", hair_e_s)
+VHAIR("Short Hair 6", hair_f_s)
+VHAIR("Skinhead", hair_skinhead_s)
+VHAIR("Afro2", hair_afro2_s)
+VHAIR("Bobcut", hair_bobcut_s)
+VHAIR("Emo", hair_emo_s)
+VHAIR("Long Over Eye", hair_longovereye_s)
+VHAIR("Feather", hair_feather_s)
+VHAIR("Hitop", hair_hitop_s)
+VHAIR("Short Over Eye", hair_shortoverye_s)
+VHAIR("Straight", hair_straight_s)
+VHAIR("Buzzcut", hair_buzzcut_s)
+VHAIR("Combover", hair_combover_s)
+VHAIR("Crewcut", hair_crewcut_s)
+VHAIR("Devillock", hair_devilock_s)
+VHAIR("Clean", hair_clean_s)
+VHAIR("Shaggy", hair_shaggy_s)
+VHAIR("Updo", hair_updo_s)
+VHAIR("Mohawk", hair_mohawk_s)
+VHAIR("Odango", hair_odango_s)
+VHAIR("Ombre", hair_ombre_s)
+VHAIR("Parted", hair_parted_s)
+VHAIR("Quiff", hair_quiff_s)
+VHAIR("Volaju", hair_volaju_s)
+VHAIR("Bun2", hair_bun2_s)
+VHAIR("Rows1", hair_rows1_s)
+VHAIR("Rows2", hair_rows2_s)
+VHAIR("Dandy Pompadour", hair_dandypompadour_s)
+VHAIR("Poofy", hair_poofy_s)
+VHAIR("Toriyama", hair_toriyama_s)
+VHAIR("Drillruru", hair_drillruru_s)
+VHAIR("Bowlcut", hair_bowlcut_s)
+VHAIR("Coffee House", hair_coffeehouse_s)
+VHAIR("Family Man", hair_thefamilyman_s)
+VHAIR("Shaved Part", hair_shavedpart_s)
+VHAIR("Modern", hair_modern_s)
+VHAIR("One Shoulder", hair_oneshoulder_s)
+VHAIR("Very Short Over Eye", hair_veryshortovereye_s)
+VHAIR("Unkept", hair_unkept_s)
+VHAIR("Wife", hair_wife_s)
+VHAIR("Nia", hair_nia_s)
+VHAIR("Undercut", hair_undercut_s)
+VHAIR("Bobcut Alt", hair_bobcutalt_s)
+VHAIR("Short Hair 4 alt", hair_shorthair4_s)
+VHAIR("Tressshoulder", hair_tressshoulder_s)
+ //END
+#undef VHAIR
@@ -1,5 +1,6 @@
 /datum/sprite_accessory/horns
 	icon = 'icons/mob/mutant_bodyparts.dmi'
+	color_src = HORNCOLOR

 /datum/sprite_accessory/horns/none
 	name = "None"
@@ -23,4 +24,13 @@

 /datum/sprite_accessory/horns/angler
 	name = "Angeler"
-	icon_state = "angler"
+	icon_state = "angler"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/horns/antler
+	name = "Deer Antlers"
+	icon_state = "deer"
+
+/datum/sprite_accessory/horns/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
@@ -0,0 +1,158 @@
+
+/******************************************
+************** IPC SCREENS ****************
+*******************************************/
+/datum/sprite_accessory/screen
+	icon = 'modular_citadel/icons/mob/ipc_screens.dmi'
+	color_src = null
+
+/datum/sprite_accessory/screen/blank
+	name = "Blank"
+	icon_state = "blank"
+
+/datum/sprite_accessory/screen/pink
+	name = "Pink"
+	icon_state = "pink"
+
+/datum/sprite_accessory/screen/green
+	name = "Green"
+	icon_state = "green"
+
+/datum/sprite_accessory/screen/red
+	name = "Red"
+	icon_state = "red"
+
+/datum/sprite_accessory/screen/blue
+	name = "Blue"
+	icon_state = "blue"
+
+/datum/sprite_accessory/screen/yellow
+	name = "Yellow"
+	icon_state = "yellow"
+
+/datum/sprite_accessory/screen/shower
+	name = "Shower"
+	icon_state = "shower"
+
+/datum/sprite_accessory/screen/nature
+	name = "Nature"
+	icon_state = "nature"
+
+/datum/sprite_accessory/screen/eight
+	name = "Eight"
+	icon_state = "eight"
+
+/datum/sprite_accessory/screen/goggles
+	name = "Goggles"
+	icon_state = "goggles"
+
+/datum/sprite_accessory/screen/heart
+	name = "Heart"
+	icon_state = "heart"
+
+/datum/sprite_accessory/screen/monoeye
+	name = "Mono eye"
+	icon_state = "monoeye"
+
+/datum/sprite_accessory/screen/breakout
+	name = "Breakout"
+	icon_state = "breakout"
+
+/datum/sprite_accessory/screen/purple
+	name = "Purple"
+	icon_state = "purple"
+
+/datum/sprite_accessory/screen/scroll
+	name = "Scroll"
+	icon_state = "scroll"
+
+/datum/sprite_accessory/screen/console
+	name = "Console"
+	icon_state = "console"
+
+/datum/sprite_accessory/screen/rgb
+	name = "RGB"
+	icon_state = "rgb"
+
+/datum/sprite_accessory/screen/golglider
+	name = "Gol Glider"
+	icon_state = "golglider"
+
+/datum/sprite_accessory/screen/rainbow
+	name = "Rainbow"
+	icon_state = "rainbow"
+
+/datum/sprite_accessory/screen/sunburst
+	name = "Sunburst"
+	icon_state = "sunburst"
+
+/datum/sprite_accessory/screen/static
+	name = "Static"
+	icon_state = "static"
+
+//Oracle Station sprites
+
+/datum/sprite_accessory/screen/bsod
+	name = "BSOD"
+	icon_state = "bsod"
+
+/datum/sprite_accessory/screen/redtext
+	name = "Red Text"
+	icon_state = "retext"
+
+/datum/sprite_accessory/screen/sinewave
+	name = "Sine wave"
+	icon_state = "sinewave"
+
+/datum/sprite_accessory/screen/squarewave
+	name = "Square wave"
+	icon_state = "squarwave"
+
+/datum/sprite_accessory/screen/ecgwave
+	name = "ECG wave"
+	icon_state = "ecgwave"
+
+/datum/sprite_accessory/screen/eyes
+	name = "Eyes"
+	icon_state = "eyes"
+
+/datum/sprite_accessory/screen/textdrop
+	name = "Text drop"
+	icon_state = "textdrop"
+
+/datum/sprite_accessory/screen/stars
+	name = "Stars"
+	icon_state = "stars"
+
+
+/******************************************
+************** IPC Antennas ***************
+*******************************************/
+
+/datum/sprite_accessory/antenna
+	icon = 'modular_citadel/icons/mob/ipc_antennas.dmi'
+	color_src = MUTCOLORS2
+
+/datum/sprite_accessory/antenna/none
+	name = "None"
+	icon_state = "None"
+
+/datum/sprite_accessory/antenna/antennae
+	name = "Angled Antennae"
+	icon_state = "antennae"
+
+/datum/sprite_accessory/antenna/tvantennae
+	name = "TV Antennae"
+	icon_state = "tvantennae"
+
+/datum/sprite_accessory/antenna/cyberhead
+	name = "Cyberhead"
+	icon_state = "cyberhead"
+
+/datum/sprite_accessory/antenna/antlers
+	name = "Antlers"
+	icon_state = "antlers"
+
+/datum/sprite_accessory/antenna/crowned
+	name = "Crowned"
+	icon_state = "crowned"
@@ -1,8 +0,0 @@
-/datum/sprite_accessory/legs 	//legs are a special case, they aren't actually sprite_accessories but are updated with them.
-	icon = null					//These datums exist for selecting legs on preference, and little else
-
-/datum/sprite_accessory/legs/none
-	name = "Normal Legs"
-
-/datum/sprite_accessory/legs/digitigrade_lizard
-	name = "Digitigrade Legs"
@@ -0,0 +1,124 @@
+/datum/sprite_accessory/legs 	//legs are a special case, they aren't actually sprite_accessories but are updated with them. -- OR SO THEY USED TO BE
+	icon = null					//These datums exist for selecting legs on preference, and little else
+
+/******************************************
+***************** Leggy *******************
+*******************************************/
+
+/datum/sprite_accessory/legs/none
+	name = "Plantigrade"
+
+/datum/sprite_accessory/legs/digitigrade_lizard
+	name = "Digitigrade"
+
+/datum/sprite_accessory/legs/digitigrade_bird
+	name = "Avian"
+
+
+/******************************************
+************** Taur Bodies ****************
+*******************************************/
+
+/datum/sprite_accessory/taur
+	icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+	extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+	extra = TRUE
+	extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+	extra2 = TRUE
+	center = TRUE
+	dimension_x = 64
+	var/taur_mode = NOT_TAURIC
+	color_src = MATRIXED
+
+/datum/sprite_accessory/taur/none
+	name = "None"
+	icon_state = "None"
+
+/datum/sprite_accessory/taur/cow
+	name = "Cow"
+	icon_state = "cow"
+	taur_mode = HOOF_TAURIC
+
+/datum/sprite_accessory/taur/deer
+	name = "Deer"
+	icon_state = "deer"
+	taur_mode = HOOF_TAURIC
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/taur/drake
+	name = "Drake"
+	icon_state = "drake"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/drider
+	name = "Drider"
+	icon_state = "drider"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/taur/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+	taur_mode = PAW_TAURIC
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/taur/fox
+	name = "Fox"
+	icon_state = "fox"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/husky
+	name = "Husky"
+	icon_state = "husky"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/horse
+	name = "Horse"
+	icon_state = "horse"
+	taur_mode = HOOF_TAURIC
+
+/datum/sprite_accessory/taur/lab
+	name = "Lab"
+	icon_state = "lab"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/naga
+	name = "Naga"
+	icon_state = "naga"
+	taur_mode = SNEK_TAURIC
+
+/datum/sprite_accessory/taur/otie
+	name = "Otie"
+	icon_state = "otie"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/pede
+	name = "Scolipede"
+	icon_state = "pede"
+	taur_mode = PAW_TAURIC
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/taur/panther
+	name = "Panther"
+	icon_state = "panther"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/shepherd
+	name = "Shepherd"
+	icon_state = "shepherd"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/tentacle
+	name = "Tentacle"
+	icon_state = "tentacle"
+	taur_mode = SNEK_TAURIC
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/taur/tiger
+	name = "Tiger"
+	icon_state = "tiger"
+	taur_mode = PAW_TAURIC
+
+/datum/sprite_accessory/taur/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+	taur_mode = PAW_TAURIC
@@ -1,68 +0,0 @@
-/datum/sprite_accessory/moth_wings
-	icon = 'icons/mob/wings.dmi'
-	color_src = null
-
-/datum/sprite_accessory/moth_wings/plain
-	name = "Plain"
-	icon_state = "plain"
-
-/datum/sprite_accessory/moth_wings/monarch
-	name = "Monarch"
-	icon_state = "monarch"
-
-/datum/sprite_accessory/moth_wings/luna
-	name = "Luna"
-	icon_state = "luna"
-
-/datum/sprite_accessory/moth_wings/atlas
-	name = "Atlas"
-	icon_state = "atlas"
-
-/datum/sprite_accessory/moth_wings/reddish
-	name = "Reddish"
-	icon_state = "redish"
-
-/datum/sprite_accessory/moth_wings/royal
-	name = "Royal"
-	icon_state = "royal"
-
-/datum/sprite_accessory/moth_wings/gothic
-	name = "Gothic"
-	icon_state = "gothic"
-
-/datum/sprite_accessory/moth_wings/lovers
-	name = "Lovers"
-	icon_state = "lovers"
-
-/datum/sprite_accessory/moth_wings/whitefly
-	name = "White Fly"
-	icon_state = "whitefly"
-
-/datum/sprite_accessory/moth_wings/punished
-	name = "Burnt Off"
-	icon_state = "punished"
-	locked = TRUE
-
-/datum/sprite_accessory/moth_wings/firewatch
-	name = "Firewatch"
-	icon_state = "firewatch"
-
-/datum/sprite_accessory/moth_wings/deathhead
-	name = "Deathshead"
-	icon_state = "deathhead"
-
-/datum/sprite_accessory/moth_wings/poison
-	name = "Poison"
-	icon_state = "poison"
-
-/datum/sprite_accessory/moth_wings/ragged
-	name = "Ragged"
-	icon_state = "ragged"
-
-/datum/sprite_accessory/moth_wings/moonfly
-	name = "Moon Fly"
-	icon_state = "moonfly"
-
-/datum/sprite_accessory/moth_wings/snow
-	name = "Snow"
-	icon_state = "snow"
@@ -15,4 +15,359 @@

 /datum/sprite_accessory/snouts/roundlight
 	name = "Round + Light"
-	icon_state = "roundlight"
+	icon_state = "roundlight"
+
+/datum/sprite_accessory/snout/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	color_src = MATRIXED
+
+//christ this was a mistake, but it's here just in case someone wants to selectively fix -- Pooj
+/************* Lizard compatable snoots ***********
+/datum/sprite_accessory/snouts/bird
+	name = "Beak"
+	icon_state = "bird"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/bigbeak
+	name = "Big Beak"
+	icon_state = "bigbeak"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/bug
+	name = "Bug"
+	icon_state = "bug"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	extra2 = TRUE
+	extra2_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/snouts/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/snouts/lcanid
+	name = "Mammal, Long"
+	icon_state = "lcanid"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/lcanidalt
+	name = "Mammal, Long ALT"
+	icon_state = "lcanidalt"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/scanid
+	name = "Mammal, Short"
+	icon_state = "scanid"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/scanidalt
+	name = "Mammal, Short ALT"
+	icon_state = "scanidalt"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/wolf
+	name = "Mammal, Thick"
+	icon_state = "wolf"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/wolfalt
+	name = "Mammal, Thick ALT"
+	icon_state = "wolfalt"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/redpanda
+	name = "WahCoon"
+	icon_state = "wah"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/rhino
+	name = "Horn"
+	icon_state = "rhino"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+	extra = TRUE
+	extra = MUTCOLORS3
+
+/datum/sprite_accessory/snouts/rodent
+	name = "Rodent"
+	icon_state = "rodent"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/husky
+	name = "Husky"
+	icon_state = "husky"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/otie
+	name = "Otie"
+	icon_state = "otie"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/pede
+	name = "Scolipede"
+	icon_state = "pede"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/snouts/shark
+	name = "Shark"
+	icon_state = "shark"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+
+/datum/sprite_accessory/snouts/toucan
+	name = "Toucan"
+	icon_state = "toucan"
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	color_src = MATRIXED
+*/
+
+/******************************************
+************** Mammal Snouts **************
+*******************************************/
+
+/datum/sprite_accessory/mam_snouts
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+
+/datum/sprite_accessory/mam_snouts/none
+	name = "None"
+	icon_state = "none"
+
+
+/datum/sprite_accessory/mam_snouts/bird
+	name = "Beak"
+	icon_state = "bird"
+
+/datum/sprite_accessory/mam_snouts/bigbeak
+	name = "Big Beak"
+	icon_state = "bigbeak"
+
+/datum/sprite_accessory/mam_snouts/bug
+	name = "Bug"
+	icon_state = "bug"
+	color_src = MUTCOLORS
+	extra2 = TRUE
+	extra2_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_snouts/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_snouts/lcanid
+	name = "Mammal, Long"
+	icon_state = "lcanid"
+
+/datum/sprite_accessory/mam_snouts/lcanidalt
+	name = "Mammal, Long ALT"
+	icon_state = "lcanidalt"
+
+/datum/sprite_accessory/mam_snouts/scanid
+	name = "Mammal, Short"
+	icon_state = "scanid"
+
+/datum/sprite_accessory/mam_snouts/scanidalt
+	name = "Mammal, Short ALT"
+	icon_state = "scanidalt"
+
+/datum/sprite_accessory/mam_snouts/wolf
+	name = "Mammal, Thick"
+	icon_state = "wolf"
+
+/datum/sprite_accessory/mam_snouts/wolfalt
+	name = "Mammal, Thick ALT"
+	icon_state = "wolfalt"
+
+/datum/sprite_accessory/mam_snouts/redpanda
+	name = "WahCoon"
+	icon_state = "wah"
+
+/datum/sprite_accessory/mam_snouts/redpandaalt
+	name = "WahCoon ALT"
+	icon_state = "wahalt"
+
+/datum/sprite_accessory/mam_snouts/rhino
+	name = "Horn"
+	icon_state = "rhino"
+	extra = TRUE
+	extra = MUTCOLORS3
+
+/datum/sprite_accessory/mam_snouts/rodent
+	name = "Rodent"
+	icon_state = "rodent"
+
+/datum/sprite_accessory/mam_snouts/husky
+	name = "Husky"
+	icon_state = "husky"
+
+/datum/sprite_accessory/mam_snouts/otie
+	name = "Otie"
+	icon_state = "otie"
+
+/datum/sprite_accessory/mam_snouts/pede
+	name = "Scolipede"
+	icon_state = "pede"
+
+/datum/sprite_accessory/mam_snouts/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_snouts/shark
+	name = "Shark"
+	icon_state = "shark"
+
+/datum/sprite_accessory/mam_snouts/toucan
+	name = "Toucan"
+	icon_state = "toucan"
+
+/datum/sprite_accessory/mam_snouts/sharp
+	name = "Sharp"
+	icon_state = "sharp"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/mam_snouts/round
+	name = "Round"
+	icon_state = "round"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/mam_snouts/sharplight
+	name = "Sharp + Light"
+	icon_state = "sharplight"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/mam_snouts/roundlight
+	name = "Round + Light"
+	icon_state = "roundlight"
+	color_src = MUTCOLORS
+
+
+/******************************************
+**************** Snouts *******************
+*************but higher up*****************/
+
+/datum/sprite_accessory/mam_snouts/fbird
+	name = "Beak (Top)"
+	icon_state = "fbird"
+
+/datum/sprite_accessory/mam_snouts/fbigbeak
+	name = "Big Beak (Top)"
+	icon_state = "fbigbeak"
+
+/datum/sprite_accessory/mam_snouts/fbug
+	name = "Bug (Top)"
+	icon_state = "fbug"
+	color_src = MUTCOLORS
+	extra2 = TRUE
+	extra2_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_snouts/felephant
+	name = "Elephant (Top)"
+	icon_state = "felephant"
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/mam_snouts/flcanid
+	name = "Mammal, Long (Top)"
+	icon_state = "flcanid"
+
+/datum/sprite_accessory/mam_snouts/flcanidalt
+	name = "Mammal, Long ALT (Top)"
+	icon_state = "flcanidalt"
+
+/datum/sprite_accessory/mam_snouts/fscanid
+	name = "Mammal, Short (Top)"
+	icon_state = "fscanid"
+
+/datum/sprite_accessory/mam_snouts/fscanidalt
+	name = "Mammal, Short ALT (Top)"
+	icon_state = "fscanidalt"
+
+/datum/sprite_accessory/mam_snouts/fwolf
+	name = "Mammal, Thick (Top)"
+	icon_state = "fwolf"
+
+/datum/sprite_accessory/mam_snouts/fwolfalt
+	name = "Mammal, Thick ALT (Top)"
+	icon_state = "fwolfalt"
+
+/datum/sprite_accessory/mam_snouts/fredpanda
+	name = "WahCoon (Top)"
+	icon_state = "fwah"
+
+/datum/sprite_accessory/mam_snouts/frhino
+	name = "Horn (Top)"
+	icon_state = "frhino"
+	extra = TRUE
+	extra = MUTCOLORS3
+
+/datum/sprite_accessory/mam_snouts/frodent
+	name = "Rodent (Top)"
+	icon_state = "frodent"
+
+/datum/sprite_accessory/mam_snouts/fhusky
+	name = "Husky (Top)"
+	icon_state = "fhusky"
+
+/datum/sprite_accessory/mam_snouts/fotie
+	name = "Otie (Top)"
+	icon_state = "fotie"
+
+/datum/sprite_accessory/mam_snouts/fpede
+	name = "Scolipede (Top)"
+	icon_state = "fpede"
+
+/datum/sprite_accessory/mam_snouts/fsergal
+	name = "Sergal (Top)"
+	icon_state = "fsergal"
+
+/datum/sprite_accessory/mam_snouts/fshark
+	name = "Shark (Top)"
+	icon_state = "fshark"
+
+/datum/sprite_accessory/mam_snouts/ftoucan
+	name = "Toucan (Top)"
+	icon_state = "ftoucan"
+
+/datum/sprite_accessory/mam_snouts/fsharp
+	name = "Sharp (Top)"
+	icon_state = "fsharp"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/mam_snouts/fround
+	name = "Round (Top)"
+	icon_state = "fround"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/mam_snouts/fsharplight
+	name = "Sharp + Light (Top)"
+	icon_state = "fsharplight"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/mam_snouts/froundlight
+	name = "Round + Light (Top)"
+	icon_state = "froundlight"
+	color_src = MUTCOLORS
@@ -4,6 +4,10 @@
 /datum/sprite_accessory/tails_animated
 	icon = 'icons/mob/mutant_bodyparts.dmi'

+/******************************************
+************* Lizard Tails ****************
+*******************************************/
+
 /datum/sprite_accessory/tails/lizard/smooth
 	name = "Smooth"
 	icon_state = "smooth"
@@ -36,6 +40,48 @@
 	name = "Spikes"
 	icon_state = "spikes"

+/datum/sprite_accessory/tails/lizard/none
+	name = "None"
+	icon_state = "None"
+
+/datum/sprite_accessory/tails_animated/lizard/none
+	name = "None"
+	icon_state = "None"
+
+/datum/sprite_accessory/tails/lizard/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/lizard/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/body_markings/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/tails/lizard/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/lizard/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/******************************************
+************** Human Tails ****************
+*******************************************/
+
 /datum/sprite_accessory/tails/human/none
 	name = "None"
 	icon_state = "none"
@@ -43,13 +89,626 @@
 /datum/sprite_accessory/tails_animated/human/none
 	name = "None"
 	icon_state = "none"
-/*
+
+/datum/sprite_accessory/tails/human/ailurus
+	name = "Red Panda"
+	icon_state = "wah"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/ailurus
+	name = "Red Panda"
+	icon_state = "wah"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/bee
+	name = "Bee"
+	icon_state = "bee"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/bee
+	name = "Bee"
+	icon_state = "bee"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
 /datum/sprite_accessory/tails/human/cat
 	name = "Cat"
 	icon_state = "cat"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = HAIR

 /datum/sprite_accessory/tails_animated/human/cat
 	name = "Cat"
 	icon_state = "cat"
-	color_src = HAIR*/
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = HAIR
+
+/datum/sprite_accessory/tails/human/catbig
+	name = "Cat, Big"
+	icon_state = "catbig"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/catbig
+	name = "Cat, Big"
+	icon_state = "catbig"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/cow
+	name = "Cow"
+	icon_state = "cow"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/cow
+	name = "Cow"
+	icon_state = "cow"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/corvid
+	name = "Corvid"
+	icon_state = "crow"
+
+/datum/sprite_accessory/tails_animated/human/corvid
+	name = "Corvid"
+	icon_state = "crow"
+
+/datum/sprite_accessory/tails/human/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/fennec
+	name = "Fennec"
+	icon_state = "fennec"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/fennec
+	name = "Fennec"
+	icon_state = "fennec"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/fox
+	name = "Fox"
+	icon_state = "fox"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/fox
+	name = "Fox"
+	icon_state = "fox"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/horse
+	name = "Horse"
+	icon_state = "horse"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = HAIR
+
+/datum/sprite_accessory/tails_animated/human/horse
+	name = "Horse"
+	icon_state = "horse"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = HAIR
+
+/datum/sprite_accessory/tails/human/husky
+	name = "Husky"
+	icon_state = "husky"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/husky
+	name = "Husky"
+	icon_state = "husky"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/insect
+	name = "Insect"
+	icon_state = "insect"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails_animated/human/insect
+	name = "insect"
+	icon_state = "insect"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+
+/datum/sprite_accessory/tails/human/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/murid
+	name = "Murid"
+	icon_state = "murid"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/murid
+	name = "Murid"
+	icon_state = "murid"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/otie
+	name = "Otusian"
+	icon_state = "otie"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/otie
+	name = "Otusian"
+	icon_state = "otie"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/orca
+	name = "Orca"
+	icon_state = "orca"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/orca
+	name = "Orca"
+	icon_state = "orca"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/pede
+	name = "Scolipede"
+	icon_state = "pede"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/pede
+	name = "Scolipede"
+	icon_state = "pede"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/shark
+	name = "Shark"
+	icon_state = "shark"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/shark
+	name = "Shark"
+	icon_state = "shark"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/datashark
+	name = "datashark"
+	icon_state = "datashark"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/datashark
+	name = "datashark"
+	icon_state = "datashark"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/straighttail
+	name = "Straight Tail"
+	icon_state = "straighttail"
+
+/datum/sprite_accessory/tails_animated/human/straighttail
+	name = "Straight Tail"
+	icon_state = "straighttail"
+
+/datum/sprite_accessory/tails/human/squirrel
+	name = "Squirrel"
+	icon_state = "squirrel"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/squirrel
+	name = "Squirrel"
+	icon_state = "squirrel"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/tentacle
+	name = "Tentacle"
+	icon_state = "tentacle"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/tentacle
+	name = "Tentacle"
+	icon_state = "tentacle"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/tiger
+	name = "Tiger"
+	icon_state = "tiger"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/tiger
+	name = "Tiger"
+	icon_state = "tiger"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails/human/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/human/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/******************************************
+************** Furry Tails ****************
+*******************************************/
+
+/datum/sprite_accessory/mam_tails
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/mam_tails/none
+	name = "None"
+	icon_state = "none"
+
+/datum/sprite_accessory/mam_tails_animated
+	color_src = MATRIXED
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/none
+	name = "None"
+	icon_state = "none"
+	color_src = MATRIXED
+
+/datum/sprite_accessory/mam_tails/ailurus
+	name = "Red Panda"
+	icon_state = "wah"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails_animated/ailurus
+	name = "Red Panda"
+	icon_state = "wah"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/mam_tails_animated/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/mam_tails/bee
+	name = "Bee"
+	icon_state = "bee"
+
+/datum/sprite_accessory/mam_tails_animated/bee
+	name = "Bee"
+	icon_state = "bee"
+
+/datum/sprite_accessory/mam_tails/cat
+	name = "Cat"
+	icon_state = "cat"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_tails_animated/cat
+	name = "Cat"
+	icon_state = "cat"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_tails/catbig
+	name = "Cat, Big"
+	icon_state = "catbig"
+
+/datum/sprite_accessory/mam_tails_animated/catbig
+	name = "Cat, Big"
+	icon_state = "catbig"
+
+/datum/sprite_accessory/mam_tails/corvid
+	name = "Corvid"
+	icon_state = "crow"
+
+/datum/sprite_accessory/mam_tails_animated/corvid
+	name = "Corvid"
+	icon_state = "crow"
+
+/datum/sprite_accessory/mam_tail/cow
+	name = "Cow"
+	icon_state = "cow"
+
+/datum/sprite_accessory/mam_tails_animated/cow
+	name = "Cow"
+	icon_state = "cow"
+
+/datum/sprite_accessory/mam_tails/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+
+/datum/sprite_accessory/mam_tails_animated/eevee
+	name = "Eevee"
+	icon_state = "eevee"
+
+/datum/sprite_accessory/mam_tails/fennec
+	name = "Fennec"
+	icon_state = "fennec"
+
+/datum/sprite_accessory/mam_tails_animated/fennec
+	name = "Fennec"
+	icon_state = "fennec"
+
+/datum/sprite_accessory/mam_tails/human/fish
+	name = "Fish"
+	icon_state = "fish"
+
+/datum/sprite_accessory/mam_tails_animated/human/fish
+	name = "Fish"
+	icon_state = "fish"
+
+/datum/sprite_accessory/mam_tails/fox
+	name = "Fox"
+	icon_state = "fox"
+
+/datum/sprite_accessory/mam_tails_animated/fox
+	name = "Fox"
+	icon_state = "fox"
+
+/datum/sprite_accessory/mam_tails/hawk
+	name = "Hawk"
+	icon_state = "hawk"
+
+/datum/sprite_accessory/mam_tails_animated/hawk
+	name = "Hawk"
+	icon_state = "hawk"
+
+/datum/sprite_accessory/mam_tails/horse
+	name = "Horse"
+	icon_state = "horse"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_tails_animated/horse
+	name = "Horse"
+	icon_state = "Horse"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_tails/husky
+	name = "Husky"
+	icon_state = "husky"
+
+/datum/sprite_accessory/mam_tails_animated/husky
+	name = "Husky"
+	icon_state = "husky"
+
+datum/sprite_accessory/mam_tails/insect
+	name = "Insect"
+	icon_state = "insect"
+
+/datum/sprite_accessory/mam_tails_animated/insect
+	name = "Insect"
+	icon_state = "insect"
+
+/datum/sprite_accessory/mam_tails/kangaroo
+	name = "kangaroo"
+	icon_state = "kangaroo"
+
+/datum/sprite_accessory/mam_tails_animated/kangaroo
+	name = "kangaroo"
+	icon_state = "kangaroo"
+
+/datum/sprite_accessory/mam_tails/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+
+/datum/sprite_accessory/mam_tails_animated/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+
+/datum/sprite_accessory/mam_tails/lab
+	name = "Lab"
+	icon_state = "lab"
+
+/datum/sprite_accessory/mam_tails_animated/lab
+	name = "Lab"
+	icon_state = "lab"
+
+/datum/sprite_accessory/mam_tails/murid
+	name = "Murid"
+	icon_state = "murid"
+
+/datum/sprite_accessory/mam_tails_animated/murid
+	name = "Murid"
+	icon_state = "murid"
+
+/datum/sprite_accessory/mam_tails/otie
+	name = "Otusian"
+	icon_state = "otie"
+
+/datum/sprite_accessory/mam_tails_animated/otie
+	name = "Otusian"
+	icon_state = "otie"
+
+/datum/sprite_accessory/mam_tails/orca
+	name = "Orca"
+	icon_state = "orca"
+
+/datum/sprite_accessory/mam_tails_animated/orca
+	name = "Orca"
+	icon_state = "orca"
+
+/datum/sprite_accessory/mam_tails/pede
+	name = "Scolipede"
+	icon_state = "pede"
+
+/datum/sprite_accessory/mam_tails_animated/pede
+	name = "Scolipede"
+	icon_state = "pede"
+
+/datum/sprite_accessory/mam_tails/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+
+/datum/sprite_accessory/mam_tails_animated/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+
+/datum/sprite_accessory/mam_tails/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_tails_animated/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_tails/skunk
+	name = "Skunk"
+	icon_state = "skunk"
+
+/datum/sprite_accessory/mam_tails_animated/skunk
+	name = "Skunk"
+	icon_state = "skunk"
+
+/datum/sprite_accessory/mam_tails/shark
+	name = "Shark"
+	icon_state = "shark"
+
+/datum/sprite_accessory/mam_tails_animated/shark
+	name = "Shark"
+	icon_state = "shark"
+
+/datum/sprite_accessory/mam_tails/shepherd
+	name = "Shepherd"
+	icon_state = "shepherd"
+
+/datum/sprite_accessory/mam_tails_animated/shepherd
+	name = "Shepherd"
+	icon_state = "shepherd"
+
+/datum/sprite_accessory/mam_tails/straighttail
+	name = "Straight Tail"
+	icon_state = "straighttail"
+
+/datum/sprite_accessory/mam_tails_animated/straighttail
+	name = "Straight Tail"
+	icon_state = "straighttail"
+
+/datum/sprite_accessory/mam_tails/squirrel
+	name = "Squirrel"
+	icon_state = "squirrel"
+
+/datum/sprite_accessory/mam_tails_animated/squirrel
+	name = "Squirrel"
+	icon_state = "squirrel"
+
+/datum/sprite_accessory/mam_tails/tentacle
+	name = "Tentacle"
+	icon_state = "tentacle"
+
+/datum/sprite_accessory/mam_tails_animated/tentacle
+	name = "Tentacle"
+	icon_state = "tentacle"
+
+/datum/sprite_accessory/mam_tails/tiger
+	name = "Tiger"
+	icon_state = "tiger"
+
+/datum/sprite_accessory/mam_tails_animated/tiger
+	name = "Tiger"
+	icon_state = "tiger"
+
+/datum/sprite_accessory/mam_tails/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+
+/datum/sprite_accessory/mam_tails_animated/wolf
+	name = "Wolf"
+	icon_state = "wolf"
@@ -1,3 +1,5 @@
+//Angel Wings
+
 /datum/sprite_accessory/wings/none
 	name = "None"
 	icon_state = "none"
@@ -23,4 +25,120 @@
 	dimension_x = 46
 	center = TRUE
 	dimension_y = 34
-	locked = TRUE
+	locked = TRUE
+
+//INSECT WINGS
+
+/datum/sprite_accessory/insect_wings
+	icon = 'icons/mob/wings.dmi'
+	color_src = null
+
+/datum/sprite_accessory/insect_wings/none
+	name = "None"
+	icon_state = "none"
+
+/datum/sprite_accessory/insect_wings/plain
+	name = "Plain"
+	icon_state = "plain"
+
+/datum/sprite_accessory/insect_wings/monarch
+	name = "Monarch"
+	icon_state = "monarch"
+
+/datum/sprite_accessory/insect_wings/luna
+	name = "Luna"
+	icon_state = "luna"
+
+/datum/sprite_accessory/insect_wings/atlas
+	name = "Atlas"
+	icon_state = "atlas"
+
+/datum/sprite_accessory/insect_wings/reddish
+	name = "Reddish"
+	icon_state = "redish"
+
+/datum/sprite_accessory/insect_wings/royal
+	name = "Royal"
+	icon_state = "royal"
+
+/datum/sprite_accessory/insect_wings/gothic
+	name = "Gothic"
+	icon_state = "gothic"
+
+/datum/sprite_accessory/insect_wings/lovers
+	name = "Lovers"
+	icon_state = "lovers"
+
+/datum/sprite_accessory/insect_wings/whitefly
+	name = "White Fly"
+	icon_state = "whitefly"
+
+/datum/sprite_accessory/insect_wings/punished
+	name = "Burnt Off"
+	icon_state = "punished"
+	locked = TRUE
+
+/datum/sprite_accessory/insect_wings/firewatch
+	name = "Firewatch"
+	icon_state = "firewatch"
+
+/datum/sprite_accessory/insect_wings/deathhead
+	name = "Deathshead"
+	icon_state = "deathhead"
+
+/datum/sprite_accessory/insect_wings/poison
+	name = "Poison"
+	icon_state = "poison"
+
+/datum/sprite_accessory/insect_wings/ragged
+	name = "Ragged"
+	icon_state = "ragged"
+
+/datum/sprite_accessory/insect_wings/moonfly
+	name = "Moon Fly"
+	icon_state = "moonfly"
+
+/datum/sprite_accessory/insect_wings/snow
+	name = "Snow"
+	icon_state = "snow"
+
+/datum/sprite_accessory/insect_wings/colored
+	name = "Colored (Hair)"
+	icon_state = "snowplain"
+	color_src = HAIR
+
+/datum/sprite_accessory/insect_fluff/colored1
+	name = "Colored (Primary)"
+	icon_state = "snowplain"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/insect_fluff/colored2
+	name = "Colored (Secondary)"
+	icon_state = "snowplain"
+	color_src = MUTCOLORS2
+
+/datum/sprite_accessory/insect_fluff/colored3
+	name = "Colored (Tertiary)"
+	icon_state = "snowplain"
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/insect_wings/bee
+	name = "Bee"
+	icon_state = "bee"
+
+/datum/sprite_accessory/insect_wings/bee_color
+	name = "Bee (Hair colored)"
+	icon_state = "bee"
+	color_src = HAIR
+
+/datum/sprite_accessory/insect_wings/fairy
+	name = "Fairy"
+	icon_state = "fairy"
+
+/datum/sprite_accessory/insect_wings/bat
+	name = "Bat"
+	icon_state = "bat"
+
+/datum/sprite_accessory/insect_wings/feathery
+	name = "Feathery"
+	icon_state = "feathery"
@@ -1,113 +0,0 @@
-/mob/living/carbon/alien/larva/emote(act,m_type=1,message = null)
-
-	var/param = null
-	if (findtext(act, "-", 1, null))
-		var/t1 = findtext(act, "-", 1, null)
-		param = copytext(act, t1 + 1, length(act) + 1)
-		act = copytext(act, 1, t1)
-
-	var/muzzled = is_muzzled()
-
-	switch(act) //Alphabetically sorted please.
-		if ("burp","burps")
-			if (!muzzled)
-				message = "<span class='name'>[src]</span> burps."
-				m_type = 2
-		if ("choke","chokes")
-			message = "<span class='name'>[src]</span> chokes."
-			m_type = 2
-		if ("collapse","collapses")
-			Paralyse(2)
-			message = "<span class='name'>[src]</span> collapses!"
-			m_type = 2
-		if ("dance","dances")
-			if (!src.restrained())
-				message = "<span class='name'>[src]</span> dances around happily."
-				m_type = 1
-		if ("deathgasp","deathgasps")
-			message = "<span class='name'>[src]</span> lets out a sickly hiss of air and falls limply to the floor..."
-			m_type = 2
-		if ("drool","drools")
-			message = "<span class='name'>[src]</span> drools."
-			m_type = 1
-		if ("gasp","gasps")
-			message = "<span class='name'>[src]</span> gasps."
-			m_type = 2
-		if ("gnarl","gnarls")
-			if (!muzzled)
-				message = "<span class='name'>[src]</span> gnarls and shows its teeth.."
-				m_type = 2
-		if ("hiss","hisses")
-			message = "<span class='name'>[src]</span> hisses softly."
-			m_type = 1
-		if ("jump","jumps")
-			message = "<span class='name'>[src]</span> jumps!"
-			m_type = 1
-		if ("me")
-			..()
-			return
-		if ("moan","moans")
-			message = "<span class='name'>[src]</span> moans!"
-			m_type = 2
-		if ("nod","nods")
-			message = "<span class='name'>[src]</span> nods its head."
-			m_type = 1
-		if ("roar","roars")
-			if (!muzzled)
-				message = "<span class='name'>[src]</span> softly roars."
-				m_type = 2
-		if ("roll","rolls")
-			if (!src.restrained())
-				message = "<span class='name'>[src]</span> rolls."
-				m_type = 1
-		if ("scratch","scratches")
-			if (!src.restrained())
-				message = "<span class='name'>[src]</span> scratches."
-				m_type = 1
-		if ("screech","screeches") //This orignally was called scretch, changing it. -Sum99
-			if (!muzzled)
-				message = "<span class='name'>[src]</span> screeches."
-				m_type = 2
-		if ("shake","shakes")
-			message = "<span class='name'>[src]</span> shakes its head."
-			m_type = 1
-		if ("shiver","shivers")
-			message = "<span class='name'>[src]</span> shivers."
-			m_type = 2
-		if ("sign","signs")
-			if (!src.restrained())
-				message = text("<span class='name'>[src]</span> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
-				m_type = 1
-		if ("snore","snores")
-			message = "<B>[src]</B> snores."
-			m_type = 2
-		if ("sulk","sulks")
-			message = "<span class='name'>[src]</span> sulks down sadly."
-			m_type = 1
-		if ("sway","sways")
-			message = "<span class='name'>[src]</span> sways around dizzily."
-			m_type = 1
-		if ("tail")
-			message = "<span class='name'>[src]</span> waves its tail."
-			m_type = 1
-		if ("twitch")
-			message = "<span class='name'>[src]</span> twitches violently."
-			m_type = 1
-		if ("whimper","whimpers")
-			if (!muzzled)
-				message = "<span class='name'>[src]</span> whimpers."
-				m_type = 2
-
-		if ("help") //"The exception"
-			src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, deathgasp, drool, gasp, gnarl, hiss, jump, me, moan, nod, roll, roar, scratch, screech, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
-
-		else
-			src << "<span class='info'>Unusable emote '[act]'. Say *help for a list.</span>"
-
-	if ((message && src.stat == 0))
-		log_emote("[name]/[key] : [message]")
-		if (m_type & 1)
-			visible_message(message)
-		else
-			audible_message(message)
-	return
@@ -802,6 +802,11 @@
 			else
 				hud_used.healthdoll.icon_state = "healthdoll_DEAD"

+		if(hud_used.staminas)
+			hud_used.staminas.icon_state = staminahudamount()
+		if(hud_used.staminabuffer)
+			hud_used.staminabuffer.icon_state = staminabufferhudamount()
+
 /mob/living/carbon/human/fully_heal(admin_revive = 0)
 	if(admin_revive)
 		regenerate_limbs()
@@ -1029,8 +1034,8 @@
 /mob/living/carbon/human/species/lizard/ashwalker
 	race = /datum/species/lizard/ashwalker

-/mob/living/carbon/human/species/moth
-	race = /datum/species/moth
+/mob/living/carbon/human/species/insect
+	race = /datum/species/insect

 /mob/living/carbon/human/species/mush
 	race = /datum/species/mush
@@ -17,6 +17,8 @@
 	//Eye colour
 	var/eye_color = "000"

+	var/horn_color = "85615a"	//specific horn colors, because why not?
+
 	var/skin_tone = "caucasian1"	//Skin tone

 	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
@@ -39,6 +39,10 @@
 		//Stuff jammed in your limbs hurts
 		handle_embedded_objects()

+	if(stat != DEAD)
+		//process your dick energy
+		handle_arousal()
+
 	//Update our name based on whether our face is obscured/disfigured
 	name = get_visible_name()

@@ -54,7 +58,7 @@
 		var/obj/item/clothing/CH = head
 		if (CS.clothing_flags & CH.clothing_flags & STOPSPRESSUREDAMAGE)
 			return ONE_ATMOSPHERE
-	if(istype(loc, /obj/belly)) //START OF CIT CHANGES - Makes it so you don't suffocate while inside vore organs. Remind me to modularize this some time - Bhijn
+	if(isbelly(loc)) //START OF CIT CHANGES - Makes it so you don't suffocate while inside vore organs. Remind me to modularize this some time - Bhijn
 		return ONE_ATMOSPHERE
 	if(istype(loc, /obj/item/dogborg/sleeper))
 		return ONE_ATMOSPHERE //END OF CIT CHANGES
@@ -1,9 +0,0 @@
-/mob/living/carbon/human/Login()
-	..()
-	if(src.martial_art == default_martial_art && mind.stored_martial_art) //If the mind has a martial art stored and the body has the default one.
-		src.mind.stored_martial_art.teach(src) //Running teach so that it deals with help verbs.
-	else if(src.martial_art != default_martial_art && src.martial_art != mind.stored_martial_art) //If the body has a martial art which is not the default one and is not stored in the mind.
-		if(src.martial_art_owner != mind)
-			src.martial_art.remove(src)
-		else
-			src.mind.stored_martial_art = src.martial_art
@@ -1,6 +1,7 @@
 // This code handles different species in the game.

 GLOBAL_LIST_EMPTY(roundstart_races)
+GLOBAL_LIST_EMPTY(roundstart_race_names)

 /datum/species
 	var/id	// if the game needs to manually check your race to do something not included in a proc here, it will use this
@@ -15,6 +16,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/hair_color	// this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
 	var/hair_alpha = 255	// the alpha used by the hair. 255 is completely solid, 0 is transparent.

+	var/horn_color	//specific horn colors, because why not?
+
 	var/use_skintones = 0	// does it use skintones or not? (spoiler alert this is only used by humans)
 	var/exotic_blood = ""	// If your race wants to bleed something other than bog standard blood, change this to reagent id.
 	var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
@@ -79,7 +82,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/fixed_mut_color3 = ""
 	var/whitelisted = 0 		//Is this species restricted to certain players?
 	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
-
+	var/should_draw_citadel = FALSE

 ///////////
 // PROCS //
@@ -98,6 +101,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		var/datum/species/S = new I
 		if(S.check_roundstart_eligible())
 			GLOB.roundstart_races += S.id
+			GLOB.roundstart_race_names["[S.name]"] = S.id
 			qdel(S)
 	if(!GLOB.roundstart_races.len)
 		GLOB.roundstart_races += "human"
@@ -260,7 +264,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		C.hud_used.update_locked_slots()

 	// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
+	if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian"))
 		species_traits += DIGITIGRADE
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(FALSE)
@@ -294,8 +298,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		for(var/datum/disease/A in C.diseases)
 			A.cure(FALSE)

-	SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
-
 //CITADEL EDIT
 	if(NOAROUSAL in species_traits)
 		C.canbearoused = FALSE
@@ -306,6 +308,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		var/mob/living/carbon/human/H = C
 		if(NOGENITALS in H.dna.species.species_traits)
 			H.give_genitals(TRUE) //call the clean up proc to delete anything on the mob then return.
+		if("meat_type" in default_features) //I can't believe it's come to the meat
+			H.type_of_meat = GLOB.meat_types[H.dna.features["meat_type"]]
+
+	SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
+

 // EDIT ENDS

@@ -317,6 +324,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	for(var/X in inherent_traits)
 		REMOVE_TRAIT(C, X, SPECIES_TRAIT)

+	if("meat_type" in default_features)
+		C.type_of_meat = GLOB.meat_types[C.dna.features["meat_type"]]
+	else
+		C.type_of_meat = initial(meat)
+
 	SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src)

 /datum/species/proc/handle_hair(mob/living/carbon/human/H, forced_colour)
@@ -612,6 +624,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		else if ("wings" in mutant_bodyparts)
 			bodyparts_to_add -= "wings_open"

+	if("insect_fluff" in mutant_bodyparts)
+		if(!H.dna.features["insect_fluff"] || H.dna.features["insect_fluff"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+			bodyparts_to_add -= "insect_fluff"
+
 //CITADEL EDIT
 	//Race specific bodyparts:
 	//Xenos
@@ -717,8 +733,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					S = GLOB.wings_open_list[H.dna.features["wings"]]
 				if("legs")
 					S = GLOB.legs_list[H.dna.features["legs"]]
-				if("moth_wings")
-					S = GLOB.moth_wings_list[H.dna.features["moth_wings"]]
+				if("insect_wings")
+					S = GLOB.insect_wings_list[H.dna.features["insect_wings"]]
+				if("insect_fluff")
+					S = GLOB.insect_fluffs_list[H.dna.features["insect_fluff"]]
 				if("caps")
 					S = GLOB.caps_list[H.dna.features["caps"]]
 				if("ipc_screen")
@@ -815,6 +833,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 							accessory_overlay.color = "#[H.facial_hair_color]"
 						if(EYECOLOR)
 							accessory_overlay.color = "#[H.eye_color]"
+						if(HORNCOLOR)
+							accessory_overlay.color = "#[H.horn_color]"
 				else
 					accessory_overlay.color = forced_colour
 			else
@@ -880,6 +900,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 						extra_accessory_overlay.color = "#[H.facial_hair_color]"
 					if(EYECOLOR)
 						extra_accessory_overlay.color = "#[H.eye_color]"
+
+					if(HORNCOLOR)
+						extra_accessory_overlay.color = "#[H.horn_color]"
 				standing += extra_accessory_overlay

 			if(S.extra2) //apply the extra overlay, if there is one
@@ -912,6 +935,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 							extra2_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
 						else
 							extra2_accessory_overlay.color = "#[H.hair_color]"
+					if(HORNCOLOR)
+						extra2_accessory_overlay.color = "#[H.horn_color]"
 				standing += extra2_accessory_overlay


@@ -1732,6 +1757,161 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			H.forcesay(GLOB.hit_appends)	//forcesay checks stat already.
 	return TRUE

+/datum/species/proc/alt_spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
+	if(!istype(M))
+		return TRUE
+	CHECK_DNA_AND_SPECIES(M)
+	CHECK_DNA_AND_SPECIES(H)
+
+	if(!istype(M)) //sanity check for drones.
+		return TRUE
+	if(M.mind)
+		attacker_style = M.mind.martial_art
+	if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK))
+		log_combat(M, H, "attempted to touch")
+		H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
+		return TRUE
+	switch(M.a_intent)
+		if(INTENT_HELP)
+			if(M == H)
+				althelp(M, H, attacker_style)
+				return TRUE
+			return FALSE
+		if(INTENT_DISARM)
+			altdisarm(M, H, attacker_style)
+			return TRUE
+	return FALSE
+
+/datum/species/proc/althelp(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
+	if(user == target && istype(user))
+		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
+			return
+		if(!user.resting)
+			to_chat(user, "<span class='notice'>You can only force yourself up if you're on the ground.</span>")
+			return
+		user.visible_message("<span class='notice'>[user] forces [p_them()]self up to [p_their()] feet!</span>", "<span class='notice'>You force yourself up to your feet!</span>")
+		user.resting = 0
+		user.update_canmove()
+		user.adjustStaminaLossBuffered(user.stambuffer) //Rewards good stamina management by making it easier to instantly get up from resting
+		playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+
+/datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
+	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+		to_chat(user, "<span class='warning'>You're too exhausted.</span>")
+		return FALSE
+	if(target.check_block())
+		target.visible_message("<span class='warning'>[target] blocks [user]'s shoving attempt!</span>")
+		return FALSE
+	if(attacker_style && attacker_style.disarm_act(user,target))
+		return TRUE
+	if(user.resting)
+		return FALSE
+	else
+		if(user == target)
+			return
+		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
+		user.adjustStaminaLossBuffered(4)
+		playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+
+		if(target.w_uniform)
+			target.w_uniform.add_fingerprint(user)
+		SEND_SIGNAL(target, COMSIG_HUMAN_DISARM_HIT, user, user.zone_selected)
+
+		if(!target.resting)
+			target.adjustStaminaLoss(5)
+
+
+		var/turf/target_oldturf = target.loc
+		var/shove_dir = get_dir(user.loc, target_oldturf)
+		var/turf/target_shove_turf = get_step(target.loc, shove_dir)
+		var/mob/living/carbon/human/target_collateral_human
+		var/obj/structure/table/target_table
+		var/shove_blocked = FALSE //Used to check if a shove is blocked so that if it is knockdown logic can be applied
+
+		//Thank you based whoneedsspace
+		target_collateral_human = locate(/mob/living/carbon/human) in target_shove_turf.contents
+		if(target_collateral_human)
+			shove_blocked = TRUE
+		else
+			target.Move(target_shove_turf, shove_dir)
+			if(get_turf(target) == target_oldturf)
+				if(target_shove_turf.density)
+					shove_blocked = TRUE
+				else
+					var/thoushallnotpass = FALSE
+					for(var/obj/O in target_shove_turf)
+						if(istype(O, /obj/structure/table))
+							target_table = O
+						else if(!O.CanPass(src, target_shove_turf))
+							shove_blocked = TRUE
+							thoushallnotpass = TRUE
+					if(thoushallnotpass)
+						target_table = null
+
+		if(target.is_shove_knockdown_blocked())
+			return
+
+		if(shove_blocked || target_table)
+			var/directional_blocked = FALSE
+			if(shove_dir in GLOB.cardinals) //Directional checks to make sure that we're not shoving through a windoor or something like that
+				var/target_turf = get_turf(target)
+				for(var/obj/O in target_turf)
+					if(O.flags_1 & ON_BORDER_1 && O.dir == shove_dir && O.density)
+						directional_blocked = TRUE
+						break
+				if(target_turf != target_shove_turf) //Make sure that we don't run the exact same check twice on the same tile
+					for(var/obj/O in target_shove_turf)
+						if(O.flags_1 & ON_BORDER_1 && O.dir == turn(shove_dir, 180) && O.density)
+							directional_blocked = TRUE
+							break
+			var/targetatrest = target.resting
+			if(((!target_table && !target_collateral_human) || directional_blocked) && !targetatrest)
+				target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
+				user.visible_message("<span class='danger'>[user.name] shoves [target.name], knocking them down!</span>",
+					"<span class='danger'>You shove [target.name], knocking them down!</span>", null, COMBAT_MESSAGE_RANGE)
+				log_combat(user, target, "shoved", "knocking them down")
+			else if(target_table)
+				if(!targetatrest)
+					target.Knockdown(SHOVE_KNOCKDOWN_TABLE)
+				user.visible_message("<span class='danger'>[user.name] shoves [target.name] onto \the [target_table]!</span>",
+					"<span class='danger'>You shove [target.name] onto \the [target_table]!</span>", null, COMBAT_MESSAGE_RANGE)
+				target.forceMove(target_shove_turf)
+				log_combat(user, target, "shoved", "onto [target_table]")
+			else if(target_collateral_human && !targetatrest)
+				target.Knockdown(SHOVE_KNOCKDOWN_HUMAN)
+				if(!target_collateral_human.resting)
+					target_collateral_human.Knockdown(SHOVE_KNOCKDOWN_COLLATERAL)
+				user.visible_message("<span class='danger'>[user.name] shoves [target.name] into [target_collateral_human.name]!</span>",
+					"<span class='danger'>You shove [target.name] into [target_collateral_human.name]!</span>", null, COMBAT_MESSAGE_RANGE)
+				log_combat(user, target, "shoved", "into [target_collateral_human.name]")
+
+		else
+			user.visible_message("<span class='danger'>[user.name] shoves [target.name]!</span>",
+				"<span class='danger'>You shove [target.name]!</span>", null, COMBAT_MESSAGE_RANGE)
+			var/target_held_item = target.get_active_held_item()
+			var/knocked_item = FALSE
+			if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types))
+				target_held_item = null
+			if(!target.has_movespeed_modifier(SHOVE_SLOWDOWN_ID))
+				target.add_movespeed_modifier(SHOVE_SLOWDOWN_ID, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH)
+				if(target_held_item)
+					target.visible_message("<span class='danger'>[target.name]'s grip on \the [target_held_item] loosens!</span>",
+						"<span class='danger'>Your grip on \the [target_held_item] loosens!</span>", null, COMBAT_MESSAGE_RANGE)
+				addtimer(CALLBACK(target, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH)
+			else if(target_held_item)
+				target.dropItemToGround(target_held_item)
+				knocked_item = TRUE
+				target.visible_message("<span class='danger'>[target.name] drops \the [target_held_item]!!</span>",
+					"<span class='danger'>You drop \the [target_held_item]!!</span>", null, COMBAT_MESSAGE_RANGE)
+			var/append_message = ""
+			if(target_held_item)
+				if(knocked_item)
+					append_message = "causing them to drop [target_held_item]"
+				else
+					append_message = "loosening their grip on [target_held_item]"
+			log_combat(user, target, "shoved", append_message)
+
 /datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H)
 	var/hit_percent = (100-(blocked+armor))/100
 	hit_percent = (hit_percent * (100-H.physiology.damage_resistance))/100
@@ -0,0 +1,64 @@
+/datum/species/insect
+	name = "Anthromorphic Insect"
+	id = "insect"
+	say_mod = "flutters"
+	default_color = "00FF00"
+	species_traits = list(LIPS,NOEYES,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
+	mutant_bodyparts = list("mam_ears", "mam_snout", "mam_tail", "taur", "insect_wings", "mam_snouts", "insect_fluff","horns")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None",
+							"insect_wings" = "None", "insect_fluff" = "None", "mam_snouts" = "None", "taur" = "None","horns" = "None")
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
+	liked_food = VEGETABLES | DAIRY
+	disliked_food = FRUIT | GROSS
+	toxic_food = MEAT | RAW
+	mutanteyes = /obj/item/organ/eyes/insect
+	should_draw_citadel = TRUE
+
+/datum/species/insect/on_species_gain(mob/living/carbon/C)
+	. = ..()
+	if(ishuman(C))
+		var/mob/living/carbon/human/H = C
+		if(!H.dna.features["insect_wings"])
+			H.dna.features["insect_wings"] = "[(H.client && H.client.prefs && LAZYLEN(H.client.prefs.features) && H.client.prefs.features["insect_wings"]) ? H.client.prefs.features["insect_wings"] : "None"]"
+			handle_mutant_bodyparts(H)
+
+/datum/species/insect/random_name(gender,unique,lastname)
+	if(unique)
+		return random_unique_moth_name()
+
+	var/randname = moth_name()
+
+	if(lastname)
+		randname += " [lastname]"
+
+	return randname
+
+/datum/species/insect/handle_fire(mob/living/carbon/human/H, no_protection = FALSE)
+	..()
+	if(H.dna.features["insect_wings"] != "Burnt Off" && H.dna.features["insect_wings"] != "None" && H.bodytemperature >= 800 && H.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
+		to_chat(H, "<span class='danger'>Your precious wings burn to a crisp!</span>")
+		if(H.dna.features["insect_wings"] != "None")
+			H.dna.features["insect_wings"] = "Burnt Off"
+		handle_mutant_bodyparts(H)
+
+/datum/species/insect/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+	. = ..()
+	if(chem.id == "pestkiller")
+		H.adjustToxLoss(3)
+		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+
+/datum/species/insect/check_weakness(obj/item/weapon, mob/living/attacker)
+	if(istype(weapon, /obj/item/melee/flyswatter))
+		return 9 //flyswatters deal 10x damage to insects
+	return 0
+
+/datum/species/insect/space_move(mob/living/carbon/human/H)
+	. = ..()
+	if(H.loc && !isspaceturf(H.loc) && (H.dna.features["insect_wings"] != "Burnt Off" && H.dna.features["insect_wings"] != "None"))
+		var/datum/gas_mixture/current = H.loc.return_air()
+		if(current && (current.return_pressure() >= ONE_ATMOSPHERE*0.85)) //as long as there's reasonable pressure and no gravity, flight is possible
+			return TRUE
@@ -1,5 +1,5 @@
 /datum/species/fly
-	name = "Flyperson"
+	name = "Anthromorphic Fly"
 	id = "fly"
 	say_mod = "buzzes"
 	species_traits = list(NOEYES)
@@ -0,0 +1,98 @@
+/datum/species/mammal
+	name = "Anthromorph"
+	id = "mammal"
+	default_color = "4B4B4B"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "horns", "legs")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky",
+						 "mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian")
+	attack_verb = "claw"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
+	liked_food = MEAT | FRIED
+	disliked_food = TOXIC
+
+//Curiosity killed the cat's wagging tail.
+/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/mammal/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/mammal/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/mammal/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/mammal/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/mammal/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+
+/datum/species/mammal/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+
+//Alien//
+/datum/species/xeno
+	// A cloning mistake, crossing human and xenomorph DNA
+	name = "Xenomorph Hybrid"
+	id = "xeno"
+	say_mod = "hisses"
+	default_color = "00FF00"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur", "legs")
+	default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+	skinned_type = /obj/item/stack/sheet/animalhide/xeno
+	exotic_bloodtype = "L"
+	damage_overlay_type = "xeno"
+	liked_food = MEAT
+
+/datum/species/xeno/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
+	if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian"))
+		species_traits += DIGITIGRADE
+	if(DIGITIGRADE in species_traits)
+		C.Digitigrade_Leg_Swap(FALSE)
+	. = ..()
+
+/datum/species/xeno/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
+	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Plantigrade")
+		species_traits -= DIGITIGRADE
+	if(DIGITIGRADE in species_traits)
+		C.Digitigrade_Leg_Swap(TRUE)
+	. = ..()
+
+//Praise the Omnissiah, A challange worthy of my skills - HS
+
+//EXOTIC//
+//These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
+
+//misc
+/mob/living/carbon/human/dummy
+	no_vore = TRUE
+
+/mob/living/carbon/human/vore
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
@@ -45,7 +45,7 @@
 	return golem_name

 /datum/species/golem/random
-	name = "Random Golem"
+	name = "Golem Mutant"
 	blacklisted = FALSE
 	dangerous_existence = FALSE
 	var/static/list/random_golem_types
@@ -1,5 +1,5 @@
 /datum/species/ipc
-	name = "IPC"
+	name = "I.P.C."
 	id = "ipc"
 	say_mod = "beeps"
 	default_color = "00FF00"
@@ -118,7 +118,7 @@
 //Slime people are able to split like slimes, retaining a single mind that can swap between bodies at will, even after death.

 /datum/species/jelly/slime
-	name = "Slimeperson"
+	name = "Xenobiological Slime Entity"
 	id = "slime"
 	default_color = "00FFFF"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
@@ -389,12 +389,268 @@
 		"<span class='notice'>...and move this one instead.</span>")


+////////////////////////////////////////////////////////Round Start Slimes///////////////////////////////////////////////////////////////////
+
+/datum/species/jelly/roundstartslime
+	name = "Xenobiological Slime Hybrid"
+	id = "slimeperson"
+	limbs_id = "slime"
+	default_color = "00FFFF"
+	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+	inherent_traits = list(TRAIT_TOXINLOVER)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur")
+	default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
+	say_mod = "says"
+	hair_color = "mutcolor"
+	hair_alpha = 160 //a notch brighter so it blends better.
+	coldmod = 3
+	heatmod = 1
+	burnmod = 1
+
+/datum/species/jelly/roundstartslime/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/jelly/roundstartslime/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/jelly/roundstartslime/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/jelly/roundstartslime/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/jelly/roundstartslime/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/jelly/roundstartslime/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+
+/datum/action/innate/slime_change
+	name = "Alter Form"
+	check_flags = AB_CHECK_CONSCIOUS
+	button_icon_state = "alter_form" //placeholder
+	icon_icon = 'modular_citadel/icons/mob/actions/actions_slime.dmi'
+	background_icon_state = "bg_alien"
+
+/datum/action/innate/slime_change/Activate()
+	var/mob/living/carbon/human/H = owner
+	if(!isjellyperson(H))
+		return
+	else
+		H.visible_message("<span class='notice'>[owner] gains a look of \
+		concentration while standing perfectly still.\
+		 Their body seems to shift and starts getting more goo-like.</span>",
+		"<span class='notice'>You focus intently on altering your body while \
+		standing perfectly still...</span>")
+		change_form()
+
+/datum/action/innate/slime_change/proc/change_form()
+	var/mob/living/carbon/human/H = owner
+	var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel")
+	if(select_alteration == "Hair Style")
+		if(H.gender == MALE)
+			var/new_style = input(owner, "Select a facial hair style", "Hair Alterations")  as null|anything in GLOB.facial_hair_styles_list
+			if(new_style)
+				H.facial_hair_style = new_style
+		else
+			H.facial_hair_style = "Shaved"
+		//handle normal hair
+		var/new_style = input(owner, "Select a hair style", "Hair Alterations")  as null|anything in GLOB.hair_styles_list
+		if(new_style)
+			H.hair_style = new_style
+			H.update_hair()
+	else if (select_alteration == "Genitals")
+		var/list/organs = list()
+		var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add sexual organ", "remove sexual organ", "cancel")
+		switch(operation)
+			if("add sexual organ")
+				var/new_organ = input("Select sexual organ:", "Organ Manipulation") in list("Penis", "Testicles", "Breasts", "Vagina", "Womb", "Cancel")
+				if(new_organ == "Penis")
+					H.give_penis()
+				else if(new_organ == "Testicles")
+					H.give_balls()
+				else if(new_organ == "Breasts")
+					H.give_breasts()
+				else if(new_organ == "Vagina")
+					H.give_vagina()
+				else if(new_organ == "Womb")
+					H.give_womb()
+				else
+					return
+			if("remove sexual organ")
+				for(var/obj/item/organ/genital/X in H.internal_organs)
+					var/obj/item/organ/I = X
+					organs["[I.name] ([I.type])"] = I
+				var/obj/item/organ = input("Select sexual organ:", "Organ Manipulation", null) in organs
+				organ = organs[organ]
+				if(!organ)
+					return
+				var/obj/item/organ/genital/O
+				if(isorgan(organ))
+					O = organ
+					O.Remove(H)
+				organ.forceMove(get_turf(H))
+				qdel(organ)
+				H.update_genitals()
+
+	else if (select_alteration == "Ears")
+		var/list/snowflake_ears_list = list("Normal" = null)
+		for(var/path in GLOB.mam_ears_list)
+			var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_ears_list[S.name] = path
+		var/new_ears
+		new_ears = input(owner, "Choose your character's ears:", "Ear Alteration") as null|anything in snowflake_ears_list
+		if(new_ears)
+			H.dna.features["mam_ears"] = new_ears
+		H.update_body()
+
+	else if (select_alteration == "Snout")
+		var/list/snowflake_snouts_list = list("Normal" = null)
+		for(var/path in GLOB.mam_snouts_list)
+			var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_snouts_list[S.name] = path
+		var/new_snout
+		new_snout = input(owner, "Choose your character's face:", "Face Alteration") as null|anything in snowflake_snouts_list
+		if(new_snout)
+			H.dna.features["mam_snouts"] = new_snout
+		H.update_body()
+
+	else if (select_alteration == "Markings")
+		var/list/snowflake_markings_list = list()
+		for(var/path in GLOB.mam_body_markings_list)
+			var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_markings_list[S.name] = path
+		var/new_mam_body_markings
+		new_mam_body_markings = input(H, "Choose your character's body markings:", "Marking Alteration") as null|anything in snowflake_markings_list
+		if(new_mam_body_markings)
+			H.dna.features["mam_body_markings"] = new_mam_body_markings
+			if(new_mam_body_markings == "None")
+				H.dna.features["mam_body_markings"] = "Plain"
+		for(var/X in H.bodyparts) //propagates the markings changes
+			var/obj/item/bodypart/BP = X
+			BP.update_limb(FALSE, H)
+		H.update_body()
+
+	else if (select_alteration == "Tail")
+		var/list/snowflake_tails_list = list("Normal" = null)
+		for(var/path in GLOB.mam_tails_list)
+			var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_tails_list[S.name] = path
+		var/new_tail
+		new_tail = input(owner, "Choose your character's Tail(s):", "Tail Alteration") as null|anything in snowflake_tails_list
+		if(new_tail)
+			H.dna.features["mam_tail"] = new_tail
+			if(new_tail != "None")
+				H.dna.features["taur"] = "None"
+		H.update_body()
+
+	else if (select_alteration == "Taur body")
+		var/list/snowflake_taur_list = list("Normal" = null)
+		for(var/path in GLOB.taur_list)
+			var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_taur_list[S.name] = path
+		var/new_taur
+		new_taur = input(owner, "Choose your character's tauric body:", "Tauric Alteration") as null|anything in snowflake_taur_list
+		if(new_taur)
+			H.dna.features["taur"] = new_taur
+			if(new_taur != "None")
+				H.dna.features["mam_tail"] = "None"
+		H.update_body()
+
+	else if (select_alteration == "Penis")
+		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Choose your character's dong", "Genital Alteration") as null|anything in GLOB.cock_shapes_list
+		if(new_shape)
+			H.dna.features["cock_shape"] = new_shape
+		H.update_genitals()
+		H.give_balls()
+		H.give_penis()
+		H.apply_overlay()
+
+
+	else if (select_alteration == "Vagina")
+		for(var/obj/item/organ/genital/vagina/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Choose your character's pussy", "Genital Alteration") as null|anything in GLOB.vagina_shapes_list
+		if(new_shape)
+			H.dna.features["vag_shape"] = new_shape
+		H.update_genitals()
+		H.give_womb()
+		H.give_vagina()
+		H.apply_overlay()
+
+	else if (select_alteration == "Penis Length")
+		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
+			qdel(X)
+		var/new_length
+		new_length = input(owner, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Genital Alteration") as num|null
+		if(new_length)
+			H.dna.features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_balls()
+		H.give_penis()
+
+	else if (select_alteration == "Breast Size")
+		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
+			qdel(X)
+		var/new_size
+		new_size = input(owner, "Breast Size", "Genital Alteration") as null|anything in GLOB.breasts_size_list
+		if(new_size)
+			H.dna.features["breasts_size"] = new_size
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_breasts()
+
+	else if (select_alteration == "Breast Shape")
+		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Breast Shape", "Genital Alteration") as null|anything in GLOB.breasts_shapes_list
+		if(new_shape)
+			H.dna.features["breasts_shape"] = new_shape
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_breasts()
+
+	else
+		return
+
+
 ///////////////////////////////////LUMINESCENTS//////////////////////////////////////////

 //Luminescents are able to consume and use slime extracts, without them decaying.

 /datum/species/jelly/luminescent
-	name = "Luminescent"
+	name = "Luminescent Slime Entity"
 	id = "lum"
 	say_mod = "says"
 	var/glow_intensity = LUMINESCENT_DEFAULT_GLOW
@@ -561,7 +817,7 @@
 //Stargazers are the telepathic branch of jellypeople, able to project psychic messages and to link minds with willing participants.

 /datum/species/jelly/stargazer
-	name = "Stargazer"
+	name = "Stargazer Slime Entity"
 	id = "stargazer"
 	var/datum/action/innate/project_thought/project_thought
 	var/datum/action/innate/link_minds/link_minds
@@ -1,17 +1,19 @@
 /datum/species/lizard
 	// Reptilian humanoids with scaled skin and tails.
-	name = "Lizardperson"
+	name = "Anthromorphic Lizard"
 	id = "lizard"
 	say_mod = "hisses"
 	default_color = "00FF00"
-	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS)
+	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR)
 	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_REPTILE)
 	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur")
 	mutanttongue = /obj/item/organ/tongue/lizard
 	mutanttail = /obj/item/organ/tail/lizard
 	coldmod = 1.5
 	heatmod = 0.67
-	default_features = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "taur" = "None")
+	default_features = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round",
+							 "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None",
+							  "legs" = "Digitigrade", "taur" = "None")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -71,14 +73,14 @@
 	H.update_body()

 /datum/species/lizard/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
+	if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian"))
 		species_traits += DIGITIGRADE
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(FALSE)
 	return ..()

 /datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Normal Legs")
+	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Plantigrade")
 		species_traits -= DIGITIGRADE
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(TRUE)
@@ -1,61 +0,0 @@
-/datum/species/moth
-	name = "Mothman"
-	id = "moth"
-	say_mod = "flutters"
-	default_color = "00FF00"
-	species_traits = list(LIPS, NOEYES)
-	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
-	mutant_bodyparts = list("moth_wings")
-	default_features = list("moth_wings" = "Plain")
-	attack_verb = "slash"
-	attack_sound = 'sound/weapons/slash.ogg'
-	miss_sound = 'sound/weapons/slashmiss.ogg'
-	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
-	liked_food = VEGETABLES | DAIRY
-	disliked_food = FRUIT | GROSS
-	toxic_food = MEAT | RAW
-	mutanteyes = /obj/item/organ/eyes/moth
-
-/datum/species/moth/on_species_gain(mob/living/carbon/C)
-	. = ..()
-	if(ishuman(C))
-		var/mob/living/carbon/human/H = C
-		if(!H.dna.features["moth_wings"])
-			H.dna.features["moth_wings"] = "[(H.client && H.client.prefs && LAZYLEN(H.client.prefs.features) && H.client.prefs.features["moth_wings"]) ? H.client.prefs.features["moth_wings"] : "Plain"]"
-			handle_mutant_bodyparts(H)
-
-/datum/species/moth/random_name(gender,unique,lastname)
-	if(unique)
-		return random_unique_moth_name()
-
-	var/randname = moth_name()
-
-	if(lastname)
-		randname += " [lastname]"
-
-	return randname
-
-/datum/species/moth/handle_fire(mob/living/carbon/human/H, no_protection = FALSE)
-	..()
-	if(H.dna.features["moth_wings"] != "Burnt Off" && H.bodytemperature >= 800 && H.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
-		to_chat(H, "<span class='danger'>Your precious wings burn to a crisp!</span>")
-		H.dna.features["moth_wings"] = "Burnt Off"
-		handle_mutant_bodyparts(H)
-
-/datum/species/moth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	. = ..()
-	if(chem.id == "pestkiller")
-		H.adjustToxLoss(3)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
-
-/datum/species/moth/check_weakness(obj/item/weapon, mob/living/attacker)
-	if(istype(weapon, /obj/item/melee/flyswatter))
-		return 9 //flyswatters deal 10x damage to moths
-	return 0
-
-/datum/species/moth/space_move(mob/living/carbon/human/H)
-	. = ..()
-	if(H.loc && !isspaceturf(H.loc) && H.dna.features["moth_wings"] != "Burnt Off")
-		var/datum/gas_mixture/current = H.loc.return_air()
-		if(current && (current.return_pressure() >= ONE_ATMOSPHERE*0.85)) //as long as there's reasonable pressure and no gravity, flight is possible
-			return TRUE
@@ -1,5 +1,5 @@
 /datum/species/mush //mush mush codecuck
-	name = "Mushroomperson"
+	name = "Anthromorphic Mushroom"
 	id = "mush"
 	mutant_bodyparts = list("caps")
 	default_features = list("caps" = "Round")
@@ -1,5 +1,5 @@
 /datum/species/plasmaman
-	name = "Plasmaman"
+	name = "Phoronoid"
 	id = "plasmaman"
 	say_mod = "rattles"
 	sexes = 0
@@ -1,6 +1,6 @@
 /datum/species/pod
 	// A mutation caused by a human being ressurected in a revival pod. These regain health in light, and begin to wither in darkness.
-	name = "Podperson"
+	name = "Anthromorphic Plant"
 	id = "pod"
 	default_color = "59CE00"
 	species_traits = list(MUTCOLORS,EYECOLOR)
@@ -71,6 +71,7 @@
 			H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)

 /datum/species/pod/pseudo_weak
+	name = "Anthromorphic Plant"
 	id = "podweak"
 	limbs_id = "pod"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS)
@@ -1,5 +1,5 @@
 /datum/species/synth
-	name = "Synth" //inherited from the real species, for health scanners and things
+	name = "Synthetic" //inherited from the real species, for health scanners and things
 	id = "synth"
 	say_mod = "beep boops" //inherited from a user's real species
 	sexes = 0
@@ -1,91 +0,0 @@
-/mob/living/carbon/human/whisper_verb(message as text)
-	whisper(message)
-
-/mob/living/carbon/human/whisper(message, datum/language/language=null)
-	if(!IsVocal())
-		return
-	if(!message)
-		return
-	if(!language)
-		language = get_default_language()
-
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-
-	if(stat == DEAD)
-		return
-
-
-	message = trim(html_encode(message))
-	if(!can_speak(message))
-		return
-
-	message = "[message]"
-	log_whisper("[src.name]/[src.key] : [message]")
-
-	if (src.client)
-		if (src.client.prefs.muted & MUTE_IC)
-			to_chat(src, "<span class='danger'>You cannot whisper (muted).</span>")
-			return
-
-	log_whisper("[src.name]/[src.key] : [message]")
-
-	var/alt_name = get_alt_name()
-
-	var/whispers = "whispers"
-	var/critical = InCritical()
-
-	// We are unconscious but not in critical, so don't allow them to whisper.
-	if(stat == UNCONSCIOUS && !critical)
-		return
-
-	// If whispering your last words, limit the whisper based on how close you are to death.
-	if(critical)
-		var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
-		// If we cut our message short, abruptly end it with a-..
-		var/message_len = length(message)
-		message = copytext(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]"
-		message = Ellipsis(message, 10, 1)
-
-	message = treat_message(message)
-	if(!message)
-		return
-
-	var/list/listening_dead = list()
-	for(var/mob/M in GLOB.player_list)
-		if(M.stat == DEAD && M.client && ((M.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) || (get_dist(M, src) <= 7)))
-			listening_dead |= M
-
-	var/list/listening = get_hearers_in_view(1, src)
-	listening |= listening_dead
-	var/list/eavesdropping = get_hearers_in_view(2, src)
-	eavesdropping -= listening
-	var/list/watching  = hearers(5, src)
-	watching  -= listening
-	watching  -= eavesdropping
-
-	var/rendered
-	whispers = critical ? "whispers something in [p_their()] final breath." : "whispers something."
-	rendered = "<span class='game say'><span class='name'>[src.name]</span> [whispers]</span>"
-	for(var/mob/M in watching)
-		M.show_message(rendered, 2)
-
-	var/spans = list(SPAN_ITALICS)
-	whispers = critical ? "whispers in [p_their()] final breath" : "whispers"
-	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[attach_spans(message, spans)]\"</span></span>"
-
-	for(var/atom/movable/AM in listening)
-		if(istype(AM,/obj/item/radio))
-			continue
-		AM.Hear(rendered, src, language, message, , spans)
-
-	message = stars(message)
-	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[attach_spans(message, spans)]\"</span></span>"
-	for(var/atom/movable/AM in eavesdropping)
-		if(istype(AM,/obj/item/radio))
-			continue
-		AM.Hear(rendered, src, language, message, , spans)
-
-	if(critical) //Dying words.
-		succumb()
@@ -536,12 +536,12 @@
 	race = /datum/species/fly
 	mutationtext = "<span class='danger'>The pain subsides. You feel... buzzy.</span>"

-/datum/reagent/mutationtoxin/moth
-	name = "Moth Mutation Toxin"
+/datum/reagent/mutationtoxin/insect
+	name = "Insect Mutation Toxin"
 	id = "mothmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
-	race = /datum/species/moth
+	race = /datum/species/insect
 	mutationtext = "<span class='danger'>The pain subsides. You feel... attracted to light.</span>"

 /datum/reagent/mutationtoxin/pod
@@ -623,7 +623,7 @@
 	required_temp = 450

 /datum/chemical_reaction/moff
-	name = "moth mutation toxic"
+	name = "insect mutation toxic"
 	id = "moffs"
 	results = list("mothmutationtoxin" = 1)
 	required_reagents  = list("liquid_dark_matter" = 2, "ammonia" = 5, "lithium" = 1, "stablemutationtoxin" = 1)
@@ -8,7 +8,7 @@
 	build_type = LIMBGROWER
 	reagents_list = list("synthflesh" = 25)
 	build_path = /obj/item/bodypart/l_arm
-	category = list("initial","human","lizard","fly","moth","plasmaman")
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")

 /datum/design/rightarm
 	name = "Right Arm"
@@ -16,7 +16,7 @@
 	build_type = LIMBGROWER
 	reagents_list = list("synthflesh" = 25)
 	build_path = /obj/item/bodypart/r_arm
-	category = list("initial","human","lizard","fly","moth","plasmaman")
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")

 /datum/design/leftleg
 	name = "Left Leg"
@@ -24,7 +24,7 @@
 	build_type = LIMBGROWER
 	reagents_list = list("synthflesh" = 25)
 	build_path = /obj/item/bodypart/l_leg
-	category = list("initial","human","lizard","fly","moth","plasmaman")
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")

 /datum/design/rightleg
 	name = "Right Leg"
@@ -32,7 +32,7 @@
 	build_type = LIMBGROWER
 	reagents_list = list("synthflesh" = 25)
 	build_path = /obj/item/bodypart/r_leg
-	category = list("initial","human","lizard","fly","moth","plasmaman")
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")

 /datum/design/armblade
 	name = "Arm Blade"
@@ -40,6 +40,7 @@
 	var/skin_tone = ""
 	var/body_gender = ""
 	var/species_id = ""
+	var/should_draw_citadel = FALSE
 	var/should_draw_gender = FALSE
 	var/should_draw_greyscale = FALSE
 	var/species_color = ""
@@ -48,8 +49,8 @@
 	var/body_markings = ""	//for bodypart markings
 	var/body_markings_icon = 'modular_citadel/icons/mob/mam_markings.dmi'
 	var/list/markings_color = list()
-	var/auxmarking = ""
-	var/list/auxmarking_color = list()
+	var/aux_marking
+	var/digitigrade_type

 	var/animal_origin = null //for nonhuman bodypart (e.g. monkey)
 	var/dismemberable = 1 //whether it can be dismembered with a weapon.
@@ -309,7 +310,7 @@
 		should_draw_greyscale = FALSE
 		no_update = TRUE
 		body_markings = "husk" // reeee
-		auxmarking = "husk"
+		aux_marking = "husk"

 	if(no_update)
 		return
@@ -351,6 +352,13 @@
 		else
 			species_color = ""

+		if("legs" in S.default_features)
+			if(body_zone == BODY_ZONE_L_LEG || body_zone == BODY_ZONE_R_LEG)
+				if(DIGITIGRADE in S.species_traits)
+					digitigrade_type = lowertext(H.dna.features.["legs"])
+			else
+				digitigrade_type = null
+
 		if("mam_body_markings" in S.default_features)
 			var/datum/sprite_accessory/Smark
 			Smark = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
@@ -358,15 +366,15 @@
 				body_markings_icon = Smark.icon
 			if(H.dna.features.["mam_body_markings"] != "None")
 				body_markings = lowertext(H.dna.features.["mam_body_markings"])
-				auxmarking = lowertext(H.dna.features.["mam_body_markings"])
+				aux_marking = lowertext(H.dna.features.["mam_body_markings"])
 			else
 				body_markings = "plain"
-				auxmarking = "plain"
+				aux_marking = "plain"
 			markings_color = list(colorlist)

 		else
 			body_markings = null
-			auxmarking = null
+			aux_marking = null

 		if(!dropping_limb && H.dna.check_mutation(HULK))
 			mutation_color = "00aa00"
@@ -381,7 +389,7 @@
 	if(status == BODYPART_ROBOTIC)
 		dmg_overlay_type = "robotic"
 		body_markings = null
-		auxmarking = null
+		aux_marking = null

 	if(dropping_limb)
 		no_update = TRUE //when attached, the limb won't be affected by the appearance changes of its mob owner.
@@ -423,7 +431,7 @@
 				else
 					. += image(body_markings_icon, "[body_markings]_[body_zone]", -MARKING_LAYER, image_dir)
 			else
-				. += image(body_markings_icon, "[body_markings]_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+				. += image(body_markings_icon, "[body_markings]_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)

 	var/image/limb = image(layer = -BODYPARTS_LAYER, dir = image_dir)
 	var/image/aux
@@ -453,21 +461,25 @@
 			if(should_draw_gender)
 				limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
 			else if(use_digitigrade)
-				limb.icon_state = "digitigrade_[use_digitigrade]_[body_zone]"
+				limb.icon_state = "[digitigrade_type]_[use_digitigrade]_[body_zone]"
 			else
 				limb.icon_state = "[species_id]_[body_zone]"
 		else
 			limb.icon = 'icons/mob/human_parts.dmi'
 			if(should_draw_gender)
 				limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
+			else if(use_digitigrade)
+				limb.icon_state = "[species_id]_[digitigrade_type]_[use_digitigrade]_[body_zone]"
 			else
 				limb.icon_state = "[species_id]_[body_zone]"

 		// Citadel Start
-		if(should_draw_citadel && !use_digitigrade)
+		if(should_draw_citadel)
 			limb.icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
 			if(should_draw_gender)
 				limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
+			else if(use_digitigrade)
+				limb.icon_state = "[species_id]_[digitigrade_type]_[use_digitigrade]_[body_zone]"
 			else
 				limb.icon_state = "[species_id]_[body_zone]"

@@ -476,7 +488,7 @@
 			if(species_id == "husk")
 				marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir)
 			else if(species_id == "husk" && use_digitigrade)
-				marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+				marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)

 			else if(!use_digitigrade)
 				if(body_zone == BODY_ZONE_CHEST)
@@ -484,20 +496,21 @@
 				else
 					marking = image(body_markings_icon, "[body_markings]_[body_zone]", -MARKING_LAYER, image_dir)
 			else
-				marking = image(body_markings_icon, "[body_markings]_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+				marking = image(body_markings_icon, "[body_markings]_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+
 			. += marking

 		// Citadel End

 		if(aux_zone)
 			aux = image(limb.icon, "[species_id]_[aux_zone]", -aux_layer, image_dir)
-			. += aux
-			if(!isnull(auxmarking))
+			if(!isnull(aux_marking))
 				if(species_id == "husk")
 					auxmarking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[aux_zone]", -aux_layer, image_dir)
 				else
 					auxmarking = image(body_markings_icon, "[body_markings]_[aux_zone]", -aux_layer, image_dir)
-				. += auxmarking
+			. += aux
+			. += auxmarking

 	else
 		limb.icon = icon
@@ -509,7 +522,7 @@
 		if(aux_zone)
 			aux = image(limb.icon, "[aux_zone]", -aux_layer, image_dir)
 			. += aux
-			if(!isnull(auxmarking))
+			if(!isnull(aux_marking))
 				if(species_id == "husk")
 					auxmarking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[aux_zone]", -aux_layer, image_dir)
 				else
@@ -528,7 +541,7 @@
 				else
 					marking = image(body_markings_icon, "[body_markings]_[body_zone]", -MARKING_LAYER, image_dir)
 			else
-				marking = image(body_markings_icon, "[body_markings]_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+				marking = image(body_markings_icon, "[body_markings]_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
 			. += marking
 		return

@@ -538,8 +551,11 @@
 			limb.color = "#[draw_color]"
 			if(aux_zone)
 				aux.color = "#[draw_color]"
-				if(!isnull(auxmarking))
-					auxmarking.color = list(markings_color)
+				if(!isnull(aux_marking))
+					if(species_id == "husk")
+						auxmarking.color = "#141414"
+					else
+						auxmarking.color = list(markings_color)

 			if(!isnull(body_markings))
 				if(species_id == "husk")
@@ -321,7 +321,7 @@
 	if(!istype(parent))
 		return INITIALIZE_HINT_QDEL

-/obj/item/organ/eyes/moth
-	name = "moth eyes"
+/obj/item/organ/eyes/insect
+	name = "insect eyes"
 	desc = "These eyes seem to have increased sensitivity to bright light, with no improvement to low light vision."
 	flash_protect = -1
@@ -410,7 +410,7 @@ ROUNDSTART_RACES human
 ## Races that are strictly worse than humans that could probably be turned on without balance concerns
 ROUNDSTART_RACES lizard
 #ROUNDSTART_RACES fly
-#ROUNDSTART_RACES moth
+#ROUNDSTART_RACES insect
 ROUNDSTART_RACES plasmaman
 #ROUNDSTART_RACES shadow
 ROUNDSTART_RACES felinid
@@ -1,26 +0,0 @@
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
-	icon = 'modular_citadel/icons/obj/foods.dmi'
-	icon_state = "ipcmeat"
-	desc = "Gross robot meat."
-	filling_color = "#000000"
-	tastes = list("metal" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
-	icon = 'modular_citadel/icons/obj/foods.dmi'
-	icon_state = "mothmeat"
-	desc = "Moth meat."
-	filling_color = "#BF896B"
-	tastes = list("insects" = 1)
-
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
-	icon = 'modular_citadel/icons/obj/foods.dmi'
-	icon_state = "birdmeat"
-	desc = "Quality bird meat."
-	filling_color = "#BF896B"
-	tastes = list("chicken" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
-	desc = "Furry meat. WHO DID THIS?!"
-	filling_color = "#6B8E23"
-	tastes = list("brains" = 1, "meat" = 1)
@@ -3,23 +3,3 @@
 /proc/cit_initialize()
 	load_mentors()
 	initialize_global_loadout_items()
-
-	//body parts and things
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_body_markings, GLOB.mam_body_markings_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_tails, GLOB.mam_tails_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_ears, GLOB.mam_ears_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_tails_animated, GLOB.mam_tails_animated_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_snouts, GLOB.mam_snouts_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/taur, GLOB.taur_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_head, GLOB.xeno_head_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_tail, GLOB.xeno_tail_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/screen, GLOB.ipc_screens_list, roundstart = TRUE)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/antenna, GLOB.ipc_antennas_list, roundstart = TRUE)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
-	for(var/K in GLOB.cock_shapes_list)
-		var/datum/sprite_accessory/penis/value = GLOB.cock_shapes_list[K]
-		GLOB.cock_shapes_icons[K] = value.icon_state
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
-	//GLOB.breasts_size_list = list("a","b","c","d","e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. This is defined twice?
@@ -1,3 +1,29 @@
 /obj/item/reagent_containers/food/snacks/carpmeat/aquatic
 	name = "fillet"
 	desc = "A fillet of one of the local water dwelling species."
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+	icon = 'modular_citadel/icons/obj/foods.dmi'
+	icon_state = "ipcmeat"
+	desc = "Gross robot meat."
+	filling_color = "#000000"
+	tastes = list("metal" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
+	desc = "Tastes like chicken, that's... not what it is!"
+	icon = 'modular_citadel/icons/obj/foods.dmi'
+	icon_state = "mothmeat"
+	filling_color = "#BF896B"
+	tastes = list("insects" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
+	desc = "Tastes like chicken, that's because it is!"
+	icon = 'modular_citadel/icons/obj/foods.dmi'
+	icon_state = "birdmeat"
+	filling_color = "#BF896B"
+	tastes = list("chicken" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
+	desc = "Tastes sweet... reminds you vaguely of chicken."
+	filling_color = "#6B8E23"
+	tastes = list("brains" = 1, "meat" = 1)
@@ -1,12 +1,6 @@
 /mob/living/carbon/human/species/mammal
 	race = /datum/species/mammal

-/mob/living/carbon/human/species/avian
-	race = /datum/species/avian
-
-/mob/living/carbon/human/species/aquatic
-	race = /datum/species/aquatic
-
 /mob/living/carbon/human/species/insect
 	race = /datum/species/insect

@@ -1,21 +0,0 @@
-/mob/living/carbon/human/Life()
-		//citadel code
-	if(stat != DEAD)
-		handle_arousal()
-	. = ..()
-
-/mob/living/carbon/human/calculate_affecting_pressure(pressure)
-	if(ismob(loc))
-		return ONE_ATMOSPHERE
-	if(istype(loc, /obj/item/dogborg/sleeper))
-		return ONE_ATMOSPHERE
-	. = ..()
-
-/mob/living/carbon/human/update_health_hud(shown_health_amount)
-	. = ..()
-	if(!client || !hud_used)
-		return
-	if(hud_used.staminas)
-		hud_used.staminas.icon_state = staminahudamount()
-	if(hud_used.staminabuffer)
-		hud_used.staminabuffer.icon_state = staminabufferhudamount()
@@ -1,166 +0,0 @@
-/datum/species
-	var/should_draw_citadel = FALSE
-
-/datum/species/proc/alt_spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
-	if(!istype(M))
-		return TRUE
-	CHECK_DNA_AND_SPECIES(M)
-	CHECK_DNA_AND_SPECIES(H)
-
-	if(!istype(M)) //sanity check for drones.
-		return TRUE
-	if(M.mind)
-		attacker_style = M.mind.martial_art
-	if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK))
-		log_combat(M, H, "attempted to touch")
-		H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
-		return TRUE
-	switch(M.a_intent)
-		if(INTENT_HELP)
-			if(M == H)
-				althelp(M, H, attacker_style)
-				return TRUE
-			return FALSE
-		if(INTENT_DISARM)
-			altdisarm(M, H, attacker_style)
-			return TRUE
-	return FALSE
-
-/datum/species/proc/althelp(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
-	if(user == target && istype(user))
-		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
-			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
-			return
-		if(!user.resting)
-			to_chat(user, "<span class='notice'>You can only force yourself up if you're on the ground.</span>")
-			return
-		user.visible_message("<span class='notice'>[user] forces [p_them()]self up to [p_their()] feet!</span>", "<span class='notice'>You force yourself up to your feet!</span>")
-		user.resting = 0
-		user.update_canmove()
-		user.adjustStaminaLossBuffered(user.stambuffer) //Rewards good stamina management by making it easier to instantly get up from resting
-		playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-
-/datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
-		to_chat(user, "<span class='warning'>You're too exhausted.</span>")
-		return FALSE
-	if(target.check_block())
-		target.visible_message("<span class='warning'>[target] blocks [user]'s shoving attempt!</span>")
-		return FALSE
-	if(attacker_style && attacker_style.disarm_act(user,target))
-		return TRUE
-	if(user.resting)
-		return FALSE
-	else
-		if(user == target)
-			return
-		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
-		user.adjustStaminaLossBuffered(4)
-		playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
-
-		if(target.w_uniform)
-			target.w_uniform.add_fingerprint(user)
-		SEND_SIGNAL(target, COMSIG_HUMAN_DISARM_HIT, user, user.zone_selected)
-
-		if(!target.resting)
-			target.adjustStaminaLoss(5)
-
-
-		var/turf/target_oldturf = target.loc
-		var/shove_dir = get_dir(user.loc, target_oldturf)
-		var/turf/target_shove_turf = get_step(target.loc, shove_dir)
-		var/mob/living/carbon/human/target_collateral_human
-		var/obj/structure/table/target_table
-		var/shove_blocked = FALSE //Used to check if a shove is blocked so that if it is knockdown logic can be applied
-
-		//Thank you based whoneedsspace
-		target_collateral_human = locate(/mob/living/carbon/human) in target_shove_turf.contents
-		if(target_collateral_human)
-			shove_blocked = TRUE
-		else
-			target.Move(target_shove_turf, shove_dir)
-			if(get_turf(target) == target_oldturf)
-				if(target_shove_turf.density)
-					shove_blocked = TRUE
-				else
-					var/thoushallnotpass = FALSE
-					for(var/obj/O in target_shove_turf)
-						if(istype(O, /obj/structure/table))
-							target_table = O
-						else if(!O.CanPass(src, target_shove_turf))
-							shove_blocked = TRUE
-							thoushallnotpass = TRUE
-					if(thoushallnotpass)
-						target_table = null
-
-		if(target.is_shove_knockdown_blocked())
-			return
-
-		if(shove_blocked || target_table)
-			var/directional_blocked = FALSE
-			if(shove_dir in GLOB.cardinals) //Directional checks to make sure that we're not shoving through a windoor or something like that
-				var/target_turf = get_turf(target)
-				for(var/obj/O in target_turf)
-					if(O.flags_1 & ON_BORDER_1 && O.dir == shove_dir && O.density)
-						directional_blocked = TRUE
-						break
-				if(target_turf != target_shove_turf) //Make sure that we don't run the exact same check twice on the same tile
-					for(var/obj/O in target_shove_turf)
-						if(O.flags_1 & ON_BORDER_1 && O.dir == turn(shove_dir, 180) && O.density)
-							directional_blocked = TRUE
-							break
-			var/targetatrest = target.resting
-			if(((!target_table && !target_collateral_human) || directional_blocked) && !targetatrest)
-				target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
-				user.visible_message("<span class='danger'>[user.name] shoves [target.name], knocking them down!</span>",
-					"<span class='danger'>You shove [target.name], knocking them down!</span>", null, COMBAT_MESSAGE_RANGE)
-				log_combat(user, target, "shoved", "knocking them down")
-			else if(target_table)
-				if(!targetatrest)
-					target.Knockdown(SHOVE_KNOCKDOWN_TABLE)
-				user.visible_message("<span class='danger'>[user.name] shoves [target.name] onto \the [target_table]!</span>",
-					"<span class='danger'>You shove [target.name] onto \the [target_table]!</span>", null, COMBAT_MESSAGE_RANGE)
-				target.forceMove(target_shove_turf)
-				log_combat(user, target, "shoved", "onto [target_table]")
-			else if(target_collateral_human && !targetatrest)
-				target.Knockdown(SHOVE_KNOCKDOWN_HUMAN)
-				if(!target_collateral_human.resting)
-					target_collateral_human.Knockdown(SHOVE_KNOCKDOWN_COLLATERAL)
-				user.visible_message("<span class='danger'>[user.name] shoves [target.name] into [target_collateral_human.name]!</span>",
-					"<span class='danger'>You shove [target.name] into [target_collateral_human.name]!</span>", null, COMBAT_MESSAGE_RANGE)
-				log_combat(user, target, "shoved", "into [target_collateral_human.name]")
-
-		else
-			user.visible_message("<span class='danger'>[user.name] shoves [target.name]!</span>",
-				"<span class='danger'>You shove [target.name]!</span>", null, COMBAT_MESSAGE_RANGE)
-			var/target_held_item = target.get_active_held_item()
-			var/knocked_item = FALSE
-			if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types))
-				target_held_item = null
-			if(!target.has_movespeed_modifier(SHOVE_SLOWDOWN_ID))
-				target.add_movespeed_modifier(SHOVE_SLOWDOWN_ID, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH)
-				if(target_held_item)
-					target.visible_message("<span class='danger'>[target.name]'s grip on \the [target_held_item] loosens!</span>",
-						"<span class='danger'>Your grip on \the [target_held_item] loosens!</span>", null, COMBAT_MESSAGE_RANGE)
-				addtimer(CALLBACK(target, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH)
-			else if(target_held_item)
-				target.dropItemToGround(target_held_item)
-				knocked_item = TRUE
-				target.visible_message("<span class='danger'>[target.name] drops \the [target_held_item]!!</span>",
-					"<span class='danger'>You drop \the [target_held_item]!!</span>", null, COMBAT_MESSAGE_RANGE)
-			var/append_message = ""
-			if(target_held_item)
-				if(knocked_item)
-					append_message = "causing them to drop [target_held_item]"
-				else
-					append_message = "loosening their grip on [target_held_item]"
-			log_combat(user, target, "shoved", append_message)
-
-
-////////////////////
-/////BODYPARTS/////
-////////////////////
-
-
-/obj/item/bodypart
-	var/should_draw_citadel = FALSE
@@ -1,237 +0,0 @@
-/datum/species/mammal
-	name = "Mammal"
-	id = "mammal"
-	default_color = "4B4B4B"
-	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
-	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "legs")
-	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs")
-	attack_verb = "claw"
-	attack_sound = 'sound/weapons/slash.ogg'
-	miss_sound = 'sound/weapons/slashmiss.ogg'
-	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
-	liked_food = MEAT | FRIED
-	disliked_food = TOXIC
-
-//Curiosity killed the cat's wagging tail.
-/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
-	if(H)
-		stop_wagging_tail(H)
-
-/datum/species/mammal/spec_stun(mob/living/carbon/human/H,amount)
-	if(H)
-		stop_wagging_tail(H)
-	. = ..()
-
-/datum/species/mammal/can_wag_tail(mob/living/carbon/human/H)
-	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/mammal/is_wagging_tail(mob/living/carbon/human/H)
-	return ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/mammal/start_wagging_tail(mob/living/carbon/human/H)
-	if("mam_tail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_tail"
-		mutant_bodyparts |= "mam_waggingtail"
-	H.update_body()
-
-/datum/species/mammal/stop_wagging_tail(mob/living/carbon/human/H)
-	if("mam_waggingtail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_waggingtail"
-		mutant_bodyparts |= "mam_tail"
-	H.update_body()
-
-
-/datum/species/mammal/qualifies_for_rank(rank, list/features)
-	return TRUE
-
-
-//AVIAN//
-/datum/species/avian
-	name = "Avian"
-	id = "avian"
-	say_mod = "chirps"
-	default_color = "BCAC9B"
-	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
-	mutant_bodyparts = list("mam_snouts", "wings", "taur", "mam_tail", "mam_body_markings", "taur")
-	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Beak", "mam_body_markings" = "Hawk", "wings" = "None", "taur" = "None", "mam_tail" = "Hawk")
-	attack_verb = "peck"
-	attack_sound = 'sound/weapons/slash.ogg'
-	miss_sound = 'sound/weapons/slashmiss.ogg'
-	liked_food = MEAT | FRUIT
-	disliked_food = TOXIC
-
-/datum/species/avian/spec_death(gibbed, mob/living/carbon/human/H)
-	if(H)
-		stop_wagging_tail(H)
-
-/datum/species/avian/spec_stun(mob/living/carbon/human/H,amount)
-	if(H)
-		stop_wagging_tail(H)
-	. = ..()
-
-/datum/species/avian/can_wag_tail(mob/living/carbon/human/H)
-	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/avian/is_wagging_tail(mob/living/carbon/human/H)
-	return ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/avian/start_wagging_tail(mob/living/carbon/human/H)
-	if("mam_tail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_tail"
-		mutant_bodyparts |= "mam_waggingtail"
-	H.update_body()
-
-/datum/species/avian/stop_wagging_tail(mob/living/carbon/human/H)
-	if("mam_waggingtail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_waggingtail"
-		mutant_bodyparts |= "mam_tail"
-	H.update_body()
-
-/datum/species/avian/qualifies_for_rank(rank, list/features)
-	return TRUE
-
-//AQUATIC//
-/datum/species/aquatic
-	name = "Aquatic"
-	id = "aquatic"
-	default_color = "BCAC9B"
-	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
-	mutant_bodyparts = list("mam_tail", "mam_ears","mam_body_markings", "taur", "legs", "mam_snouts")
-	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "Shark", "mam_ears" = "None", "mam_body_markings" = "Shark", "mam_snouts" = "Round", "taur" = "None", "legs" = "Normal Legs")
-	attack_verb = "bite"
-	attack_sound = 'sound/weapons/bite.ogg'
-	miss_sound = 'sound/weapons/slashmiss.ogg'
-	liked_food = MEAT
-	disliked_food = TOXIC
-	meat = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic
-
-/datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
-	if(H)
-		stop_wagging_tail(H)
-
-/datum/species/aquatic/spec_stun(mob/living/carbon/human/H,amount)
-	if(H)
-		stop_wagging_tail(H)
-	. = ..()
-
-/datum/species/aquatic/can_wag_tail(mob/living/carbon/human/H)
-	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/aquatic/is_wagging_tail(mob/living/carbon/human/H)
-	return ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/aquatic/start_wagging_tail(mob/living/carbon/human/H)
-	if("mam_tail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_tail"
-		mutant_bodyparts |= "mam_waggingtail"
-	H.update_body()
-
-/datum/species/aquatic/stop_wagging_tail(mob/living/carbon/human/H)
-	if("mam_waggingtail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_waggingtail"
-		mutant_bodyparts |= "mam_tail"
-	H.update_body()
-
-/datum/species/aquatic/qualifies_for_rank(rank, list/features)
-	return TRUE
-
-//INSECT//
-/datum/species/insect
-	name = "Insect"
-	id = "insect"
-	default_color = "BCAC9B"
-	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
-	mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings", "mam_snouts")
-	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None")
-	attack_verb = "flutter" //wat?
-	attack_sound = 'sound/weapons/slash.ogg'
-	miss_sound = 'sound/weapons/slashmiss.ogg'
-	liked_food = MEAT | FRUIT
-	disliked_food = TOXIC
-
-/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
-	if(H)
-		stop_wagging_tail(H)
-
-/datum/species/insect/spec_stun(mob/living/carbon/human/H,amount)
-	if(H)
-		stop_wagging_tail(H)
-	. = ..()
-
-/datum/species/insect/can_wag_tail(mob/living/carbon/human/H)
-	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/insect/is_wagging_tail(mob/living/carbon/human/H)
-	return ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/insect/start_wagging_tail(mob/living/carbon/human/H)
-	if("mam_tail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_tail"
-		mutant_bodyparts |= "mam_waggingtail"
-	H.update_body()
-
-/datum/species/insect/stop_wagging_tail(mob/living/carbon/human/H)
-	if("mam_waggingtail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_waggingtail"
-		mutant_bodyparts |= "mam_tail"
-	H.update_body()
-
-/datum/species/insect/qualifies_for_rank(rank, list/features)
-	return TRUE
-
-//Alien//
-/datum/species/xeno
-	// A cloning mistake, crossing human and xenomorph DNA
-	name = "Xeno Hybrid"
-	id = "xeno"
-	say_mod = "hisses"
-	default_color = "00FF00"
-	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
-	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
-	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur", "legs")
-	default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade Legs")
-	attack_verb = "slash"
-	attack_sound = 'sound/weapons/slash.ogg'
-	miss_sound = 'sound/weapons/slashmiss.ogg'
-	meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
-	skinned_type = /obj/item/stack/sheet/animalhide/xeno
-	exotic_bloodtype = "L"
-	damage_overlay_type = "xeno"
-	liked_food = MEAT
-
-/datum/species/xeno/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
-		species_traits += DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(FALSE)
-	. = ..()
-
-/datum/species/xeno/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Normal Legs")
-		species_traits -= DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(TRUE)
-	. = ..()
-
-//Praise the Omnissiah, A challange worthy of my skills - HS
-
-//EXOTIC//
-//These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
-
-//misc
-/mob/living/carbon/human/dummy
-	no_vore = TRUE
-
-/mob/living/carbon/human/vore
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
@@ -1,257 +0,0 @@
-/datum/species/jelly/slime
-	name = "Xenobiological Slimeperson"
-
-//##########SLIMEPEOPLE##########
-
-/datum/species/jelly/roundstartslime
-	name = "Slimeperson"
-	id = "slimeperson"
-	limbs_id = "slime"
-	default_color = "00FFFF"
-	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
-	inherent_traits = list(TRAIT_TOXINLOVER)
-	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur")
-	default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
-	say_mod = "says"
-	hair_color = "mutcolor"
-	hair_alpha = 160 //a notch brighter so it blends better.
-	coldmod = 3
-	heatmod = 1
-	burnmod = 1
-
-/datum/species/jelly/roundstartslime/spec_death(gibbed, mob/living/carbon/human/H)
-	if(H)
-		stop_wagging_tail(H)
-
-/datum/species/jelly/roundstartslime/spec_stun(mob/living/carbon/human/H,amount)
-	if(H)
-		stop_wagging_tail(H)
-	. = ..()
-
-/datum/species/jelly/roundstartslime/can_wag_tail(mob/living/carbon/human/H)
-	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/jelly/roundstartslime/is_wagging_tail(mob/living/carbon/human/H)
-	return ("mam_waggingtail" in mutant_bodyparts)
-
-/datum/species/jelly/roundstartslime/start_wagging_tail(mob/living/carbon/human/H)
-	if("mam_tail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_tail"
-		mutant_bodyparts |= "mam_waggingtail"
-	H.update_body()
-
-/datum/species/jelly/roundstartslime/stop_wagging_tail(mob/living/carbon/human/H)
-	if("mam_waggingtail" in mutant_bodyparts)
-		mutant_bodyparts -= "mam_waggingtail"
-		mutant_bodyparts |= "mam_tail"
-	H.update_body()
-
-
-/datum/action/innate/slime_change
-	name = "Alter Form"
-	check_flags = AB_CHECK_CONSCIOUS
-	button_icon_state = "alter_form" //placeholder
-	icon_icon = 'modular_citadel/icons/mob/actions/actions_slime.dmi'
-	background_icon_state = "bg_alien"
-
-/datum/action/innate/slime_change/Activate()
-	var/mob/living/carbon/human/H = owner
-	if(!isjellyperson(H))
-		return
-	else
-		H.visible_message("<span class='notice'>[owner] gains a look of \
-		concentration while standing perfectly still.\
-		 Their body seems to shift and starts getting more goo-like.</span>",
-		"<span class='notice'>You focus intently on altering your body while \
-		standing perfectly still...</span>")
-		change_form()
-
-/datum/action/innate/slime_change/proc/change_form()
-	var/mob/living/carbon/human/H = owner
-	var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel")
-	if(select_alteration == "Hair Style")
-		if(H.gender == MALE)
-			var/new_style = input(owner, "Select a facial hair style", "Hair Alterations")  as null|anything in GLOB.facial_hair_styles_list
-			if(new_style)
-				H.facial_hair_style = new_style
-		else
-			H.facial_hair_style = "Shaved"
-		//handle normal hair
-		var/new_style = input(owner, "Select a hair style", "Hair Alterations")  as null|anything in GLOB.hair_styles_list
-		if(new_style)
-			H.hair_style = new_style
-			H.update_hair()
-	else if (select_alteration == "Genitals")
-		var/list/organs = list()
-		var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add sexual organ", "remove sexual organ", "cancel")
-		switch(operation)
-			if("add sexual organ")
-				var/new_organ = input("Select sexual organ:", "Organ Manipulation") in list("Penis", "Testicles", "Breasts", "Vagina", "Womb", "Cancel")
-				if(new_organ == "Penis")
-					H.give_penis()
-				else if(new_organ == "Testicles")
-					H.give_balls()
-				else if(new_organ == "Breasts")
-					H.give_breasts()
-				else if(new_organ == "Vagina")
-					H.give_vagina()
-				else if(new_organ == "Womb")
-					H.give_womb()
-				else
-					return
-			if("remove sexual organ")
-				for(var/obj/item/organ/genital/X in H.internal_organs)
-					var/obj/item/organ/I = X
-					organs["[I.name] ([I.type])"] = I
-				var/obj/item/organ = input("Select sexual organ:", "Organ Manipulation", null) in organs
-				organ = organs[organ]
-				if(!organ)
-					return
-				var/obj/item/organ/genital/O
-				if(isorgan(organ))
-					O = organ
-					O.Remove(H)
-				organ.forceMove(get_turf(H))
-				qdel(organ)
-				H.update_genitals()
-
-	else if (select_alteration == "Ears")
-		var/list/snowflake_ears_list = list("Normal" = null)
-		for(var/path in GLOB.mam_ears_list)
-			var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
-			if(istype(instance, /datum/sprite_accessory))
-				var/datum/sprite_accessory/S = instance
-				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
-					snowflake_ears_list[S.name] = path
-		var/new_ears
-		new_ears = input(owner, "Choose your character's ears:", "Ear Alteration") as null|anything in snowflake_ears_list
-		if(new_ears)
-			H.dna.features["mam_ears"] = new_ears
-		H.update_body()
-
-	else if (select_alteration == "Snout")
-		var/list/snowflake_snouts_list = list("Normal" = null)
-		for(var/path in GLOB.mam_snouts_list)
-			var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[path]
-			if(istype(instance, /datum/sprite_accessory))
-				var/datum/sprite_accessory/S = instance
-				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
-					snowflake_snouts_list[S.name] = path
-		var/new_snout
-		new_snout = input(owner, "Choose your character's face:", "Face Alteration") as null|anything in snowflake_snouts_list
-		if(new_snout)
-			H.dna.features["mam_snouts"] = new_snout
-		H.update_body()
-
-	else if (select_alteration == "Markings")
-		var/list/snowflake_markings_list = list()
-		for(var/path in GLOB.mam_body_markings_list)
-			var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
-			if(istype(instance, /datum/sprite_accessory))
-				var/datum/sprite_accessory/S = instance
-				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
-					snowflake_markings_list[S.name] = path
-		var/new_mam_body_markings
-		new_mam_body_markings = input(H, "Choose your character's body markings:", "Marking Alteration") as null|anything in snowflake_markings_list
-		if(new_mam_body_markings)
-			H.dna.features["mam_body_markings"] = new_mam_body_markings
-			if(new_mam_body_markings == "None")
-				H.dna.features["mam_body_markings"] = "Plain"
-		for(var/X in H.bodyparts) //propagates the markings changes
-			var/obj/item/bodypart/BP = X
-			BP.update_limb(FALSE, H)
-		H.update_body()
-
-	else if (select_alteration == "Tail")
-		var/list/snowflake_tails_list = list("Normal" = null)
-		for(var/path in GLOB.mam_tails_list)
-			var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
-			if(istype(instance, /datum/sprite_accessory))
-				var/datum/sprite_accessory/S = instance
-				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
-					snowflake_tails_list[S.name] = path
-		var/new_tail
-		new_tail = input(owner, "Choose your character's Tail(s):", "Tail Alteration") as null|anything in snowflake_tails_list
-		if(new_tail)
-			H.dna.features["mam_tail"] = new_tail
-			if(new_tail != "None")
-				H.dna.features["taur"] = "None"
-		H.update_body()
-
-	else if (select_alteration == "Taur body")
-		var/list/snowflake_taur_list = list("Normal" = null)
-		for(var/path in GLOB.taur_list)
-			var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
-			if(istype(instance, /datum/sprite_accessory))
-				var/datum/sprite_accessory/S = instance
-				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
-					snowflake_taur_list[S.name] = path
-		var/new_taur
-		new_taur = input(owner, "Choose your character's tauric body:", "Tauric Alteration") as null|anything in snowflake_taur_list
-		if(new_taur)
-			H.dna.features["taur"] = new_taur
-			if(new_taur != "None")
-				H.dna.features["mam_tail"] = "None"
-		H.update_body()
-
-	else if (select_alteration == "Penis")
-		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
-			qdel(X)
-		var/new_shape
-		new_shape = input(owner, "Choose your character's dong", "Genital Alteration") as null|anything in GLOB.cock_shapes_list
-		if(new_shape)
-			H.dna.features["cock_shape"] = new_shape
-		H.update_genitals()
-		H.give_balls()
-		H.give_penis()
-		H.apply_overlay()
-
-
-	else if (select_alteration == "Vagina")
-		for(var/obj/item/organ/genital/vagina/X in H.internal_organs)
-			qdel(X)
-		var/new_shape
-		new_shape = input(owner, "Choose your character's pussy", "Genital Alteration") as null|anything in GLOB.vagina_shapes_list
-		if(new_shape)
-			H.dna.features["vag_shape"] = new_shape
-		H.update_genitals()
-		H.give_womb()
-		H.give_vagina()
-		H.apply_overlay()
-
-	else if (select_alteration == "Penis Length")
-		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
-			qdel(X)
-		var/new_length
-		new_length = input(owner, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Genital Alteration") as num|null
-		if(new_length)
-			H.dna.features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
-		H.update_genitals()
-		H.apply_overlay()
-		H.give_balls()
-		H.give_penis()
-
-	else if (select_alteration == "Breast Size")
-		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
-			qdel(X)
-		var/new_size
-		new_size = input(owner, "Breast Size", "Genital Alteration") as null|anything in GLOB.breasts_size_list
-		if(new_size)
-			H.dna.features["breasts_size"] = new_size
-		H.update_genitals()
-		H.apply_overlay()
-		H.give_breasts()
-
-	else if (select_alteration == "Breast Shape")
-		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
-			qdel(X)
-		var/new_shape
-		new_shape = input(owner, "Breast Shape", "Genital Alteration") as null|anything in GLOB.breasts_shapes_list
-		if(new_shape)
-			H.dna.features["breasts_shape"] = new_shape
-		H.update_genitals()
-		H.apply_overlay()
-		H.give_breasts()
-
-	else
-		return
@@ -1940,15 +1940,17 @@
 #include "code\modules\mob\dead\new_player\poll.dm"
 #include "code\modules\mob\dead\new_player\preferences_setup.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\_sprite_accessories.dm"
+#include "code\modules\mob\dead\new_player\sprite_accessories\alienpeople.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\body_markings.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\caps.dm"
+#include "code\modules\mob\dead\new_player\sprite_accessories\Citadel_Snowflake.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\ears.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\frills.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\hair_face.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\hair_head.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\horns.dm"
-#include "code\modules\mob\dead\new_player\sprite_accessories\legs.dm"
-#include "code\modules\mob\dead\new_player\sprite_accessories\moth_wings.dm"
+#include "code\modules\mob\dead\new_player\sprite_accessories\ipc_synths.dm"
+#include "code\modules\mob\dead\new_player\sprite_accessories\legs_and_taurs.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\pines.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\snouts.dm"
 #include "code\modules\mob\dead\new_player\sprite_accessories\socks.dm"
@@ -2055,15 +2057,17 @@
 #include "code\modules\mob\living\carbon\human\species_types\abductors.dm"
 #include "code\modules\mob\living\carbon\human\species_types\android.dm"
 #include "code\modules\mob\living\carbon\human\species_types\angel.dm"
+#include "code\modules\mob\living\carbon\human\species_types\bugmen.dm"
 #include "code\modules\mob\living\carbon\human\species_types\corporate.dm"
 #include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
 #include "code\modules\mob\living\carbon\human\species_types\felinid.dm"
 #include "code\modules\mob\living\carbon\human\species_types\flypeople.dm"
+#include "code\modules\mob\living\carbon\human\species_types\furrypeople.dm"
 #include "code\modules\mob\living\carbon\human\species_types\golems.dm"
 #include "code\modules\mob\living\carbon\human\species_types\humans.dm"
+#include "code\modules\mob\living\carbon\human\species_types\ipc.dm"
 #include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
 #include "code\modules\mob\living\carbon\human\species_types\lizardpeople.dm"
-#include "code\modules\mob\living\carbon\human\species_types\mothmen.dm"
 #include "code\modules\mob\living\carbon\human\species_types\mushpeople.dm"
 #include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm"
 #include "code\modules\mob\living\carbon\human\species_types\podpeople.dm"
@@ -2937,7 +2941,6 @@
 #include "modular_citadel\code\game\objects\items\boombox.dm"
 #include "modular_citadel\code\game\objects\items\holy_weapons.dm"
 #include "modular_citadel\code\game\objects\items\honk.dm"
-#include "modular_citadel\code\game\objects\items\meat.dm"
 #include "modular_citadel\code\game\objects\items\stunsword.dm"
 #include "modular_citadel\code\game\objects\items\vending_items.dm"
 #include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm"
@@ -3034,7 +3037,6 @@
 #include "modular_citadel\code\modules\mining\mining_ruins.dm"
 #include "modular_citadel\code\modules\mob\cit_emotes.dm"
 #include "modular_citadel\code\modules\mob\mob.dm"
-#include "modular_citadel\code\modules\mob\dead\new_player\sprite_accessories.dm"
 #include "modular_citadel\code\modules\mob\living\damage_procs.dm"
 #include "modular_citadel\code\modules\mob\living\living.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\carbon.dm"
@@ -3044,11 +3046,6 @@
 #include "modular_citadel\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human_movement.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\human\life.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\human\species.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\furrypeople.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\ipc.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
 #include "modular_citadel\code\modules\mob\living\silicon\ai\vox_sounds.dm"
 #include "modular_citadel\code\modules\mob\living\silicon\robot\dogborg_equipment.dm"
 #include "modular_citadel\code\modules\mob\living\silicon\robot\robot.dm"