Revert "cease your shitcode: cum edition"

code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm

@@ -1,9 +1,9 @@
-/datum/sprite_accessory/tails/mam_tails/shark/datashark
+/datum/sprite_accessory/mam_tails/shark/datashark
 	name = "DataShark"
 	icon_state = "datashark"
 	ckeys_allowed = list("rubyflamewing")
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/shark/datashark
+/datum/sprite_accessory/mam_tails_animated/shark/datashark
 	name = "DataShark"
 	icon_state = "datashark"
 	ckeys_allowed = list("rubyflamewing")
@@ -14,19 +14,19 @@
 	ckeys_allowed = list("rubyflamewing")
 
 //Sabresune
-/datum/sprite_accessory/ears/mam_ears/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/tails/mam_tails/sabresune
+/datum/sprite_accessory/mam_tails/sabresune
 	name = "Sabresune"
 	icon_state = "sabresune"
 	ckeys_allowed = list("poojawa")
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/sabresune
+/datum/sprite_accessory/mam_tails_animated/sabresune
 	name = "Sabresune"
 	icon_state = "sabresune"
 	ckeys_allowed = list("poojawa")
@@ -37,17 +37,17 @@
 	ckeys_allowed = list("poojawa")
 
 //Lunasune
-/datum/sprite_accessory/ears/mam_ears/lunasune
+/datum/sprite_accessory/mam_ears/lunasune
 	name = "lunasune"
 	icon_state = "lunasune"
 	ckeys_allowed = list("invader4352")
 
-/datum/sprite_accessory/tails/mam_tails/lunasune
+/datum/sprite_accessory/mam_tails/lunasune
 	name = "lunasune"
 	icon_state = "lunasune"
 	ckeys_allowed = list("invader4352")
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/lunasune
+/datum/sprite_accessory/mam_tails_animated/lunasune
 	name = "lunasune"
 	icon_state = "lunasune"
 	ckeys_allowed = list("invader4352")

code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm

@@ -76,9 +76,6 @@
 	//For soft-restricting markings to species IDs
 	var/list/recommended_species
 
-/datum/sprite_accessory/proc/is_not_visible(var/mob/living/carbon/human/H, var/tauric) //return if the accessory shouldn't be shown
-	return FALSE
-
 /datum/sprite_accessory/underwear
 	icon = 'icons/mob/clothing/underwear.dmi'
 	var/has_color = FALSE

code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm

@@ -7,9 +7,6 @@
 	mutant_part_string = "xenodorsal"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/xeno_dorsal/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!H.dna.features["xenodorsal"] || H.dna.features["xenodorsal"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)))
-
 /datum/sprite_accessory/xeno_dorsal/standard
 	name = "Standard"
 	icon_state = "standard"
