From 3b21c318729657b1a23034b83b5680914e06e73f Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 2 Oct 2020 16:56:21 -0700 Subject: [PATCH 1/2] Makes water closet loot work and not cause bad GC bugs. --- code/game/objects/structures/watercloset.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index c52249686a..7b54e95a31 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -131,15 +131,12 @@ return ..() /obj/structure/toilet/secret - var/obj/item/secret var/secret_type = null -/obj/structure/toilet/secret/Initialize(mapload) +/obj/structure/toilet/secret/PopulateContents() . = ..() if (secret_type) - secret = new secret_type(src) - secret.desc += "" //In case you want to add something to the item that spawns - contents += secret + new secret_type(src) /obj/structure/toilet/secret/LateInitialize() . = ..() From 29213bbcbe0a273f7fad48c1de2df325b2449951 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 2 Oct 2020 17:39:53 -0700 Subject: [PATCH 2/2] ok i guess it has to be initialize --- code/game/objects/structures/watercloset.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 7b54e95a31..2214f9e4bb 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -133,7 +133,7 @@ /obj/structure/toilet/secret var/secret_type = null -/obj/structure/toilet/secret/PopulateContents() +/obj/structure/toilet/secret/Initialize() . = ..() if (secret_type) new secret_type(src)