Merge pull request #115 from wewman222/main

stupid tails
CausticCove · Jan 6, 2025 · ae75b25 · ae75b25
2 parents 5897db7 + 294ce41
commit ae75b25
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/code/modules/client/customizer/customizers/organ/tail.dm b/code/modules/client/customizer/customizers/organ/tail.dm
@@ -155,6 +155,8 @@
 		/datum/sprite_accessory/tail/taur/spider,
 		/datum/sprite_accessory/tail/taur/sect,
 		/datum/sprite_accessory/tail/taur/drake,
+		/datum/sprite_accessory/tail/largedragon,
+		/datum/sprite_accessory/tail/bigsnaketail,
 		)
 
 /datum/customizer/organ/tail/anthro
@@ -227,4 +229,6 @@
 		/datum/sprite_accessory/tail/taur/spider,
 		/datum/sprite_accessory/tail/taur/sect,
 		/datum/sprite_accessory/tail/taur/drake,
+		/datum/sprite_accessory/tail/largedragon,
+		/datum/sprite_accessory/tail/bigsnaketail,
 		)
diff --git a/code/modules/client/customizer/customizers/organ/tail_feature.dm b/code/modules/client/customizer/customizers/organ/tail_feature.dm
@@ -29,6 +29,7 @@
 		/datum/sprite_accessory/tail_feature/taur/feline,
 		/datum/sprite_accessory/tail_feature/taur/wolf,
 		/datum/sprite_accessory/tail_feature/taur/drake,
+		/datum/sprite_accessory/tail_feature/dragonmarking,
 		)
 
 /datum/customizer/organ/tail_feature/vox_markings

diff --git a/code/modules/mob/dead/new_player/sprite_accessory/tail_features.dm b/code/modules/mob/dead/new_player/sprite_accessory/tail_features.dm
@@ -71,12 +71,13 @@
 	icon_state = "stripe"
 
 //Caustic Tail Markings
-/datum/sprite_accessory/tail_feature/
-	name = "Mermaid Orca Markings"
+/datum/sprite_accessory/tail_feature/dragonmarking
+	name = "Dragon Markings"
 	icon = 'icons/mob/sprite_accessory/tail_features/dragon_tail_marking.dmi'
 	icon_state = "big_liz_mark"
 
 
+
 //TAUR BULLSHIT MARKINGS AAAAAAAAAAAA
 
 /datum/sprite_accessory/tail_feature/taur

diff --git a/code/modules/mob/dead/new_player/sprite_accessory/tails.dm b/code/modules/mob/dead/new_player/sprite_accessory/tails.dm
@@ -346,11 +346,19 @@
 
 /datum/sprite_accessory/tail/largedragon
 	name = "Large Dragon"
-	icon = 'icons/mob/sprite_accessory/tails/dragon_tail.dmi'
+	icon = 'icons/mob/sprite_accessory/tails/large_dragon.dmi'
 	icon_state = "big_liz"
 	color_key_defaults = list(KEY_SKIN_COLOR)
 	can_wag = TRUE
 
+/datum/sprite_accessory/tail/bigsnaketail
+	name = "Big Snake"
+	icon = 'icons/mob/sprite_accessory/tails/snaketail.dmi'
+	icon_state = "snaketail"
+	color_key_defaults = list(KEY_SKIN_COLOR)
+	can_wag = TRUE
+
+
 //TAUR BULLSHIT HELP
 /datum/sprite_accessory/tail/taur
 	relevant_layers = list(BODY_FRONT_SECOND_LAYER, BODY_BEHIND_LAYER)

diff --git a/...b/sprite_accessory/tails/large dragon.dmi → ...b/sprite_accessory/tails/large_dragon.dmi b/...b/sprite_accessory/tails/large dragon.dmi → ...b/sprite_accessory/tails/large_dragon.dmi
diff --git a/icons/mob/sprite_accessory/tails/snaketail.dmi b/icons/mob/sprite_accessory/tails/snaketail.dmi