cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes the sayspan rewrite not runtime everything to fuck.

Browse Source 
Also fixes #8168
This commit is contained in:
Miauw
2015-03-19 20:42:33 +01:00
parent 16258d3096
commit c4892765db
10 changed files with 32 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/broadcaster.dm
+4 -1
View File
@@ -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)
code/game/machinery/telecomms/telecomunications.dm
+2 -1
View File
@@ -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
code/game/say.dm
+7 -7
View File
@@ -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 = "<span class='[radio_freq ? get_radio_span(radio_freq) : "game say"]'>"
@@ -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]</span>"
/proc/message_spans_start(list/spans = list())
/proc/message_spans_start(list/spans)
var/output = "<span class='"
for(var/S in spans)
output = "[output][S] "