From 8111e7bd10d75fa4d200078bf9fa4ac72dbda54a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 16 Feb 2021 14:47:32 -0500
Subject: [PATCH 1/2] Merge pull request #9735 from Novacat/nova-basicfixes

Additional GC Fixes
---
 code/game/objects/effects/effect_system.dm                     | 3 +++
 .../mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 1e804bbb26..0ec3f40036 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -33,6 +33,9 @@ would spawn and follow the beaker, even if it is carried or thrown.
 
 	proc/start()
 
+	Destroy()
+		holder = null
+		return ..()
 
 /////////////////////////////////////////////
 // GENERIC STEAM SPREAD SYSTEM
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
index d29981726d..d5ba330c0d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
@@ -57,7 +57,7 @@
 	return ..()
 
 /mob/living/simple_mob/mechanical/mecha/Destroy()
-	qdel(sparks)
+	qdel_null(sparks)
 	return ..()
 
 /mob/living/simple_mob/mechanical/mecha/death()