sigh

code/__DEFINES/loadout.dm

@@ -1,56 +1,56 @@
 //defines for loadout categories
 //no category defines
-#define NOCATEGORY list("NOCATEGORY")
-#define NOSUBCATEGORY list("NOSUBCATEGORY")
+#define LOADOUT_CATEGORY_NONE list("Miscellaneous")
+#define LOADOUT_SUBCATEGORY_NONE list("Miscellaneous")
 
 
 //backpack
-#define CATEGORY_BACKPACK 				"In backpack"
-#define SUBCATEGORY_BACKPACK_GENERAL 	"General" //basically anything that there's not enough of to have its own subcategory
-#define SUBCATEGORY_BACKPACK_TOYS 		"Toys"
+#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
+#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS 		"Toys"
 //neck
-#define CATEGORY_NECK "Neck"
-#define SUBCATEGORY_NECK_GENERAL 	"General"
-#define SUBCATEGORY_NECK_TIE 		"Ties"
-#define SUBCATEGORY_NECK_SCARVES 	"Scarves"
+#define LOADOUT_CATEGORY_NECK "Neck"
+#define LOADOUT_SUBCATEGORY_NECK_GENERAL 	"General"
+#define LOADOUT_SUBCATEGORY_NECK_TIE 		"Ties"
+#define LOADOUT_SUBCATEGORY_NECK_SCARVES 	"Scarves"
 
 //mask
-#define CATEGORY_MASK "Mask"
+#define LOADOUT_CATEGORY_MASK "Mask"
 
 //hands
-#define CATEGORY_HANDS 				"Hands"
+#define LOADOUT_CATEGORY_HANDS 				"Hands"
 
 //uniform
-#define CATEGORY_UNIFORM 			"Uniform" //there's so many types of uniform it's best to have lots of categories
-#define SUBCATEGORY_UNIFORM_GENERAL "General"
-#define SUBCATEGORY_UNIFORM_JOBS 	"Jobs"
-#define SUBCATEGORY_UNIFORM_SUITS	"Suits"
-#define SUBCATEGORY_UNIFORM_SKIRTS	"Skirts"
-#define SUBCATEGORY_UNIFORM_DRESSES	"Dresses"
-#define SUBCATEGORY_UNIFORM_SWEATERS	"Sweaters"
-#define SUBCATEGORY_UNIFORM_PANTS	"Pants"
-#define SUBCATEGORY_UNIFORM_SHORTS	"Shorts"
+#define LOADOUT_CATEGORY_UNIFORM 			"Uniform" //there's so many types of uniform it's best to have lots of categories
+#define LOADOUT_SUBCATEGORY_UNIFORM_GENERAL "General"
+#define LOADOUT_SUBCATEGORY_UNIFORM_JOBS 	"Jobs"
+#define LOADOUT_SUBCATEGORY_UNIFORM_SUITS	"Suits"
+#define LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS	"Skirts"
+#define LOADOUT_SUBCATEGORY_UNIFORM_DRESSES	"Dresses"
+#define LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS	"Sweaters"
+#define LOADOUT_SUBCATEGORY_UNIFORM_PANTS	"Pants"
+#define LOADOUT_SUBCATEGORY_UNIFORM_SHORTS	"Shorts"
 
 //suit
-#define CATEGORY_SUIT 				"Suit"
-#define SUBCATEGORY_SUIT_GENERAL 	"General"
-#define SUBCATEGORY_SUIT_COATS 		"Coats"
-#define SUBCATEGORY_SUIT_JACKETS 	"Jackets"
-#define SUBCATEGORY_SUIT_JOBS 		"Jobs"
+#define LOADOUT_CATEGORY_SUIT 				"Suit"
+#define LOADOUT_SUBCATEGORY_SUIT_GENERAL 	"General"
+#define LOADOUT_SUBCATEGORY_SUIT_COATS 		"Coats"
+#define LOADOUT_SUBCATEGORY_SUIT_JACKETS 	"Jackets"
+#define LOADOUT_SUBCATEGORY_SUIT_JOBS 		"Jobs"
 
 //head
-#define CATEGORY_HEAD 				"Head"
-#define SUBCATEGORY_HEAD_GENERAL 	"General"
-#define SUBCATEGORY_HEAD_JOBS 		"Jobs"
+#define LOADOUT_CATEGORY_HEAD 				"Head"
+#define LOADOUT_SUBCATEGORY_HEAD_GENERAL 	"General"
+#define LOADOUT_SUBCATEGORY_HEAD_JOBS 		"Jobs"
 
 //shoes
-#define CATEGORY_SHOES 		"Shoes"
+#define LOADOUT_CATEGORY_SHOES 		"Shoes"
 
 //gloves
-#define CATEGORY_GLOVES		"Gloves"
+#define LOADOUT_CATEGORY_GLOVES		"Gloves"
 
 //glasses
-#define CATEGORY_GLASSES	"Glasses"
+#define LOADOUT_CATEGORY_GLASSES	"Glasses"
 
 //donator items
-#define CATEGORY_DONATOR	"Donator"
+#define LOADOUT_CATEGORY_DONATOR	"Donator"

