diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 2f0940b7a6..4ba3d6b485 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -231,13 +231,6 @@ desc = "" icon_state = "beethorax" -/datum/sprite_accessory/tail/doublekitsune - name = "double kitsune tail, colorable" - desc = "" - icon_state = "doublekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/spade_color name = "spade-tail (colorable)" desc = "" @@ -909,6 +902,20 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/fox_tail + name = "Fox tail, colorable" + desc = "" + icon_state = "fox_tail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/fox_tail_plain + name = "Fox tail, colorable, plain" + desc = "" + icon_state = "fox_tail_plain_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/foxtail name = "Fox tail, colourable (vwag)" desc = "" @@ -919,6 +926,21 @@ ani_state = "foxtail_w" extra_overlay_w = "foxtail-tips_w" +/datum/sprite_accessory/tail/doublekitsune + name = "Kitsune 2 tails, colorable" + desc = "" + icon_state = "doublekitsune" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/doublekitsunealt + name = "Kitsune 2 tails, colorable, alt" + desc = "" + icon_state = "doublekitsunealt" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "doublekitsunealt-tips" + /datum/sprite_accessory/tail/triplekitsune_colorable name = "Kitsune 3 tails, colorable" desc = "" @@ -927,6 +949,14 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "triplekitsune_tips" +/datum/sprite_accessory/tail/sevenkitsune_colorable + name = "Kitsune 7 tails, colorable" + desc = "" + icon_state = "sevenkitsune" + extra_overlay = "sevenkitsune-tips" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/ninekitsune_colorable name = "Kitsune 9 tails, colorable" desc = "" diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index 9bbdc8240c..82459ead5d 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -211,13 +211,6 @@ desc = "" icon_state = "beethorax" -/datum/sprite_accessory/tail/doublekitsune - name = "double kitsune tail, colorable" - desc = "" - icon_state = "doublekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/spade_color name = "spade-tail (colorable)" desc = "" @@ -964,6 +957,52 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/fennec_tail + name = "Fennec tail" + desc = "" + icon_state = "fennec_tail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/fox_tail + name = "Fox tail, colorable" + desc = "" + icon_state = "fox_tail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/fox_tail_plain + name = "Fox tail, colorable, plain" + desc = "" + icon_state = "fox_tail_plain_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/foxtail + name = "Fox tail, colourable (vwag)" + desc = "" + icon_state = "foxtail" + extra_overlay = "foxtail-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "foxtail_w" + extra_overlay_w = "foxtail-tips_w" + +/datum/sprite_accessory/tail/doublekitsune + name = "Kitsune 2 tails, colorable" + desc = "" + icon_state = "doublekitsune" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/doublekitsunealt + name = "Kitsune 2 tails, colorable, alt" + desc = "" + icon_state = "doublekitsunealt" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "doublekitsunealt-tips" + /datum/sprite_accessory/tail/triplekitsune_colorable name = "Kitsune 3 tails, colorable" desc = "" @@ -972,6 +1011,14 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "triplekitsune_tips" +/datum/sprite_accessory/tail/sevenkitsune_colorable + name = "Kitsune 7 tails, colorable" + desc = "" + icon_state = "sevenkitsune" + extra_overlay = "sevenkitsune-tips" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/ninekitsune_colorable name = "Kitsune 9 tails, colorable" desc = "" @@ -980,6 +1027,16 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "ninekitsune-tips" +/datum/sprite_accessory/tail/hideableninetails + name = "Kitsune 9-in-1 tail, colourable (vwag)" + desc = "" + icon_state = "ninekitsune" + extra_overlay = "ninekitsune-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "foxtail_w" + extra_overlay_w = "foxtail-tips_w" + /datum/sprite_accessory/tail/shadekin_short name = "Shadekin Short Tail, colorable" desc = "" @@ -1058,27 +1115,6 @@ ani_state = "Segmentedtail_w" extra_overlay_w = "Segmentedlights_w" -/datum/sprite_accessory/tail/fox_tail - name = "Fox tail" - desc = "" - icon_state = "fox_tail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/fox_tail_plain - name = "Fox tail" - desc = "" - icon_state = "fox_tail_plain_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/fennec_tail - name = "Fennec tail" - desc = "" - icon_state = "fennec_tail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/lizard_tail_smooth name = "Lizard Tail (Smooth)" desc = "" @@ -1146,7 +1182,7 @@ icon_state = "tentacle" ani_state = "tentacle_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + color_blend_mode = ICON_MULTIPLY //LONG TAILS ARE NOT TAUR BUTTS >:O /datum/sprite_accessory/tail/longtail diff --git a/icons/mob/human_races/sprite_accessories/tails.dmi b/icons/mob/human_races/sprite_accessories/tails.dmi index 5e4a27597f..960a44d5e2 100644 Binary files a/icons/mob/human_races/sprite_accessories/tails.dmi and b/icons/mob/human_races/sprite_accessories/tails.dmi differ diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index 9d1c37b8da..d5a4d7ad57 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