diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 4ed099d9e2..4372c4ca24 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -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"
diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index da5981ff8a..d966c73d23 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -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))
 
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 8ff40c3ef9..ef9e6a044f 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -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) )
 
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index ad2bedaa4e..4a92ea02e4 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -30,7 +30,7 @@
 	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)
 
 //CIT CHANGES START HERE, ADDS SNOWFLAKE BODYPARTS AND MORE
 	//mammal bodyparts (fucking furries)
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 7ec99fa885..1f960ffa4f 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -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,8 @@
 		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)
 
 	//CIT CHANGES - genitals and such
 	if(!GLOB.cock_shapes_list.len)
@@ -138,13 +138,14 @@
 		"wings" = "None",
 		"snout" = pick(GLOB.snouts_list),
 		"horns" = pick(GLOB.horns_list),
+		"horn_color" = "85615a",
 		"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"),
+		"legs" = pick("Plantigrade","Digitigrade"),
 		"caps" = pick(GLOB.caps_list),
-		"moth_wings" = pick(GLOB.moth_wings_list),
+		"insect_wings" = pick(GLOB.insect_wings_list),
 		"taur" = "None",
 		"mam_body_markings" = pick(snowflake_markings_list),
 		"mam_ears" 			= pick(snowflake_ears_list),
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index d09368d7b7..63696f4ba5 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -34,7 +34,7 @@ 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(caps_list)
 
 GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list("ghost")) //stores the ghost forms that support directional sprites
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 59806e97a4..b9cc6078e5 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -27,7 +27,7 @@
 							"human",
 							"lizard",
 							"fly",
-							"moth",
+							"insect",
 							"plasmaman",
 							"other"
 							)
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index f66cda42dc..2a05576ed0 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -34,7 +34,7 @@
 	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.update_body()
 	H.update_hair()
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index 8a3ff2186a..72edb18020 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -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
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d487b873b1..f2dc2c13a6 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -85,19 +85,21 @@ 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",
 		"tail_human" = "None",
 		"snout" = "Round",
 		"horns" = "None",
+		"horn_color" = "85615a",
 		"ears" = "None",
 		"wings" = "None",
 		"frills" = "None",
 		"spines" = "None",
 		"body_markings" = "None",
-		"legs" = "Normal Legs",
-		"moth_wings" = "Plain",
+		"legs" = "Plantigrade",
+		"insect_wings" = "Plain",
 		"mcolor2" = "FFF",
 		"mcolor3" = "FFF",
 		"mam_body_markings" = "Plain",
@@ -471,6 +473,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=horn_color;task=input'>Change</a><BR>"
+
 
 				mutant_category++
 				if(mutant_category >= MAX_MUTANT_ROWS)
@@ -573,13 +577,13 @@ 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)
@@ -1727,6 +1731,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_horns)
 						features["horns"] = new_horns
 
+				if("horn_colors")
+					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
@@ -1761,11 +1770,11 @@ 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("s_tone")
 					var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference")  as null|anything in GLOB.skin_tones
@@ -2325,7 +2334,7 @@ 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(("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
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 7911d92495..79fd324d70 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -242,11 +242,26 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(needs_update == -2)		//fatal, can't load any data
 		return 0
 
+	//Let's make our players NOT cry desperately as we wipe their savefiles of their special snowflake texts:
+	if((S["flavor_text"] != "") && (S["flavor_text"] != null) && S["flavor_text"]) //If old text isn't null and isn't "" but still exists.
+		S["flavor_text"]				>> features["flavor_text"] //Load old flavortext as current dna-based flavortext
+
+		WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) //Save it in our new type of flavor-text
+		WRITE_FILE(S["flavor_text"]	, "") //Remove old flavortext, completing the cut-and-paste into the new format.
+
+	else //We have no old flavortext, default to new
+		S["feature_flavor_text"]		>> features["flavor_text"]
+
 	//Species
 	var/species_id
 	S["species"]			>> species_id
 	if(species_id)
 		var/newtype = GLOB.species_list[species_id]
+		if(species_id == "avian" || species_id == "aquatic")
+			newtype = "mammal"
+		else if(species_id == "moth")
+			newtype = "insect"
+
 		if(newtype)
 			pref_species = new newtype
 
@@ -280,14 +295,21 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_lizard_tail"]			>> features["tail_lizard"]
 	S["feature_lizard_snout"]			>> features["snout"]
 	S["feature_lizard_horns"]			>> features["horns"]
+	S["feature_horn_color"]				>> features["horn_color"]
 	S["feature_lizard_frills"]			>> features["frills"]
 	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"]
 
+	if((S["feature_moth_wings"] != "") && (S["feature_moth_wings"] != null) && S["feature_moth_wings"]) //Shamelessly adapted from flavortext stuff
+		S["feature_moth_wings"]			>> features["moth_wings"]
+		WRITE_FILE(S["insect_wings"], features["moth_wings"])
+		WRITE_FILE(S["feature_moth_wings"]	, "")
+	else
+		S["feature_insect_wings"]				>> features["insect_wings"]
+
 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		var/savefile_slot_name = custom_name_id + "_name" //TODO remove this
@@ -417,12 +439,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	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["horn_color"]	= sanitize_hexcolor(features["horn_color"], 3, 0)
 	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)
 
 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -493,7 +516,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	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_insect_wings"]			, features["insect_wings"])
 
 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 1a82d1b406..ee169e9861 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -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"
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 7d1e25235d..ed19d27b22 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -402,14 +402,14 @@
 	begin_month = JUNE
 	begin_weekday = SUNDAY
 