code/_globalvars/lists/loadout_categories.dm

@@ -1,13 +1,13 @@
 GLOBAL_LIST_INIT(loadout_categories, list(
-	CATEGORY_BACKPACK = list(SUBCATEGORY_BACKPACK_GENERAL, SUBCATEGORY_BACKPACK_TOYS),
-	CATEGORY_NECK = list(SUBCATEGORY_NECK_GENERAL, SUBCATEGORY_NECK_TIE, SUBCATEGORY_NECK_SCARVES),
-	CATEGORY_MASK = NOSUBCATEGORY,
-	CATEGORY_HANDS = NOSUBCATEGORY,
-	CATEGORY_UNIFORM = list(SUBCATEGORY_UNIFORM_GENERAL, SUBCATEGORY_UNIFORM_JOBS, SUBCATEGORY_UNIFORM_SUITS, SUBCATEGORY_UNIFORM_SKIRTS, SUBCATEGORY_UNIFORM_DRESSES, SUBCATEGORY_UNIFORM_SWEATERS, SUBCATEGORY_UNIFORM_PANTS, SUBCATEGORY_UNIFORM_SHORTS),
-	CATEGORY_SUIT = list(SUBCATEGORY_SUIT_GENERAL, SUBCATEGORY_SUIT_COATS, SUBCATEGORY_SUIT_JACKETS, SUBCATEGORY_SUIT_JOBS),
-	CATEGORY_HEAD = list(SUBCATEGORY_HEAD_GENERAL, SUBCATEGORY_HEAD_JOBS),
-	CATEGORY_SHOES = NOSUBCATEGORY,
-	CATEGORY_GLOVES = NOSUBCATEGORY,
-	CATEGORY_GLASSES = NOSUBCATEGORY,
-	CATEGORY_DONATOR = NOSUBCATEGORY
+	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_LOADOUT_SUBCATEGORY_NONE,
+	LOADOUT_CATEGORY_HANDS = LOADOUT_LOADOUT_SUBCATEGORY_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_LOADOUT_SUBCATEGORY_NONE,
+	LOADOUT_CATEGORY_GLOVES = LOADOUT_LOADOUT_SUBCATEGORY_NONE,
+	LOADOUT_CATEGORY_GLASSES = LOADOUT_LOADOUT_SUBCATEGORY_NONE,
+	LOADOUT_CATEGORY_DONATOR = LOADOUT_LOADOUT_SUBCATEGORY_NONE
 ))

code/modules/client/preferences.dm

@@ -229,7 +229,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/gear_points = 10
 	var/list/gear_categories
 	var/list/chosen_gear = list()
-	var/gear_tab
+	var/gear_category = 1
+	var/gear_subcategory = 1
 
 	var/screenshake = 100
 	var/damagescreenshake = 2
@@ -1058,60 +1059,86 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<br>"
 
 		if(3)
-			if(!gear_tab)
-				gear_tab = GLOB.loadout_items[1]
 			dat += "<table align='center' width='100%'>"
 			dat += "<tr><td colspan=4><center><b><font color='[gear_points == 0 ? "#E62100" : "#CCDDFF"]'>[gear_points]</font> loadout points remaining.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
 			dat += "<tr><td colspan=4><center>You can only choose one item per category, unless it's an item that spawns in your backpack or hands.</center></td></tr>"
 			dat += "<tr><td colspan=4><center><b>"
 
-			var/firstcat = TRUE
-			for(var/i in GLOB.loadout_items)
-				if(firstcat)
-					firstcat = FALSE
-				else
-					dat += " |"
-				if(i == gear_tab)
-					dat += " <span class='linkOn'>[i]</span> "
-				else
-					dat += " <a href='?_src_=prefs;preference=gear;select_category=[i]'>[i]</a> "
+			if(!length(GLOB.loadout_items))
+				dat += "<center>ERROR: No loadout categories - something is horribly wrong!"
+			else
+				gear_category = clamp(1, length(GLOB.loadout_items))		// no runtimes
+				var/firstcat
+				for(var/i in 1 to length(GLOB.loadout_items))
+					var/category = GLOB.loadout_items[i]
+					if(firstcat)
+						firstcat = FALSE
+					else
+						dat += " |"
+					if(i == gear_category)
+						dat += " <span class='linkOn'>[category]</span> "
+					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><b><center>[gear_tab]</center></b></td></tr>"
-			dat += "<tr><td colspan=4><hr></td></tr>"
-			dat += "<tr width=10% style='vertical-align:top;'><td width=15%><b>Name</b></td>"
-			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/j in GLOB.loadout_items[gear_tab])
-				var/datum/gear/gear = GLOB.loadout_items[gear_tab][j]
-				var/donoritem = gear.donoritem
-				if(donoritem && !gear.donator_ckey_check(user.ckey))
-					continue
-				var/class_link = ""
-				if(gear.type in chosen_gear)
-					class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'"
-				else if(gear_points <= 0)
-					class_link = "style='white-space:normal;' class='linkOff'"
-				else if(donoritem)
-					class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
+				dat += "</b></center></td></tr>"
+				dat += "<tr><td colspan=4><hr></td></tr>"
+				dat += "<tr><td colspan=4><b><center>[gear_tab]</center></b></td></tr>"
+				dat += "<tr><td colspan=4><hr></td></tr>"
+
+				dat += "<tr><td colspan=4><center><b>"
+				
+				if(!length(GLOB.loadout_categories[gear_category]))
+					dat += "No subcategories detected. Something is horribly wrong!"
 				else
