Readds hand items into the backpack tab

ARF-SS13 · Dec 23, 2024 · 1ba6c0f · 1ba6c0f
1 parent ee3b076
commit 1ba6c0f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -22,6 +22,8 @@
 //backpack
 #define LOADOUT_CATEGORY_BACKPACK 				"In backpack"
 #define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL 	"General" //basically anything that there's not enough of to have its own subcategory
+//Migrated content from the hands category
+#define LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS "Small items"
 //#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS 		"Toys"
 #define LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS 	"Backpacks"
 #define LOADOUT_SUBCATEGORY_BACKPACK_RATIONS 	"Snacks"

diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
@@ -1,5 +1,5 @@
 GLOBAL_LIST_INIT(loadout_categories, list(
-	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
+	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS, LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS, LOADOUT_SUBCATEGORIES_EARRINGS /*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
 	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES),
 	LOADOUT_CATEGORY_MASK = list(LOADOUT_SUBCATEGORY_MASK_GENERAL, LOADOUT_SUBCATEGORY_MASK_BANDANA/*, LOADOUT_SUBCATEGORY_MASK_MISCELLANEOUS*/),
 	LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND, LOADOUT_SUBCATEGORY_UNIFORM_MEDICAL, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_TRADITIONAL, LOADOUT_SUBCATEGORY_UNIFORM_RAIDER, LOADOUT_SUBCATEGORY_UNIFORM_UNIFORMS, LOADOUT_SUBCATEGORY_UNIFORM_JUMPSUITS, LOADOUT_SUBCATEGORY_UNIFORM_ESCORT, LOADOUT_SUBCATEGORY_UNIFORM_TRIBAL),

diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm
@@ -1,7 +1,7 @@
 /datum/gear/hands
-	category = LOADOUT_CATEGORY_HANDS
-	subcategory = LOADOUT_SUBCATEGORY_NECK_GENERAL
-	slot = SLOT_HANDS
+	category = LOADOUT_CATEGORY_BACKPACK
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS
+	slot = SLOT_IN_BACKPACK
 	cost = 0
 
 /datum/gear/hands/briefcase/crafted