From 7c8f03a81fe2971ff752de5d4c077aa5d9e64b02 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 1 Aug 2020 18:29:27 +0100 Subject: [PATCH] new defines --- code/__DEFINES/loadout.dm | 4 ++++ code/_globalvars/lists/loadout_categories.dm | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index d4541fd8a7..332095e049 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -1,4 +1,8 @@ //defines for loadout categories +//no category defines +#define NOCATEGORY list("NOCATEGORY") +#define NOSUBCATEGORY list("NOSUBCATEGORY") + //backpack #define CATEGORY_BACKPACK "In backpack" diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm index 9ebc6cca01..2a44bf60f4 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( CATEGORY_BACKPACK = list(SUBCATEGORY_BACKPACK_GENERAL, SUBCATEGORY_BACKPACK_TOYS), CATEGORY_NECK = list(SUBCATEGORY_NECK_GENERAL, SUBCATEGORY_NECK_TIE, SUBCATEGORY_NECK_SCARVES), - CATEGORY_MASK = list("NOSUBCATEGORY"), - CATEGORY_HANDS = list("NOSUBCATEGORY"), + 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 = list("NOSUBCATEGORY"), - CATEGORY_GLOVES = list("NOSUBCATEGORY"), - CATEGORY_GLASSES = list("NOSUBCATEGORY"), - CATEGORY_DONATOR = list("NOSUBCATEGORY") + CATEGORY_SHOES = NOSUBCATEGORY, + CATEGORY_GLOVES = NOSUBCATEGORY, + CATEGORY_GLASSES = NOSUBCATEGORY, + CATEGORY_DONATOR = NOSUBCATEGORY ))