From 9c27dede54dfb3f0abb372b410a4c6256b6e1b36 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 3 Mar 2017 20:34:08 -0500 Subject: [PATCH] Fix color_mult species. THIS IS WHY WE ADD COMMENTS TO AREAS WE EDIT. --- code/modules/organs/organ_icon.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 0fd12ad9efa..b64ac107c51 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -150,9 +150,12 @@ var/global/list/limb_icon_cache = list() applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) icon_cache_key += "_tone_[s_tone]" else if(s_col && s_col.len >= 3) - applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD) - icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]" - + //VOREStation Edit - Support for species.color_mult + if(species && species.color_mult) + applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY) + else + applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD) + //VOREStation Edit End // Translucency. if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND