From 824adb4fcb319c939eeb740d264d92b82dd1dae8 Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Fri, 13 Dec 2019 23:08:57 -0600 Subject: [PATCH 1/3] Fixes bug with PDA language that made the in-chat notice omnilingual --- code/game/objects/items/devices/PDA/PDA.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 0ac2639981c7..3c16a208977d 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -695,7 +695,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(signal.data["automated"]) reply = "\[Automated Message\]" - to_chat(L, "[icon2html(src)] Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], [signal.format_message()] [reply]") + to_chat(L, "[icon2html(src)] Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], [signal.format_message(L)] [reply]") update_icon() add_overlay(icon_alert) From 965bdd8b3a71940e557ace55a3b2140592a6104a Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Sat, 14 Dec 2019 15:11:47 -0600 Subject: [PATCH 2/3] Fixes clearing messages on PDAs --- code/game/objects/items/devices/PDA/PDA.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 3c16a208977d..08cd99f3668f 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -520,7 +520,7 @@ GLOBAL_LIST_EMPTY(PDAs) if("Toggle Ringer")//If viewing texts then erase them, if not then toggle silent status silent = !silent if("Clear")//Clears messages - tnote = null + tnote = list() if("Ringtone") var/t = input(U, "Please enter new ringtone", name, ttone) as text if(in_range(src, U) && loc == U && t) From 75357186954092e0a61f57392040cf1b3250a078 Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Sat, 14 Dec 2019 15:11:58 -0600 Subject: [PATCH 3/3] Fixes PDA language handling --- code/game/machinery/telecomms/computers/message.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index bb2007cd90c4..537610e17731 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -425,7 +425,7 @@ "name" = "[customsender]", "job" = "[customjob]", "message" = custommessage, - "language" = get_default_language(), // PDAs now use the language system! + "language" = usr.get_default_language(), // PDAs now use the language system! "targets" = list("[customrecepient.owner] ([customrecepient.ownjob])") )) // this will log the signal and transmit it to the target diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 08cd99f3668f..b276a974d434 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -642,6 +642,7 @@ GLOBAL_LIST_EMPTY(PDAs) "name" = "[owner]", "job" = "[ownjob]", "message" = message, + "language" = user.get_default_language(), "targets" = string_targets )) if (picture)