From dae51909410406f83e96024025ef23f74e7f9246 Mon Sep 17 00:00:00 2001
From: Jerry Wester <jerrywester@yahoo.com>
Date: Sun, 11 Dec 2022 20:45:46 -0700
Subject: [PATCH] Remove sandstorm edit, fix suit storage

---
 code/datums/outfit.dm                            | 14 +-------------
 code/game/machinery/suit_storage_unit.dm         |  8 ++++++--
 tgui/packages/tgui/interfaces/SuitStorageUnit.js | 10 ++++++++++
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm
index e85a29ae6e..8327260449 100755
--- a/code/datums/outfit.dm
+++ b/code/datums/outfit.dm
@@ -184,25 +184,13 @@
 	if(neck)
 		H.equip_to_slot_or_del(new neck(H), ITEM_SLOT_NECK, TRUE)
 	if(ears)
-		H.equip_to_slot_or_del(new ears(H), ITEM_SLOT_EARS_LEFT, TRUE) // Sandstorm edit
+		H.equip_to_slot_or_del(new ears(H), ITEM_SLOT_EARS, TRUE)
 	if(glasses)
 		H.equip_to_slot_or_del(new glasses(H), ITEM_SLOT_EYES, TRUE)
 	if(id)
 		H.equip_to_slot_or_del(new id(H), ITEM_SLOT_ID, TRUE)
 	if(suit_store)
 		H.equip_to_slot_or_del(new suit_store(H), ITEM_SLOT_SUITSTORE, TRUE)
-	// Sandstorm edit
-	if(ears_extra)
-		H.equip_to_slot_or_del(new ears_extra(H), ITEM_SLOT_EARS_RIGHT, TRUE)
-	if(underwear)
-		H.equip_to_slot_or_del(new underwear(H), ITEM_SLOT_UNDERWEAR, TRUE)
-	if(socks)
-		H.equip_to_slot_or_del(new socks(H), ITEM_SLOT_SOCKS, TRUE)
-	if(shirt)
-		H.equip_to_slot_or_del(new shirt(H), ITEM_SLOT_SHIRT, TRUE)
-	if(wrists)
-		H.equip_to_slot_or_del(new wrists(H), ITEM_SLOT_WRISTS, TRUE)
-	//
 
 	if(accessory)
 		var/obj/item/clothing/under/U = H.w_uniform
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index aa351e6c90..ca57e8457a 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -499,6 +499,10 @@
 		data["mask"] = mask.name
 	else
 		data["mask"] = null
+	if(mod)
+		data["mod"] = mod.name
+	else
+		data["mod"] = null
 	if(storage)
 		data["storage"] = storage.name
 	else
@@ -529,7 +533,7 @@
 		if("uv")
 			if(occupant && safeties)
 				return
-			else if(!helmet && !mask && !suit && !storage && !occupant)
+			else if(!helmet && !mask && !mod && !suit && !storage && !occupant)
 				return
 			else
 				if(occupant)
@@ -541,7 +545,7 @@
 			if(!state_open)
 				return
 
-			var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
+			var/static/list/valid_items = list("helmet", "suit", "mask", "mod", "storage")
 			var/item_name = params["item"]
 			if(item_name in valid_items)
 				var/obj/item/I = vars[item_name]
diff --git a/tgui/packages/tgui/interfaces/SuitStorageUnit.js b/tgui/packages/tgui/interfaces/SuitStorageUnit.js
index c6f66a79d2..c7ac915153 100644
--- a/tgui/packages/tgui/interfaces/SuitStorageUnit.js
+++ b/tgui/packages/tgui/interfaces/SuitStorageUnit.js
@@ -14,6 +14,7 @@ export const SuitStorageUnit = (props, context) => {
     suit,
     helmet,
     mask,
+    mod,
     storage,
   } = data;
   return (
@@ -89,6 +90,15 @@ export const SuitStorageUnit = (props, context) => {
                       item: 'mask',
                     })} />
                 </LabeledList.Item>
+                <LabeledList.Item label="MOD">
+                  <Button
+                    icon={mod ? 'square' : 'square-o'}
+                    content={mod || 'Empty'}
+                    disabled={!mod}
+                    onClick={() => act('dispense', {
+                      item: 'mod',
+                    })} />
+                </LabeledList.Item>
                 <LabeledList.Item label="Storage">
                   <Button
                     icon={storage ? 'square' : 'square-o'}