From ad656360142f3e5dfceea5f84aa6cc6275e6619b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 18 May 2017 06:12:39 -0500 Subject: [PATCH] [MIRROR] Fixes saying nothing when you have no language (#861) * Fixes saying nothing when you have no language * fix .rej * Update say.dm --- code/game/say.dm | 12 ++++++------ code/modules/admin/admin_investigate.dm.rej | 14 -------------- code/modules/admin/verbs/mapping.dm.rej | 19 ------------------- code/modules/surgery/organs/tongue.dm.rej | 9 --------- .../modules/surgery/organs/vocal_cords.dm.rej | 10 ---------- 5 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 code/modules/admin/admin_investigate.dm.rej delete mode 100644 code/modules/admin/verbs/mapping.dm.rej delete mode 100644 code/modules/surgery/organs/tongue.dm.rej delete mode 100644 code/modules/surgery/organs/vocal_cords.dm.rej diff --git a/code/game/say.dm b/code/game/say.dm index fe76000c71..bbbca1bbd9 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -35,10 +35,10 @@ GLOBAL_LIST_INIT(freqtospan, list( return 1 /atom/movable/proc/send_speech(message, range = 7, obj/source = src, bubble_type, list/spans, datum/language/message_language = null, message_mode) - var/rendered = compose_message(src, message_language, message, , spans) + var/rendered = compose_message(src, message_language, message, , spans, message_mode) for(var/_AM in get_hearers_in_view(range, source)) var/atom/movable/AM = _AM - AM.Hear(rendered, src, message_language, message, , spans) + AM.Hear(rendered, src, message_language, message, , spans, message_mode) //To get robot span classes, stuff like that. /atom/movable/proc/get_spans() @@ -58,11 +58,11 @@ GLOBAL_LIST_INIT(freqtospan, list( var/endspanpart = "" //Message - var/messagepart = " [lang_treat(speaker, message_language, raw_message, spans)]" + var/messagepart = " [lang_treat(speaker, message_language, raw_message, spans, message_mode)]" var/languageicon = "" var/datum/language/D = GLOB.language_datum_instances[message_language] - if(D.display_icon(src)) + if(istype(D) && D.display_icon(src)) languageicon = "[D.get_icon()] " return "[spanpart1][spanpart2][freqpart][languageicon][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]" @@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(freqtospan, list( return "0" /atom/movable/proc/GetVoice() - return "[src]" //Returns the atom's name, prepended with 'The' if it's not a proper noun + return name /atom/movable/proc/IsVocal() return 1 @@ -172,4 +172,4 @@ GLOBAL_LIST_INIT(freqtospan, list( return source /atom/movable/virtualspeaker/GetRadio() - return radio + return radio \ No newline at end of file diff --git a/code/modules/admin/admin_investigate.dm.rej b/code/modules/admin/admin_investigate.dm.rej deleted file mode 100644 index f87fa938c7..0000000000 --- a/code/modules/admin/admin_investigate.dm.rej +++ /dev/null @@ -1,14 +0,0 @@ -diff a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm (rejected hunks) -@@ -1,4 +1,4 @@ --atom/proc/investigate_log(message, subject) -+/atom/proc/investigate_log(message, subject) - if(!message || !subject) - return - var/F = file("[GLOB.log_directory]/[subject].html") -@@ -18,4 +18,4 @@ atom/proc/investigate_log(message, subject) - if(!fexists(F)) - to_chat(src, "No [subject] logfile was found.") - return -- src << browse(F,"window=investigate[subject];size=800x300") -\ No newline at end of file -+ src << browse(F,"window=investigate[subject];size=800x300") diff --git a/code/modules/admin/verbs/mapping.dm.rej b/code/modules/admin/verbs/mapping.dm.rej deleted file mode 100644 index 2b4bebd53d..0000000000 --- a/code/modules/admin/verbs/mapping.dm.rej +++ /dev/null @@ -1,19 +0,0 @@ -diff a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm (rejected hunks) -@@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( - - for(var/t in GLOB.active_turfs_startlist) - var/turf/T = t -- dat += "[T.x], [T.y], [T.z]\n" -+ dat += "[ADMIN_COORDJMP(T)]\n" - dat += "
" - - usr << browse(dat, "window=at_list") -@@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( - count++ - to_chat(usr, "[count] AT markers placed.") - -- feedback_add_details("admin_verb", "Show Roundstart Active Turf Markers") -+ SSblackbox.add_details("admin_verb","Show Roundstart Active Turf Markers") - - /client/proc/enable_debug_verbs() - set category = "Debug" diff --git a/code/modules/surgery/organs/tongue.dm.rej b/code/modules/surgery/organs/tongue.dm.rej deleted file mode 100644 index c1f978600b..0000000000 --- a/code/modules/surgery/organs/tongue.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm (rejected hunks) -@@ -15,6 +15,7 @@ - /datum/language/common, - /datum/language/draconic, - /datum/language/monkey, -+ /datum/language/narsie, - /datum/language/ratvar - )) - diff --git a/code/modules/surgery/organs/vocal_cords.dm.rej b/code/modules/surgery/organs/vocal_cords.dm.rej deleted file mode 100644 index b991c4f5c0..0000000000 --- a/code/modules/surgery/organs/vocal_cords.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm (rejected hunks) -@@ -51,7 +51,7 @@ - if(C.getorganslot("adamantine_resonator")) - to_chat(C, msg) - if(isobserver(m)) -- var/link = FOLLOW_LINK(m, src) -+ var/link = FOLLOW_LINK(m, owner) - to_chat(m, "[link] [msg]") - - //Colossus drop, forces the listeners to obey certain commands