Skip to content

Commit

Permalink
You can now only convert people who have BB enabled in their prefs (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy authored Jun 7, 2024
1 parent 05539db commit 7ae6d42
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion code/modules/antagonists/brother/brother.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@
return ..()

/datum/antagonist/brother/proc/on_mob_successful_flashed_carbon(mob/living/source, mob/living/carbon/flashed, obj/item/assembly/flash/flash)
SIGNAL_HANDLER
/* SIGNAL_HANDLER */ // monkestation edit: allow used of is_banned_from

if (flashed.stat == DEAD)
return


if (flashed.stat != CONSCIOUS)
flashed.balloon_alert(source, "unconscious!")
return
Expand All @@ -62,6 +63,12 @@
flashed.balloon_alert(source, "[flashed.p_their()] mind is vacant!")
return

// monkestation edit: allow people to opt-out of BB
if(!(ROLE_BROTHER in flashed.client?.prefs?.be_special) || is_banned_from(flashed.ckey, list(ROLE_BROTHER, ROLE_SYNDICATE)))
flashed.balloon_alert(source, "unwilling to play role!")
return
// monkestation end

for(var/datum/objective/brother_objective as anything in source.mind.get_all_objectives())
// If the objective has a target, are we flashing them?
if(flashed == brother_objective.target?.current)
Expand Down

0 comments on commit 7ae6d42

Please sign in to comment.