diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 8dde896803b4..db4b7890e81f 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -49,7 +49,7 @@ return ..() /datum/antagonist/brother/proc/on_mob_successful_flashed_carbon(mob/living/source, mob/living/carbon/flashed, obj/item/assembly/flash/flash) - /* SIGNAL_HANDLER */ // monkestation edit: allow used of is_banned_from + SIGNAL_HANDLER if (flashed.stat == DEAD) return @@ -63,11 +63,13 @@ 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? diff --git a/monkestation/code/modules/blueshift/items/soul_catcher.dm b/monkestation/code/modules/blueshift/items/soul_catcher.dm index 2bc51e191fa4..90d669c10444 100644 --- a/monkestation/code/modules/blueshift/items/soul_catcher.dm +++ b/monkestation/code/modules/blueshift/items/soul_catcher.dm @@ -111,6 +111,11 @@ composed_message += special_desc . += composed_message +/mob/living/carbon/human/examine_more(mob/user) + . = ..() + if(user.mind?.has_antag_datum(/datum/antagonist/brother) && !(ROLE_BROTHER in client?.prefs?.be_special)) + . += span_orange("[p_They()] do[p_es()] not seem to be too fond of brotherly connections.") + /obj/item/disk/nifsoft_uploader/soulcatcher name = "Soulcatcher" loaded_nifsoft = /datum/nifsoft/soulcatcher