-					class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
-				dat += "<tr style='vertical-align:top;'><td width=15%><a [class_link]>[j]</a></td>"
-				dat += "<td width = 5% style='vertical-align:top'>[gear.cost]</td><td>"
-				if(islist(gear.restricted_roles))
-					if(gear.restricted_roles.len)
-						if(gear.restricted_desc)
-							dat += "<font size=2>"
-							dat += gear.restricted_desc
-							dat += "</font>"
+					gear_subcategory = clamp(1, length(GLOB.loadout_categories[gear_category]))
+
+					var/firstsubcat
+					for(var/i in 1 to length(GLOB.loadout_categories[gear_category]))
+						if(!firstsubcat)
+							dat += " |"
 						else
-							dat += "<font size=2>"
-							dat += gear.restricted_roles.Join(";")
-							dat += "</font>"
-				dat += "</td><td><font size=2><i>[gear.description]</i></font></td></tr>"
-			dat += "</table>"
+							firstsubcat = FALSE
+						var/subcategory = GLOB.loadout_categories[gear_category][i]
+						if(gear_subcategory == i)
+							dat += " <span class='linkOn'>[subcategory]</span> "
+						else
+							dat += " <a href='?_src_=prefs;preference=gear;select_subcategory=[i]'>[subcategory]</a> "
+					dat += "</b></center></td></tr>"
+
+					dat += "<tr width=10% style='vertical-align:top;'><td width=15%><b>Name</b></td>"
+					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])
+						var/datum/gear/gear = GLOB.loadout_items[gear_category][gear_subcategory][i]
+						if(!gear.name)
+							continue
+						var/donoritem = gear.donoritem
+						if(donoritem && !gear.donator_ckey_check(user.ckey))
+							continue
+						var/class_link = ""
+						if(gear.type in chosen_gear)
+							class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'"
+						else if(gear_points <= 0)
+							class_link = "style='white-space:normal;' class='linkOff'"
+						else if(donoritem)
+							class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
+						else
+							class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
+						dat += "<tr style='vertical-align:top;'><td width=15%><a [class_link]>[j]</a></td>"
+						dat += "<td width = 5% style='vertical-align:top'>[gear.cost]</td><td>"
+						if(islist(gear.restricted_roles))
+							if(gear.restricted_roles.len)
+								if(gear.restricted_desc)
+									dat += "<font size=2>"
+									dat += gear.restricted_desc
+									dat += "</font>"
+								else
+									dat += "<font size=2>"
+									dat += gear.restricted_roles.Join(";")
+									dat += "</font>"
+						dat += "</td><td><font size=2><i>[gear.description]</i></font></td></tr>"
+					dat += "</table>"
 		if(4) // Content preferences
 			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 			dat += "<h2>Fetish content prefs</h2>"
@@ -2692,11 +2719,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			gear_points = CONFIG_GET(number/initial_gear_points)
 			save_preferences()
 		if(href_list["select_category"])
-			for(var/i in GLOB.loadout_items)
-				if(i == href_list["select_category"])
-					gear_tab = i
+			gear_category = text2num(href_list["select_category"])
+			gear_subcategory = 1
+		if(href_list["select_subcategory"])
+			gear_subcategory = text2num(href_list["select_subcategory"])
 		if(href_list["toggle_gear_path"])
-			var/datum/gear/G = GLOB.loadout_items[gear_tab][html_decode(href_list["toggle_gear_path"])]
+			var/datum/gear/G = GLOB.loadout_items[gear_category][gear_subcategory][html_decode(href_list["toggle_gear_path"])]
 			if(!G)
 				return
 			var/toggle = text2num(href_list["toggle_gear"])
@@ -2876,17 +2904,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	LAZYINITLIST(L)
 	for(var/i in chosen_gear)
 		var/datum/gear/G = i
-		var/occupied_slots = L[slot_to_string(initial(G.category))] ? L[slot_to_string(initial(G.category))] + 1 : 1
-		LAZYSET(L, slot_to_string(initial(G.category)), occupied_slots)
+		var/occupied_slots = L[initial(G.category)] ? L[initial(G.category)] + 1 : 1
+		LAZYSET(L, initial(G.category), occupied_slots)
 	switch(slot)
 		if(SLOT_IN_BACKPACK)
-			if(L[slot_to_string(SLOT_IN_BACKPACK)] < BACKPACK_SLOT_AMT)
+			if(L[LOADOUT_CATEGORY_BACKPACK] < BACKPACK_SLOT_AMT)
 				return TRUE
 		if(SLOT_HANDS)
