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>
This commit is contained in:
BiancaWilkson
2024-06-28 03:36:07 +00:00
committed by GitHub
co-authored by Nathan Winters
parent c844c3ae06
commit f9288b194c
2 changed files with 4 additions and 1 deletions
+3 -1
View File
@@ -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, "<span class='warning'>This spawner is out of charges!</span>")
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, "<span class='warning'>You are jobanned!</span>")
return FALSE
if(!HAS_TRAIT(user, TRAIT_RESPAWNABLE))
+1
View File
@@ -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