diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 02ad14339b2..1a70443e37f 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -220,6 +220,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept virt.source = AM virt.faketrack = data == 4 ? 1 : 0 virt.radio = radio + virt.verb_say = AM.verb_say + virt.verb_ask = AM.verb_ask + virt.verb_yell = AM.verb_yell if(compression > 0) message = Gibberish(message, compression + 40) @@ -272,7 +275,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if(length(receive)) // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/blackbox_msg = "[AM] [AM.say_quote(message)]" + var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]" if(istype(blackbox)) switch(freq) if(1459) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 599c5a20429..1fd2f349c89 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -87,7 +87,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() "type" = signal.data["type"], "server" = signal.data["server"], "reject" = signal.data["reject"], - "level" = signal.data["level"] + "level" = signal.data["level"], + "spans" = signal.data["spans"] ) // Keep the "original" signal constant diff --git a/code/game/say.dm b/code/game/say.dm index a4687d225ef..4f0f24139dd 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -30,7 +30,7 @@ var/list/freqtospan = list( /atom/movable/proc/can_speak() return 1 -/atom/movable/proc/send_speech(message, range = 7, obj/source = src, bubble_type, list/spans = list()) +/atom/movable/proc/send_speech(message, range = 7, obj/source = src, bubble_type, list/spans) var/rendered = compose_message(src, languages, message, , spans) for(var/atom/movable/AM in get_hearers_in_view(range, src)) AM.Hear(rendered, src, languages, message, , spans) @@ -39,7 +39,7 @@ var/list/freqtospan = list( /atom/movable/proc/get_spans() return list() -/atom/movable/proc/compose_message(atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans = list()) +/atom/movable/proc/compose_message(atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans) //This proc uses text() because it is faster than appending strings. Thanks BYOND. //Basic span var/spanpart1 = "" @@ -76,7 +76,7 @@ var/list/freqtospan = list( return "[verb_say], \"[input]\"" -/atom/movable/proc/lang_treat(atom/movable/speaker, message_langs, raw_message, list/spans = list()) +/atom/movable/proc/lang_treat(atom/movable/speaker, message_langs, raw_message, list/spans) if(languages & message_langs) var/atom/movable/AM = speaker.GetSource() if(AM) @@ -86,9 +86,9 @@ var/list/freqtospan = list( else if(message_langs & HUMAN) var/atom/movable/AM = speaker.GetSource() if(AM) - return AM.say_quote(stars(raw_message, spans)) + return AM.say_quote(stars(raw_message), spans) else - return speaker.say_quote(stars(raw_message, spans)) + return speaker.say_quote(stars(raw_message), spans) else if(message_langs & MONKEY) return "chimpers." else if(message_langs & ALIEN) @@ -112,10 +112,10 @@ var/list/freqtospan = list( return returntext return "[copytext("[freq]", 1, 4)].[copytext("[freq]", 4, 5)]" -/proc/attach_spans(input, list/spans = list()) +/proc/attach_spans(input, list/spans) return "[message_spans_start(spans)][input]" -/proc/message_spans_start(list/spans = list()) +/proc/message_spans_start(list/spans) var/output = "Your radio transmitter is offline!" return 0 diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 949e1df5b5b..770ccf53f79 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -109,7 +109,7 @@
[right_part]
- "} + "} //" usr << browse(dat, "window=pai;size=640x480;border=0;can_close=1;can_resize=1;can_minimize=1;titlebar=1") onclose(usr, "pai") temp = null @@ -252,7 +252,7 @@ add_med_hud() if("translator") if(href_list["toggle"]) - languages = languages == ALL ? HUMAN & ROBOT : ALL + languages = (languages == ALL) ? (HUMAN & ROBOT) : ALL if("doorjack") if(href_list["jack"]) if(src.cable && src.cable.machine) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 64224cdd61f..7fe05e7dce4 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -34,7 +34,7 @@ /mob/living/silicon/lingcheck() return 0 //Borged or AI'd lings can't speak on the ling channel. -/mob/living/silicon/radio(message, message_mode, list/spans = list()) +/mob/living/silicon/radio(message, message_mode, list/spans) . = ..() if(. != 0) return . diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 6f7a2649e78..5c3fc9142ef 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -133,7 +133,7 @@ speech_buffer |= html_decode(raw_message) ..() -/mob/living/simple_animal/parrot/radio(message, message_mode, list/spans = list()) //literally copied from human/radio(), but there's no other way to do this. at least it's better than it used to be. +/mob/living/simple_animal/parrot/radio(message, message_mode, list/spans) //literally copied from human/radio(), but there's no other way to do this. at least it's better than it used to be. . = ..() if(. != 0) return .