From a3a2fb03b630266416640706609d5fc01170dc4d Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sun, 14 Jul 2019 14:21:28 +0200 Subject: [PATCH] My bad, my bad. --- code/game/objects/structures/crates_lockers/closets.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index d65ef4c846..2c4463928c 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -171,6 +171,7 @@ if(++mobs_stored >= mob_storage_capacity) return FALSE L.stop_pulling() + else if(istype(AM, /obj/structure/closet)) return FALSE @@ -179,14 +180,16 @@ else if(isobj(AM)) if((!allow_dense && AM.density) || AM.anchored || AM.has_buckled_mobs()) - return TRUE - if(isitem(AM) && HAS_TRAIT(AM, TRAIT_NODROP)) + return FALSE + if(isitem(AM) && !HAS_TRAIT(AM, TRAIT_NODROP)) return TRUE else if(!allow_objects && !istype(AM, /obj/effect/dummy/chameleon)) return FALSE else return FALSE + return TRUE + /obj/structure/closet/proc/close(mob/living/user) if(!opened || !can_close(user)) return FALSE