From 3640a33ff65127d0cc5ed871190e75784987aa9c Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 6 Aug 2020 23:22:53 -0700
Subject: [PATCH] e

---
 code/__DEFINES/loadout.dm                         |  5 ++---
 code/_globalvars/lists/loadout_categories.dm      | 12 ++++++------
 code/modules/client/preferences.dm                | 15 +++++++++------
 .../code/modules/client/loadout/_loadout.dm       |  4 ++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index 1ce5909af5..3e632eedfa 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -1,8 +1,7 @@
 //defines for loadout categories
 //no category defines
-#define LOADOUT_CATEGORY_NONE list("Miscellaneous")
-#define LOADOUT_SUBCATEGORY_NONE list("Miscellaneous")
-
+#define LOADOUT_CATEGORY_NONE			"ERROR"
+#define LOADOUT_SUBCATEGORIES_NONE		list("Miscellaneous")
 
 //backpack
 #define LOADOUT_CATEGORY_BACKPACK 				"In backpack"
diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
index 77d0fd73cd..0f0ac52214 100644
--- a/code/_globalvars/lists/loadout_categories.dm
+++ b/code/_globalvars/lists/loadout_categories.dm
@@ -1,13 +1,13 @@
 GLOBAL_LIST_INIT(loadout_categories, list(
 	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL, LOADOUT_SUBCATEGORY_BACKPACK_TOYS),
 	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL, LOADOUT_SUBCATEGORY_NECK_TIE, LOADOUT_SUBCATEGORY_NECK_SCARVES),
-	LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORY_NONE,
-	LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORY_NONE,
+	LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORIES_NONE,
+	LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_JOBS, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_SHORTS),
 	LOADOUT_CATEGORY_SUIT = list(LOADOUT_SUBCATEGORY_SUIT_GENERAL, LOADOUT_SUBCATEGORY_SUIT_COATS, LOADOUT_SUBCATEGORY_SUIT_JACKETS, LOADOUT_SUBCATEGORY_SUIT_JOBS),
 	LOADOUT_CATEGORY_HEAD = list(LOADOUT_SUBCATEGORY_HEAD_GENERAL, LOADOUT_SUBCATEGORY_HEAD_JOBS),
-	LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORY_NONE,
-	LOADOUT_CATEGORY_GLOVES = LOADOUT_SUBCATEGORY_NONE,
-	LOADOUT_CATEGORY_GLASSES = LOADOUT_SUBCATEGORY_NONE,
-	LOADOUT_CATEGORY_DONATOR = LOADOUT_SUBCATEGORY_NONE
+	LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORIES_NONE,
+	LOADOUT_CATEGORY_GLOVES = LOADOUT_SUBCATEGORIES_NONE,
+	LOADOUT_CATEGORY_GLASSES = LOADOUT_SUBCATEGORIES_NONE,
+	LOADOUT_CATEGORY_DONATOR = LOADOUT_SUBCATEGORIES_NONE
 ))
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 1ec2e8867e..40f35df320 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1069,6 +1069,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			else
 				gear_category = clamp(gear_category, 1, length(GLOB.loadout_items))		// no runtimes
 				var/firstcat
+				var/chosen_category
 				for(var/i in 1 to length(GLOB.loadout_items))
 					var/category = GLOB.loadout_items[i]
 					if(firstcat)
@@ -1077,13 +1078,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						dat += " |"
 					if(i == gear_category)
 						dat += " <span class='linkOn'>[category]</span> "
+						chosen_category = category
 					else
 						dat += " <a href='?_src_=prefs;preference=gear;select_category=[i]'>[category]</a> "
 
 				dat += "</b></center></td></tr>"
 				dat += "<tr><td colspan=4><hr></td></tr>"
-				dat += "<tr><td colspan=4><hr></td></tr>"
-
+				
 				dat += "<tr><td colspan=4><center><b>"
 				
 				if(!length(GLOB.loadout_categories[gear_category]))
@@ -1091,15 +1092,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				else
 					gear_subcategory = clamp(gear_subcategory, 1, length(GLOB.loadout_categories[gear_category]))
 
-					var/firstsubcat
-					for(var/i in 1 to length(GLOB.loadout_categories[gear_category]))
+					var/firstsubcat = FALSE
+					var/chosen_subcategory
+					for(var/i in 1 to length(GLOB.loadout_categories[chosen_category]))
 						if(!firstsubcat)
 							dat += " |"
 						else
 							firstsubcat = FALSE
-						var/subcategory = GLOB.loadout_categories[gear_category][i]
+						var/subcategory = GLOB.loadout_categories[chosen_subcategory][i]
 						if(gear_subcategory == i)
 							dat += " <span class='linkOn'>[subcategory]</span> "
+							chosen_subcategory = subcategory
 						else
 							dat += " <a href='?_src_=prefs;preference=gear;select_subcategory=[i]'>[subcategory]</a> "
 					dat += "</b></center></td></tr>"
@@ -1108,7 +1111,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "<td style='vertical-align:top'><b>Cost</b></td>"
 					dat += "<td width=10%><font size=2><b>Restrictions</b></font></td>"
 					dat += "<td width=80%><font size=2><b>Description</b></font></td></tr>"
-					for(var/i in GLOB.loadout_items[gear_category][gear_subcategory])
+					for(var/i in GLOB.loadout_items[chosen_category][chosen_subcategory])
 						var/datum/gear/gear = GLOB.loadout_items[gear_category][gear_subcategory][i]
 						if(!gear.name)
 							continue
diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm
index 04e44f92a2..a97ae8bcb2 100644
--- a/modular_citadel/code/modules/client/loadout/_loadout.dm
+++ b/modular_citadel/code/modules/client/loadout/_loadout.dm
@@ -43,8 +43,8 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 
 /datum/gear
 	var/name
-	var/category = "LOADOUT_CATEGORY_NONE"
-	var/subcategory = "LOADOUT_SUBCATEGORY_NONE"
+	var/category = LOADOUT_CATEGORY_NONE
+	var/subcategory = LOADOUT_SUBCATEGORY_NONE
 	var/slot
 	var/description
 	var/path //item-to-spawn path