From 3651637cd85b2f4def4b01fbfc55541f70b08f88 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Tue, 23 May 2017 13:44:19 -0500
Subject: [PATCH] Fixes advanced cam not cleaning up properly

---
 code/datums/holocall.dm                                      | 2 +-
 code/game/gamemodes/miniantags/abduction/machinery/camera.dm | 2 +-
 code/game/machinery/computer/camera_advanced.dm              | 2 +-
 code/modules/research/xenobiology/xenobio_camera.dm          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index 8f18f8b1fe..a3157e6514 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -46,7 +46,7 @@
 	user.reset_perspective()
 	if(user.client)
 		for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
-			user.client.images -= chunk.obscured
+			chunk.remove(eye)
 	user.remote_control = null
 	QDEL_NULL(eye)
 	
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
index 4bbdd0ca18..1e725bccba 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
@@ -75,7 +75,7 @@
 	if(C.client)
 		C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
-			C.client.images -= chunk.obscured
+			chunk.remove(remote_eye)
 	C.remote_control = null
 	C.unset_machine()
 	Remove(C)
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 39cdb1478c..e3637d3430 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -157,7 +157,7 @@ obj/machinery/computer/camera_advanced/attack_ai(mob/user)
 		if(remote_eye.visible_icon)
 			C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
-			C.client.images -= chunk.obscured
+			chunk.remove(remote_eye)
 	C.remote_control = null
 	C.unset_machine()
 	Remove(C)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index bd34ff60c0..ff7c3f6340 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -101,7 +101,7 @@
 	if(C.client)
 		C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
-			C.client.images -= chunk.obscured
+			chunk.remove(remote_eye)
 	C.remote_control = null
 	C.unset_machine()
 	Remove(C)