Merge pull request #1054 from EerieDream/Caca

Rattlesnake port from Bubberstation (READY)
GeneralPantsuIsBadAtCoding · Dec 20, 2024 · 07954ba · 07954ba
2 parents 7c4f675 + 2307095
commit 07954ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/code/modules/client/customizer/customizers/organ/tail.dm b/code/modules/client/customizer/customizers/organ/tail.dm
@@ -147,6 +147,7 @@
 		/datum/sprite_accessory/tail/lizard/dtiger,
 		/datum/sprite_accessory/tail/lizard/ltiger,
 		/datum/sprite_accessory/tail/lizard/spikes,
+		/datum/sprite_accessory/tail/rattlesnake
 		)
 
 /datum/customizer/organ/tail/anthro
@@ -212,4 +213,5 @@
 		/datum/sprite_accessory/tail/lizard/dtiger,
 		/datum/sprite_accessory/tail/lizard/ltiger,
 		/datum/sprite_accessory/tail/lizard/spikes,
+		/datum/sprite_accessory/tail/rattlesnake
 		)
diff --git a/code/modules/mob/dead/new_player/sprite_accessory/tails.dm b/code/modules/mob/dead/new_player/sprite_accessory/tails.dm
@@ -341,3 +341,10 @@
 	icon_state = "hearttail"
 	color_key_defaults = list(KEY_SKIN_COLOR)
 	can_wag = TRUE
+
+/datum/sprite_accessory/tail/rattlesnake
+	name = "Rattlesnake"
+	icon_state = "rattlesnake"
+	color_keys = 2
+	color_key_names = list("Tail", "Tip")
+	can_wag = TRUE
diff --git a/icons/mob/sprite_accessory/tails/tails.dmi b/icons/mob/sprite_accessory/tails/tails.dmi