From e2c0e6fd6a39e672a424d75c4eb93158779013b3 Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Wed, 22 Jan 2020 16:12:34 +0000
Subject: [PATCH] Latespawn AI will have their eye spawn in the correct
 location. (#8056)

---
 code/modules/mob/abstract/freelook/ai/eye.dm       | 3 +--
 code/modules/mob/abstract/new_player/new_player.dm | 1 +
 html/changelogs/ai_eye_loc_spawn.yml               | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/ai_eye_loc_spawn.yml

diff --git a/code/modules/mob/abstract/freelook/ai/eye.dm b/code/modules/mob/abstract/freelook/ai/eye.dm
index 5733f86c64e..89cfefa1c75 100644
--- a/code/modules/mob/abstract/freelook/ai/eye.dm
+++ b/code/modules/mob/abstract/freelook/ai/eye.dm
@@ -48,9 +48,8 @@
 	if(client)
 		client.eye = new_eye
 
-/mob/living/silicon/ai/proc/create_eyeobj(var/newloc)
+/mob/living/silicon/ai/proc/create_eyeobj(var/newloc = get_turf(src))
 	if(eyeobj) destroy_eyeobj()
-	if(!newloc) newloc = get_turf(src)
 	eyeobj = new /mob/abstract/eye/aiEye(newloc)
 	eyeobj.possess(src)
 
diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm
index 0d53ff8c044..e2b5a1ce82e 100644
--- a/code/modules/mob/abstract/new_player/new_player.dm
+++ b/code/modules/mob/abstract/new_player/new_player.dm
@@ -336,6 +336,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
 		empty_playable_ai_cores -= C
 
 		character.forceMove(C.loc)
+		character.eyeobj.forceMove(C.loc)
 
 		AnnounceCyborg(character, rank, "has been downloaded to the empty core in \the [character.loc.loc]")
 		SSticker.mode.handle_latejoin(character)
diff --git a/html/changelogs/ai_eye_loc_spawn.yml b/html/changelogs/ai_eye_loc_spawn.yml
new file mode 100644
index 00000000000..d484e86332d
--- /dev/null
+++ b/html/changelogs/ai_eye_loc_spawn.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Latespawn AI will spawn with their eye in the right location."
\ No newline at end of file