From 7ae6d4208d780d3fce04a0adc119f1122772af03 Mon Sep 17 00:00:00 2001 From: Lucy Date: Fri, 7 Jun 2024 16:20:34 -0400 Subject: [PATCH] You can now only convert people who have BB enabled in their prefs (#2134) --- code/modules/antagonists/brother/brother.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 7054a1cc6887..ba43f49f272a 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -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 @@ -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)