From 19fa2f7e256953f65190ef0acadbdd8067067f38 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:31:53 +0100 Subject: [PATCH] [MIRROR] Blood brother gives chat log for conversions, fix blood brothers getting more antags (maybe?), better admin logging [MDB IGNORE] (#25438) * Blood brother gives chat log for conversions, fix blood brothers getting more antags (maybe?), better admin logging (#80095) I think I fixed the issue of blood brothers getting more antags by setting special_role. Dynamic rulesets are too complicated and this shouldn't even be possible as a bug. I intend to completely rewrite how rulesets work. * Blood brother gives chat log for conversions, fix blood brothers getting more antags (maybe?), better admin logging --------- Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 1 + code/modules/antagonists/brother/brother.dm | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 76708746723..bb1300249c7 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -128,6 +128,7 @@ GLOBAL_VAR_INIT(revolutionary_win, FALSE) assigned += candidate.mind candidate.mind.restricted_roles = restricted_roles + candidate.mind.special_role = ROLE_BROTHER GLOB.pre_setup_antags += candidate.mind return TRUE diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 33897d4f791..08d4887a364 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -72,8 +72,15 @@ return flashed.mind.add_antag_datum(/datum/antagonist/brother, team) + source.log_message("converted [key_name(flashed)] to blood brother", LOG_ATTACK) + flashed.log_message("was converted by [key_name(source)] to blood brother", LOG_ATTACK) + log_game("[key_name(flashed)] converted [key_name(source)] to blood brother", list( + "flashed" = flashed, + "victim" = source, + )) flashed.balloon_alert(source, "converted") + to_chat(source, span_notice("[span_bold("[flashed]")] has been converted to aide you as your Brother!")) flash.burn_out() flashed.mind.add_memory( \ /datum/memory/recruited_by_blood_brother, \