From 97fa286a2c1a027150ec2f29465aac71bdfafecc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 22 Mar 2021 14:05:25 +0100 Subject: [PATCH] [MIRROR] Fixes items in toilet cisterns being deleted / null'd on deconstruction (#4320) * Fixes items in toilet cisterns being deleted / null'd on deconstruction (#57864) * banished * drop loc * Fixes items in toilet cisterns being deleted / null'd on deconstruction Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/game/objects/structures/watercloset.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 9c9a608ca2c..fefa0c2bbfc 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -84,6 +84,8 @@ /obj/structure/toilet/deconstruct() if(!(flags_1 & NODECONSTRUCT_1)) + for(var/obj/toilet_item in contents) + toilet_item.forceMove(drop_location()) if(buildstacktype) new buildstacktype(loc,buildstackamount) else