From f9288b194ca2697881dcf465bbe090e033e66e9a Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Thu, 27 Jun 2024 23:36:07 -0400 Subject: [PATCH] Antagbanned people can join the ghost bar (#25869) * Antagbanned people can be a ghost * Update code/modules/awaymissions/mob_spawn.dm Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> --------- Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> --- code/modules/awaymissions/mob_spawn.dm | 4 +++- code/modules/ruins/ghost_bar.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/awaymissions/mob_spawn.dm b/code/modules/awaymissions/mob_spawn.dm index 399e91b4117..e9b62c111c6 100644 --- a/code/modules/awaymissions/mob_spawn.dm +++ b/code/modules/awaymissions/mob_spawn.dm @@ -39,6 +39,8 @@ var/ghost_usable = TRUE var/offstation_role = TRUE // If set to true, the role of the user's mind will be set to offstation 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. + ///If antagbanned people are prevented from using it, only false for the ghost bar spawner. + var/restrict_antagban = TRUE /obj/effect/mob_spawn/attack_ghost(mob/user) if(!valid_to_spawn(user)) @@ -84,7 +86,7 @@ if(!uses && !permanent) to_chat(user, "This spawner is out of charges!") return FALSE - if(jobban_isbanned(user, banType) || jobban_isbanned(user, ROLE_SYNDICATE)) + if((jobban_isbanned(user, banType) || (restrict_antagban && jobban_isbanned(user, ROLE_SYNDICATE)))) to_chat(user, "You are jobanned!") return FALSE if(!HAS_TRAIT(user, TRAIT_RESPAWNABLE)) diff --git a/code/modules/ruins/ghost_bar.dm b/code/modules/ruins/ghost_bar.dm index 6035ecbaba5..a89755e820c 100644 --- a/code/modules/ruins/ghost_bar.dm +++ b/code/modules/ruins/ghost_bar.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(occupants_by_key) flavour_text = "You are a ghost bar occupant. You've gotten sick of being dead and decided to meet up with some of your fellow haunting brothers. Take a seat, grab a beer, and chat it out." assignedrole = "Ghost Bar Occupant" death_cooldown = 1 MINUTES + restrict_antagban = FALSE /obj/effect/mob_spawn/human/alive/ghost_bar/create(ckey, flavour = TRUE, name, mob/user = usr) // So divorced from the normal proc it's just being overriden var/datum/character_save/save_to_load