-			if(L[slot_to_string(SLOT_HANDS)] < HANDS_SLOT_AMT)
+			if(L[LOADOUT_CATEGORY_HANDS] < HANDS_SLOT_AMT)
 				return TRUE
 		else
-			if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT)
+			if(L[slot] < DEFAULT_SLOT_AMT)
 				return TRUE
 
 #undef DEFAULT_SLOT_AMT

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -4,7 +4,7 @@
 	name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!"
 	slot = SLOT_IN_BACKPACK
 	path = /obj/item/bikehorn/golden
-	category = CATEGORY_DONATOR
+	category = LOADOUT_CATEGORY_DONATOR
 	ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
 
 /datum/gear/donator/donortestingbikehorn

modular_citadel/code/modules/client/loadout/_loadout.dm

@@ -43,8 +43,8 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 
 /datum/gear
 	var/name
-	var/category = "NOCATEGORY"
-	var/subcategory = "NOSUBCATEGORY"
+	var/category = "LOADOUT_CATEGORY_NONE"
+	var/subcategory = "LOADOUT_SUBCATEGORY_NONE"
 	var/slot
 	var/description
 	var/path //item-to-spawn path

modular_citadel/code/modules/client/loadout/_medical.dm

@@ -11,21 +11,21 @@
 
 /datum/gear/uniform/bluescrubs
 	name = "Blue Scrubs"
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/medical/doctor/blue
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
 /datum/gear/uniform/greenscrubs
 	name = "Green Scrubs"
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/medical/doctor/green
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
 /datum/gear/uniform/purplescrubs
 	name = "Purple Scrubs"
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/medical/doctor/purple
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
@@ -33,13 +33,13 @@
 /datum/gear/head/nursehat
 	name = "Nurse Hat"
 	path = /obj/item/clothing/head/nursehat
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
 /datum/gear/uniform/nursesuit
 	name = "Nurse Suit"
 	path = /obj/item/clothing/under/rank/medical/doctor/nurse
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"

modular_citadel/code/modules/client/loadout/_security.dm

@@ -1,66 +1,66 @@
 /datum/gear/uniform/navyblueuniformhos
  	name = "Head of Security navyblue uniform"
- 	subcategory = SUBCATEGORY_UNIFORM_JOBS
+ 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
  	path = /obj/item/clothing/under/rank/security/head_of_security/formal
  	restricted_roles = list("Head of Security")
 
 /datum/gear/head/navybluehosberet
 	name = "Head of security's navyblue beret"
 	path = /obj/item/clothing/head/beret/sec/navyhos
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Head of Security")
 
 /datum/gear/suit/navybluejackethos
 	name = "head of security's navyblue jacket"
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	path = /obj/item/clothing/suit/armor/hos/navyblue
 	restricted_roles = list("Head of Security")
 
 /datum/gear/suit/navybluejacketofficer
 	name = "security officer's navyblue jacket"
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	path = /obj/item/clothing/suit/armor/navyblue
 	restricted_roles = list("Security Officer")
 
 /datum/gear/head/navyblueofficerberet
 	name = "Security officer's Navyblue beret"
 	path = /obj/item/clothing/head/beret/sec/navyofficer
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Security Officer")
 
 /datum/gear/uniform/navyblueuniformofficer
  	name = "Security officer navyblue uniform"
- 	subcategory = SUBCATEGORY_UNIFORM_JOBS
+ 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
  	path = /obj/item/clothing/under/rank/security/officer/formal
  	restricted_roles = list("Security Officer")
 
 /datum/gear/suit/navybluejacketwarden
 	name = "warden navyblue jacket"
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	path = /obj/item/clothing/suit/armor/vest/warden/navyblue
 	restricted_roles = list("Warden")
 
 /datum/gear/head/navybluewardenberet
 	name = "Warden's navyblue beret"
 	path = /obj/item/clothing/head/beret/sec/navywarden
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Warden")
 
 /datum/gear/uniform/navyblueuniformwarden
  	name = "Warden navyblue uniform"
- 	subcategory = SUBCATEGORY_UNIFORM_JOBS
+ 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
  	path = /obj/item/clothing/under/rank/security/warden/formal
  	restricted_roles = list("Warden")
 
 /datum/gear/uniform/secskirt
 	name = "Security skirt"
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/security/officer/skirt
 	restricted_roles = list("Security Officer", "Warden", "Head of Security")
 
 /datum/gear/uniform/hosskirt
 	name = "Head of security's skirt"
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/security/head_of_security/skirt
 	restricted_roles = list("Head of Security")
 

modular_citadel/code/modules/client/loadout/_service.dm

@@ -1,33 +1,33 @@
 /datum/gear/uniform/greytidestationwide
 	name = "Staff Assistant's jumpsuit"
 	path = /obj/item/clothing/under/misc/staffassistant
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant")
 
 /datum/gear/suit/neetsuit
 	name = "D.A.B. suit"
 	path = /obj/item/clothing/suit/assu_suit
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant")
 	cost = 2
 
 /datum/gear/head/neethelm
 	name = "D.A.B. helmet"
 	path = /obj/item/clothing/head/assu_helmet
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Assistant")
 	cost = 2
 
 /datum/gear/backpack/plushvar
 	name = "Ratvar Plushie"
 	path = /obj/item/toy/plush/plushvar
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	cost = 5
 	restricted_roles = list("Chaplain")
 
 /datum/gear/backpack/narplush
 	name = "Narsie Plushie"
 	path = /obj/item/toy/plush/narplush
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	cost = 5
 	restricted_roles = list("Chaplain")

