Merge pull request #13582 from timothyteakettle/i-hate-mcolor

adds advanced colouring mode: allows you to individually colour mutant parts

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

@@ -63,6 +63,7 @@
 	var/list/relevant_layers //list of layers that this accessory uses. As of now only used in species.handle_mutant_bodyparts(), but that's where most sprite accessories are anyway.
 	var/mutant_part_string //Also used in species.handle_mutant_bodyparts() to generate the overlay icon state.
 	var/alpha_mask_state
+	var/matrixed_sections = MATRIX_NONE //if color_src is MATRIXED, how many sections does it have? 1-3
 
 	//Special / holdover traits for Citadel specific sprites.
 	var/extra = FALSE

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

@@ -5,6 +5,7 @@
 /datum/sprite_accessory/body_markings
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	relevant_layers = list(BODY_ADJ_LAYER)
+	mutant_part_string = "body_markings"
 
 /datum/sprite_accessory/body_markings/none
 	name = "None"
@@ -21,6 +22,7 @@
 	icon_state = "guilmon"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/body_markings/ltiger
 	name = "Light Tiger Body"
@@ -47,6 +49,7 @@
 	gender_specific = 0
 	icon = 'modular_citadel/icons/mob/mam_markings.dmi'
 	recommended_species = list("mammal", "xeno", "slimeperson", "podweak")
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/mam_body_markings/none
 	name = "None"
@@ -54,6 +57,7 @@
 	ckeys_allowed = list("yousshouldnteverbeseeingthisyoumeme")
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
 	relevant_layers = null
+	matrixed_sections = 0
 
 /datum/sprite_accessory/mam_body_markings/redpanda
 	name = "Redpanda"
@@ -229,6 +233,7 @@
 	icon = 'icons/mob/wings.dmi'
 	color_src = 0
 	relevant_layers = list(BODY_FRONT_LAYER)
+	mutant_part_string = "insect_fluff"
 
 /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))

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

@@ -26,18 +26,21 @@
 	icon_state = "bear"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/human/bigwolf
 	name = "Big Wolf"
 	icon_state = "bigwolf"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/human/bigwolfinner
 	name = "Big Wolf (ALT)"
 	icon_state = "bigwolfinner"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 	extra = TRUE
 	extra_color_src = NONE
 
@@ -46,12 +49,14 @@
 	icon_state = "bigwolfdark"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/human/bigwolfinnerdark
 	name = "Dark Big Wolf (ALT)"
 	icon_state = "bigwolfinnerdark"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 	extra = TRUE
 	extra_color_src = NONE
 
@@ -59,6 +64,7 @@
 	name = "Bunny"
 	icon_state = "bunny"
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 
 /datum/sprite_accessory/ears/cat
@@ -73,6 +79,7 @@
 	icon_state = "cow"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/human/curled
 	name = "Curled Horn"
@@ -84,6 +91,7 @@
 	name = "Dog, Floppy"
 	icon_state = "lab"
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 
 /datum/sprite_accessory/ears/human/eevee
@@ -91,12 +99,14 @@
 	icon_state = "eevee"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/human/elephant
 	name = "Elephant"
 	icon_state = "elephant"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/human/elf
 	name = "Elf"
@@ -109,17 +119,20 @@
 	icon_state = "fennec"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/fish
 	name = "Fish"
 	icon_state = "fish"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/fox
 	name = "Fox"
 	icon_state = "fox"
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 
 /datum/sprite_accessory/ears/human/jellyfish
@@ -132,17 +145,20 @@
 	icon_state = "murid"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/human/otie
 	name = "Otusian"
 	icon_state = "otie"
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 
 /datum/sprite_accessory/ears/human/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 
 /datum/sprite_accessory/ears/human/pede
@@ -150,30 +166,35 @@
 	icon_state = "pede"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/human/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/human/skunk
 	name = "skunk"
 	icon_state = "skunk"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
