Merge pull request #181 from ARF-SS13/122624a

Readds collars and makeup category to loadout oops
ARF-SS13 · Dec 26, 2024 · 0317d2e · 0317d2e
2 parents 26d5f36 + e810a02
commit 0317d2e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
@@ -1,6 +1,6 @@
 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_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_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_MAKEUP),
+	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES, LOADOUT_SUBCATEGORY_NECK_COLLAR),
 	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),
 	LOADOUT_CATEGORY_SUIT = list(LOADOUT_SUBCATEGORY_SUIT_GENERAL, LOADOUT_SUBCATEGORY_SUIT_MEDICAL, LOADOUT_SUBCATEGORY_SUIT_ARMOR, LOADOUT_SUBCATEGORY_SUIT_BALLISTICVEST, LOADOUT_SUBCATEGORY_SUIT_JACKETS, LOADOUT_SUBCATEGORY_SUIT_TAUR),