@@ -30,9 +27,6 @@
 	mutant_part_string = "tail"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/xeno_tail/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!H.dna.features["xenotail"] || H.dna.features["xenotail"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
-
 /datum/sprite_accessory/xeno_tail/none
 	name = "None"
 	relevant_layers = null
@@ -49,10 +43,6 @@
 	mutant_part_string = "xhead"
 	relevant_layers = list(BODY_ADJ_LAYER)
 
-/datum/sprite_accessory/xeno_head/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return (!H.dna.features["xenohead"] || H.dna.features["xenohead"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
-
 /datum/sprite_accessory/xeno_head/standard
 	name = "Standard"
 	icon_state = "standard"

code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm

@@ -224,9 +224,6 @@
 	color_src = 0
 	relevant_layers = list(BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/insect_fluff/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!H.dna.features["insect_fluff"] || H.dna.features["insect_fluff"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
-
 /datum/sprite_accessory/insect_fluff/none
 	name = "None"
 	icon_state = "none"

code/modules/mob/dead/new_player/sprite_accessories/ears.dm

@@ -3,10 +3,6 @@
 	mutant_part_string = "ears"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/ears/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return (!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
-
 /datum/sprite_accessory/ears/none
 	name = "None"
 	icon_state = "none"
@@ -179,54 +175,50 @@
 *************** Furry Ears ****************
 *******************************************/
 
-/datum/sprite_accessory/ears/mam_ears
+/datum/sprite_accessory/mam_ears
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
 	mutant_part_string = "ears"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/ears/mam_ears/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return (!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
-
-/datum/sprite_accessory/ears/mam_ears/none
+/datum/sprite_accessory/mam_ears/none
 	name = "None"
 	icon_state = "none"
 	relevant_layers = null
 
-/datum/sprite_accessory/ears/mam_ears/axolotl
+/datum/sprite_accessory/mam_ears/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
 
-/datum/sprite_accessory/ears/mam_ears/bat
+/datum/sprite_accessory/mam_ears/bat
 	name = "Bat"
 	icon_state = "bat"
 
-/datum/sprite_accessory/ears/mam_ears/bear
+/datum/sprite_accessory/mam_ears/bear
 	name = "Bear"
 	icon_state = "bear"
 
-/datum/sprite_accessory/ears/mam_ears/bigwolf
+/datum/sprite_accessory/mam_ears/bigwolf
 	name = "Big Wolf"
 	icon_state = "bigwolf"
 
-/datum/sprite_accessory/ears/mam_ears/bigwolfinner
+/datum/sprite_accessory/mam_ears/bigwolfinner
 	name = "Big Wolf (ALT)"
 	icon_state = "bigwolfinner"
 	extra = TRUE
 	extra_color_src = NONE
 
-/datum/sprite_accessory/ears/mam_ears/bigwolfdark
+/datum/sprite_accessory/mam_ears/bigwolfdark
 	name = "Dark Big Wolf"
 	icon_state = "bigwolfdark"
 
-/datum/sprite_accessory/ears/mam_ears/bigwolfinnerdark
+/datum/sprite_accessory/mam_ears/bigwolfinnerdark
 	name = "Dark Big Wolf (ALT)"
 	icon_state = "bigwolfinnerdark"
 	extra = TRUE
 	extra_color_src = NONE
 
-/datum/sprite_accessory/ears/mam_ears/cat
+/datum/sprite_accessory/mam_ears/cat
 	name = "Cat"
 	icon_state = "cat"
 	icon = 'icons/mob/mutant_bodyparts.dmi'
@@ -234,100 +226,100 @@
 	extra = TRUE
 	extra_color_src = NONE
 
-/datum/sprite_accessory/ears/mam_ears/catbig
+/datum/sprite_accessory/mam_ears/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
 
-/datum/sprite_accessory/ears/mam_ears/cow
+/datum/sprite_accessory/mam_ears/cow
 	name = "Cow"
 	icon_state = "cow"
 
-/datum/sprite_accessory/ears/mam_ears/curled
+/datum/sprite_accessory/mam_ears/curled
 	name = "Curled Horn"
 	icon_state = "horn1"
 	color_src = MUTCOLORS3
 
-/datum/sprite_accessory/ears/mam_ears/deer
+/datum/sprite_accessory/mam_ears/deer
 	name = "Deer"
 	icon_state = "deer"
 	color_src = MUTCOLORS3
 
-/datum/sprite_accessory/ears/mam_ears/eevee
+/datum/sprite_accessory/mam_ears/eevee
 	name = "Eevee"
 	icon_state = "eevee"
 
 
-/datum/sprite_accessory/ears/mam_ears/elf
+/datum/sprite_accessory/mam_ears/elf
 	name = "Elf"
 	icon_state = "elf"
 	color_src = MUTCOLORS3
 
 
-/datum/sprite_accessory/ears/mam_ears/elephant
+/datum/sprite_accessory/mam_ears/elephant
 	name = "Elephant"
 	icon_state = "elephant"
 
-/datum/sprite_accessory/ears/mam_ears/fennec
+/datum/sprite_accessory/mam_ears/fennec
 	name = "Fennec"
 	icon_state = "fennec"
 
-/datum/sprite_accessory/ears/mam_ears/fish
+/datum/sprite_accessory/mam_ears/fish
 	name = "Fish"
 	icon_state = "fish"
 
-/datum/sprite_accessory/ears/mam_ears/fox
+/datum/sprite_accessory/mam_ears/fox
 	name = "Fox"
 	icon_state = "fox"
 
-/datum/sprite_accessory/ears/mam_ears/husky
+/datum/sprite_accessory/mam_ears/husky
 	name = "Husky"
 	icon_state = "wolf"
 
-/datum/sprite_accessory/ears/mam_ears/kangaroo
+/datum/sprite_accessory/mam_ears/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
 
-/datum/sprite_accessory/ears/mam_ears/jellyfish
+/datum/sprite_accessory/mam_ears/jellyfish
 	name = "Jellyfish"
 	icon_state = "jellyfish"
 	color_src = HAIR
 
-/datum/sprite_accessory/ears/mam_ears/lab
+/datum/sprite_accessory/mam_ears/lab
 	name = "Dog, Long"
 	icon_state = "lab"
 
-/datum/sprite_accessory/ears/mam_ears/murid
+/datum/sprite_accessory/mam_ears/murid
 	name = "Murid"
 	icon_state = "murid"
 
-/datum/sprite_accessory/ears/mam_ears/otie
+/datum/sprite_accessory/mam_ears/otie
 	name = "Otusian"
 	icon_state = "otie"
 
-/datum/sprite_accessory/ears/mam_ears/squirrel
+/datum/sprite_accessory/mam_ears/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
 
-/datum/sprite_accessory/ears/mam_ears/pede
+/datum/sprite_accessory/mam_ears/pede
 	name = "Scolipede"
 	icon_state = "pede"
 
-/datum/sprite_accessory/ears/mam_ears/rabbit
+/datum/sprite_accessory/mam_ears/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
 
-/datum/sprite_accessory/ears/mam_ears/sergal
+/datum/sprite_accessory/mam_ears/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 
-/datum/sprite_accessory/ears/mam_ears/skunk
+/datum/sprite_accessory/mam_ears/skunk
 	name = "skunk"
 	icon_state = "skunk"
 
-/datum/sprite_accessory/ears/mam_ears/wolf
+/datum/sprite_accessory/mam_ears/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 
-/datum/sprite_accessory/ears/mam_ears/bunny
+/datum/sprite_accessory/mam_ears/bunny
 	name = "Bunny"
 	icon_state = "bunny"

code/modules/mob/dead/new_player/sprite_accessories/frills.dm

@@ -2,10 +2,6 @@
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	relevant_layers = list(BODY_ADJ_LAYER)
 
-/datum/sprite_accessory/frills/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return (!H.dna.features["frills"] || H.dna.features["frills"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || !HD || HD.status == BODYPART_ROBOTIC)
-
 /datum/sprite_accessory/frills/none
 	name = "None"
 	icon_state = "none"

code/modules/mob/dead/new_player/sprite_accessories/horns.dm

@@ -3,10 +3,6 @@
 	color_src = HORNCOLOR
 	relevant_layers = list(HORNS_LAYER)
 
-/datum/sprite_accessory/horns/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return (!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
-
 /datum/sprite_accessory/horns/none
 	name = "None"
 	icon_state = "none"

code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm

@@ -30,9 +30,6 @@
 	var/alt_taur_mode = NONE //Same as above.
 	var/hide_legs = USE_QUADRUPED_CLIP_MASK
 
-/datum/sprite_accessory/taur/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!tauric || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)))
-
 /datum/sprite_accessory/taur/New()
 	switch(hide_legs)
 		if(USE_QUADRUPED_CLIP_MASK)

code/modules/mob/dead/new_player/sprite_accessories/snouts.dm

@@ -3,10 +3,6 @@
 	mutant_part_string = "snout"
 	relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/snouts/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return ((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
-
 /datum/sprite_accessory/snouts/sharp
 	name = "Sharp"
 	icon_state = "sharp"
@@ -154,39 +150,35 @@
 ************** Mammal Snouts **************
 *******************************************/
 
-/datum/sprite_accessory/snouts/mam_snouts
+/datum/sprite_accessory/mam_snouts
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
 	recommended_species = list("mammal", "slimeperson", "insect", "podweak")
 	mutant_part_string = "snout"
 	relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/snouts/mam_snouts/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	return ((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
-
-/datum/sprite_accessory/snouts/mam_snouts/none
+/datum/sprite_accessory/mam_snouts/none
 	name = "None"
 	icon_state = "none"
 	recommended_species = null
 	relevant_layers = null
 
-/datum/sprite_accessory/snouts/mam_snouts/bird
+/datum/sprite_accessory/mam_snouts/bird
 	name = "Beak"
 	icon_state = "bird"
 
-/datum/sprite_accessory/snouts/mam_snouts/bigbeak
+/datum/sprite_accessory/mam_snouts/bigbeak
 	name = "Big Beak"
 	icon_state = "bigbeak"
 
-/datum/sprite_accessory/snouts/mam_snouts/bug
+/datum/sprite_accessory/mam_snouts/bug
 	name = "Bug"
 	icon_state = "bug"
 	color_src = MUTCOLORS
 	extra2 = TRUE
 	extra2_color_src = MUTCOLORS3
 
-/datum/sprite_accessory/snouts/mam_snouts/elephant
+/datum/sprite_accessory/mam_snouts/elephant
 	name = "Elephant"
 	icon_state = "elephant"
 	extra = TRUE
@@ -202,92 +194,92 @@
 	name = "Mammal, Long"
 	icon_state = "lcanid"
 
-/datum/sprite_accessory/snouts/mam_snouts/lcanidalt
+/datum/sprite_accessory/mam_snouts/lcanidalt
 	name = "Mammal, Long ALT"
 	icon_state = "lcanidalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/scanid
+/datum/sprite_accessory/mam_snouts/scanid
 	name = "Mammal, Short"
 	icon_state = "scanid"
 
-/datum/sprite_accessory/snouts/mam_snouts/scanidalt
+/datum/sprite_accessory/mam_snouts/scanidalt
 	name = "Mammal, Short ALT"
 	icon_state = "scanidalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/scanidalt2
+/datum/sprite_accessory/mam_snouts/scanidalt2
 	name = "Mammal, Short ALT 2"
 	icon_state = "scanidalt2"
 
-/datum/sprite_accessory/snouts/mam_snouts/wolf
+/datum/sprite_accessory/mam_snouts/wolf
 	name = "Mammal, Thick"
 	icon_state = "wolf"
 
-/datum/sprite_accessory/snouts/mam_snouts/wolfalt
+/datum/sprite_accessory/mam_snouts/wolfalt
 	name = "Mammal, Thick ALT"
 	icon_state = "wolfalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/redpanda
+/datum/sprite_accessory/mam_snouts/redpanda
 	name = "WahCoon"
 	icon_state = "wah"
 
-/datum/sprite_accessory/snouts/mam_snouts/redpandaalt
+/datum/sprite_accessory/mam_snouts/redpandaalt
 	name = "WahCoon ALT"
 	icon_state = "wahalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/rhino
+/datum/sprite_accessory/mam_snouts/rhino
 	name = "Horn"
 	icon_state = "rhino"
 	extra = TRUE
 	extra = MUTCOLORS3
 
-/datum/sprite_accessory/snouts/mam_snouts/rodent
+/datum/sprite_accessory/mam_snouts/rodent
 	name = "Rodent"
 	icon_state = "rodent"
 
-/datum/sprite_accessory/snouts/mam_snouts/husky
+/datum/sprite_accessory/mam_snouts/husky
 	name = "Husky"
 	icon_state = "husky"
 
-/datum/sprite_accessory/snouts/mam_snouts/otie
+/datum/sprite_accessory/mam_snouts/otie
 	name = "Otie"
 	icon_state = "otie"
 
-/datum/sprite_accessory/snouts/mam_snouts/pede
+/datum/sprite_accessory/mam_snouts/pede
 	name = "Scolipede"
 	icon_state = "pede"
 
-/datum/sprite_accessory/snouts/mam_snouts/sergal
+/datum/sprite_accessory/mam_snouts/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 
-/datum/sprite_accessory/snouts/mam_snouts/shark
+/datum/sprite_accessory/mam_snouts/shark
 	name = "Shark"
 	icon_state = "shark"
 
-/datum/sprite_accessory/snouts/mam_snouts/hshark
+/datum/sprite_accessory/mam_snouts/hshark
 	name = "hShark"
 	icon_state = "hshark"
 
-/datum/sprite_accessory/snouts/mam_snouts/toucan
+/datum/sprite_accessory/mam_snouts/toucan
 	name = "Toucan"
 	icon_state = "toucan"
 
-/datum/sprite_accessory/snouts/mam_snouts/sharp
+/datum/sprite_accessory/mam_snouts/sharp
 	name = "Sharp"
 	icon_state = "sharp"
 	color_src = MUTCOLORS
 
-/datum/sprite_accessory/snouts/mam_snouts/round
+/datum/sprite_accessory/mam_snouts/round
 	name = "Round"
 	icon_state = "round"
 	color_src = MUTCOLORS
 
-/datum/sprite_accessory/snouts/mam_snouts/sharplight
+/datum/sprite_accessory/mam_snouts/sharplight
 	name = "Sharp + Light"
 	icon_state = "sharplight"
 	color_src = MUTCOLORS
 
-/datum/sprite_accessory/snouts/mam_snouts/roundlight
+/datum/sprite_accessory/mam_snouts/roundlight
 	name = "Round + Light"
 	icon_state = "roundlight"
 	color_src = MUTCOLORS
@@ -297,109 +289,109 @@
 **************** Snouts *******************
 *************but higher up*****************/
 
-/datum/sprite_accessory/snouts/mam_snouts/fbird
+/datum/sprite_accessory/mam_snouts/fbird
 	name = "Beak (Top)"
 	icon_state = "fbird"
 
-/datum/sprite_accessory/snouts/mam_snouts/fbigbeak
+/datum/sprite_accessory/mam_snouts/fbigbeak
 	name = "Big Beak (Top)"
 	icon_state = "fbigbeak"
 
-/datum/sprite_accessory/snouts/mam_snouts/fbug
+/datum/sprite_accessory/mam_snouts/fbug
 	name = "Bug (Top)"
 	icon_state = "fbug"
 	color_src = MUTCOLORS
 	extra2 = TRUE
 	extra2_color_src = MUTCOLORS3
 
-/datum/sprite_accessory/snouts/mam_snouts/felephant
+/datum/sprite_accessory/mam_snouts/felephant
 	name = "Elephant (Top)"
 	icon_state = "felephant"
 	extra = TRUE
 	extra_color_src = MUTCOLORS3
 
-/datum/sprite_accessory/snouts/mam_snouts/flcanid
+/datum/sprite_accessory/mam_snouts/flcanid
 	name = "Mammal, Long (Top)"
 	icon_state = "flcanid"
 
-/datum/sprite_accessory/snouts/mam_snouts/flcanidalt
+/datum/sprite_accessory/mam_snouts/flcanidalt
 	name = "Mammal, Long ALT (Top)"
 	icon_state = "flcanidalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/fscanid
+/datum/sprite_accessory/mam_snouts/fscanid
 	name = "Mammal, Short (Top)"
 	icon_state = "fscanid"
 
-/datum/sprite_accessory/snouts/mam_snouts/fscanidalt
+/datum/sprite_accessory/mam_snouts/fscanidalt
 	name = "Mammal, Short ALT (Top)"
 	icon_state = "fscanidalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/fscanidalt2
+/datum/sprite_accessory/mam_snouts/fscanidalt2
 	name = "Mammal, Short ALT 2 (Top)"
 	icon_state = "fscanidalt2"
 
-/datum/sprite_accessory/snouts/mam_snouts/fwolf
+/datum/sprite_accessory/mam_snouts/fwolf
 	name = "Mammal, Thick (Top)"
 	icon_state = "fwolf"
 
-/datum/sprite_accessory/snouts/mam_snouts/fwolfalt
+/datum/sprite_accessory/mam_snouts/fwolfalt
 	name = "Mammal, Thick ALT (Top)"
 	icon_state = "fwolfalt"
 
-/datum/sprite_accessory/snouts/mam_snouts/fredpanda
+/datum/sprite_accessory/mam_snouts/fredpanda
 	name = "WahCoon (Top)"
 	icon_state = "fwah"
 
-/datum/sprite_accessory/snouts/mam_snouts/frhino
+/datum/sprite_accessory/mam_snouts/frhino
 	name = "Horn (Top)"
 	icon_state = "frhino"
 	extra = TRUE
 	extra = MUTCOLORS3
 
-/datum/sprite_accessory/snouts/mam_snouts/frodent
+/datum/sprite_accessory/mam_snouts/frodent
 	name = "Rodent (Top)"
 	icon_state = "frodent"
 
-/datum/sprite_accessory/snouts/mam_snouts/fhusky
+/datum/sprite_accessory/mam_snouts/fhusky
 	name = "Husky (Top)"
 	icon_state = "fhusky"
 
-/datum/sprite_accessory/snouts/mam_snouts/fotie
+/datum/sprite_accessory/mam_snouts/fotie
 	name = "Otie (Top)"
 	icon_state = "fotie"
 
-/datum/sprite_accessory/snouts/mam_snouts/fpede
+/datum/sprite_accessory/mam_snouts/fpede
 	name = "Scolipede (Top)"
 	icon_state = "fpede"
 
-/datum/sprite_accessory/snouts/mam_snouts/fsergal
+/datum/sprite_accessory/mam_snouts/fsergal
 	name = "Sergal (Top)"
 	icon_state = "fsergal"
 
-/datum/sprite_accessory/snouts/mam_snouts/fshark
+/datum/sprite_accessory/mam_snouts/fshark
 	name = "Shark (Top)"
 	icon_state = "fshark"
 
-/datum/sprite_accessory/snouts/mam_snouts/ftoucan
+/datum/sprite_accessory/mam_snouts/ftoucan
 	name = "Toucan (Top)"
 	icon_state = "ftoucan"
 
-/datum/sprite_accessory/snouts/mam_snouts/fsharp
+/datum/sprite_accessory/mam_snouts/fsharp
 	name = "Sharp (Top)"
 	icon_state = "fsharp"
 	color_src = MUTCOLORS
 
-/datum/sprite_accessory/snouts/mam_snouts/fround
+/datum/sprite_accessory/mam_snouts/fround
 	name = "Round (Top)"
 	icon_state = "fround"
 	color_src = MUTCOLORS
 
-/datum/sprite_accessory/snouts/mam_snouts/fsharplight
+/datum/sprite_accessory/mam_snouts/fsharplight
 	name = "Sharp + Light (Top)"
 	icon_state = "fsharplight"
 	color_src = MUTCOLORS
 
-/datum/sprite_accessory/snouts/mam_snouts/froundlight
+/datum/sprite_accessory/mam_snouts/froundlight
 	name = "Round + Light (Top)"
 	icon_state = "froundlight"
 	color_src = MUTCOLORS

code/modules/mob/dead/new_player/sprite_accessories/spines.dm

@@ -2,15 +2,10 @@
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER)
 
-/datum/sprite_accessory/spines/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR))
-
 /datum/sprite_accessory/spines_animated
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER)
 
-/datum/sprite_accessory/spines_animated/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || H.dna.species.mutant_bodyparts["tail"])
 /datum/sprite_accessory/spines/none
 	name = "None"
 	icon_state = "none"

code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm

@@ -1,24 +1,24 @@
 //Synth snouts (This is the most important part)
-/datum/sprite_accessory/snouts/mam_snouts/synthliz
+/datum/sprite_accessory/mam_snouts/synthliz
 	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard - Snout"
 	icon_state = "synthliz_basic"
 
-/datum/sprite_accessory/snouts/mam_snouts/synthliz/synthliz_under
+/datum/sprite_accessory/mam_snouts/synthliz/synthliz_under
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Snout Under"
 	icon_state = "synthliz_under"
 
-/datum/sprite_accessory/snouts/mam_snouts/synthliz/synthliz_tert
+/datum/sprite_accessory/mam_snouts/synthliz/synthliz_tert
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Snout Tertiary"
 	icon_state = "synthliz_tert"
 
-/datum/sprite_accessory/snouts/mam_snouts/synthliz/synthliz_tertunder
+/datum/sprite_accessory/mam_snouts/synthliz/synthliz_tertunder
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Snout Tertiary Under"
@@ -42,14 +42,14 @@
 	icon_state = "synthlizpecslight"
 
 //Synth tails
-/datum/sprite_accessory/tails/mam_tails/synthliz
+/datum/sprite_accessory/mam_tails/synthliz
 	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_tails.dmi'
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard"
 	icon_state = "synthliz"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/synthliz
+/datum/sprite_accessory/mam_tails_animated/synthliz
 	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_tails.dmi'
 	color_src = MUTCOLORS

code/modules/mob/dead/new_player/sprite_accessories/tails.dm

@@ -3,9 +3,6 @@
 	mutant_part_string = "tail"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/tails/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return ((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
-
 /datum/sprite_accessory/tails_animated
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	mutant_part_string = "tailwag"
@@ -15,9 +12,6 @@
 ************* Lizard Tails ****************
 *******************************************/
 
-/datum/sprite_accessory/tails_animated/lizard/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return ((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric || H.dna.species.mutant_bodyparts["tail_lizard"])
-
 /datum/sprite_accessory/tails/lizard/smooth
 	name = "Smooth"
 	icon_state = "smooth"
@@ -104,9 +98,6 @@
 	icon_state = "none"
 	relevant_layers = null
 
-/datum/sprite_accessory/tails_animated/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return ((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric || H.dna.species.mutant_bodyparts["tail_human"])
-
 /datum/sprite_accessory/tails/human/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
@@ -131,22 +122,22 @@
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
 
-/datum/sprite_accessory/tails/mam_tails/batl
+/datum/sprite_accessory/mam_tails/batl
 	name = "Bat (Long)"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	icon_state = "batl"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/batl
+/datum/sprite_accessory/mam_tails_animated/batl
 	name = "Bat (Long)"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	icon_state = "batl"
 
-/datum/sprite_accessory/tails/mam_tails/bats
+/datum/sprite_accessory/mam_tails/bats
 	name = "Bat (Short)"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	icon_state = "bats"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/bats
+/datum/sprite_accessory/mam_tails_animated/bats
 	name = "Bat (Short)"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	icon_state = "bats"
@@ -527,371 +518,368 @@
 ************** Furry Tails ****************
 *******************************************/
 
-/datum/sprite_accessory/tails/mam_tails
+/datum/sprite_accessory/mam_tails
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	recommended_species = list("mammal", "slimeperson", "podweak", "felinid", "insect")
 	mutant_part_string = "tail"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/tails/mam_tails/none
+/datum/sprite_accessory/mam_tails/none
 	name = "None"
 	icon_state = "none"
 	recommended_species = null
 	relevant_layers = null
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated
+/datum/sprite_accessory/mam_tails_animated
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	mutant_part_string = "tailwag"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return ((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric || H.dna.species.mutant_bodyparts["mam_tail"])
-
-/datum/sprite_accessory/tails_animated/mam_tails_animated/none
+/datum/sprite_accessory/mam_tails_animated/none
 	name = "None"
 	icon_state = "none"
 	relevant_layers = null
 
-/datum/sprite_accessory/tails/mam_tails/ailurus
+/datum/sprite_accessory/mam_tails/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
 	extra = TRUE
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/ailurus
+/datum/sprite_accessory/mam_tails_animated/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
 	extra = TRUE
 
-/datum/sprite_accessory/tails/mam_tails/axolotl
+/datum/sprite_accessory/mam_tails/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/axolotl
+/datum/sprite_accessory/mam_tails_animated/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
 
-/datum/sprite_accessory/tails/mam_tails/batl
+/datum/sprite_accessory/mam_tails/batl
 	name = "Bat (Long)"
 	icon_state = "batl"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/batl
+/datum/sprite_accessory/mam_tails_animated/batl
 	name = "Bat (Long)"
 	icon_state = "batl"
 
-/datum/sprite_accessory/tails/mam_tails/bats
+/datum/sprite_accessory/mam_tails/bats
 	name = "Bat (Short)"
 	icon_state = "bats"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/bats
+/datum/sprite_accessory/mam_tails_animated/bats
 	name = "Bat (Short)"
 	icon_state = "bats"
 
-/datum/sprite_accessory/tails/mam_tails/bee
+/datum/sprite_accessory/mam_tails/bee
 	name = "Bee"
 	icon_state = "bee"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/bee
+/datum/sprite_accessory/mam_tails_animated/bee
 	name = "Bee"
 	icon_state = "bee"
 
-/datum/sprite_accessory/tails/mam_tails/cat
+/datum/sprite_accessory/mam_tails/cat
 	name = "Cat"
 	icon_state = "cat"
 	color_src = HAIR
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/cat
+/datum/sprite_accessory/mam_tails_animated/cat
 	name = "Cat"
 	icon_state = "cat"
 	color_src = HAIR
 
-/datum/sprite_accessory/tails/mam_tails/catbig
+/datum/sprite_accessory/mam_tails/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/catbig
+/datum/sprite_accessory/mam_tails_animated/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
 
-/datum/sprite_accessory/tails/mam_tails/twocat
+/datum/sprite_accessory/mam_tails/twocat
 	name = "Cat, Double"
 	icon_state = "twocat"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/twocat
+/datum/sprite_accessory/mam_tails_animated/twocat
 	name = "Cat, Double"
 	icon_state = "twocat"
 
-/datum/sprite_accessory/tails/mam_tails/corvid
+/datum/sprite_accessory/mam_tails/corvid
 	name = "Corvid"
 	icon_state = "crow"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/corvid
+/datum/sprite_accessory/mam_tails_animated/corvid
 	name = "Corvid"
 	icon_state = "crow"
 
-/datum/sprite_accessory/tails/mam_tail/cow
+/datum/sprite_accessory/mam_tail/cow
 	name = "Cow"
 	icon_state = "cow"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/cow
+/datum/sprite_accessory/mam_tails_animated/cow
 	name = "Cow"
 	icon_state = "cow"
 
-/datum/sprite_accessory/tails/mam_tails/eevee
+/datum/sprite_accessory/mam_tails/eevee
 	name = "Eevee"
 	icon_state = "eevee"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/eevee
+/datum/sprite_accessory/mam_tails_animated/eevee
 	name = "Eevee"
 	icon_state = "eevee"
 
-/datum/sprite_accessory/tails/mam_tails/fennec
+/datum/sprite_accessory/mam_tails/fennec
 	name = "Fennec"
 	icon_state = "fennec"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/fennec
+/datum/sprite_accessory/mam_tails_animated/fennec
 	name = "Fennec"
 	icon_state = "fennec"
 
-/datum/sprite_accessory/tails/mam_tails/human/fish
+/datum/sprite_accessory/mam_tails/human/fish
 	name = "Fish"
 	icon_state = "fish"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/human/fish
+/datum/sprite_accessory/mam_tails_animated/human/fish
 	name = "Fish"
 	icon_state = "fish"
 
-/datum/sprite_accessory/tails/mam_tails/fox
+/datum/sprite_accessory/mam_tails/fox
 	name = "Fox"
 	icon_state = "fox"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/fox
+/datum/sprite_accessory/mam_tails_animated/fox
 	name = "Fox"
 	icon_state = "fox"
 
-/datum/sprite_accessory/tails/mam_tails/hawk
+/datum/sprite_accessory/mam_tails/hawk
 	name = "Hawk"
 	icon_state = "hawk"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/hawk
+/datum/sprite_accessory/mam_tails_animated/hawk
 	name = "Hawk"
 	icon_state = "hawk"
 
-/datum/sprite_accessory/tails/mam_tails/horse
+/datum/sprite_accessory/mam_tails/horse
 	name = "Horse"
 	icon_state = "horse"
 	color_src = HAIR
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/horse
+/datum/sprite_accessory/mam_tails_animated/horse
 	name = "Horse"
 	icon_state = "horse"
 	color_src = HAIR
 
-/datum/sprite_accessory/tails/mam_tails/husky
+/datum/sprite_accessory/mam_tails/husky
 	name = "Husky"
 	icon_state = "husky"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/husky
+/datum/sprite_accessory/mam_tails_animated/husky
 	name = "Husky"
 	icon_state = "husky"
 
-datum/sprite_accessory/tails/mam_tails/insect
+datum/sprite_accessory/mam_tails/insect
 	name = "Insect"
 	icon_state = "insect"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/insect
+/datum/sprite_accessory/mam_tails_animated/insect
 	name = "Insect"
 	icon_state = "insect"
 
-/datum/sprite_accessory/tails/mam_tails/kangaroo
+/datum/sprite_accessory/mam_tails/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/kangaroo
+/datum/sprite_accessory/mam_tails_animated/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
 
-/datum/sprite_accessory/tails/mam_tails/kitsune
+/datum/sprite_accessory/mam_tails/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/kitsune
+/datum/sprite_accessory/mam_tails_animated/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
 
-/datum/sprite_accessory/tails/mam_tails/lab
+/datum/sprite_accessory/mam_tails/lab
 	name = "Lab"
 	icon_state = "lab"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/lab
+/datum/sprite_accessory/mam_tails_animated/lab
 	name = "Lab"
 	icon_state = "lab"
 
-/datum/sprite_accessory/tails/mam_tails/murid
+/datum/sprite_accessory/mam_tails/murid
 	name = "Murid"
 	icon_state = "murid"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/murid
+/datum/sprite_accessory/mam_tails_animated/murid
 	name = "Murid"
 	icon_state = "murid"
 
-/datum/sprite_accessory/tails/mam_tails/otie
+/datum/sprite_accessory/mam_tails/otie
 	name = "Otusian"
 	icon_state = "otie"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/otie
+/datum/sprite_accessory/mam_tails_animated/otie
 	name = "Otusian"
 	icon_state = "otie"
 
-/datum/sprite_accessory/tails/mam_tails/orca
+/datum/sprite_accessory/mam_tails/orca
 	name = "Orca"
 	icon_state = "orca"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/orca
+/datum/sprite_accessory/mam_tails_animated/orca
 	name = "Orca"
 	icon_state = "orca"
 
-/datum/sprite_accessory/tails/mam_tails/pede
+/datum/sprite_accessory/mam_tails/pede
 	name = "Scolipede"
 	icon_state = "pede"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/pede
+/datum/sprite_accessory/mam_tails_animated/pede
 	name = "Scolipede"
 	icon_state = "pede"
 
-/datum/sprite_accessory/tails/mam_tails/rabbit
+/datum/sprite_accessory/mam_tails/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/rabbit
+/datum/sprite_accessory/mam_tails_animated/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
 
-/datum/sprite_accessory/tails/mam_tails/sergal
+/datum/sprite_accessory/mam_tails/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/sergal
+/datum/sprite_accessory/mam_tails_animated/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 
-/datum/sprite_accessory/tails/mam_tails/skunk
+/datum/sprite_accessory/mam_tails/skunk
 	name = "Skunk"
 	icon_state = "skunk"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/skunk
+/datum/sprite_accessory/mam_tails_animated/skunk
 	name = "Skunk"
 	icon_state = "skunk"
 
-/datum/sprite_accessory/tails/mam_tails/smooth
+/datum/sprite_accessory/mam_tails/smooth
 	name = "Smooth"
 	icon_state = "smooth"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/smooth
+/datum/sprite_accessory/mam_tails_animated/smooth
 	name = "Smooth"
 	icon_state = "smooth"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/spikes
+/datum/sprite_accessory/mam_tails_animated/spikes
 	name = "Spikes"
 	icon_state = "spikes"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails/mam_tails/spikes
+/datum/sprite_accessory/mam_tails/spikes
 	name = "Spikes"
 	icon_state = "spikes"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails/mam_tails/shark
+/datum/sprite_accessory/mam_tails/shark
 	name = "Shark"
 	icon_state = "shark"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/shark
+/datum/sprite_accessory/mam_tails_animated/shark
 	name = "Shark"
 	icon_state = "shark"
 
-/datum/sprite_accessory/tails/mam_tails/shepherd
+/datum/sprite_accessory/mam_tails/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/shepherd
+/datum/sprite_accessory/mam_tails_animated/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
 
-/datum/sprite_accessory/tails/mam_tails/straighttail
+/datum/sprite_accessory/mam_tails/straighttail
 	name = "Straight Tail"
 	icon_state = "straighttail"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/straighttail
+/datum/sprite_accessory/mam_tails_animated/straighttail
 	name = "Straight Tail"
 	icon_state = "straighttail"
 
-/datum/sprite_accessory/tails/mam_tails/squirrel
+/datum/sprite_accessory/mam_tails/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/squirrel
+/datum/sprite_accessory/mam_tails_animated/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
 
-/datum/sprite_accessory/tails/mam_tails/tamamo_kitsune
+/datum/sprite_accessory/mam_tails/tamamo_kitsune
 	name = "Tamamo Kitsune Tails"
 	icon_state = "9sune"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/tamamo_kitsune
+/datum/sprite_accessory/mam_tails_animated/tamamo_kitsune
 	name = "Tamamo Kitsune Tails"
 	icon_state = "9sune"
 
-/datum/sprite_accessory/tails/mam_tails/tentacle
+/datum/sprite_accessory/mam_tails/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/tentacle
+/datum/sprite_accessory/mam_tails_animated/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
 
-/datum/sprite_accessory/tails/mam_tails/tiger
+/datum/sprite_accessory/mam_tails/tiger
 	name = "Tiger"
 	icon_state = "tiger"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/tiger
+/datum/sprite_accessory/mam_tails_animated/tiger
 	name = "Tiger"
 	icon_state = "tiger"
 
-/datum/sprite_accessory/tails/mam_tails/dtiger
+/datum/sprite_accessory/mam_tails/dtiger
 	name = "Dark Tiger"
 	icon_state = "dtiger"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/dtiger
+/datum/sprite_accessory/mam_tails_animated/dtiger
 	name = "Dark Tiger"
 	icon_state = "dtiger"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails/mam_tails/ltiger
+/datum/sprite_accessory/mam_tails/ltiger
 	name = "Light Tiger"
 	icon_state = "ltiger"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/ltiger
+/datum/sprite_accessory/mam_tails_animated/ltiger
 	name = "Light Tiger"
 	icon_state = "ltiger"
 	color_src = MUTCOLORS
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 
-/datum/sprite_accessory/tails/mam_tails/wolf
+/datum/sprite_accessory/mam_tails/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 
-/datum/sprite_accessory/tails_animated/mam_tails_animated/wolf
+/datum/sprite_accessory/mam_tails_animated/wolf
 	name = "Wolf"
 	icon_state = "wolf"

code/modules/mob/dead/new_player/sprite_accessories/wings.dm

@@ -5,16 +5,10 @@
 	icon_state = "none"
 	relevant_layers = null
 
-/datum/sprite_accessory/wings/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (!H.dna.features["wings"] || H.dna.features["wings"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception))))
-
 /datum/sprite_accessory/wings_open
 	icon = 'icons/mob/wings.dmi'
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
-/datum/sprite_accessory/wings_open/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
-	return (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception)) || H.dna.species.mutant_bodyparts["wings"])
-
 /datum/sprite_accessory/wings_open/angel
 	name = "Angel"
 	icon_state = "angel"

code/modules/mob/living/carbon/human/species.dm

@@ -642,15 +642,106 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	if(!mutant_bodyparts)
 		return
 
+	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
 	var/tauric = mutant_bodyparts["taur"] && H.dna.features["taur"] && H.dna.features["taur"] != "None"
 
-	for(var/mutant_part in mutant_bodyparts)
-		var/reference_list = GLOB.mutant_reference_list[mutant_part]
-		if(reference_list)
-			var/datum/sprite_accessory/S
-			S = reference_list[H.dna.features[mutant_part]]
-			if(!S || S.is_not_visible(H, tauric))
-				bodyparts_to_add -= mutant_part
+	if(mutant_bodyparts["tail_lizard"])
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
+			bodyparts_to_add -= "tail_lizard"
+
+	if(mutant_bodyparts["waggingtail_lizard"])
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
+			bodyparts_to_add -= "waggingtail_lizard"
+		else if (mutant_bodyparts["tail_lizard"])
+			bodyparts_to_add -= "waggingtail_lizard"
+
+	if(mutant_bodyparts["tail_human"])
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
+			bodyparts_to_add -= "tail_human"
+
+	if(mutant_bodyparts["waggingtail_human"])
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
+			bodyparts_to_add -= "waggingtail_human"
+		else if (mutant_bodyparts["tail_human"])
+			bodyparts_to_add -= "waggingtail_human"
+
+	if(mutant_bodyparts["spines"])
+		if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR))
+			bodyparts_to_add -= "spines"
+
+	if(mutant_bodyparts["waggingspines"])
+		if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR))
+			bodyparts_to_add -= "waggingspines"
+		else if (mutant_bodyparts["tail"])
+			bodyparts_to_add -= "waggingspines"
+
+	if(mutant_bodyparts["snout"]) //Take a closer look at that snout!
+		if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "snout"
+
+	if(mutant_bodyparts["frills"])
+		if(!H.dna.features["frills"] || H.dna.features["frills"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "frills"
+
+	if(mutant_bodyparts["horns"])
+		if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "horns"
+
+	if(mutant_bodyparts["ears"])
+		if(!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "ears"
+
+	if(mutant_bodyparts["wings"])
+		if(!H.dna.features["wings"] || H.dna.features["wings"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception))))
+			bodyparts_to_add -= "wings"
+
+	if(mutant_bodyparts["wings_open"])
+		if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception)))
+			bodyparts_to_add -= "wings_open"
+		else if (mutant_bodyparts["wings"])
+			bodyparts_to_add -= "wings_open"
+
+	if(mutant_bodyparts["insect_fluff"])
+		if(!H.dna.features["insect_fluff"] || H.dna.features["insect_fluff"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+			bodyparts_to_add -= "insect_fluff"
+
+//CITADEL EDIT
+	//Race specific bodyparts:
+	//Xenos
+	if(mutant_bodyparts["xenodorsal"])
+		if(!H.dna.features["xenodorsal"] || H.dna.features["xenodorsal"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)))
+			bodyparts_to_add -= "xenodorsal"
+	if(mutant_bodyparts["xenohead"])//This is an overlay for different castes using different head crests
+		if(!H.dna.features["xenohead"] || H.dna.features["xenohead"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "xenohead"
+	if(mutant_bodyparts["xenotail"])
+		if(!H.dna.features["xenotail"] || H.dna.features["xenotail"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+			bodyparts_to_add -= "xenotail"
+
+	//Other Races
+	if(mutant_bodyparts["mam_tail"])
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
+			bodyparts_to_add -= "mam_tail"
+
+	if(mutant_bodyparts["mam_waggingtail"])
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
+			bodyparts_to_add -= "mam_waggingtail"
+		else if (mutant_bodyparts["mam_tail"])
+			bodyparts_to_add -= "mam_waggingtail"
+
+	if(mutant_bodyparts["mam_ears"])
+		if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "mam_ears"
+
+	if(mutant_bodyparts["mam_snouts"]) //Take a closer look at that snout!
+		if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "mam_snouts"
+
+	if(mutant_bodyparts["taur"])
+		if(!tauric || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)))
+			bodyparts_to_add -= "taur"
+
+//END EDIT
 
 	//Digitigrade legs are stuck in the phantom zone between true limbs and mutant bodyparts. Mainly it just needs more agressive updating than most limbs.
 	var/update_needed = FALSE
@@ -687,18 +778,76 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/list/dna_feature_as_text_string = list()
 
 	for(var/bodypart in bodyparts_to_add)
-		var/reference_list = GLOB.mutant_reference_list[bodypart]
-		if(reference_list)
-			var/datum/sprite_accessory/S
-			S = reference_list[H.dna.features[bodypart]]
+		var/datum/sprite_accessory/S
+		switch(bodypart)
+			if("tail_lizard")
+				S = GLOB.tails_list_lizard[H.dna.features["tail_lizard"]]
+			if("waggingtail_lizard")
+				S = GLOB.animated_tails_list_lizard[H.dna.features["tail_lizard"]]
+			if("tail_human")
+				S = GLOB.tails_list_human[H.dna.features["tail_human"]]
+			if("waggingtail_human")
+				S = GLOB.animated_tails_list_human[H.dna.features["tail_human"]]
+			if("spines")
+				S = GLOB.spines_list[H.dna.features["spines"]]
+			if("waggingspines")
+				S = GLOB.animated_spines_list[H.dna.features["spines"]]
+			if("snout")
+				S = GLOB.snouts_list[H.dna.features["snout"]]
+			if("frills")
+				S = GLOB.frills_list[H.dna.features["frills"]]
+			if("horns")
+				S = GLOB.horns_list[H.dna.features["horns"]]
+			if("ears")
+				S = GLOB.ears_list[H.dna.features["ears"]]
+			if("body_markings")
+				S = GLOB.body_markings_list[H.dna.features["body_markings"]]
+			if("wings")
+				S = GLOB.wings_list[H.dna.features["wings"]]
+			if("wingsopen")
+				S = GLOB.wings_open_list[H.dna.features["wings"]]
+			if("deco_wings")
+				S = GLOB.deco_wings_list[H.dna.features["deco_wings"]]
+			if("legs")
+				S = GLOB.legs_list[H.dna.features["legs"]]
+			if("insect_wings")
+				S = GLOB.insect_wings_list[H.dna.features["insect_wings"]]
+			if("insect_fluff")
+				S = GLOB.insect_fluffs_list[H.dna.features["insect_fluff"]]
+			if("insect_markings")
+				S = GLOB.insect_markings_list[H.dna.features["insect_markings"]]
+			if("caps")
+				S = GLOB.caps_list[H.dna.features["caps"]]
+			if("ipc_screen")
+				S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
+			if("ipc_antenna")
+				S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
+			if("mam_tail")
+				S = GLOB.mam_tails_list[H.dna.features["mam_tail"]]
+			if("mam_waggingtail")
+				S = GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]]
+			if("mam_body_markings")
+				S = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
+			if("mam_ears")
+				S = GLOB.mam_ears_list[H.dna.features["mam_ears"]]
+			if("mam_snouts")
+				S = GLOB.mam_snouts_list[H.dna.features["mam_snouts"]]
+			if("taur")
+				S = GLOB.taur_list[H.dna.features["taur"]]
+			if("xenodorsal")
+				S = GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]]
+			if("xenohead")
+				S = GLOB.xeno_head_list[H.dna.features["xenohead"]]
+			if("xenotail")
+				S = GLOB.xeno_tail_list[H.dna.features["xenotail"]]
 
