Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes a few bugs with PDA language handling #7330

Merged
Amelia0010 merged 3 commits into from
Dec 17, 2019
Merged

Fixes a few bugs with PDA language handling #7330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
824adb4
Fixes bug with PDA language that made the in-chat notice omnilingual
Altoids1 Dec 14, 2019
965bdd8
Fixes clearing messages on PDAs
Altoids1 Dec 14, 2019
7535718
Fixes PDA language handling
Altoids1 Dec 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/telecomms/computers/message.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions code/game/objects/items/devices/PDA/PDA.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -642,6 +642,7 @@ GLOBAL_LIST_EMPTY(PDAs)
"name" = "[owner]",
"job" = "[ownjob]",
"message" = message,
"language" = user.get_default_language(),
"targets" = string_targets
))
if (picture)
Expand Down Expand Up @@ -695,7 +696,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if(signal.data["automated"])
reply = "\[Automated Message\]"

to_chat(L, "[icon2html(src)] <b>Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], </b>[signal.format_message()] [reply]")
to_chat(L, "[icon2html(src)] <b>Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], </b>[signal.format_message(L)] [reply]")

update_icon()
add_overlay(icon_alert)
Expand Down