modular_citadel/code/modules/client/loadout/backpack.dm

@@ -1,17 +1,17 @@
 /datum/gear/backpack
-	category = CATEGORY_BACKPACK
-	subcategory = SUBCATEGORY_BACKPACK_GENERAL
+	category = LOADOUT_CATEGORY_BACKPACK
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL
 	slot = SLOT_IN_BACKPACK
 
 /datum/gear/backpack/plushbox
 	name = "Plushie Choice Box"
 	path = /obj/item/choice_beacon/box/plushie
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
 /datum/gear/backpack/tennis
 	name = "Classic Tennis Ball"
 	path = /obj/item/toy/tennis
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
 /datum/gear/backpack/tennis/red
 	name = "Red Tennis Ball"
@@ -40,12 +40,12 @@
 /datum/gear/backpack/dildo
 	name = "Customizable dildo"
 	path = /obj/item/dildo/custom
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
 /datum/gear/backpack/toykatana
 	name = "Toy Katana"
 	path = /obj/item/toy/katana
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	cost = 3
 
 /datum/gear/backpack/tapeplayer
@@ -63,7 +63,7 @@
 /datum/gear/backpack/crayons
 	name = "Box of crayons"
 	path = /obj/item/storage/crayons
-	subcategory = SUBCATEGORY_BACKPACK_TOYS
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
 /datum/gear/backpack/multipen
 	name = "A multicolored pen"

modular_citadel/code/modules/client/loadout/glasses.dm

@@ -1,5 +1,5 @@
 /datum/gear/glasses
-	category = CATEGORY_GLASSES
+	category = LOADOUT_CATEGORY_GLASSES
 	slot = SLOT_GLASSES
 
 /datum/gear/glasses/blindfold

modular_citadel/code/modules/client/loadout/gloves.dm

@@ -1,5 +1,5 @@
 /datum/gear/gloves
-	category = CATEGORY_GLOVES
+	category = LOADOUT_CATEGORY_GLOVES
 	slot = SLOT_GLOVES
 
 /datum/gear/gloves/fingerless

modular_citadel/code/modules/client/loadout/hands.dm

@@ -1,5 +1,5 @@
 /datum/gear/hands
-	category = CATEGORY_HANDS
+	category = LOADOUT_CATEGORY_HANDS
 	slot = SLOT_HANDS
 
 /datum/gear/hands/cane

modular_citadel/code/modules/client/loadout/head.dm

@@ -1,6 +1,6 @@
 /datum/gear/head
-	category = CATEGORY_HEAD
-	subcategory = SUBCATEGORY_HEAD_GENERAL
+	category = LOADOUT_CATEGORY_HEAD
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_GENERAL
 	slot = SLOT_HEAD
 
 /datum/gear/head/baseball
@@ -63,33 +63,33 @@
 /datum/gear/head/trekcap
 	name = "Federation Officer's Cap (White)"
 	path = /obj/item/clothing/head/caphat/formal/fedcover
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Captain","Head of Personnel")
 
 /datum/gear/head/trekcapcap
 	name = "Federation Officer's Cap (Black)"
 	path = /obj/item/clothing/head/caphat/formal/fedcover/black
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Captain","Head of Personnel")
 
 /datum/gear/head/trekcapmedisci
 	name = "Federation Officer's Cap (Blue)"
 	path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/head/trekcapeng
 	name = "Federation Officer's Cap (Yellow)"
 	path = /obj/item/clothing/head/caphat/formal/fedcover/eng
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 /datum/gear/head/trekcapsec
 	name = "Federation Officer's Cap (Red)"
 	path = /obj/item/clothing/head/caphat/formal/fedcover/sec
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -98,7 +98,7 @@
 	name = "Federation Kepi, command"
 	description = "A visored cap. Intended to be used with ORV uniform."
 	path = /obj/item/clothing/head/kepi/orvi/command
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
 
@@ -106,7 +106,7 @@
 	name = "Federation Kepi, ops/sec"
 	description = "A visored cap. Intended to be used with ORV uniform."
 	path = /obj/item/clothing/head/kepi/orvi/engsec
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Engineering, Security and Cargo"
 	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -114,7 +114,7 @@
 	name = "Federation Kepi, medsci"
 	description = "A visored cap. Intended to be used with ORV uniform."
 	path = /obj/item/clothing/head/kepi/orvi/medsci
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
 
@@ -122,7 +122,7 @@
 	name = "Federation Kepi, service"
 	description = "A visored cap. Intended to be used with ORV uniform."
 	path = /obj/item/clothing/head/kepi/orvi/service
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
 	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
 
