diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 63be74dc16b..d6c95256585 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -38,15 +38,6 @@
t = replacetext(t, char, repl_chars[char])
return t
-/proc/readd_quotes(var/t)
- var/list/repl_chars = list(""" = "\"")
- for(var/char in repl_chars)
- var/index = findtext(t, char)
- while(index)
- t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index+5)
- index = findtext(t, char)
- return t
-
//Runs byond's sanitization proc along-side sanitize_simple
/proc/sanitize(var/t,var/list/repl_chars = null)
return html_encode(sanitize_simple(t,repl_chars))
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index b53b16a1075..828b26f69b3 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -87,7 +87,9 @@
//If the computer is being hacked or is emagged, display the reboot message.
if(hacking || emag)
message = rebootmsg
- var/dat = "Message Monitor Console"
+ var/dat = "Message Monitor Console"
+ dat += ""
+ dat += ""
dat += "Message Monitor Console
"
dat += ""
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index 7a86ad11ee5..c9d91281601 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -55,7 +55,7 @@
note = "Congratulations, your station has chosen the [pda.model_name]!"
/datum/data/pda/app/notekeeper/update_ui(mob/user as mob, list/data)
- data["note"] = note // current pda notes
+ data["note"] = html_decode(note) // current pda notes
/datum/data/pda/app/notekeeper/ui_act(action, params)
if(..())
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index 49d0b8d722d..e10b0f84c43 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -28,8 +28,8 @@
data["messages"] = tnote
for(var/c in tnote)
if(c["target"] == active_conversation)
- data["convo_name"] = sanitize(c["owner"])
- data["convo_job"] = sanitize(c["job"])
+ data["convo_name"] = c["owner"]
+ data["convo_job"] = c["job"]
break
else
var/list/convopdas = list()
@@ -113,7 +113,6 @@
if(!t)
return
t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
- t = readd_quotes(t)
if(!t || !istype(P))
return
if(!in_range(pda, U) && pda.loc != U)
@@ -171,8 +170,8 @@
useMS.send_pda_message("[P.owner]","[pda.owner]","[t]")
- tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "[P.UID()]")))
- PM.tnote.Add(list(list("sent" = 0, "owner" = "[pda.owner]", "job" = "[pda.ownjob]", "message" = "[t]", "target" = "[pda.UID()]")))
+ tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[html_decode(t)]", "target" = "[P.UID()]")))
+ PM.tnote.Add(list(list("sent" = 0, "owner" = "[pda.owner]", "job" = "[pda.ownjob]", "message" = "[html_decode(t)]", "target" = "[pda.UID()]")))
pda.investigate_log("PDA Message - [U.key] - [pda.owner] -> [P.owner]: [t]", "pda")
// Show it to ghosts