From a8509b0f55bb07fa0e78bf87e4e9239a6a30800b Mon Sep 17 00:00:00 2001
From: Alan <alfalfascout@users.noreply.github.com>
Date: Sun, 23 Aug 2026 14:23:52 +0000
Subject: [PATCH] Close all storage UIs inside locker on closing locker.
 (#32477)

---
 code/game/objects/structures/crates_lockers/closets.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 197758ddfca..21ba436d8bf 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -266,6 +266,11 @@
 			break
 		if(!I.anchored)
 			I.forceMove(src)
+			var/list/all_contents = I.get_all_contents()
+			for(var/obj/item/storage/one_content in all_contents)
+				if(isstorage(one_content))
+					for(var/mob/player in one_content.mobs_viewing)
+						one_content.hide_from(player)
 			itemcount++
 
 	for(var/mob/M in loc)