Merge pull request #5413 from ARF-SS13/adding-more-color-to-tail

Lets us color the tip of the big cat tail, also adds in a duel color option for cat ears
ARF-SS13 · Sep 29, 2024 · 5a4cd7e · 5a4cd7e
2 parents 9b94777 + 765bbbe
commit 5a4cd7e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
@@ -610,3 +610,10 @@
 	icon_state = "draconicspikes"
 	icon = 'icons/mob/mam/citadel/mam_ears.dmi'
 	matrixed_sections = MATRIX_ALL
+
+//Two tone ears
+
+/datum/sprite_accessory/ears/mam_ears/catbigtwo
+	name = "Cat, Big Duel Color"
+	icon_state = "catbigtwo"
+	matrixed_sections = MATRIX_ALL
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -151,14 +151,14 @@
 	icon_state = "catbig"
 	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
-	matrixed_sections = MATRIX_RED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
 	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
-	matrixed_sections = MATRIX_RED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/twocat
 	name = "Cat, Double"
@@ -671,12 +671,12 @@
 /datum/sprite_accessory/tails/mam_tails/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
-	matrixed_sections = MATRIX_RED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
-	matrixed_sections = MATRIX_RED
+	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/mam_tails/twocat
 	name = "Cat, Double"

diff --git a/icons/mob/mam/citadel/mam_ears.dmi b/icons/mob/mam/citadel/mam_ears.dmi
diff --git a/icons/mob/mam/citadel/mam_tails.dmi b/icons/mob/mam/citadel/mam_tails.dmi