From 7f6a28f16dca3eeddf134a7919b3a2f930ae03fa Mon Sep 17 00:00:00 2001 From: Farie82 Date: Sat, 12 Jun 2021 19:13:42 +0200 Subject: [PATCH] Respawning using anomalous crystal exploit fixes (#16165) * Ahud anomalous crystal fix Makes it so that you can't get around ahud enabling using the anomalous helper crystal * Merge conflict fix thing --- code/modules/mining/lavaland/loot/colossus_loot.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index d3b4e2f8563..0bf1d67bf71 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -231,12 +231,22 @@ /obj/machinery/anomalous_crystal/helpers/attack_ghost(mob/dead/observer/user) ..() - if(cannotPossess(user)) - return if(ready_to_deploy) + if(!istype(user)) // No revs allowed + return + 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 + if(!loc || QDELETED(src) || QDELETED(user)) + if(user) + to_chat(user, "[src] is no longer usable!") + return var/mob/living/simple_animal/hostile/lightgeist/W = new /mob/living/simple_animal/hostile/lightgeist(get_turf(loc)) W.key = user.key