cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes a radio emoting bug (#63591)

Browse Source
This commit is contained in:
Seris02
2021-12-29 04:19:08 +08:00
committed by GitHub
parent a3146afaa0
commit 42ee1f72b2
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_say.dm
+2 -1
View File
@@ -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
code/modules/mob/living/silicon/silicon.dm
+7 -7
View File
@@ -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)