From fa4e0e61d6efd55f9404611127bee89259d8c898 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Fri, 26 May 2017 09:05:52 -0500
Subject: [PATCH] Fixes adv camera leaving obscured images

---
 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 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
index 1e725bccba..554d992987 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/camera.dm
@@ -70,12 +70,12 @@
 	origin.vest_mode_action.Remove(C)
 	origin.vest_disguise_action.Remove(C)
 	origin.set_droppoint_action.Remove(C)
-	remote_eye.eye_user = null
 	C.reset_perspective(null)
 	if(C.client)
 		C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
 			chunk.remove(remote_eye)
+	remote_eye.eye_user = null
 	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 e3637d3430..1719695cf5 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -151,13 +151,13 @@ obj/machinery/computer/camera_advanced/attack_ai(mob/user)
 	var/mob/camera/aiEye/remote/remote_eye = C.remote_control
 	remote_eye.origin.current_user = null
 	remote_eye.origin.jump_action.Remove(C)
-	remote_eye.eye_user = null
 	if(C.client)
 		C.reset_perspective(null)
 		if(remote_eye.visible_icon)
 			C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
 			chunk.remove(remote_eye)
+	remote_eye.eye_user = null
 	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 ff7c3f6340..f43a89eef4 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -96,12 +96,12 @@
 	origin.feed_slime_action.Remove(C)
 	origin.monkey_recycle_action.Remove(C)
 	//All of this stuff below could probably be a proc for all advanced cameras, only the action removal needs to be camera specific
-	remote_eye.eye_user = null
 	C.reset_perspective(null)
 	if(C.client)
 		C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
 			chunk.remove(remote_eye)
+	remote_eye.eye_user = null
 	C.remote_control = null
 	C.unset_machine()
 	Remove(C)