-/datum/holiday/moth
-	name = "Moth Week"
+/datum/holiday/insect
+	name = "Insect Week"
 
-/datum/holiday/moth/shouldCelebrate(dd, mm, yy, ww, ddd) //National Moth Week falls on the last full week of July
+/datum/holiday/insect/shouldCelebrate(dd, mm, yy, ww, ddd) //National Insect Week falls on the last full week of July
 	return mm == JULY && (ww == 4 || (ww == 5 && ddd == SUNDAY))
 
-/datum/holiday/moth/getStationPrefix()
-	return pick("Mothball","Lepidopteran","Lightbulb","Moth","Giant Atlas","Twin-spotted Sphynx","Madagascan Sunset","Luna","Death's Head","Emperor Gum","Polyphenus","Oleander Hawk","Io","Rosy Maple","Cecropia","Noctuidae","Giant Leopard","Dysphania Militaris","Garden Tiger")
+/datum/holiday/insect/getStationPrefix()
+	return pick("Mothball","Lepidopteran","Lightbulb","Insect","Giant Atlas","Twin-spotted Sphynx","Madagascan Sunset","Luna","Death's Head","Emperor Gum","Polyphenus","Oleander Hawk","Io","Rosy Maple","Cecropia","Noctuidae","Giant Leopard","Dysphania Militaris","Garden Tiger")
 
 /datum/holiday/ramadan
 	name = "Start of Ramadan"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm b/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm
new file mode 100644
index 0000000000..020776a75f
--- /dev/null
+++ b/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm
@@ -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")
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
index 5e24d0630b..dd66f68e5d 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
@@ -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
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm b/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm
new file mode 100644
index 0000000000..6c0659f851
--- /dev/null
+++ b/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm
@@ -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"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
index 6bce18d7ce..6977419c3a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
@@ -1,6 +1,6 @@
-//////////.//////////////////
-// MutantParts Definitions //
-/////////////////////////////
+/******************************************
+************* Lizard Markings *************
+*******************************************/
 
 /datum/sprite_accessory/body_markings
 	icon = 'icons/mob/mutant_bodyparts.dmi'
@@ -22,4 +22,187 @@
 /datum/sprite_accessory/body_markings/lbelly
 	name = "Light Belly"
 	icon_state = "lbelly"
-	gender_specific = 1
\ No newline at end of file
+	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'
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
index 163f8370a2..1496ca030a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
@@ -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
\ No newline at end of file
+	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"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm
index 3566f3dea5..d11299fd5b 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm
@@ -86,4 +86,45 @@
 
 /datum/sprite_accessory/facial_hair/elvis
 	name = "Sideburns (Elvis)"
-	icon_state = "facial_elvis"
\ No newline at end of file
+	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
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
index f8d8d26328..abcc90c0ee 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
@@ -461,4 +461,163 @@
 
 /datum/sprite_accessory/hair/longestalt
 	name = "Very Long with Fringe"
-	icon_state = "hair_vlongfringe"
\ No newline at end of file
+	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
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
index 607ad650e3..a630ead7b3 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
@@ -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"
\ No newline at end of file
+	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"
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm b/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm
new file mode 100644
index 0000000000..6d2ab1a39b
--- /dev/null
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm
@@ -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"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs.dm
deleted file mode 100644
index 7663100822..0000000000
--- a/code/modules/mob/dead/new_player/sprite_accessories/legs.dm
+++ /dev/null
@@ -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"
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
new file mode 100644
index 0000000000..15640a2699
--- /dev/null
+++ b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
@@ -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
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/moth_wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/moth_wings.dm
deleted file mode 100644
index 6b8036bd69..0000000000
--- a/code/modules/mob/dead/new_player/sprite_accessories/moth_wings.dm
+++ /dev/null
@@ -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"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
index c663c08d69..7252f85324 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
@@ -15,4 +15,359 @@
 
 /datum/sprite_accessory/snouts/roundlight
 	name = "Round + Light"
