From baa2fe0dfa15a97e0579ae16cabccba0e8030a5f Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Fri, 10 Apr 2015 11:29:50 +0200
Subject: [PATCH] Eye runtime fixes.

Ensures the spawn in ai/New() doesn't attempt to update eyeobj if the AI was deleted before the timer.
---
 code/modules/mob/freelook/ai/eye.dm | 8 +++++---
 code/modules/mob/freelook/eye.dm    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm
index 8bc60b819d..a0df415c03 100644
--- a/code/modules/mob/freelook/ai/eye.dm
+++ b/code/modules/mob/freelook/ai/eye.dm
@@ -36,11 +36,13 @@
 	eyeobj.owner = src
 	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 	spawn(5)
-		eyeobj.loc = src.loc
+		if(eyeobj)
+			eyeobj.loc = src.loc
 
 /mob/living/silicon/ai/Del()
-	eyeobj.owner = null
-	del(eyeobj) // No AI, no Eye
+	if(eyeobj)
+		eyeobj.owner = null
+		del(eyeobj) // No AI, no Eye
 	..()
 
 /atom/proc/move_camera_by_click()
diff --git a/code/modules/mob/freelook/eye.dm b/code/modules/mob/freelook/eye.dm
index 318ed4da6e..a9fefbc5bd 100644
--- a/code/modules/mob/freelook/eye.dm
+++ b/code/modules/mob/freelook/eye.dm
@@ -36,7 +36,7 @@ mob/eye/Del()
 		ghost_darkness_images -= ghostimage
 		ghost_sightless_images -= ghostimage
 		del(ghostimage)
-		ghostimage = null;
+		ghostimage = null
 		updateallghostimages()
 	..()