From 072dfa3058c923de4a35d896bc0c081bab9ed4d5 Mon Sep 17 00:00:00 2001
From: spookerton <spkrtn@pm.me>
Date: Mon, 14 Aug 2023 13:26:42 +0100
Subject: [PATCH] respawn timers are correctly applied to ghosting and
 observing

---
 code/modules/mob/mob.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 5721976fd7..260ab4dee8 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -405,16 +405,18 @@
 	// Try harder to find a key to use
 	if(!keytouse && key)
 		keytouse = ckey(key)
-	else if(!keytouse && mind?.key)
+	if (!keytouse && mind?.key)
 		keytouse = ckey(mind.key)
-
+	if (!keytouse)
+		return
 	GLOB.respawn_timers[keytouse] = world.time + time
 
+
 /mob/observer/dead/set_respawn_timer()
 	if(config.antag_hud_restricted && has_enabled_antagHUD)
 		..(-1)
 	else
-		return // Don't set it, no need
+		..()
 
 /mob/verb/abandon_mob()
 	set name = "Return to Menu"