From a6ee6b35e38fbe06d7de29f62d42c98f0a2c7bd0 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 25 Apr 2017 04:13:02 -0400
Subject: [PATCH] Fixes a few more Destroys

---
 code/game/mecha/mecha_parts.dm  | 15 +++++++++------
 code/modules/admin/buildmode.dm |  5 ++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 11fed270bab..9250dfa4839 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -17,13 +17,16 @@
 	var/datum/construction/construct
 	flags = CONDUCT
 
-	attackby(obj/item/W as obj, mob/user as mob, params)
-		if(!construct || !construct.action(W, user))
-			..()
-		return
+/obj/item/mecha_parts/chassis/Destroy()
+	QDEL_NULL(construct)
+	return ..()
 
-	attack_hand()
-		return
+/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
+	if(!construct || !construct.action(W, user))
+		..()
+
+/obj/item/mecha_parts/chassis/attack_hand()
+	return
 
 /////////// Ripley
 
diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm
index 32bdfa135b5..1286876ea10 100644
--- a/code/modules/admin/buildmode.dm
+++ b/code/modules/admin/buildmode.dm
@@ -95,6 +95,7 @@
 	cl.images -= I
 	cl = null
 	qdel(I)
+	return ..()
 
 /obj/effect/buildmode_line
 	var/image/I
@@ -140,6 +141,8 @@
 /datum/click_intercept/Destroy()
 	for(var/button in buttons)
 		qdel(button)
+	buttons.Cut()
+	return ..()
 
 
 /datum/click_intercept/proc/create_buttons()
@@ -191,7 +194,7 @@
 	Reset()
 	areaimage.loc = null
 	qdel(areaimage)
-	..()
+	return ..()
 
 /datum/click_intercept/buildmode/create_buttons()
 	buttons += new /obj/screen/buildmode/mode(src)