-			if(!S || S.icon_state == "none")
-				continue
+		if(!S || S.icon_state == "none")
+			continue
 
-			for(var/L in S.relevant_layers)
-				LAZYADD(relevant_layers["[L]"], S)
-			if(!S.mutant_part_string)
-				dna_feature_as_text_string[S] = bodypart
+		for(var/L in S.relevant_layers)
+			LAZYADD(relevant_layers["[L]"], S)
+		if(!S.mutant_part_string)
+			dna_feature_as_text_string[S] = bodypart
 
 	var/static/list/layer_text = list(
 		"[BODY_BEHIND_LAYER]" = "BEHIND",
@@ -1897,8 +2046,17 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	return
 
 /**
+
+
+
   * The human species version of [/mob/living/carbon/proc/get_biological_state]. Depends on the HAS_FLESH and HAS_BONE species traits, having bones lets you have bone wounds, having flesh lets you have burn, slash, and piercing wounds
+
+
+
   */
+
+
+
 /datum/species/proc/get_biological_state(mob/living/carbon/human/H)
 	. = BIO_INORGANIC
 	if(HAS_FLESH in species_traits)
@@ -1914,6 +2072,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	if(HAS_TRAIT(H, TRAIT_NOBREATH))
 		return TRUE
 
+
 /datum/species/proc/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H)
 	if(!environment)
 		return
