From 4f8e4fbbd8b58147c1cad3b89882e9ae5464d5ce Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Thu, 5 Jul 2018 15:04:51 -0400 Subject: [PATCH] Tweak i_beam qdel logic Seems sketchy! --- code/modules/assembly/infrared.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 63c781452c..9e9eaeb868 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -250,9 +250,8 @@ return /obj/effect/beam/i_beam/Destroy() + . = ..() if(master.first == src) master.first = null - if(next) - qdel(next) - next = null - ..() + if(next && !next.gc_destroyed) + qdel_null(next)