From 877acc972a8e1929cf6e69e904d0e3d414d6d995 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Fri, 5 May 2017 18:12:07 -0500
Subject: [PATCH 1/2] Fixes dead mobs being initialized twice

---
 code/modules/mob/dead/dead.dm.rej | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 code/modules/mob/dead/dead.dm.rej

diff --git a/code/modules/mob/dead/dead.dm.rej b/code/modules/mob/dead/dead.dm.rej
new file mode 100644
index 0000000000..4a71374804
--- /dev/null
+++ b/code/modules/mob/dead/dead.dm.rej
@@ -0,0 +1,9 @@
+diff a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm	(rejected hunks)
+@@ -5,6 +5,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
+ /mob/dead/Initialize()
+ 	if(initialized)
+ 		stack_trace("Warning: [src]([type]) initialized multiple times!")
++	initialized = TRUE
+ 	tag = "mob_[next_mob_id++]"
+ 	GLOB.mob_list += src
+ 

From 3d0a1b2573d6e8039d742e63b87284157dafe977 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 14 May 2017 00:05:53 -0500
Subject: [PATCH 2/2] commit

---
 code/modules/mob/dead/dead.dm | 82 ++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index dcd4762d64..45a64bbfde 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -1,49 +1,51 @@
 //Dead mobs can exist whenever. This is needful
 
-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
+
INITIALIZE_IMMEDIATE(/mob/dead)
 
-	prepare_huds()
+
/mob/dead/Initialize()
+
	if(initialized)
+
		stack_trace("Warning: [src]([type]) initialized multiple times!")
+
	initialized = TRUE
+
	tag = "mob_[next_mob_id++]"
+
	GLOB.mob_list += src
 
-	if(config.cross_allowed)
-		verbs += /mob/dead/proc/server_hop
-	return INITIALIZE_HINT_NORMAL
+
	prepare_huds()
 
-/mob/dead/dust()	//ghosts can't be vaporised.
-	return
-
-/mob/dead/gib()		//ghosts can't be gibbed.
-	return
+
	if(config.cross_allowed)
+
		verbs += /mob/dead/proc/server_hop
+
	return INITIALIZE_HINT_NORMAL
 
-/mob/dead/ConveyorMove()	//lol
-	return
+
/mob/dead/dust()	//ghosts can't be vaporised.
+
	return
+
+
/mob/dead/gib()		//ghosts can't be gibbed.
+
	return
+
+
/mob/dead/ConveyorMove()	//lol
+
	return
 
 
 
-/mob/dead/proc/server_hop()
-	set category = "OOC"
-	set name = "Server Hop!"
-	set desc= "Jump to the other server"
-	if(notransform)
-		return
-	if(!config.cross_allowed)
-		verbs -= /mob/dead/proc/server_hop
-		to_chat(src, "<span class='notice'>Server Hop has been disabled.</span>")
-		return
-	if (alert(src, "Jump to server running at [config.cross_address]?", "Server Hop", "Yes", "No") != "Yes")
-		return 0
-	if (client && config.cross_allowed)
-		to_chat(src, "<span class='notice'>Sending you to [config.cross_address].</span>")
-		new /obj/screen/splash(client)
-		notransform = TRUE
-		sleep(29)	//let the animation play
-		notransform = FALSE
-		winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources
-		client << link(config.cross_address + "?server_hop=[key]")
-	else
-		to_chat(src, "<span class='error'>There is no other server configured!</span>")
+
/mob/dead/proc/server_hop()
+
	set category = "OOC"
+
	set name = "Server Hop!"
+
	set desc= "Jump to the other server"
+
	if(notransform)
+
		return
+
	if(!config.cross_allowed)
+
		verbs -= /mob/dead/proc/server_hop
+
		to_chat(src, "<span class='notice'>Server Hop has been disabled.</span>")
+
		return
+
	if (alert(src, "Jump to server running at [config.cross_address]?", "Server Hop", "Yes", "No") != "Yes")
+
		return 0
+
	if (client && config.cross_allowed)
+
		to_chat(src, "<span class='notice'>Sending you to [config.cross_address].</span>")
+
		new /obj/screen/splash(client)
+
		notransform = TRUE
+
		sleep(29)	//let the animation play
+
		notransform = FALSE
+
		winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources
+
		client << link(config.cross_address + "?server_hop=[key]")
+
	else
+
		to_chat(src, "<span class='error'>There is no other server configured!</span>")
+
\ No newline at end of file