TGS Test Merge (#6045)

Citadel-Station-13 · Oct 4, 2023 · 4cefc28 · 4cefc28
2 parents 9424199 + 3c454a4
commit 4cefc28
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/code/modules/sprite_accessories/tail/taurs.dm b/code/modules/sprite_accessories/tail/taurs.dm
@@ -152,6 +152,27 @@
 	icon_state = "altnaga_s"
 	extra_overlay = "altnaga_markings"
 
+/datum/sprite_accessory/tail/taur/naga/naga_tailmaw
+	name = "Naga Tailmaw (Taur)"
+	id = "tail_taur_naga_tailmaw"
+	icon_state = "altnagatailmaw_s"
+	extra_overlay = "altnagatailmaw_markings"
+	extra_overlay2 = "altnagatailmaw_eyes"
+
+// yes, a mermaid is not a naga, i'm just lazy so it's using the same messages because it's still a tail okay
+/datum/sprite_accessory/tail/taur/naga/mermaid
+	name = "Mermaid (Taur)"
+	id = "tail_taur_mermaid"
+	icon_state = "mermaid_s"
+	suit_sprites = null
+
+/datum/sprite_accessory/tail/taur/naga/mermaid/alt
+	name = "Mermaid Alt (Taur)"
+	id = "tail_taur_mermaid_alt"
+	icon_state = "altmermaid_s"
+	extra_overlay = "altmermaid_markings"
+	extra_overlay2 = "altmermaid_markings2"
+
 /datum/sprite_accessory/tail/taur/horse
 	name = "Horse (Taur)"
 	id = "tail_taur_horse"

diff --git a/icons/mob/sprite_accessories/taurs.dmi b/icons/mob/sprite_accessories/taurs.dmi