@@ -2105,6 +2264,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 /datum/species/proc/spec_stun(mob/living/carbon/human/H,amount)
 	if(H)
 		stop_wagging_tail(H)
+
 	. = stunmod * H.physiology.stun_mod * amount
 
 //////////////

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -504,7 +504,7 @@
 	else if (select_alteration == "Ears")
 		var/list/snowflake_ears_list = list("Normal" = null)
 		for(var/path in GLOB.mam_ears_list)
-			var/datum/sprite_accessory/ears/mam_ears/instance = GLOB.mam_ears_list[path]
+			var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
 			if(istype(instance, /datum/sprite_accessory))
 				var/datum/sprite_accessory/S = instance
 				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
@@ -518,7 +518,7 @@
 	else if (select_alteration == "Snout")
 		var/list/snowflake_snouts_list = list("Normal" = null)
 		for(var/path in GLOB.mam_snouts_list)
-			var/datum/sprite_accessory/snouts/mam_snouts/instance = GLOB.mam_snouts_list[path]
+			var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[path]
 			if(istype(instance, /datum/sprite_accessory))
 				var/datum/sprite_accessory/S = instance
 				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
@@ -549,7 +549,7 @@
 	else if (select_alteration == "Tail")
 		var/list/snowflake_tails_list = list("Normal" = null)
 		for(var/path in GLOB.mam_tails_list)
