From 42ee1f72b2f19ac2c81676c3b4e804da4f6fed10 Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Wed, 29 Dec 2021 04:19:08 +0800
Subject: [PATCH] fixes a radio emoting bug (#63591)

---
 code/modules/mob/living/living_say.dm      |  3 ++-
 code/modules/mob/living/silicon/silicon.dm | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 6d0be610386..9aca6d880e1 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -126,7 +126,8 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
 	var/original_message = message
 	message = get_message_mods(message, message_mods)
 	var/datum/saymode/saymode = SSradio.saymodes[message_mods[RADIO_KEY]]
-	message = check_for_custom_say_emote(message, message_mods)
+	if (!forced)
+		message = check_for_custom_say_emote(message, message_mods)
 
 	if(!message)
 		return
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 6446d84ac40..c0adfa49e8a 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -195,9 +195,9 @@
 	var/list/lawcache_lawcheck = lawcheck.Copy()
 	var/list/lawcache_ioncheck = ioncheck.Copy()
 	var/list/lawcache_hackedcheck = hackedcheck.Copy()
-
+	var/forced_log_message = "stating laws[force ? ", forced" : ""]"
 	//"radiomod" is inserted before a hardcoded message to change if and how it is handled by an internal radio.
-	say("[radiomod] Current Active Laws:")
+	say("[radiomod] Current Active Laws:", forced = forced_log_message)
 	//laws_sanity_check()
 	//laws.show_laws(world)
 	var/number = 1
@@ -205,7 +205,7 @@
 
 	if (lawcache_zeroth)
 		if (force || lawcache_lawcheck[1] == "Yes")
-			say("[radiomod] 0. [lawcache_zeroth]")
+			say("[radiomod] 0. [lawcache_zeroth]", forced = forced_log_message)
 			sleep(10)
 
 	for (var/index in 1 to length(lawcache_hacked))
@@ -213,7 +213,7 @@
 		var/num = ion_num()
 		if (length(law) > 0)
 			if (force || lawcache_hackedcheck[index] == "Yes")
-				say("[radiomod] [num]. [law]")
+				say("[radiomod] [num]. [law]", forced = forced_log_message)
 				sleep(10)
 
 	for (var/index in 1 to length(lawcache_ion))
@@ -221,7 +221,7 @@
 		var/num = ion_num()
 		if (length(law) > 0)
 			if (force || lawcache_ioncheck[index] == "Yes")
-				say("[radiomod] [num]. [law]")
+				say("[radiomod] [num]. [law]", forced = forced_log_message)
 				sleep(10)
 
 	for (var/index in 1 to length(lawcache_inherent))
@@ -229,7 +229,7 @@
 
 		if (length(law) > 0)
 			if (force || lawcache_lawcheck[index+1] == "Yes")
-				say("[radiomod] [number]. [law]")
+				say("[radiomod] [number]. [law]", forced = forced_log_message)
 				number++
 				sleep(10)
 
@@ -239,7 +239,7 @@
 		if (length(law) > 0)
 			if(lawcache_lawcheck.len >= number+1)
 				if (force || lawcache_lawcheck[number+1] == "Yes")
-					say("[radiomod] [number]. [law]")
+					say("[radiomod] [number]. [law]", forced = forced_log_message)
 					number++
 					sleep(10)