From e149fe390e4bc846964823e068adf4e150978409 Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Mon, 22 Jan 2018 14:06:37 -0500 Subject: [PATCH] Changeling clothes blood fix (#34743) --- code/datums/components/decals/blood.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/datums/components/decals/blood.dm b/code/datums/components/decals/blood.dm index f2dc9a48d0..ccd7dfed51 100644 --- a/code/datums/components/decals/blood.dm +++ b/code/datums/components/decals/blood.dm @@ -14,11 +14,15 @@ _icon = 'icons/effects/blood.dmi' if(!_icon_state) _icon_state = "itemblood" - if(!initial(I.icon) || !initial(I.icon_state)) - return FALSE + var/icon = initial(I.icon) + var/icon_state = initial(I.icon_state) + if(!icon || !icon_state) + // It's something which takes on the look of other items, probably + icon = I.icon + icon_state = I.icon_state var/static/list/blood_splatter_appearances = list() //try to find a pre-processed blood-splatter. otherwise, make a new one - var/index = "[REF(initial(I.icon))]-[initial(I.icon_state)]" + var/index = "[REF(icon)]-[icon_state]" pic = blood_splatter_appearances[index] if(!pic) var/icon/blood_splatter_icon = icon(initial(I.icon), initial(I.icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object