From 3be6e258d79303c5a38470814cd72bb8ad0fe38e Mon Sep 17 00:00:00 2001 From: doom Date: Mon, 25 Sep 2023 04:02:36 -0700 Subject: [PATCH] ... --- code/__HELPERS/icons.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 2abd51dd9266..275777698173 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -479,14 +479,16 @@ world // Blend the overlay into the flattened icon flat.Blend(add, blendMode2iconMode(curblend), layer_image.pixel_x + 2 - flatX1, layer_image.pixel_y + 2 - flatY1) - if(appearance.color) + if(apply_color && appearance.color) if(islist(appearance.color)) - flat.MapColors(arglist(appearance.color)) + add.MapColors(arglist(appearance.color)) else - flat.Blend(appearance.color, ICON_MULTIPLY) + add.Blend(appearance.color, ICON_MULTIPLY) - if(appearance.alpha < 255) - flat.Blend(rgb(255, 255, 255, appearance.alpha), ICON_MULTIPLY) + if(alpha_apply && appearance.alpha < 255) +- flat.Blend(rgb(255, 255, 255, appearance.alpha), ICON_MULTIPLY) ++ // Blend the overlay into the flattened icon ++ flat.Blend(add, blendMode2iconMode(curblend), layer_image.pixel_x + 2 - flatX1, layer_image.pixel_y + 2 - flatY1) if(no_anim) //Clean up repeated frames