From 90bcf0ef8489fca130b1b0811b16744837254197 Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Thu, 25 Jan 2018 09:09:27 -0200
Subject: [PATCH 1/2] Merge pull request #34860 from YPOQ/camerafix

Fixes double camera assemblies when deconstructing cameras
---
 code/game/machinery/camera/camera.dm          | 9 ++++++---
 code/game/machinery/camera/camera_assembly.dm | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 4742172108..14502b9e46 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -42,10 +42,13 @@
 
 	var/internal_light = TRUE //Whether it can light up when an AI views it
 
-/obj/machinery/camera/Initialize(mapload)
+/obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/CA)
 	. = ..()
-	assembly = new(src)
-	assembly.state = 4
+	if(CA)
+		assembly = CA
+	else
+		assembly = new(src)
+		assembly.state = 4
 	GLOB.cameranet.cameras += src
 	GLOB.cameranet.addCamera(src)
 	if (isturf(loc))
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 952011d595..b6cec23110 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -100,9 +100,8 @@
 		to_chat(user, "<span class='warning'>No network found, please hang up and try your call again!</span>")
 		return
 	state = 4
-	var/obj/machinery/camera/C = new(src.loc)
+	var/obj/machinery/camera/C = new(loc, src)
 	forceMove(C)
-	C.assembly = src
 	C.setDir(src.dir)
 
 	C.network = tempnetwork