From 21b1c091ad95a60e458b043ff560490bc3ef11d0 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 3 Apr 2017 19:44:04 -0400
Subject: [PATCH] more things

---
 code/game/machinery/camera/camera.dm          | 11 +++++++----
 code/game/machinery/camera/camera_assembly.dm |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index f98c84c61ac..881305948d7 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -52,17 +52,20 @@
 /obj/machinery/camera/Destroy()
 	toggle_cam(null, 0) //kick anyone viewing out
 	if(assembly)
-		qdel(assembly)
-		assembly = null
+		QDEL_NULL(assembly)
 	if(istype(bug))
 		bug.bugged_cameras -= src.c_tag
 		if(bug.current == src)
 			bug.current = null
 		bug = null
-	qdel(wires)
-	wires = null
+	if(wires)
+		QDEL_NULL(wires)
 	cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that
 	cameranet.cameras -= src
+	var/area/ai_monitored/A = get_area(src)
+	if(istype(A))
+		A.motioncamera = null
+	area_motion = null
 	return ..()
 
 /obj/machinery/camera/emp_act(severity)
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 99e9273b682..11fcede1fe9 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -20,6 +20,12 @@
 				4 = Screwdriver panel closed and is fully built (you cannot attach upgrades)
 	*/
 
+/obj/item/weapon/camera_assembly/Destroy()
+	for(var/thing in upgrades)
+		qdel(thing)
+	upgrades.Cut()
+	return ..()
+
 /obj/item/weapon/camera_assembly/attackby(obj/item/W, mob/living/user, params)
 
 	switch(state)