@@ -130,7 +130,7 @@
 	name = "Federation Kepi, assistant"
 	description = "A visored cap. Intended to be used with ORV uniform."
 	path = /obj/item/clothing/head/kepi/orvi
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Assistant")
 
 /*Commenting out Until next Christmas or made automatic
@@ -165,7 +165,7 @@
 /datum/gear/head/cowboyhat/sec
 	name = "Cowboy Hat, Security"
 	path = /obj/item/clothing/head/cowboyhat/sec
-	subcategory = SUBCATEGORY_HEAD_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Security"
 	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
 

modular_citadel/code/modules/client/loadout/mask.dm

@@ -1,5 +1,5 @@
 /datum/gear/mask
-	category = CATEGORY_MASK
+	category = LOADOUT_CATEGORY_MASK
 	slot = SLOT_WEAR_MASK
 
 /datum/gear/mask/balaclava

modular_citadel/code/modules/client/loadout/neck.dm

@@ -1,21 +1,21 @@
 /datum/gear/neck
-	category = CATEGORY_NECK
-	subcategory = SUBCATEGORY_NECK_GENERAL
+	category = LOADOUT_CATEGORY_NECK
+	subcategory = LOADOUT_SUBCATEGORY_NECK_GENERAL
 	slot = SLOT_NECK
 
 /datum/gear/neck/bluetie
 	name = "Blue tie"
-	subcategory = SUBCATEGORY_NECK_TIE
+	subcategory = LOADOUT_SUBCATEGORY_NECK_TIE
 	path = /obj/item/clothing/neck/tie/blue
 
 /datum/gear/neck/redtie
 	name = "Red tie"
-	subcategory = SUBCATEGORY_NECK_TIE
+	subcategory = LOADOUT_SUBCATEGORY_NECK_TIE
 	path = /obj/item/clothing/neck/tie/red
 
 /datum/gear/neck/blacktie
 	name = "Black tie"
-	subcategory = SUBCATEGORY_NECK_TIE
+	subcategory = LOADOUT_SUBCATEGORY_NECK_TIE
 	path = /obj/item/clothing/neck/tie/black
 
 /datum/gear/neck/collar
@@ -32,7 +32,7 @@
 
 /datum/gear/neck/scarf
 	name = "White scarf"
-	subcategory = SUBCATEGORY_NECK_SCARVES
+	subcategory = LOADOUT_SUBCATEGORY_NECK_SCARVES
 	path = /obj/item/clothing/neck/scarf
 
 /datum/gear/neck/scarf/black

modular_citadel/code/modules/client/loadout/shoes.dm

@@ -1,5 +1,5 @@
 /datum/gear/shoes
-	category = CATEGORY_SHOES
+	category = LOADOUT_CATEGORY_SHOES
 	slot = SLOT_SHOES
 
 /datum/gear/shoes/laceup

modular_citadel/code/modules/client/loadout/suit.dm

@@ -1,6 +1,6 @@
 /datum/gear/suit
-	category = CATEGORY_SUIT
-	subcategory = SUBCATEGORY_SUIT_GENERAL
+	category = LOADOUT_CATEGORY_SUIT
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
 	slot = SLOT_WEAR_SUIT
 
 /datum/gear/suit/poncho
@@ -23,67 +23,67 @@
 /datum/gear/suit/jacketbomber
 	name = "Bomber jacket"
 	path = /obj/item/clothing/suit/jacket
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack
 	name = "Black flannel jacket"
 	path = /obj/item/clothing/suit/jacket/flannel
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketflannelred
 	name = "Red flannel jacket"
 	path = /obj/item/clothing/suit/jacket/flannel/red
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketflannelaqua
 	name = "Aqua flannel jacket"
 	path = /obj/item/clothing/suit/jacket/flannel/aqua
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketflannelbrown
 	name = "Brown flannel jacket"
 	path = /obj/item/clothing/suit/jacket/flannel/brown
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketleather
 	name = "Leather jacket"
 	path = /obj/item/clothing/suit/jacket/leather
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/overcoatleather
 	name = "Leather overcoat"
 	path = /obj/item/clothing/suit/jacket/leather/overcoat
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketpuffer
 	name = "Puffer jacket"
 	path = /obj/item/clothing/suit/jacket/puffer
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/vestpuffer
 	name = "Puffer vest"
 	path = /obj/item/clothing/suit/jacket/puffer/vest
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketlettermanbrown
 	name = "Brown letterman jacket"
 	path = /obj/item/clothing/suit/jacket/letterman
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketlettermanred
 	name = "Red letterman jacket"
 	path = /obj/item/clothing/suit/jacket/letterman_red
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/jacketlettermanNT
 	name = "Nanotrasen letterman jacket"
 	path = /obj/item/clothing/suit/jacket/letterman_nanotrasen
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/coat
 	name = "Winter coat"
 	path = /obj/item/clothing/suit/hooded/wintercoat
-	subcategory = SUBCATEGORY_SUIT_COATS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
 /datum/gear/suit/coat/aformal
 	name = "Assistant's formal winter coat"
@@ -155,7 +155,7 @@
 /datum/gear/suit/militaryjacket
 	name = "Military Jacket"
 	path = /obj/item/clothing/suit/jacket/miljacket
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
 /datum/gear/suit/ianshirt
 	name = "Ian Shirt"
@@ -164,13 +164,13 @@
 /datum/gear/suit/flakjack
 	name = "Flak Jacket"
 	path = /obj/item/clothing/suit/flakjack
-	subcategory = SUBCATEGORY_SUIT_JACKETS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 	cost = 2
 
 /datum/gear/suit/trekds9_coat
 	name = "DS9 Overcoat (use uniform)"
 	path = /obj/item/clothing/suit/storage/trek/ds9
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "All, barring Service and Civilian"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
 							"Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist",
@@ -180,27 +180,27 @@
 /datum/gear/suit/trekcmdcap
 	name = "Fed (movie) uniform, Black"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_roles = list("Captain","Head of Personnel")
 
 /datum/gear/suit/trekcmdmov
 	name = "Fed (movie) uniform, Red"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Heads of Staff and Security"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
 
 /datum/gear/suit/trekmedscimov
 	name = "Fed (movie) uniform, Blue"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/suit/trekengmov
 	name = "Fed (movie) uniform, Yellow"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Engineering and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -212,38 +212,38 @@
 /datum/gear/suit/trekcmdmod
 	name = "Fed (Modern) uniform, Red"
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/sec
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Heads of Staff and Security"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
 
 /datum/gear/suit/trekmedscimod
 	name = "Fed (Modern) uniform, Blue"
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/suit/trekengmod
 	name = "Fed (Modern) uniform, Yellow"
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng
-	subcategory = SUBCATEGORY_SUIT_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Engineering and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 /datum/gear/suit/christmascoatr
 	name = "Red Christmas Coat"
 	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatr
-	subcategory = SUBCATEGORY_SUIT_COATS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
 /datum/gear/suit/christmascoatg
 	name = "Green Christmas Coat"
 	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatg
-	subcategory = SUBCATEGORY_SUIT_COATS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
 /datum/gear/suit/christmascoatrg
 	name = "Red and Green Christmas Coat"
 	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg
-	subcategory = SUBCATEGORY_SUIT_COATS
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
 /datum/gear/suit/samurai
 	name = "Samurai outfit"

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -1,12 +1,12 @@
 /datum/gear/uniform
-	category = CATEGORY_UNIFORM
-	subcategory = SUBCATEGORY_UNIFORM_GENERAL
+	category = LOADOUT_CATEGORY_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
 	slot = SLOT_W_UNIFORM
 
 /datum/gear/uniform/suit
 	name = "Black suit"
 	path = /obj/item/clothing/under/suit/black
-	subcategory = SUBCATEGORY_UNIFORM_SUITS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SUITS
 
 /datum/gear/uniform/suit/green
 	name = "Green suit"
@@ -51,7 +51,7 @@
 /datum/gear/uniform/skirt
 	name = "Black skirt"
 	path = /obj/item/clothing/under/dress/skirt
-	subcategory = SUBCATEGORY_UNIFORM_SKIRTS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
 
 /datum/gear/uniform/skirt/blue
 	name = "Blue skirt"
@@ -88,7 +88,7 @@
 /datum/gear/uniform/dress
 	name = "Striped Dress"
 	path = /obj/item/clothing/under/dress/striped
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 
 /datum/gear/uniform/dress/sun/white
 	name = "White Sundress"
@@ -121,7 +121,7 @@
 /datum/gear/uniform/pants
 	name = "Yoga Pants"
 	path = /obj/item/clothing/under/pants/yoga
-	subcategory = SUBCATEGORY_UNIFORM_PANTS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_PANTS
 
 /datum/gear/uniform/kilt
 	name = "Kilt"
@@ -134,7 +134,7 @@
 /datum/gear/uniform/shorts
 	name = "Athletic Shorts"
 	path = /obj/item/clothing/under/shorts/red
-	subcategory = SUBCATEGORY_UNIFORM_SHORTS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SHORTS
 
 /datum/gear/uniform/pants/bjeans
 	name = "Black Jeans"
@@ -185,7 +185,7 @@
 /datum/gear/uniform/sweater
 	name = "Cream Commando Sweater"
 	path = /obj/item/clothing/under/sweater
-	subcategory = SUBCATEGORY_UNIFORM_SWEATERS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS
 
 /datum/gear/uniform/sweater/black
 	name = "Black Commando Sweater"
@@ -251,21 +251,21 @@
 /datum/gear/uniform/trekcmdtos
 	name = "TOS uniform, cmd"
 	path = /obj/item/clothing/under/trek/command
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/uniform/trekmedscitos
 	name = "TOS uniform, med/sci"
 	path = /obj/item/clothing/under/trek/medsci
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/uniform/trekengtos
 	name = "TOS uniform, ops/sec"
 	path = /obj/item/clothing/under/trek/engsec
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -273,21 +273,21 @@
 /datum/gear/uniform/trekcmdtng
 	name = "TNG uniform, cmd"
 	path = /obj/item/clothing/under/trek/command/next
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/uniform/trekmedscitng
 	name = "TNG uniform, med/sci"
 	path = /obj/item/clothing/under/trek/medsci/next
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/uniform/trekengtng
 	name = "TNG uniform, ops/sec"
 	path = /obj/item/clothing/under/trek/engsec/next
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -295,21 +295,21 @@
 /datum/gear/uniform/trekcmdvoy
 	name = "VOY uniform, cmd"
 	path = /obj/item/clothing/under/trek/command/voy
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/uniform/trekmedscivoy
 	name = "VOY uniform, med/sci"
 	path = /obj/item/clothing/under/trek/medsci/voy
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/uniform/trekengvoy
 	name = "VOY uniform, ops/sec"
 	path = /obj/item/clothing/under/trek/engsec/voy
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -317,21 +317,21 @@
 /datum/gear/uniform/trekcmdds9
 	name = "DS9 uniform, cmd"
 	path = /obj/item/clothing/under/trek/command/ds9
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/uniform/trekmedscids9
 	name = "DS9 uniform, med/sci"
 	path = /obj/item/clothing/under/trek/medsci/ds9
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/uniform/trekengds9
 	name = "DS9 uniform, ops/sec"
 	path = /obj/item/clothing/under/trek/engsec/ds9
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -339,21 +339,21 @@
 /datum/gear/uniform/trekcmdent
 	name = "ENT uniform, cmd"
 	path = /obj/item/clothing/under/trek/command/ent
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/uniform/trekmedscient
 	name = "ENT uniform, med/sci"
 	path = /obj/item/clothing/under/trek/medsci/ent
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/uniform/trekengent
 	name = "ENT uniform, ops/sec"
 	path = /obj/item/clothing/under/trek/engsec/ent
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -361,7 +361,7 @@
 /datum/gear/uniform/trekfedutil
 	name = "TMP uniform"
 	path = /obj/item/clothing/under/trek/fedutil
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "All, barring Service and Civilian"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
 							"Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist",
@@ -371,13 +371,13 @@
 /datum/gear/uniform/trekfedtrainee
 	name = "TMP uniform, trainee"
 	path = /obj/item/clothing/under/trek/fedutil/trainee
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant", "Janitor", "Cargo Technician")
 
 /datum/gear/uniform/trekfedservice
 	name = "TMP uniform, service"
 	path = /obj/item/clothing/under/trek/fedutil/service
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
 	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
 
@@ -385,52 +385,52 @@
 /datum/gear/uniform/orvcmd
 	name = "ORV uniform, cmd"
 	path = /obj/item/clothing/under/trek/command/orv
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
 
 /datum/gear/uniform/orvcmd_capt
 	name = "ORV uniform, capt"
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/trek/command/orv/captain
 	restricted_roles = list("Captain")
 
 /datum/gear/uniform/orvmedsci
 	name = "ORV uniform, med/sci"
 	path = /obj/item/clothing/under/trek/medsci/orv
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
 
 /datum/gear/uniform/orvcmd_medsci
 	name = "ORV uniform, med/sci, cmd"
 	path = /obj/item/clothing/under/trek/command/orv/medsci
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Chief Medical Officer", "Research Director")
 
 /datum/gear/uniform/orvops
 	name = "ORV uniform, ops/sec"
 	path = /obj/item/clothing/under/trek/engsec/orv
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security and Cargo"
 	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
 
 /datum/gear/uniform/orvcmd_ops
 	name = "ORV uniform, ops/sec, cmd"
 	path = /obj/item/clothing/under/trek/command/orv/engsec
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Chief Engineer", "Head of Security")
 
 /datum/gear/uniform/orvass
 	name = "ORV uniform, assistant"
 	path = /obj/item/clothing/under/trek/orv
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant")
 
 /datum/gear/uniform/orvsrv
 	name = "ORV uniform, service"
 	path = /obj/item/clothing/under/trek/orv/service
-	subcategory = SUBCATEGORY_UNIFORM_JOBS
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
 	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
 
@@ -476,37 +476,37 @@
 /datum/gear/uniform/qipao
 	name = "Qipao, Black"
 	path = /obj/item/clothing/under/costume/qipao
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
 /datum/gear/uniform/qipao/white
 	name = "Qipao, White"
 	path = /obj/item/clothing/under/costume/qipao/white
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
 /datum/gear/uniform/qipao/red
 	name = "Qipao, Red"
 	path = /obj/item/clothing/under/costume/qipao/red
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
 /datum/gear/uniform/cheongsam
 	name = "Cheongsam, Black"
 	path = /obj/item/clothing/under/costume/cheongsam
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
 /datum/gear/uniform/cheongsam/white
 	name = "Cheongsam, White"
 	path = /obj/item/clothing/under/costume/cheongsam/white
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
 /datum/gear/uniform/cheongsam/red
 	name = "Cheongsam, Red"
 	path = /obj/item/clothing/under/costume/cheongsam/red
-	subcategory = SUBCATEGORY_UNIFORM_DRESSES
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
 /datum/gear/uniform/dress/black