From c606f70fa0879461b36101cfaae63eb6c49b3819 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 6 Sep 2015 21:49:58 -0700 Subject: [PATCH] Fix tail-wagging invisible tails --- .../mob/living/carbon/human/body_accessories.dm | 12 ++++++++++++ code/modules/mob/living/carbon/human/update_icons.dm | 7 +++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 4ad65f05ffb..e4cac481f21 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -56,6 +56,18 @@ var/global/list/body_accessory_by_species = list("None" = null) /datum/body_accessory/proc/get_pixel_y(var/mob/living/carbon/human/H) return pixel_offsets["y"] +/datum/body_accessory/proc/get_animated_icon() //return animated if it has it, return static if it does not. + if(animated_icon) + return animated_icon + + else return icon + +/datum/body_accessory/proc/get_animated_icon_state() + if(animated_icon_state) + return animated_icon_state + + else return icon_state + //Bodies /datum/body_accessory/body diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 1fb591ba8a3..b62ac1a786b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -924,11 +924,10 @@ var/global/list/damage_icon_parts = list() overlays_standing[TAIL_LAYER] = null if(body_accessory) - if(body_accessory.animated_icon && body_accessory.animated_icon_state) - var/icon/accessory_s = new/icon("icon" = body_accessory.animated_icon, "icon_state" = body_accessory.animated_icon_state) - accessory_s.Blend(rgb(r_skin, g_skin, b_skin), body_accessory.blend_mode) + var/icon/accessory_s = new/icon("icon" = body_accessory.get_animated_icon(), "icon_state" = body_accessory.get_animated_icon_state()) + accessory_s.Blend(rgb(r_skin, g_skin, b_skin), body_accessory.blend_mode) - overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.get_pixel_x(src), "pixel_y" = body_accessory.get_pixel_y(src)) + overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.get_pixel_x(src), "pixel_y" = body_accessory.get_pixel_y(src)) else if(species.tail && species.bodyflags & HAS_TAIL) var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]w_s")