From 015243914500ed8dbbc8d7aabb17261917cb0a04 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 15 Sep 2018 22:17:53 -0400 Subject: [PATCH] Makes it plausible to use a list for geargroupid --- modular_citadel/code/modules/client/loadout/__donator.dm | 2 +- modular_citadel/code/modules/client/loadout/loadout.dm | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 4e432c7672..be8398ec9a 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -10,7 +10,7 @@ name = "Donor item testing bikehorn" category = SLOT_IN_BACKPACK path = /obj/item/bikehorn - geargroupID = "DONORTEST" + geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings /datum/gear/kevhorn name = "Airhorn" diff --git a/modular_citadel/code/modules/client/loadout/loadout.dm b/modular_citadel/code/modules/client/loadout/loadout.dm index 563f678577..52e4f86dbe 100644 --- a/modular_citadel/code/modules/client/loadout/loadout.dm +++ b/modular_citadel/code/modules/client/loadout/loadout.dm @@ -33,7 +33,13 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) if(!GLOB.loadout_items[slot_to_string(I.category)]) LAZYINITLIST(GLOB.loadout_items[slot_to_string(I.category)]) LAZYSET(GLOB.loadout_items[slot_to_string(I.category)], I.name, I) - if(I.geargroupID in GLOB.loadout_whitelist_ids) + if(islist(I.geargroupID)) + var/list/ggidlist = I.geargroupID + I.ckeywhitelist = list() + for(var/entry in ggidlist) + if(entry in GLOB.loadout_whitelist_ids) + I.ckeywhitelist |= GLOB.loadout_whitelist_ids["[entry]"] + else if(I.geargroupID in GLOB.loadout_whitelist_ids) I.ckeywhitelist = GLOB.loadout_whitelist_ids["[I.geargroupID]"]