From 680a0521366a0bb0e89d10b1a8ae5bed33551166 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Wed, 1 Jul 2015 01:04:21 -0400
Subject: [PATCH] Fixes check_eye() for AI, pAI, and helm console

reset_view() is no longer called every time check_eye() is. Instead it
is called only when the mob's eye should change.
---
 code/modules/mob/living/silicon/ai/ai.dm     | 3 +--
 code/modules/mob/living/silicon/pai/pai.dm   | 1 -
 code/modules/overmap/ships/computers/helm.dm | 9 +++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 32c2b643b0b..15a1ee2f8aa 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -388,8 +388,7 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/check_eye(var/mob/user as mob)
 	if (!camera)
-		return null
-	user.reset_view(camera)
+		return -1
 	return 0
 
 /mob/living/silicon/ai/restrained()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index e575c2d7c47..84a94001715 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -124,7 +124,6 @@
 /mob/living/silicon/pai/check_eye(var/mob/user as mob)
 	if (!src.current)
 		return -1
-	user.reset_view(src.current)
 	return 0
 
 /mob/living/silicon/pai/blob_act()
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index a0611c68669..e15de319698 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -53,11 +53,10 @@
 
 /obj/machinery/computer/helm/check_eye(var/mob/user as mob)
 	if (!manual_control)
-		return null
+		return -1
 	if (!get_dist(user, src) > 1 || user.blinded || !linked )
-		return null
-	user.reset_view(linked)
-	return 1
+		return -1
+	return 0
 
 /obj/machinery/computer/helm/attack_hand(var/mob/user as mob)
 	if(..())
@@ -67,6 +66,8 @@
 
 	if(!isAI(user))
 		user.set_machine(src)
+		if(linked)
+			user.reset_view(linked)
 
 	ui_interact(user)