+	matrixed_sections = MATRIX_RED_BLUE
 
 /******************************************
 *************** Furry Ears ****************
@@ -182,7 +203,6 @@
 /datum/sprite_accessory/ears/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)
@@ -197,38 +217,46 @@
 /datum/sprite_accessory/ears/mam_ears/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/bat
 	name = "Bat"
 	icon_state = "bat"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/bear
 	name = "Bear"
 	icon_state = "bear"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/bigwolf
 	name = "Big Wolf"
 	icon_state = "bigwolf"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/mam_ears/bigwolfinner
 	name = "Big Wolf (ALT)"
 	icon_state = "bigwolfinner"
 	extra = TRUE
 	extra_color_src = NONE
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/bigwolfdark //alphabetical sort ignored here for ease-of-use
 	name = "Dark Big Wolf"
 	icon_state = "bigwolfdark"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/mam_ears/bigwolfinnerdark
 	name = "Dark Big Wolf (ALT)"
 	icon_state = "bigwolfinnerdark"
 	extra = TRUE
 	extra_color_src = NONE
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/bunny
 	name = "Bunny"
 	icon_state = "bunny"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/cat
 	name = "Cat"
@@ -241,10 +269,12 @@
 /datum/sprite_accessory/ears/mam_ears/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/cow
 	name = "Cow"
 	icon_state = "cow"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/curled
 	name = "Curled Horn"
@@ -259,6 +289,7 @@
 /datum/sprite_accessory/ears/mam_ears/eevee
 	name = "Eevee"
 	icon_state = "eevee"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/elf
 	name = "Elf"
@@ -268,22 +299,27 @@
 /datum/sprite_accessory/ears/mam_ears/elephant
 	name = "Elephant"
 	icon_state = "elephant"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/fennec
 	name = "Fennec"
 	icon_state = "fennec"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/mam_ears/fish
 	name = "Fish"
 	icon_state = "fish"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/fox
 	name = "Fox"
 	icon_state = "fox"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/husky
 	name = "Husky"
 	icon_state = "wolf"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/ears/mam_ears/jellyfish
 	name = "Jellyfish"
@@ -293,39 +329,49 @@
 /datum/sprite_accessory/ears/mam_ears/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/lab
 	name = "Dog, Long"
 	icon_state = "lab"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/ears/mam_ears/murid
 	name = "Murid"
 	icon_state = "murid"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/otie
 	name = "Otusian"
 	icon_state = "otie"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/pede
 	name = "Scolipede"
 	icon_state = "pede"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/sergal
 	name = "Sergal"
 	icon_state = "sergal"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/skunk
 	name = "skunk"
 	icon_state = "skunk"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/ears/mam_ears/wolf
 	name = "Wolf"
 	icon_state = "wolf"
+	matrixed_sections = MATRIX_RED_BLUE

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

@@ -1,6 +1,7 @@
 /datum/sprite_accessory/frills
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	relevant_layers = list(BODY_ADJ_LAYER)
+	mutant_part_string = "frills"
 
 /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)

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

@@ -132,6 +132,7 @@
 	color_src = MUTCOLORS2
 	relevant_layers = list(BODY_ADJ_LAYER)
 	recommended_species = list("ipc")
+	mutant_part_string = "ipc_antenna"
 
 /datum/sprite_accessory/antenna/none
 	name = "None"

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

@@ -29,6 +29,7 @@
 	var/taur_mode = NONE //Must be a single specific tauric suit variation bitflag. Don't do FLAG_1|FLAG_2
 	var/alt_taur_mode = NONE //Same as above.
 	var/hide_legs = USE_QUADRUPED_CLIP_MASK
+	mutant_part_string = "taur"
 
 /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)))
@@ -67,6 +68,7 @@
 	name = "Cow (Spotted)"
 	icon_state = "cow_spotted"
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/taur/deer
 	name = "Deer"
@@ -88,6 +90,7 @@
 	icon_state = "drake_old"
 	color_src = MATRIXED
 	extra = FALSE
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/taur/drider
 	name = "Drider"
@@ -114,17 +117,20 @@
 	icon_state = "horse"
 	taur_mode = STYLE_HOOF_TAURIC
 	alt_taur_mode = STYLE_PAW_TAURIC
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/taur/naga
 	name = "Naga"
 	icon_state = "naga"
 	taur_mode = STYLE_SNEK_TAURIC
 	hide_legs = USE_SNEK_CLIP_MASK
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/taur/otie
 	name = "Otie"
 	icon_state = "otie"
 	taur_mode = STYLE_PAW_TAURIC
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/taur/pede
 	name = "Scolipede"

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

@@ -7,11 +7,6 @@
 	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.is_robotic_limb(FALSE))
 
-/datum/sprite_accessory/snout/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	color_src = MATRIXED
-
 /datum/sprite_accessory/snouts/round
 	name = "Round"
 	icon_state = "round"
@@ -158,7 +153,6 @@
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
 	recommended_species = list("mammal", "slimeperson", "insect", "podweak", "lizard")
-	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)
@@ -174,10 +168,12 @@
 /datum/sprite_accessory/snouts/mam_snouts/bird
 	name = "Beak"
 	icon_state = "bird"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/snouts/mam_snouts/bigbeak
 	name = "Big Beak"
 	icon_state = "bigbeak"
+	matrixed_sections = MATRIX_BLUE
 
 /datum/sprite_accessory/snouts/mam_snouts/bug
 	name = "Bug"
@@ -191,52 +187,64 @@
 	icon_state = "elephant"
 	extra = TRUE
 	extra_color_src = MUTCOLORS3
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/husky
 	name = "Husky"
 	icon_state = "husky"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/rhino
 	name = "Horn"
 	icon_state = "rhino"
 	extra = TRUE
-	extra = MUTCOLORS3
+	extra_color_src = MUTCOLORS3
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/snouts/mam_snouts/rodent
 	name = "Rodent"
 	icon_state = "rodent"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/lcanid
 	name = "Mammal, Long"
 	icon_state = "lcanid"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/lcanidalt
 	name = "Mammal, Long ALT"
 	icon_state = "lcanidalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/scanid
 	name = "Mammal, Short"
 	icon_state = "scanid"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/scanidalt
 	name = "Mammal, Short ALT"
 	icon_state = "scanidalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/scanidalt2
 	name = "Mammal, Short ALT 2"
 	icon_state = "scanidalt2"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/wolf
 	name = "Mammal, Thick"
 	icon_state = "wolf"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/wolfalt
 	name = "Mammal, Thick ALT"
 	icon_state = "wolfalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/otie
 	name = "Otie"
 	icon_state = "otie"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/round
 	name = "Round"
@@ -251,18 +259,22 @@
 /datum/sprite_accessory/snouts/mam_snouts/pede
 	name = "Scolipede"
 	icon_state = "pede"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/sergal
 	name = "Sergal"
 	icon_state = "sergal"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/shark
 	name = "Shark"
 	icon_state = "shark"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/hshark
 	name = "hShark"
 	icon_state = "hshark"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/sharp
 	name = "Sharp"
@@ -279,18 +291,22 @@
 	icon_state = "skulldog"
 	extra = TRUE
 	extra_color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/toucan
 	name = "Toucan"
 	icon_state = "toucan"
+	matrixed_sections = MATRIX_RED_BLUE //one single pixel of red. one.
 
 /datum/sprite_accessory/snouts/mam_snouts/redpanda
 	name = "WahCoon"
 	icon_state = "wah"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/snouts/mam_snouts/redpandaalt
 	name = "WahCoon ALT"
 	icon_state = "wahalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /******************************************
 **************** Snouts *******************
@@ -299,10 +315,12 @@
 /datum/sprite_accessory/snouts/mam_snouts/fbird
 	name = "Beak (Top)"
 	icon_state = "fbird"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/snouts/mam_snouts/fbigbeak
 	name = "Big Beak (Top)"
 	icon_state = "fbigbeak"
+	matrixed_sections = MATRIX_BLUE
 
 /datum/sprite_accessory/snouts/mam_snouts/fbug
 	name = "Bug (Top)"
@@ -316,52 +334,64 @@
 	icon_state = "felephant"
 	extra = TRUE
 	extra_color_src = MUTCOLORS3
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/frhino
 	name = "Horn (Top)"
 	icon_state = "frhino"
 	extra = TRUE
 	extra = MUTCOLORS3
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/snouts/mam_snouts/fhusky
 	name = "Husky (Top)"
 	icon_state = "fhusky"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/flcanid
 	name = "Mammal, Long (Top)"
 	icon_state = "flcanid"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/flcanidalt
 	name = "Mammal, Long ALT (Top)"
 	icon_state = "flcanidalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fscanid
 	name = "Mammal, Short (Top)"
 	icon_state = "fscanid"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fscanidalt
 	name = "Mammal, Short ALT (Top)"
 	icon_state = "fscanidalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fscanidalt2
 	name = "Mammal, Short ALT 2 (Top)"
 	icon_state = "fscanidalt2"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/fwolf
 	name = "Mammal, Thick (Top)"
 	icon_state = "fwolf"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fwolfalt
 	name = "Mammal, Thick ALT (Top)"
 	icon_state = "fwolfalt"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fotie
 	name = "Otie (Top)"
 	icon_state = "fotie"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/frodent
 	name = "Rodent (Top)"
 	icon_state = "frodent"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/fround
 	name = "Round (Top)"
@@ -376,14 +406,17 @@
 /datum/sprite_accessory/snouts/mam_snouts/fpede
 	name = "Scolipede (Top)"
 	icon_state = "fpede"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fsergal
 	name = "Sergal (Top)"
 	icon_state = "fsergal"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/mam_snouts/fshark
 	name = "Shark (Top)"
 	icon_state = "fshark"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/snouts/mam_snouts/fsharp
 	name = "Sharp (Top)"
@@ -398,7 +431,14 @@
 /datum/sprite_accessory/snouts/mam_snouts/ftoucan
 	name = "Toucan (Top)"
 	icon_state = "ftoucan"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/snouts/mam_snouts/fredpanda
 	name = "WahCoon (Top)"
 	icon_state = "fwah"
+	matrixed_sections = MATRIX_ALL
+
+/datum/sprite_accessory/snouts/mam_snouts/fredpanda/alt
+	name = "WahCoon ALT (Top)"
+	icon_state = "fwahalt"
+	matrixed_sections = MATRIX_RED_GREEN

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

@@ -1,6 +1,7 @@
 /datum/sprite_accessory/spines
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER)
+	mutant_part_string = "spines"
 
 /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))

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

@@ -11,35 +11,41 @@
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Snout Under"
 	icon_state = "synthliz_under"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/snouts/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"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/snouts/mam_snouts/synthliz/synthliz_tertunder
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Snout Tertiary Under"
 	icon_state = "synthliz_tertunder"
+	matrixed_sections = MATRIX_ALL
 
 //Synth body markings
 /datum/sprite_accessory/mam_body_markings/synthliz/synthliz_pecs
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Pecs"
 	icon_state = "synthlizpecs"
+	matrixed_sections = MATRIX_GREEN
 
 /datum/sprite_accessory/mam_body_markings/synthliz/synthliz_pecslight
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Pecs Light"
 	icon_state = "synthlizpecslight"
+	matrixed_sections = MATRIX_GREEN_BLUE
 
 /datum/sprite_accessory/mam_body_markings/synthliz
 	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Plates"
 	icon_state = "synthlizscutes"
+	matrixed_sections = MATRIX_GREEN
 
 //Synth tails
 /datum/sprite_accessory/tails/mam_tails/synthliz
@@ -81,6 +87,7 @@
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Horns Light"
 	icon_state = "synth_hornslight"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/antenna/synthliz/synth_short
 	icon = 'modular_citadel/icons/mob/synthliz_antennas.dmi'
@@ -99,6 +106,7 @@
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Sharp Light"
 	icon_state = "synth_sharplight"
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/antenna/synthliz/synthliz_thick
 	icon = 'modular_citadel/icons/mob/synthliz_antennas.dmi'
@@ -111,6 +119,7 @@
 	color_src = MATRIXED
 	name = "Synthetic Lizard - Thick Light"
 	icon_state = "synth_thicklight"
+	matrixed_sections = MATRIX_RED_BLUE
 
 //Synth Taurs (Ported from Virgo)
 /datum/sprite_accessory/taur/synthliz
@@ -118,6 +127,7 @@
 	icon_state = "synthlizard"
 	taur_mode = STYLE_PAW_TAURIC
 	recommended_species = list("synthliz")
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/taur/synthliz/inv
 	name = "Virgo - Synthetic Lizard (Inverted)"

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

@@ -8,7 +8,7 @@
 
 /datum/sprite_accessory/tails_animated
 	icon = 'icons/mob/mutant_bodyparts.dmi'
-	mutant_part_string = "tailwag"
+	mutant_part_string = "tailwag" //keep this the same, ALWAYS, this is incredibly important for colouring!
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
 
 /******************************************
@@ -34,12 +34,14 @@
 	icon_state = "axolotl"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/lizard/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/lizard/dtiger
 	name = "Dark Tiger"
@@ -54,12 +56,14 @@
 	icon_state = "guilmon"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/lizard/guilmon
 	name = "Guilmon"
 	icon_state = "guilmon"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/lizard/ltiger
 	name = "Light Tiger"
@@ -107,44 +111,28 @@
 	icon_state = "axolotl"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /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/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
-	name = "Bat (Long)"
-	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	icon_state = "batl"
-
-/datum/sprite_accessory/tails/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
-	name = "Bat (Short)"
-	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-	icon_state = "bats"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/bee
 	name = "Bee"
 	icon_state = "bee"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/bee
 	name = "Bee"
 	icon_state = "bee"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/cat
 	name = "Cat"
@@ -163,24 +151,28 @@
 	icon_state = "catbig"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/twocat
 	name = "Cat, Double"
 	icon_state = "twocat"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/twocat
 	name = "Cat, Double"
 	icon_state = "twocat"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/corvid
 	name = "Corvid"
@@ -195,12 +187,14 @@
 	icon_state = "cow"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/cow
 	name = "Cow"
 	icon_state = "cow"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/dtiger
 	name = "Dark Tiger"
@@ -215,60 +209,70 @@
 	icon_state = "datashark"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/tails_animated/human/datashark
 	name = "datashark"
 	icon_state = "datashark"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_BLUE
 
 /datum/sprite_accessory/tails/human/eevee
 	name = "Eevee"
 	icon_state = "eevee"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/eevee
 	name = "Eevee"
 	icon_state = "eevee"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/fennec
 	name = "Fennec"
 	icon_state = "fennec"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/fennec
 	name = "Fennec"
 	icon_state = "fennec"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/fish
 	name = "Fish"
 	icon_state = "fish"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/fish
 	name = "Fish"
 	icon_state = "fish"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/fox
 	name = "Fox"
 	icon_state = "fox"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/fox
 	name = "Fox"
 	icon_state = "fox"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/horse
 	name = "Horse"
@@ -287,36 +291,42 @@
 	icon_state = "husky"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/husky
 	name = "Husky"
 	icon_state = "husky"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/insect
 	name = "Insect"
 	icon_state = "insect"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/insect
 	name = "Insect"
 	icon_state = "insect"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/ltiger
 	name = "Light Tiger"
@@ -331,108 +341,126 @@
 	icon_state = "murid"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_GREEN
 
 /datum/sprite_accessory/tails_animated/human/murid
 	name = "Murid"
 	icon_state = "murid"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_GREEN
 
 /datum/sprite_accessory/tails/orca
 	name = "Orca"
 	icon_state = "orca"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/orca
 	name = "Orca"
 	icon_state = "orca"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/otie
 	name = "Otusian"
 	icon_state = "otie"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/otie
 	name = "Otusian"
 	icon_state = "otie"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/pede
 	name = "Scolipede"
 	icon_state = "pede"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/pede
 	name = "Scolipede"
 	icon_state = "pede"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/sergal
 	name = "Sergal"
 	icon_state = "sergal"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/shark
 	name = "Shark"
 	icon_state = "shark"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/shark
 	name = "Shark"
 	icon_state = "shark"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/skunk
 	name = "skunk"
 	icon_state = "skunk"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails_animated/human/skunk
 	name = "skunk"
 	icon_state = "skunk"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails/human/smooth
 	name = "Smooth"
@@ -463,60 +491,70 @@
 	icon_state = "squirrel"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/tamamo_kitsune
 	name = "Tamamo Kitsune Tails" //Tamamo-no-Tiro, let it be known!
 	icon_state = "9sune"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/tamamo_kitsune
 	name = "Tamamo Kitsune Tails"
 	icon_state = "9sune"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/human/tiger
 	name = "Tiger"
 	icon_state = "tiger"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails_animated/human/tiger
 	name = "Tiger"
 	icon_state = "tiger"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails/human/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/human/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	matrixed_sections = MATRIX_RED
 
 /******************************************
 ************** Furry Tails ****************
@@ -526,7 +564,6 @@
 	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
@@ -538,7 +575,6 @@
 /datum/sprite_accessory/tails_animated/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)
@@ -552,34 +588,42 @@
 /datum/sprite_accessory/tails/mam_tails/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/axolotl
 	name = "Axolotl"
 	icon_state = "axolotl"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/batl
 	name = "Bat (Long)"
 	icon_state = "batl"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/batl
 	name = "Bat (Long)"
 	icon_state = "batl"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/bats
 	name = "Bat (Short)"
 	icon_state = "bats"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/bats
 	name = "Bat (Short)"
 	icon_state = "bats"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/bee
 	name = "Bee"
 	icon_state = "bee"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/bee
 	name = "Bee"
 	icon_state = "bee"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/cat
 	name = "Cat"
@@ -594,34 +638,42 @@
 /datum/sprite_accessory/tails/mam_tails/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/twocat
 	name = "Cat, Double"
 	icon_state = "twocat"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/twocat
 	name = "Cat, Double"
 	icon_state = "twocat"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/corvid
 	name = "Corvid"
 	icon_state = "crow"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/corvid
 	name = "Corvid"
 	icon_state = "crow"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tail/cow
 	name = "Cow"
 	icon_state = "cow"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/cow
 	name = "Cow"
 	icon_state = "cow"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/dtiger
 	name = "Dark Tiger"
@@ -638,42 +690,52 @@
 /datum/sprite_accessory/tails/mam_tails/eevee
 	name = "Eevee"
 	icon_state = "eevee"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/eevee
 	name = "Eevee"
 	icon_state = "eevee"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/fennec
 	name = "Fennec"
 	icon_state = "fennec"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/fennec
 	name = "Fennec"
 	icon_state = "fennec"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/fish
 	name = "Fish"
 	icon_state = "fish"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/fish
 	name = "Fish"
 	icon_state = "fish"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/fox
 	name = "Fox"
 	icon_state = "fox"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/fox
 	name = "Fox"
 	icon_state = "fox"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/hawk
 	name = "Hawk"
 	icon_state = "hawk"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/hawk
 	name = "Hawk"
 	icon_state = "hawk"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/horse
 	name = "Horse"
@@ -688,42 +750,52 @@
 /datum/sprite_accessory/tails/mam_tails/husky
 	name = "Husky"
 	icon_state = "husky"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/husky
 	name = "Husky"
 	icon_state = "husky"
+	matrixed_sections = MATRIX_RED_GREEN
 
 datum/sprite_accessory/tails/mam_tails/insect
 	name = "Insect"
 	icon_state = "insect"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/insect
 	name = "Insect"
 	icon_state = "insect"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/lab
 	name = "Lab"
 	icon_state = "lab"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/lab
 	name = "Lab"
 	icon_state = "lab"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/ltiger
 	name = "Light Tiger"
@@ -740,84 +812,104 @@ datum/sprite_accessory/tails/mam_tails/insect
 /datum/sprite_accessory/tails/mam_tails/murid
 	name = "Murid"
 	icon_state = "murid"
+	matrixed_sections = MATRIX_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/murid
 	name = "Murid"
 	icon_state = "murid"
+	matrixed_sections = MATRIX_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/orca
 	name = "Orca"
 	icon_state = "orca"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/orca
 	name = "Orca"
 	icon_state = "orca"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/otie
 	name = "Otusian"
 	icon_state = "otie"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/otie
 	name = "Otusian"
 	icon_state = "otie"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
 	extra = TRUE
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/ailurus
 	name = "Red Panda"
 	icon_state = "wah"
 	extra = TRUE
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/pede
 	name = "Scolipede"
 	icon_state = "pede"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/pede
 	name = "Scolipede"
 	icon_state = "pede"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/sergal
 	name = "Sergal"
 	icon_state = "sergal"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/sergal
 	name = "Sergal"
 	icon_state = "sergal"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/shark
 	name = "Shark"
 	icon_state = "shark"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/shark
 	name = "Shark"
 	icon_state = "shark"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
+	matrixed_sections = MATRIX_GREEN_BLUE
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
+	matrixed_sections = MATRIX_GREEN_BLUE
 
 /datum/sprite_accessory/tails/mam_tails/skunk
 	name = "Skunk"
 	icon_state = "skunk"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/skunk
 	name = "Skunk"
 	icon_state = "skunk"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails/mam_tails/smooth
 	name = "Smooth"
@@ -846,47 +938,59 @@ datum/sprite_accessory/tails/mam_tails/insect
 /datum/sprite_accessory/tails/mam_tails/straighttail
 	name = "Straight Tail"
 	icon_state = "straighttail"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/straighttail
 	name = "Straight Tail"
 	icon_state = "straighttail"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/squirrel
 	name = "Squirrel"
 	icon_state = "squirrel"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/tamamo_kitsune
 	name = "Tamamo Kitsune Tails"
 	icon_state = "9sune"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/tamamo_kitsune
 	name = "Tamamo Kitsune Tails"
 	icon_state = "9sune"
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/tiger
 	name = "Tiger"
 	icon_state = "tiger"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/tiger
 	name = "Tiger"
 	icon_state = "tiger"
+	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails/mam_tails/wolf
 	name = "Wolf"
 	icon_state = "wolf"
+	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/wolf
 	name = "Wolf"
 	icon_state = "wolf"
+	matrixed_sections = MATRIX_RED

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

@@ -175,6 +175,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 //Called when cloning, copies some vars that should be kept
 /datum/species/proc/copy_properties_from(datum/species/old_species)
+	mutant_bodyparts["limbs_id"] = old_species.mutant_bodyparts["limbs_id"]
 	return
 
 //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
@@ -746,14 +747,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		)
 
 	var/g = (H.dna.features["body_model"] == FEMALE) ? "f" : "m"
-	var/list/colorlist = list()
 	var/husk = HAS_TRAIT(H, TRAIT_HUSK)
-	colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features["mcolor"]]00")
-	colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features["mcolor2"]]00")
-	colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features["mcolor3"]]00")
-	colorlist += husk ? list(0, 0, 0) : list(0, 0, 0, hair_alpha)
-	for(var/index in 1 to colorlist.len)
-		colorlist[index] /= 255
 
 	for(var/layer in relevant_layers)
 		var/list/standing = list()
@@ -775,6 +769,22 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			if(S.center)
 				accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y)
 
+			var/advanced_color_system = (H.dna.features["color_scheme"] == ADVANCED_CHARACTER_COLORING)
+
+			var/mutant_string = S.mutant_part_string
+			if(mutant_string == "tailwag") //wagging tails should be coloured the same way as your tail
+				mutant_string = "tail"
+			var/primary_string = advanced_color_system ? "[mutant_string]_primary" : "mcolor"
+			var/secondary_string = advanced_color_system ? "[mutant_string]_secondary" : "mcolor2"
+			var/tertiary_string = advanced_color_system ? "[mutant_string]_tertiary" : "mcolor3"
+			//failsafe: if there's no value for any of these, set it to white
+			if(!H.dna.features[primary_string])
+				H.dna.features[primary_string] = advanced_color_system ? H.dna.features["mcolor"] : "FFFFFF"
+			if(!H.dna.features[secondary_string])
+				H.dna.features[secondary_string] = advanced_color_system ? H.dna.features["mcolor2"] : "FFFFFF"
+			if(!H.dna.features[tertiary_string])
+				H.dna.features[tertiary_string] = advanced_color_system ? H.dna.features["mcolor3"] : "FFFFFF"
+
 			if(!husk)
 				if(!forced_colour)
 					switch(S.color_src)
@@ -784,20 +794,36 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 							if(fixed_mut_color)
 								accessory_overlay.color = "#[fixed_mut_color]"
 							else
-								accessory_overlay.color = "#[H.dna.features["mcolor"]]"
+								accessory_overlay.color = "#[H.dna.features[primary_string]]"
 						if(MUTCOLORS2)
 							if(fixed_mut_color2)
 								accessory_overlay.color = "#[fixed_mut_color2]"
 							else
-								accessory_overlay.color = "#[H.dna.features["mcolor2"]]"
+								accessory_overlay.color = "#[H.dna.features[primary_string]]"
 						if(MUTCOLORS3)
 							if(fixed_mut_color3)
 								accessory_overlay.color = "#[fixed_mut_color3]"
 							else
-								accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
+								accessory_overlay.color = "#[H.dna.features[primary_string]]"
 
 						if(MATRIXED)
-							accessory_overlay.color = list(colorlist)
+							var/list/accessory_colorlist = list()
+							if(S.matrixed_sections == MATRIX_RED || S.matrixed_sections == MATRIX_RED_GREEN || S.matrixed_sections == MATRIX_RED_BLUE || S.matrixed_sections == MATRIX_ALL)
+								accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features[primary_string]]00")
+							else
+								accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("00000000")
+							if(S.matrixed_sections == MATRIX_GREEN || S.matrixed_sections == MATRIX_RED_GREEN || S.matrixed_sections == MATRIX_GREEN_BLUE || S.matrixed_sections == MATRIX_ALL)
+								accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features[secondary_string]]00")
+							else
+								accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("00000000")
+							if(S.matrixed_sections == MATRIX_BLUE || S.matrixed_sections == MATRIX_RED_BLUE || S.matrixed_sections == MATRIX_GREEN_BLUE || S.matrixed_sections == MATRIX_ALL)
+								accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features[tertiary_string]]00")
+							else
+								accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("00000000")
+							accessory_colorlist += husk ? list(0, 0, 0) : list(0, 0, 0, hair_alpha)
+							for(var/index in 1 to accessory_colorlist.len)
+								accessory_colorlist[index] /= 255
+							accessory_overlay.color = list(accessory_colorlist)
 
 						if(HAIR)
 							if(hair_color == "mutcolor")
@@ -820,7 +846,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				if(bodypart == "tail")
 					accessory_overlay.icon_state = "m_tail_husk_[layertext]"
 				if(S.color_src == MATRIXED)
-					accessory_overlay.color = colorlist
+					var/list/accessory_colorlist = list()
+					accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features[primary_string]]00")
+					accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features[secondary_string]]00")
+					accessory_colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features[tertiary_string]]00")
+					accessory_colorlist += husk ? list(0, 0, 0) : list(0, 0, 0, hair_alpha)
+					for(var/index in 1 to accessory_colorlist.len)
+						accessory_colorlist[index] /= 255
+					accessory_overlay.color = list(accessory_colorlist)
 
 			if(OFFSET_MUTPARTS in H.dna.species.offset_features)
 				accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
@@ -837,23 +870,22 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				if(S.center)
 					extra_accessory_overlay = center_image(extra_accessory_overlay, S.dimension_x, S.dimension_y)
 
-
 				switch(S.extra_color_src) //change the color of the extra overlay
 					if(MUTCOLORS)
 						if(fixed_mut_color)
 							extra_accessory_overlay.color = "#[fixed_mut_color]"
 						else
-							extra_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
+							extra_accessory_overlay.color = "#[H.dna.features[secondary_string]]"
 					if(MUTCOLORS2)
 						if(fixed_mut_color2)
 							extra_accessory_overlay.color = "#[fixed_mut_color2]"
 						else
-							extra_accessory_overlay.color = "#[H.dna.features["mcolor2"]]"
+							extra_accessory_overlay.color = "#[H.dna.features[secondary_string]]"
 					if(MUTCOLORS3)
 						if(fixed_mut_color3)
 							extra_accessory_overlay.color = "#[fixed_mut_color3]"
 						else
-							extra_accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
+							extra_accessory_overlay.color = "#[H.dna.features[secondary_string]]"
 					if(HAIR)
 						if(hair_color == "mutcolor")
 							extra_accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
@@ -889,17 +921,17 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 						if(fixed_mut_color)
 							extra2_accessory_overlay.color = "#[fixed_mut_color]"
 						else
-							extra2_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features[tertiary_string]]"
 					if(MUTCOLORS2)
 						if(fixed_mut_color2)
 							extra2_accessory_overlay.color = "#[fixed_mut_color2]"
 						else
-							extra2_accessory_overlay.color = "#[H.dna.features["mcolor2"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features[tertiary_string]]"
 					if(MUTCOLORS3)
 						if(fixed_mut_color3)
 							extra2_accessory_overlay.color = "#[fixed_mut_color3]"
 						else
-							extra2_accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features[tertiary_string]]"
 					if(HAIR)
 						if(hair_color == "mutcolor3")
 							extra2_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
@@ -916,7 +948,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 				standing += extra2_accessory_overlay
 
-
 		H.overlays_standing[layernum] = standing
 
 	H.apply_overlay(BODY_BEHIND_LAYER)

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

@@ -669,6 +669,7 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if
 //produces a key based on the human's limbs
 /mob/living/carbon/human/generate_icon_render_key()
 	. = "[dna.species.mutant_bodyparts["limbs_id"]]"
+	. += "[dna.features["color_scheme"]]"
 
 	if(dna.check_mutation(HULK))
 		. += "-coloured-hulk"
@@ -708,6 +709,11 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if
 			. += "-[BP.dmg_overlay_type]"
 		if(BP.body_markings)
 			. += "-[BP.body_markings]"
+			if(length(BP.markings_color) && length(BP.markings_color[1]))
+				for(var/color in BP.markings_color[1])
+					. += "-[color]"
+		if(BP.icon)
+			. += "-[BP.icon]"
 		else
 			. += "-no_marking"