From 6670284b620c5c838d6cf48b8676450aaf66be50 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 20 Jul 2018 06:41:34 -0400 Subject: [PATCH] fixes items spawning on top of closets rather than inside closets (#7361) --- code/game/objects/structures/crates_lockers/closets.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 15963b812b..32d0fa00e1 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -36,11 +36,11 @@ /obj/structure/closet/Initialize(mapload) - if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents - addtimer(CALLBACK(src, .proc/take_contents), 0) . = ..() update_icon() PopulateContents() + if(mapload && !opened) + take_contents() //USE THIS TO FILL IT, NOT INITIALIZE OR NEW /obj/structure/closet/proc/PopulateContents() @@ -167,6 +167,8 @@ var/obj/item/I = AM if (I.item_flags & NODROP) return + else if(istype(AM, /obj/effect)) + return else if(!allow_objects && !istype(AM, /obj/effect/dummy/chameleon)) return if(!allow_dense && AM.density)