From 418267e2f3578195550bea229646009b15e432c9 Mon Sep 17 00:00:00 2001
From: Vladisvell <73733747+Vladisvell@users.noreply.github.com>
Date: Mon, 11 Dec 2023 00:40:09 +0500
Subject: [PATCH] bugfix: storage-in-storage runtime fix (#4031)

---
 code/game/objects/items/weapons/storage/storage.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 71d5e82b93e..ce9e95495ac 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -158,6 +158,8 @@
 /obj/item/storage/proc/show_to(mob/user)
 	if(!user.client)
 		return
+	if(QDELETED(src))
+		return
 	if(user.s_active != src && !isobserver(user))
 		for(var/obj/item/I in src) // For bombs with mousetraps, facehuggers etc
 			if(I.on_found(user))
@@ -466,7 +468,7 @@
 
 	if(usr)
 		orient2hud(usr)
-		if(usr.s_active)
+		if(usr.s_active && !QDELETED(src))
 			usr.s_active.show_to(usr)
 	if(W.maptext)
 		W.maptext = ""