From 58251baa3acfc79010861b4930d5aa4452a6a50e Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Wed, 21 Mar 2018 23:50:29 -0400 Subject: [PATCH] Fix Teshari Tail-hair Rendering Add the '_s' suffix to the icon state in the tail hair stage of tail icon generation. This fixes an issue where Teshari tail hair wasn't rendering. Also amends the colouration (was necessary for this to work for us) since VOREStation uses multiplicative blending --- code/modules/mob/living/carbon/human/update_icons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 0db94400c5..6bd53b7324 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -871,8 +871,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() // The following will not work with animated tails. var/use_species_tail = species.get_tail_hair(src) if(use_species_tail) - var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]") - hair_icon.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) + var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]_s") //VOREStation edit -- Suffix icon state string with '_s' to compensate for diff in .dmi b/w us & Polaris. + hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species.color_mult ? ICON_MULTIPLY : ICON_ADD) //VOREStation edit -- Check for species color_mult tail_icon.Blend(hair_icon, ICON_OVERLAY) tail_icon_cache[icon_key] = tail_icon