-			var/datum/sprite_accessory/tails/mam_tails/instance = GLOB.mam_tails_list[path]
+			var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
 			if(istype(instance, /datum/sprite_accessory))
 				var/datum/sprite_accessory/S = instance
 				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))

code/modules/mob/living/carbon/human/species_types/plasmamen.dm

@@ -57,10 +57,89 @@
 	..()
 
 /datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
+	var/current_job = J?.title
 	var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
-	if(J)
-		if(J.plasma_outfit)
-			O = new J.plasma_outfit
+	switch(current_job)
+		if("Chaplain")
+			O = new /datum/outfit/plasmaman/chaplain
+
+		if("Curator")
+			O = new /datum/outfit/plasmaman/curator
+
+		if("Janitor")
+			O = new /datum/outfit/plasmaman/janitor
+
+		if("Botanist")
+			O = new /datum/outfit/plasmaman/botany
+
+		if("Bartender", "Lawyer")
+			O = new /datum/outfit/plasmaman/bar
+
+		if("Cook")
+			O = new /datum/outfit/plasmaman/chef
+
+		if("Security Officer")
+			O = new /datum/outfit/plasmaman/security
+
+		if("Detective")
+			O = new /datum/outfit/plasmaman/detective
+
+		if("Warden")
+			O = new /datum/outfit/plasmaman/warden
+
+		if("Cargo Technician", "Quartermaster")
+			O = new /datum/outfit/plasmaman/cargo
+
+		if("Shaft Miner")
+			O = new /datum/outfit/plasmaman/mining
+
+		if("Medical Doctor")
+			O = new /datum/outfit/plasmaman/medical
+
+		if("Chemist")
+			O = new /datum/outfit/plasmaman/chemist
+
+		if("Geneticist")
+			O = new /datum/outfit/plasmaman/genetics
+
+		if("Roboticist")
+			O = new /datum/outfit/plasmaman/robotics
+
+		if("Virologist")
+			O = new /datum/outfit/plasmaman/viro
+
+		if("Scientist")
+			O = new /datum/outfit/plasmaman/science
+
+		if("Station Engineer")
+			O = new /datum/outfit/plasmaman/engineering
+
+		if("Atmospheric Technician")
+			O = new /datum/outfit/plasmaman/atmospherics
+
+		if("Captain")
+			O = new /datum/outfit/plasmaman/captain
+
+		if("Head of Personnel")
+			O = new /datum/outfit/plasmaman/hop
+
+		if("Head of Security")
+			O = new /datum/outfit/plasmaman/hos
+
+		if("Chief Engineer")
+			O = new /datum/outfit/plasmaman/ce
+
+		if("Chief Medical Officer")
+			O = new /datum/outfit/plasmaman/cmo
+
+		if("Research Director")
+			O = new /datum/outfit/plasmaman/rd
+
+		if("Mime")
+			O = new /datum/outfit/plasmaman/mime
+
+		if("Clown")
+			O = new /datum/outfit/plasmaman/clown
 
 	H.equipOutfit(O, visualsOnly)
 	H.internal = H.get_item_for_held_index(2)

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -82,11 +82,13 @@
 	M.AddSpell(SW)
 	shadowwalk = SW
 
