From b14ae1dcf65e938174bb6ea9db7d3836e845211f Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Thu, 16 May 2019 23:46:50 +0300
Subject: [PATCH] Fixes harddel causes for various things (#43989)

* hardddel stuff

* mech stuff
---
 code/game/mecha/mech_bay.dm              | 10 ++++++++++
 code/modules/mob/living/carbon/carbon.dm |  1 +
 code/modules/spells/spell.dm             |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 6bc35958e39..5919df1a119 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -29,6 +29,11 @@
 	. = ..()
 	recharging_turf = get_step(loc, dir)
 
+/obj/machinery/mech_bay_recharge_port/Destroy()
+	if (recharge_console && recharge_console.recharge_port == src)
+		recharge_console.recharge_port = null
+	return ..()
+
 /obj/machinery/mech_bay_recharge_port/RefreshParts()
 	var/MC
 	for(var/obj/item/stock_parts/capacitor/C in component_parts)
@@ -135,3 +140,8 @@
 /obj/machinery/computer/mech_bay_power_console/Initialize()
 	. = ..()
 	reconnect()
+
+/obj/machinery/computer/mech_bay_power_console/Destroy()
+	if (recharge_port && recharge_port.recharge_console == src)
+		recharge_port.recharge_console = null
+	return ..()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 0dbf978f133..1040f3c23d3 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -11,6 +11,7 @@
 	//This must be done first, so the mob ghosts correctly before DNA etc is nulled
 	. =  ..()
 
+	QDEL_LIST(hand_bodyparts)
 	QDEL_LIST(internal_organs)
 	QDEL_LIST(stomach_contents)
 	QDEL_LIST(bodyparts)
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index cb2af17e1e4..652ef3badf1 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -35,6 +35,8 @@
 GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for the badmin verb for now
 
 /obj/effect/proc_holder/Destroy()
+	if (action)
+		qdel(action)
 	if(ranged_ability_user)
 		remove_ranged_ability()
 	return ..()