From 19d8efef6806b27bc10b625362c4c7cb5fe3d1d6 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Mon, 6 May 2019 10:08:28 +0100
Subject: [PATCH] Morgue Updating [Hooks P4]

---
 code/controllers/hooks-defs.dm         | 16 +---------------
 code/game/objects/structures/morgue.dm | 12 +-----------
 code/modules/mob/login.dm              |  3 +--
 code/modules/mob/logout.dm             |  2 +-
 code/modules/mob/new_player/login.dm   |  2 +-
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/code/controllers/hooks-defs.dm b/code/controllers/hooks-defs.dm
index b080c279d93..433e2647d32 100644
--- a/code/controllers/hooks-defs.dm
+++ b/code/controllers/hooks-defs.dm
@@ -15,18 +15,4 @@
  * Called in supervisor.dm when a captain spawns
  * Parameters: var/mob/living/carbon/human/captain
  */
-/hook/captain_spawned
-
-/**
- * Mob login hook.
- * Called in login.dm when a player logs in to a mob.
- * Parameters: var/client/client, var/mob/mob
- */
-/hook/mob_login
-
- /**
- * Mob logout hook.
- * Called in logout.dm when a player logs out of a mob.
- * Parameters: var/client/client, var/mob/mob
- */
-/hook/mob_logout
+/hook/captain_spawned
\ No newline at end of file
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 3001b52f399..2953744a824 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -484,14 +484,4 @@
 		if(istype(C)) //We found our corpse, is it inside a morgue?
 			morgue = get(C.loc, /obj/structure/morgue)
 			if(morgue)
-				morgue.update()
-
-/hook/mob_login/proc/update_morgue(var/client/client, var/mob/mob)
-	//Update morgues on login
-	mob.update_morgue()
-	return 1
-
-/hook/mob_logout/proc/update_morgue(var/client/client, var/mob/mob)
-	//Update morgues on logout
-	mob.update_morgue()
-	return 1
+				morgue.update()
\ No newline at end of file
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 0a1346fd0ed..f5f1924e395 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -70,5 +70,4 @@
 			AA.display_to(list(src))
 
 	update_client_colour(0)
-
-	callHook("mob_login", list("client" = client, "mob" = src))
+	update_morgue()
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index f409d184340..cb92665e2fc 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -16,5 +16,5 @@
 				send2irc(config.admin_notify_irc, "[key_name(src)] logged out - No active admins, [admincounter[2]] non-admin staff, [admincounter[3]] inactive staff.")
 
 	..()
-	callHook("mob_logout", list("client" = client, "mob" = src))
+	update_morgue()
 	return 1
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 1c7b06b1ce1..45f64f3acb1 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -27,7 +27,7 @@
 		loc = pick(watch_locations)
 */
 
-	callHook("mob_login", list("client" = client, "mob" = src))
+	update_morgue() // Why is this called for new players that dont even have a morgue
 
 	new_player_panel()