Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme

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()