From 2f99ae9cb93c4822759c8c1470e8871e18ca0dc8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 1 Dec 2022 02:00:36 +0100 Subject: [PATCH] [MIRROR] Small optimization for allowed lists [MDB IGNORE] (#17798) * Small optimization for allowed lists * Conflicts Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- code/__DEFINES/inventory.dm | 12 ++++++------ code/modules/mod/mod_control.dm | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index b36b4784c2a..07a503ed71b 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -188,7 +188,7 @@ //Allowed equipment lists for security vests. -GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list( +GLOBAL_LIST_INIT(detective_vest_allowed, list( /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/detective_scanner, @@ -207,9 +207,9 @@ GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/thermal, /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION - ))) +)) -GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list( +GLOBAL_LIST_INIT(security_vest_allowed, list( /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/flashlight, @@ -225,9 +225,9 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/thermal, /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION - ))) +)) -GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list( +GLOBAL_LIST_INIT(security_wintercoat_allowed, list( /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/gun/ballistic, @@ -239,7 +239,7 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/thermal, /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION - ))) +)) /// String for items placed into the left pocket. #define LOCATION_LPOCKET "in your left pocket" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 33a73ec3cc1..cca3dd8665e 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -114,7 +114,7 @@ helmet = new /obj/item/clothing/head/mod(src) mod_parts += helmet chestplate = new /obj/item/clothing/suit/mod(src) - chestplate.allowed += typecacheof(theme.allowed_suit_storage) + chestplate.allowed += theme.allowed_suit_storage mod_parts += chestplate gauntlets = new /obj/item/clothing/gloves/mod(src) mod_parts += gauntlets