From 3fabcd89dd04298ae6b8ca178e03a516bbcd88b7 Mon Sep 17 00:00:00 2001 From: bawhoppen Date: Mon, 23 Dec 2019 13:05:25 -0600 Subject: [PATCH] All small objects can now fit into filing cabinets (#48353) Better to have them be able to hold anything that is reasonably small, rather than a pre-defined list of papers, folders, and photographs. This will work well for things like pens, ID cards, tapes, or even secret booze, which would all rightfully belong in an administrator's filing cabinet. Also could be useful for future away missions, etc. --- code/modules/paperwork/filingcabinet.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 83f4a5c0072..c42d9511141 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -35,7 +35,7 @@ . = ..() 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(I.w_class < WEIGHT_CLASS_NORMAL) //there probably shouldn't be anything placed ontop of filing cabinets in a map that isn't meant to go in them I.forceMove(src) /obj/structure/filingcabinet/deconstruct(disassembled = TRUE) @@ -46,7 +46,7 @@ qdel(src) /obj/structure/filingcabinet/attackby(obj/item/P, mob/user, params) - if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/documents)) + if(P.w_class < WEIGHT_CLASS_NORMAL) if(!user.transferItemToLoc(P, src)) return to_chat(user, "You put [P] in [src].")