Skip to content

Commit

Permalink
removes bb block
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint committed Jul 3, 2024
1 parent 881c3ea commit 48d8da7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion code/modules/antagonists/brother/brother.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?
Expand Down
5 changes: 5 additions & 0 deletions monkestation/code/modules/blueshift/items/soul_catcher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 48d8da7

Please sign in to comment.