diff --git a/code/game/say.dm b/code/game/say.dm index abf2511ca159..8eb2b780228d 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -37,14 +37,6 @@ GLOBAL_LIST_INIT(freqtospan, list( /atom/movable/proc/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range=0) SEND_SIGNAL(src, COMSIG_MOVABLE_HEAR, args) -//MONKESTATION EDIT -/mob/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range) - . = ..() - if(client && radio_freq) - var/atom/movable/virtualspeaker/V = speaker - if(isAI(V.source)) - playsound_local(get_turf(src), 'goon/sounds/radio_ai.ogg', 170, 1, 0, 0, pressure_affected = FALSE, use_reverb = FALSE, mixer_channel = CHANNEL_MOB_SOUNDS) -//MONKESTATION EDIT END /** * Checks if our movable can speak the provided message, passing it through filters * and spam detection. Does not call can_speak. CAN include feedback messages about diff --git a/monkestation/code/game/say.dm b/monkestation/code/game/say.dm new file mode 100644 index 000000000000..4ffd44a849f1 --- /dev/null +++ b/monkestation/code/game/say.dm @@ -0,0 +1,14 @@ +/mob/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range) + . = ..() + if(client && (radio_freq && (radio_freq == FREQ_COMMON || radio_freq < MIN_FREQ))) + var/atom/movable/virtualspeaker/vspeaker = speaker + if(isAI(vspeaker.source)) + playsound_local( + get_turf(src), + 'goon/sounds/radio_ai.ogg', + vol = 100, + vary = TRUE, + pressure_affected = FALSE, + use_reverb = FALSE, + mixer_channel = CHANNEL_MOB_SOUNDS + ) diff --git a/tgstation.dme b/tgstation.dme index da4992e28f65..d49ce26e010f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5899,6 +5899,7 @@ #include "monkestation\code\datums\weather\weather_types\radiation_storm.dm" #include "monkestation\code\datums\wires\particle_accelerator.dm" #include "monkestation\code\game\atom.dm" +#include "monkestation\code\game\say.dm" #include "monkestation\code\game\sound.dm" #include "monkestation\code\game\world.dm" #include "monkestation\code\game\area\areas.dm"