From fa6ce77679e6d3ebd324ba0b124f0abfa00870f3 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sun, 24 Mar 2024 08:16:42 -0400 Subject: [PATCH 1/2] Update filingcabinet.dm --- code/modules/paperwork/filingcabinet.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 50396085a551..2dfdbb9a6bf3 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -1,3 +1,6 @@ +// Way to many types to just leave as a instance variable +GLOBAL_LIST_INIT(filingcabinet_types, typecacheof(list(/obj/item/paper, /obj/item/folder, /obj/item/photo, /obj/item/documents, /obj/item/clipboard, /obj/item/tape))) + /* Filing cabinets! * Contains: * Filing Cabinets @@ -71,7 +74,7 @@ update_appearance(UPDATE_ICON) if(mapload) for(var/obj/item/I in loc) - if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo)) + if(is_type_in_typecache(I, GLOB.filingcabinet_types)) I.forceMove(src) /obj/structure/filingcabinet/deconstruct(disassembled = TRUE) @@ -89,7 +92,7 @@ else name = initial(name) return - if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/documents) || istype(P, /obj/item/clipboard)) + if(is_type_in_typecache(P, GLOB.filingcabinet_types)) if(!user.transferItemToLoc(P, src)) return to_chat(user, span_notice("You put [P] in [src].")) From 23098911158607e5149b50244b0f25eda02baf04 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sun, 24 Mar 2024 08:25:30 -0400 Subject: [PATCH 2/2] probably faster than a typecache --- code/modules/paperwork/filingcabinet.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 2dfdbb9a6bf3..be29a37de1e6 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -1,6 +1,3 @@ -// Way to many types to just leave as a instance variable -GLOBAL_LIST_INIT(filingcabinet_types, typecacheof(list(/obj/item/paper, /obj/item/folder, /obj/item/photo, /obj/item/documents, /obj/item/clipboard, /obj/item/tape))) - /* Filing cabinets! * Contains: * Filing Cabinets @@ -21,6 +18,9 @@ GLOBAL_LIST_INIT(filingcabinet_types, typecacheof(list(/obj/item/paper, /obj/ite density = TRUE anchored = TRUE + /// List of allowed item types + var/allowed_types = list(/obj/item/paper, /obj/item/folder, /obj/item/photo, /obj/item/documents, /obj/item/clipboard, /obj/item/tape) + /obj/structure/filingcabinet/chestdrawer name = "chest drawer" icon_state = "chestdrawer" @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(filingcabinet_types, typecacheof(list(/obj/item/paper, /obj/ite update_appearance(UPDATE_ICON) if(mapload) for(var/obj/item/I in loc) - if(is_type_in_typecache(I, GLOB.filingcabinet_types)) + if(is_type_in_list(I, allowed_types)) I.forceMove(src) /obj/structure/filingcabinet/deconstruct(disassembled = TRUE) @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(filingcabinet_types, typecacheof(list(/obj/item/paper, /obj/ite else name = initial(name) return - if(is_type_in_typecache(P, GLOB.filingcabinet_types)) + if(is_type_in_list(P, allowed_types)) if(!user.transferItemToLoc(P, src)) return to_chat(user, span_notice("You put [P] in [src]."))