From 0c2c95b037933243fcaa2a8c6434ddbbfecb1901 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 27 Jun 2022 03:15:04 +0200
Subject: [PATCH] [MIRROR] Fix reinforcement nukeops not getting their HUDs
 [MDB IGNORE] (#14553)

* Fix reinforcement nukeops not getting their HUDs (#67976)

* Fix reinforcement nukeops not getting their HUDs

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
---
 code/modules/antagonists/_common/antag_spawner.dm | 4 ++++
 code/modules/mob/living/carbon/carbon.dm          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index b01a8551534..0e22ab0c6f2 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -145,6 +145,10 @@
 	C.prefs.safe_transfer_prefs_to(nukie, is_antag = TRUE)
 	nukie.ckey = C.key
 	var/datum/mind/op_mind = nukie.mind
+	if(length(GLOB.newplayer_start)) // needed as hud code doesn't render huds if the atom (in this case the nukie) is in nullspace, so just move the nukie somewhere safe
+		nukie.forceMove(pick(GLOB.newplayer_start))
+	else
+		nukie.forceMove(locate(1,1,1))
 
 	antag_datum = new()
 	antag_datum.send_to_spawnpoint = FALSE
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index fbb93c20ac9..d1de191c003 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -581,7 +581,7 @@
 		if(!isnull(E.lighting_alpha))
 			lighting_alpha = E.lighting_alpha
 
-	if(client.eye != src)
+	if(client.eye && client.eye != src)
 		var/atom/A = client.eye
 		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
 			return