From 86f6072579d0d280abac819f3fdb76f6fed72e20 Mon Sep 17 00:00:00 2001 From: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Date: Mon, 4 Dec 2023 22:20:34 -0800 Subject: [PATCH] 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. --- .../subsystem/dynamic/dynamic_rulesets_roundstart.dm | 1 + code/modules/antagonists/brother/brother.dm | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_roundstart.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_roundstart.dm index 7aa21d5388a..290b7116162 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/controllers/subsystem/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 baf6b30f6b1..0052915071c 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, \