From 35a35098bd9cfb6bfa77a320e0c046e9209962e0 Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Sun, 17 May 2020 06:50:28 +0800
Subject: [PATCH] fixed (#12278)

---
 code/datums/components/storage/ui.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/datums/components/storage/ui.dm b/code/datums/components/storage/ui.dm
index 1795aec731..c7ac0d3549 100644
--- a/code/datums/components/storage/ui.dm
+++ b/code/datums/components/storage/ui.dm
@@ -237,7 +237,7 @@
 	if(!M.client)
 		return TRUE
 	UnregisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT)
-	M.client.screen -= list(ui_boxes, ui_close, ui_left, ui_continuous) + get_ui_item_objects_hide()
+	M.client.screen -= list(ui_boxes, ui_close, ui_left, ui_continuous) + get_ui_item_objects_hide(M)
 	if(M.active_storage == src)
 		M.active_storage = null
 	LAZYREMOVE(is_using, M)
@@ -253,8 +253,8 @@
 /**
   * Gets the ui item objects to ui_hide.
   */
-/datum/component/storage/proc/get_ui_item_objects_hide()
-	if(!volumetric_ui())
+/datum/component/storage/proc/get_ui_item_objects_hide(mob/M)
+	if(!volumetric_ui() || M.client?.prefs?.no_tetris_storage)
 		var/atom/real_location = real_location()
 		return real_location.contents
 	else