From b3ac3ee241f3ec7a5ce161ebd9b3c576cd51f9b8 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Mon, 26 Feb 2024 15:19:53 -0500 Subject: [PATCH] [MIRROR] [NO GBP] fixes item blood overlays "leaking" onto other objects (#1142) * [NO GBP] fixes item blood overlays "leaking" onto other objects (#81662) Looks like KEEP_TOGETHER is necessary after all before ![Screenshot 2024-02-24 144648](https://github.com/tgstation/tgstation/assets/46101244/e973b372-8391-4678-bc26-28b9d32f05af) after ![Screenshot 2024-02-24 144001](https://github.com/tgstation/tgstation/assets/46101244/b6c25fcd-9c7f-4f3a-8b8f-69d98b81d424) ## Changelog :cl: fix: Blood overlays on items no longer leak onto other objects /:cl: * [NO GBP] fixes item blood overlays "leaking" onto other objects --------- Co-authored-by: 13spacemen <46101244+13spacemen@users.noreply.github.com> --- code/datums/elements/decals/blood.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/elements/decals/blood.dm b/code/datums/elements/decals/blood.dm index ec09caed73d..7984939cddc 100644 --- a/code/datums/elements/decals/blood.dm +++ b/code/datums/elements/decals/blood.dm @@ -9,10 +9,14 @@ /datum/element/decal/blood/Detach(atom/source) UnregisterSignal(source, COMSIG_ATOM_GET_EXAMINE_NAME) + if(isitem(source)) + var/obj/item/source_item = source + REMOVE_KEEP_TOGETHER(source_item, type) return ..() /datum/element/decal/blood/generate_appearance(_icon, _icon_state, _dir, _plane, _layer, _color, _alpha, _smoothing, source) var/obj/item/I = source + ADD_KEEP_TOGETHER(I, type) var/icon = I.icon var/icon_state = I.icon_state if(!icon || !icon_state)