From c3013b83cad8392ffab280055cae888e7a88cddc Mon Sep 17 00:00:00 2001
From: Nazsgull <53869326+Skycert@users.noreply.github.com>
Date: Fri, 22 Apr 2022 12:42:58 +0200
Subject: [PATCH] Closes UI for all players looking into a storage inside a
 recently closed locker (#17519)

* Close UI for all players looking into a storage inside a locker

* Moves the check to objects/item/weapons/storage

Also removed the code from objects\structures\crates_lockers\closets.dm

* Keeps UI open for the mob itself, when they should

Also removed code from attack_hand that conflicted with forceMove. That behaviour is being handled from the forceMove instead of from attack_hand.
---
 code/game/objects/items/weapons/storage/storage.dm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 0ad8439d123..45ace81c07d 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -85,6 +85,14 @@
 	LAZYCLEARLIST(mobs_viewing)
 	return ..()
 
+/obj/item/storage/forceMove(atom/destination)
+	. = ..()
+	if(!ismob(destination.loc))
+		for(var/mob/player in mobs_viewing)
+			if(player == destination)
+				continue
+			hide_from(player)
+
 /obj/item/storage/MouseDrop(obj/over_object)
 	if(!ismob(usr)) //so monkeys can take off their backpacks -- Urist
 		return
@@ -532,9 +540,6 @@
 		show_to(user)
 	else
 		..()
-		for(var/mob/M in range(1))
-			if(M.s_active == src)
-				close(M)
 	add_fingerprint(user)
 
 /obj/item/storage/equipped(mob/user, slot, initial)