From f04b513dd78d12bca3f44d2d6bc3d0d6a8309a98 Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Thu, 27 Jun 2024 23:16:49 -0400 Subject: [PATCH] Brains can ghost (#26003) --- code/modules/mob/dead/observer/observer_base.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm index f33e16df49b..0a370d5b620 100644 --- a/code/modules/mob/dead/observer/observer_base.dm +++ b/code/modules/mob/dead/observer/observer_base.dm @@ -241,14 +241,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return ghostize(TRUE) return - if(isbrain(M) && isturf(M.loc)) + if(isbrain(M)) // let a brain ghost out if they want to, but also let them freely re-enter their brain. - var/mob/dead/observer/ghost = ghostize(TRUE) - ghost.can_reenter_corpse = FALSE - if(tgui_alert(src, "Ghosting from this brain means you'll be respawnable but will be kicked out of your brain, which someone else could take over. Is this what you want?", "Ghost", list("Stay in Brain", "Ghost") != "Ghost")) - return - - log_admin("[key_name(M)] has ghosted as a brain-mob, but is keeping respawnability.") + var/response = tgui_alert(src, "Ghosting from this brain means you'll be respawnable but will be kicked out of your brain, which someone else could take over. Is this what you want?", "Ghost", list("Stay in Brain", "Ghost")) + if(response == "Ghost") + ghostize(TRUE) + log_admin("[key_name(M)] has ghosted as a brain-mob, but is keeping respawnability.") return if(P) if(TOO_EARLY_TO_GHOST)