From 61c86841926150745e08ccde29835261ba113b5a Mon Sep 17 00:00:00 2001 From: Farie82 Date: Mon, 16 May 2022 15:40:14 +0200 Subject: [PATCH] Cryoing now won't cause items to try and remove themselves from deleted storages. Runtime fix (#17665) --- code/game/objects/items.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index ec61e27595d..307234f6946 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -167,7 +167,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect m.unEquip(src, 1) else if(istype(loc, /obj/item/storage)) var/obj/item/storage/S = loc - S.remove_from_storage(src) + if(!QDELETED(S)) // Can happen when the storage gets deleted, thus deleting the contents + S.remove_from_storage(src) // Not required to call. Will only cause runtimes QDEL_LIST(actions) master = null return ..()