+
 /obj/item/organ/brain/nightmare/Remove(special = FALSE)
 	if(shadowwalk && owner)
 		owner.RemoveSpell(shadowwalk)
 	return ..()
 
+
 /obj/item/organ/heart/nightmare
 	name = "heart of darkness"
 	desc = "An alien organ that twists and writhes when exposed to light."

code/modules/mob/living/carbon/human/species_types/skeletons.dm

@@ -24,7 +24,7 @@
 		burnmod = 1
 	..()
 
-/datum/species/skeleton/check_roundstart_eligible()
+/datum/species/skeleton/greater/check_roundstart_eligible()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
 		return TRUE
 	return ..()

code/modules/mob/living/carbon/human/species_types/synthliz.dm

@@ -22,4 +22,4 @@
 
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
-	species_type = "robotic"
+	species_type = "robotic"

code/modules/mob/living/carbon/human/species_types/synths.dm

@@ -100,12 +100,14 @@
 	else
 		return ..()
 
+
 /datum/species/synth/handle_body(mob/living/carbon/human/H)
 	if(fake_species)
 		fake_species.handle_body(H)
 	else
 		return ..()
 
+
 /datum/species/synth/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
 	if(fake_species)
 		fake_species.handle_body(H,forced_colour)

code/modules/mob/living/simple_animal/bot/cleanbot.dm

@@ -313,7 +313,7 @@
 		/obj/effect/decal/cleanable/dirt,
 		/obj/effect/decal/cleanable/insectguts,
 		/obj/effect/decal/cleanable/semen,
-		/obj/effect/decal/cleanable/semen/femcum,
+		/obj/effect/decal/cleanable/femcum,
 		/obj/effect/decal/cleanable/generic,
 		/obj/effect/decal/cleanable/glass,,
 		/obj/effect/decal/cleanable/cobweb,