From d8ca321b0bda6840b50fd7b41edfe3048aca5a97 Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 5 Nov 2017 00:19:00 -0400 Subject: [PATCH] Reverts removed stuff from earlier pol sync. --- code/modules/mob/living/carbon/human/update_icons.dm | 9 +++++++-- 1 file changed, 7 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 c612aa59a4..cb4aa33ab3 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1162,14 +1162,19 @@ var/global/list/damage_icon_parts = list() if(!tail_icon) //generate a new one var/species_tail_anim = species.get_tail_animation(src) + if(species.icobase_tail) species_tail_anim = species.icobase //VOREStation Code if(!species_tail_anim) species_tail_anim = 'icons/effects/species.dmi' tail_icon = new/icon(species_tail_anim) - tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD) + //VOREStation Code Start + if(species.color_mult) + tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY) + else + tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD) // 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) + hair_icon.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY) //VOREStation Edit tail_icon.Blend(hair_icon, ICON_OVERLAY) tail_icon_cache[icon_key] = tail_icon