From cc82f08ebcf59f9c6e98567767aab3938fbb6d49 Mon Sep 17 00:00:00 2001
From: Seris02 <littlenebulae421@gmail.com>
Date: Sat, 18 Apr 2020 18:28:35 +0800
Subject: [PATCH] weh

---
 code/datums/components/storage/ui.dm               | 2 +-
 code/modules/client/preferences.dm                 | 3 +++
 code/modules/client/preferences_savefile.dm        | 7 +++++--
 modular_citadel/code/modules/client/preferences.dm | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/datums/components/storage/ui.dm b/code/datums/components/storage/ui.dm
index c1c049dfd3..d1df47390e 100644
--- a/code/datums/components/storage/ui.dm
+++ b/code/datums/components/storage/ui.dm
@@ -198,7 +198,7 @@
 			M.active_storage.ui_hide(M)
 		M.active_storage = src
 	LAZYOR(is_using, M)
-	if(volumetric_ui())
+	if(!M.client?.prefs?.no_tetris_storage && volumetric_ui())
 		//new volumetric ui bay-style
 		M.client.screen |= orient2hud_volumetric(M, maxallowedscreensize)
 	else
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d44b2ffa04..c452b9db60 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -866,6 +866,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Widescreen:</b> <a href='?_src_=prefs;preference=widescreenpref'>[widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]</a><br>"
 			dat += "<b>Auto stand:</b> <a href='?_src_=prefs;preference=autostand'>[autostand ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>Auto OOC:</b> <a href='?_src_=prefs;preference=auto_ooc'>[auto_ooc ? "Enabled" : "Disabled"]</a><br>"
+			dat += "<b>Force Slot Storage HUD:</b> <a href='?_src_=prefs;preference=no_tetris_storage'>[no_tetris_storage ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
 			if (user && user.client && !user.client.prefs.screenshake==0)
 				dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
@@ -2204,6 +2205,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					autostand = !autostand
 				if("auto_ooc")
 					auto_ooc = !auto_ooc
+				if("no_tetris_storage")
+					no_tetris_storage = !no_tetris_storage
 				if ("screenshake")
 					var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, 200 = maximum.)", "Character Preference", screenshake)  as null|num
 					if (!isnull(desiredshake))
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 6d99ef63aa..ea78b05f76 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -231,7 +231,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["autostand"]			>> autostand
 	S["cit_toggles"]		>> cit_toggles
 	S["preferred_chaos"]	>> preferred_chaos
-	S["auto_ooc"]	>> auto_ooc
+	S["auto_ooc"]			>> auto_ooc
+	S["no_tetris_storage"]		>> no_tetris_storage
 
 
 	//try to fix any outdated data if necessary
@@ -268,10 +269,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	pda_skin		= sanitize_inlist(pda_skin, GLOB.pda_reskins, PDA_SKIN_ALT)
 	screenshake			= sanitize_integer(screenshake, 0, 800, initial(screenshake))
 	damagescreenshake	= sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake))
-	widescreenpref			= sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
+	widescreenpref		= sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
 	autostand			= sanitize_integer(autostand, 0, 1, initial(autostand))
 	cit_toggles			= sanitize_integer(cit_toggles, 0, 65535, initial(cit_toggles))
 	auto_ooc			= sanitize_integer(auto_ooc, 0, 1, initial(auto_ooc))
+	no_tetris_storage		= sanitize_integer(no_tetris_storage, 0, 1, initial(no_tetris_storage))
 
 	return 1
 
@@ -336,6 +338,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["cit_toggles"], cit_toggles)
 	WRITE_FILE(S["preferred_chaos"], preferred_chaos)
 	WRITE_FILE(S["auto_ooc"], auto_ooc)
+	WRITE_FILE(S["no_tetris_storage"], no_tetris_storage)
 
 	return 1
 
diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm
index 8c55f2d9a8..6658d96cc3 100644
--- a/modular_citadel/code/modules/client/preferences.dm
+++ b/modular_citadel/code/modules/client/preferences.dm
@@ -16,6 +16,7 @@
 	var/widescreenpref = TRUE
 	var/autostand = TRUE
 	var/auto_ooc = FALSE
+	var/no_tetris_storage = FALSE
 
 	//vore prefs
 	var/toggleeatingnoise = TRUE