From c782e15d64fcc8d97a252d24961afab7f03df177 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 8 May 2017 18:47:21 -0500
Subject: [PATCH] [MIRROR] Fix server hop (#740)

* Fix server hop

* Delete new_player.dm.rej
---
 code/modules/mob/dead/dead.dm                  |  9 ++++++++-
 code/modules/mob/dead/new_player/new_player.dm | 11 ++++-------
 code/modules/mob/dead/observer/observer.dm     |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 666222aa27..dcd4762d64 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -3,9 +3,16 @@
 INITIALIZE_IMMEDIATE(/mob/dead)
 
 /mob/dead/Initialize()
-	. = ..()
+	if(initialized)
+		stack_trace("Warning: [src]([type]) initialized multiple times!")
+	tag = "mob_[next_mob_id++]"
+	GLOB.mob_list += src
+
+	prepare_huds()
+
 	if(config.cross_allowed)
 		verbs += /mob/dead/proc/server_hop
+	return INITIALIZE_HINT_NORMAL
 
 /mob/dead/dust()	//ghosts can't be vaporised.
 	return
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index bc00dc395a..e3943d07e6 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -16,12 +16,6 @@
 	var/mob/living/new_character	//for instant transfer once the round is set up
 
 /mob/dead/new_player/Initialize()
-	if(initialized)
-		stack_trace("Warning: [src]([type]) initialized multiple times!")
-	initialized = TRUE
-	tag = "mob_[next_mob_id++]"
-	GLOB.mob_list += src
-
 	if(client && SSticker.state == GAME_STATE_STARTUP)
 		var/obj/screen/splash/S = new(client, TRUE, TRUE)
 		S.Fade(TRUE)
@@ -30,7 +24,10 @@
 		loc = pick(GLOB.newplayer_start)
 	else
 		loc = locate(1,1,1)
-	return INITIALIZE_HINT_NORMAL
+	. = ..()
+
+/mob/dead/new_player/prepare_huds()
+	return
 
 /mob/dead/new_player/proc/new_player_panel()
 
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 7f2c6d6485..7331312173 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -118,6 +118,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	animate(src, pixel_y = 2, time = 10, loop = -1)
 
 	grant_all_languages()
+	GLOB.dead_mob_list += src
 	..()
 
 /mob/dead/observer/narsie_act()