From fc7acc4597c2e69a425395f37d7cd4e24ed9ba82 Mon Sep 17 00:00:00 2001 From: Burzah <116982774+Burzah@users.noreply.github.com> Date: Sun, 28 Apr 2024 13:05:39 -0700 Subject: [PATCH] adjusted logic for humanize_spider (#25286) --- .../hostile/terror_spiders/terror_ghost_interaction.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm index 37d3a4cd8b4..5f132fa5487 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm @@ -16,10 +16,6 @@ humanize_prompt += " Role: [spider_role_summary]" if(user.ckey in GLOB.ts_ckey_blacklist) error_on_humanize = "You are not able to control any terror spider this round." - else if(isobserver(user)) - var/mob/dead/observer/O = user - if(!O.check_ahud_rejoin_eligibility()) - error_on_humanize = "You have enabled antag HUD and are unable to re-enter the round." else if(!ai_playercontrol_allowtype) error_on_humanize = "This specific type of terror spider is not player-controllable." else if(degenerate) @@ -28,6 +24,10 @@ error_on_humanize = "Dead spiders are not player-controllable." else if(!HAS_TRAIT(user, TRAIT_RESPAWNABLE)) error_on_humanize = "You are not able to rejoin the round." + else if(isobserver(user)) + var/mob/dead/observer/O = user + if(!O.check_ahud_rejoin_eligibility()) + error_on_humanize = "You have enabled antag HUD and are unable to re-enter the round." if(jobban_isbanned(user, ROLE_SYNDICATE) || jobban_isbanned(user, ROLE_TSPIDER)) to_chat(user, "You are jobbanned from role of syndicate and/or terror spider.") return