From 7aa4cc4e1b3b9310d16bbd7e0c8a374e633cec34 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:51:26 +0200 Subject: [PATCH] [MIRROR] Replaces bold HTML tag with ++ in certain secbot/mulebot messages (#28364) * Replaces bold HTML tag with ++ in certain secbot/mulebot messages (#84133) ## About The Pull Request Adds RUNECHAT_BOLD which just emboldens messages and uses it instead of `` in secbots and mulebots ## Why It's Good For The Game Secbots and mulebots actually show the `` tag in chat rather than making the text bold, replacing it with ++ emboldens it properly. ![340880630-de5dc932-3e75-4713-8609-d29f13a0adc3](https://github.com/tgstation/tgstation/assets/79808856/a8a2bd81-f81a-4e0b-8d5b-2cd7129a7af6) Fixes #84130 * Replaces bold HTML tag with ++ in certain secbot/mulebot messages --------- Co-authored-by: combustor <79808856+combustor@users.noreply.github.com> --- code/__DEFINES/chat.dm | 2 ++ code/modules/mob/living/simple_animal/bot/mulebot.dm | 4 ++-- code/modules/mob/living/simple_animal/bot/secbot.dm | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/chat.dm b/code/__DEFINES/chat.dm index 4590a5081f0..c3fe46b0cd4 100644 --- a/code/__DEFINES/chat.dm +++ b/code/__DEFINES/chat.dm @@ -45,3 +45,5 @@ #define debug_world_log(msg) if (GLOB.Debug2) log_world("DEBUG: [msg]") /// Adds a generic box around whatever message you're sending in chat. Really makes things stand out. #define examine_block(str) ("
" + str + "
") +/// Emboldens runechat messages +#define RUNECHAT_BOLD(str) "+[str]+" diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 7a205da5c08..7ce0e89cd2b 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -638,7 +638,7 @@ if(load) // if loaded, unload at target if(report_delivery) - speak("Destination [destination] reached. Unloading [load].",radio_channel) + speak("Destination [RUNECHAT_BOLD("[destination]")] reached. Unloading [load].",radio_channel) unload(loaddir) else // not loaded @@ -654,7 +654,7 @@ if(AM?.Adjacent(src)) load(AM) if(report_delivery) - speak("Now loading [load] at [get_area_name(src)].", radio_channel) + speak("Now loading [load] at [RUNECHAT_BOLD("[get_area_name(src)]")].", radio_channel) // whatever happened, check to see if we return home if(auto_return && home_destination && destination != home_destination) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 5f22d0ed1c8..eaae5373f7e 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -262,7 +262,7 @@ if(HAS_TRAIT(user, TRAIT_PACIFISM)) user.visible_message(span_notice("[user] taunts [src], daring [p_them()] to give chase!"), \ span_notice("You taunt [src], daring [p_them()] to chase you!"), span_hear("You hear someone shout a daring taunt!"), DEFAULT_MESSAGE_RANGE, user) - speak("Taunted by pacifist scumbag [user] in [get_area(src)].", radio_channel) + speak("Taunted by pacifist scumbag [RUNECHAT_BOLD("[user]")] in [get_area(src)].", radio_channel) // Interrupt the attack chain. We've already handled this scenario for pacifists. return @@ -374,7 +374,7 @@ log_combat(src, current_target, "stunned") if(security_mode_flags & SECBOT_DECLARE_ARRESTS) var/area/location = get_area(src) - speak("[security_mode_flags & SECBOT_HANDCUFF_TARGET ? "Arresting" : "Detaining"] level [threat] scumbag [current_target] in [location].", radio_channel) + speak("[security_mode_flags & SECBOT_HANDCUFF_TARGET ? "Arresting" : "Detaining"] level [threat] scumbag [RUNECHAT_BOLD("[current_target]")] in [location].", radio_channel) current_target.visible_message(span_danger("[src] stuns [current_target]!"),\ span_userdanger("[src] stuns you!"))