From 6b326123ac46f4153e1a1ec7ab249e8ea7d64c2a Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Fri, 30 Jul 2021 14:57:36 +0100
Subject: [PATCH] DNR ghost spawns fix (#16458)
---
code/modules/awaymissions/corpse.dm | 4 ----
code/modules/mining/lavaland/loot/colossus_loot.dm | 3 ---
2 files changed, 7 deletions(-)
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index f11e6e238da..9ed88fc1c4e 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -36,7 +36,6 @@
var/death_cooldown = 0 // How long you have to wait after dying before using it again, in deciseconds. People that join as observers are not included.
/obj/effect/mob_spawn/attack_ghost(mob/user)
- var/mob/dead/observer/O = user
if(SSticker.current_state != GAME_STATE_PLAYING || !loc || !ghost_usable)
return
if(!uses)
@@ -48,9 +47,6 @@
if(cannotPossess(user))
to_chat(user, "Upon using the antagHUD you forfeited the ability to join the round.")
return
- if(!O.can_reenter_corpse)
- to_chat(user, "You have forfeited the right to respawn.")
- return
if(time_check(user))
return
var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 0bf1d67bf71..b8b2a96402f 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -237,9 +237,6 @@
if(cannotPossess(user))
to_chat(user, "Upon using the antagHUD you forfeited the ability to join the round.")
return
- if(!user.can_reenter_corpse)
- to_chat(user, "You have forfeited the right to respawn.")
- return
var/be_helper = alert("Become a Lightgeist? (Warning, You can no longer be cloned!)",,"Yes","No")
if(be_helper == "No")
return