From 65839060c926337e76fe6e4f36a4aace5c244f1e Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 6 Aug 2020 23:39:57 -0700
Subject: [PATCH] Fixes

---
 code/__DEFINES/loadout.dm                               | 1 +
 code/modules/client/preferences.dm                      | 8 +++-----
 modular_citadel/code/modules/client/loadout/_loadout.dm | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index 3e632eedfa..94059c0880 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -1,6 +1,7 @@
 //defines for loadout categories
 //no category defines
 #define LOADOUT_CATEGORY_NONE			"ERROR"
+#define LOADOUT_SUBCATEGORY_NONE		"Miscellaneous"
 #define LOADOUT_SUBCATEGORIES_NONE		list("Miscellaneous")
 
 //backpack
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 40f35df320..89815409dc 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1099,7 +1099,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							dat += " |"
 						else
 							firstsubcat = FALSE
-						var/subcategory = GLOB.loadout_categories[chosen_subcategory][i]
+						var/subcategory = GLOB.loadout_categories[chosen_category][i]
 						if(gear_subcategory == i)
 							dat += " <span class='linkOn'>[subcategory]</span> "
 							chosen_subcategory = subcategory
@@ -1111,10 +1111,8 @@ 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[chosen_category][chosen_subcategory])
-						var/datum/gear/gear = GLOB.loadout_items[gear_category][gear_subcategory][i]
-						if(!gear.name)
-							continue
+					for(var/name in GLOB.loadout_items[chosen_category][chosen_subcategory])
+						var/datum/gear/gear = GLOB.loadout_items[chosen_category][chosen_subcategory][name]
 						var/donoritem = gear.donoritem
 						if(donoritem && !gear.donator_ckey_check(user.ckey))
 							continue
diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm
index a97ae8bcb2..0ebfa060f2 100644
--- a/modular_citadel/code/modules/client/loadout/_loadout.dm
+++ b/modular_citadel/code/modules/client/loadout/_loadout.dm
@@ -27,7 +27,10 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 /proc/initialize_global_loadout_items()
 	load_loadout_config()
 	for(var/item in subtypesof(/datum/gear))
-		var/datum/gear/I = new item
+		var/datum/gear/I = item
+		if(!initial(I.name))
+			continue
+		I = new item
 		LAZYINITLIST(GLOB.loadout_items[I.category])
 		LAZYINITLIST(GLOB.loadout_items[I.category][I.subcategory])
 		GLOB.loadout_items[I.category][I.subcategory][I.name] = I