-	icon_state = "roundlight"
\ No newline at end of file
+	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
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
index 31faabf663..6042d97247 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -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*/
\ No newline at end of file
+	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"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index d051b2f07a..1afad5ed16 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -1,3 +1,5 @@
+//Angel Wings
+
 /datum/sprite_accessory/wings/none
 	name = "None"
 	icon_state = "none"
@@ -23,4 +25,105 @@
 	dimension_x = 46
 	center = TRUE
 	dimension_y = 34
-	locked = TRUE
\ No newline at end of file
+	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 = "snow"
+	color_src = HAIR
+
+/datum/sprite_accessory/insect_wings/bee
+	name = "Bee"
+	icon_state = "bee"
+
+/datum/sprite_accessory/insect_wings/bee
+	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"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 528b55c921..dc2020c71d 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1029,8 +1029,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
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 35b0384145..2425fcf14d 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 0f83e675fc..bb65bfbcb0 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -15,6 +15,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)
@@ -260,7 +262,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)
@@ -717,8 +719,8 @@ 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("caps")
 					S = GLOB.caps_list[H.dna.features["caps"]]
 				if("ipc_screen")
@@ -815,6 +817,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 +884,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 +919,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
 
 
diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
new file mode 100644
index 0000000000..5ee591f690
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
@@ -0,0 +1,63 @@
+/datum/species/insect
+	name = "Anthromorphic Insect"
+	id = "insect"
+	say_mod = "flutters"
+	default_color = "00FF00"
+	species_traits = list(LIPS,NOEYES,HAIR,FACEHAIR,MUTCOLORS)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
+	mutant_bodyparts = list("mam_ears", "mam_snout", "mam_body_markings", "mam_tail", "taur", "insect_wings", "mam_snouts", "legs")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "insect_wings" = "None", "mam_snouts" = "None", "mam_body_markings" = "None", "taur" = "None", "legs" = "Plantigrade 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/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
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 30bf705547..98da8954ed 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -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", "horn_color" = "85615a", "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)
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
deleted file mode 100644
index d15d989384..0000000000
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ /dev/null
@@ -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
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 07c9b166ff..a593f93004 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -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
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index e34f34675c..fb2e4c396c 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -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)
diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm
index 71f7234e34..b31235052d 100644
--- a/code/modules/research/designs/limbgrower_designs.dm
+++ b/code/modules/research/designs/limbgrower_designs.dm
@@ -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")
 
 /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")
 
 /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")
 
 /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")
 
 /datum/design/armblade
 	name = "Arm Blade"
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 81b491e6de..45a9490bec 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -48,8 +48,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 +309,7 @@
 		should_draw_greyscale = FALSE
 		no_update = TRUE
 		body_markings = "husk" // reeee
-		auxmarking = "husk"
+		aux_marking = "husk"
 
 	if(no_update)
 		return
@@ -351,6 +351,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 +365,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 +388,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 +430,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 +460,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 +487,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 +495,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 +521,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 +540,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 +550,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")
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index eeaaaf2a03..40d11ca2a4 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -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
diff --git a/config/game_options.txt b/config/game_options.txt
index 6d59f10807..2e346ce0ac 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -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
diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi
index fc6fafb275..6bd504674f 100644
Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 7f10d992bc..8b894fea6b 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi
index 19ebe0a4be..f8d1f22860 100644
Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ
diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi
index b2990a1509..460185f157 100644
Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ
diff --git a/modular_citadel/code/game/objects/items/meat.dm b/modular_citadel/code/game/objects/items/meat.dm
index 3891c5ca9d..57f2123f8b 100644
--- a/modular_citadel/code/game/objects/items/meat.dm
+++ b/modular_citadel/code/game/objects/items/meat.dm
@@ -5,10 +5,10 @@
 	filling_color = "#000000"
 	tastes = list("metal" = 1)
 
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
 	icon = 'modular_citadel/icons/obj/foods.dmi'
 	icon_state = "mothmeat"
-	desc = "Moth meat."
+	desc = "Insect meat."
 	filling_color = "#BF896B"
 	tastes = list("insects" = 1)
 
diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
deleted file mode 100644
index bf811b777c..0000000000
--- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ /dev/null
@@ -1,2083 +0,0 @@
-/datum/sprite_accessory
-	var/extra = FALSE
-	var/extra_color_src = MUTCOLORS2						//The color source for the extra overlay.
-	var/extra2 = FALSE
-	var/extra_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	var/extra2_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	var/extra2_color_src = MUTCOLORS3
-	var/list/ckeys_allowed
-
-/datum/sprite_accessory/moth_wings/none
-	name = "None"
-	icon_state = "none"
-
-/***************** Alphabetical Order please ***************
-************* Keep it to Ears, Tails, Tails Animated *********/
-
-
-/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'
-
-//christ this was a mistake, but it's here just in case someone wants to selectively fix
-/************* 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
-*/
-
-/******************************************
-*************** 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/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'
-
-
-
-/******************************************
-************** Human Tails ****************
-*******************************************/
-
-/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"
-	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'
-
-/******************************************
-*********** Mammal Body Parts *************
-*******************************************/
-
-/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_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_snouts
-	color_src = MATRIXED
-	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
-
-/datum/sprite_accessory/mam_snouts/none
-	name = "None"
-	icon_state = "none"
-
-
-/******************************************
-**************** Snouts *******************
-*******************************************/
-
-/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
-
-/******************************************
-***************** Ears ********************
-*******************************************/
-
-/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"
-
-/******************************************
-*********** Tails and Things **************
-*******************************************/
-
-/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"
-
-/******************************************
-************ Body Markings ****************
-*******************************************/
-
-/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/hippo
-	name = "Hippo"
-	icon_state = "hippo"
-
-/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/moth
-	name = "Moth"
-	icon_state = "moth"
-	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'
-
-
-/******************************************
-************ 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
-
-/******************************************
-*************** Ayyliums ******************
-*******************************************/
-
-//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 Tail
-/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 Caste 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"
-
-// IPCs
-/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"
-
-// *** Snooooow flaaaaake ***
-
-/datum/sprite_accessory/horns/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
-
-/datum/sprite_accessory/snout/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	color_src = MATRIXED
-
-/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"
-
-/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
-
-/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"
-
-/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"
-
-/*************** 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
-
-#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
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human.dm b/modular_citadel/code/modules/mob/living/carbon/human/human.dm
index bb8d4a5f4a..e0d592827e 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/human.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/human.dm
@@ -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
 
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index 6b6349c0f3..58c276785b 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -1,12 +1,13 @@
 /datum/species/mammal
-	name = "Mammal"
+	name = "Anthromorph"
 	id = "mammal"
 	default_color = "4B4B4B"
 	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+	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", "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")
+	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", "horn_color" = "85615a" , "legs" = "Plantigrade")
 	attack_verb = "claw"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -47,150 +48,10 @@
 	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"
+	name = "Xenomorph Hybrid"
 	id = "xeno"
 	say_mod = "hisses"
 	default_color = "00FF00"
@@ -198,7 +59,7 @@
 	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")
+	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'
@@ -209,14 +70,14 @@
 	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")
+	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"] == "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)
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index c18303ad84..b8089708bd 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -4,7 +4,7 @@
 //##########SLIMEPEOPLE##########
 
 /datum/species/jelly/roundstartslime
-	name = "Slimeperson"
+	name = "Xenobiological Slime Hybrid"
 	id = "slimeperson"
 	limbs_id = "slime"
 	default_color = "00FFFF"
diff --git a/modular_citadel/icons/mob/mam_ears.dmi b/modular_citadel/icons/mob/mam_ears.dmi
index 569667a82d..a23716562e 100644
Binary files a/modular_citadel/icons/mob/mam_ears.dmi and b/modular_citadel/icons/mob/mam_ears.dmi differ
diff --git a/modular_citadel/icons/mob/mam_markings.dmi b/modular_citadel/icons/mob/mam_markings.dmi
index 8327be6eaf..dce56de556 100644
Binary files a/modular_citadel/icons/mob/mam_markings.dmi and b/modular_citadel/icons/mob/mam_markings.dmi differ
diff --git a/modular_citadel/icons/mob/markings_notmammals.dmi b/modular_citadel/icons/mob/markings_notmammals.dmi
index 59b10e93aa..d9577698d1 100644
Binary files a/modular_citadel/icons/mob/markings_notmammals.dmi and b/modular_citadel/icons/mob/markings_notmammals.dmi differ
diff --git a/modular_citadel/icons/mob/mutant_bodyparts.dmi b/modular_citadel/icons/mob/mutant_bodyparts.dmi
index 1e12d2bf1a..8c0856429b 100644
Binary files a/modular_citadel/icons/mob/mutant_bodyparts.dmi and b/modular_citadel/icons/mob/mutant_bodyparts.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 96bcffea30..d38c693d40 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1913,15 +1913,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"
@@ -2028,6 +2030,7 @@
 #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"
@@ -2036,7 +2039,6 @@
 #include "code\modules\mob\living\carbon\human\species_types\humans.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"
@@ -3003,7 +3005,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"