From 41e2c60d4a4835e06be2739ed9a1a9c4d3b59c49 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Fri, 27 Mar 2020 22:52:43 +0100
Subject: [PATCH] Ports "Makes raw HTML and browser datum popups UTF-8 aware"
---
code/datums/browser.dm | 4 ++--
code/datums/datumvars.dm | 1 +
code/datums/elements/flavor_text.dm | 2 +-
code/game/gamemodes/clock_cult/clock_cult.dm | 2 +-
code/game/gamemodes/dynamic/dynamic.dm | 12 ++++++------
code/game/machinery/camera/camera.dm | 4 ++--
.../machinery/telecomms/machines/message_server.dm | 2 +-
code/game/mecha/combat/honker.dm | 4 +++-
code/game/mecha/equipment/tools/medical_tools.dm | 2 ++
code/game/mecha/mech_fabricator.dm | 3 ++-
code/game/mecha/mecha_control_console.dm | 2 +-
code/game/mecha/mecha_topic.dm | 11 ++++++++---
code/game/objects/items/blueprints.dm | 3 ++-
code/game/objects/items/devices/PDA/PDA.dm | 4 ++--
code/game/objects/items/manuals.dm | 10 ++++++++++
code/game/objects/items/storage/book.dm | 2 +-
code/game/objects/structures/safe.dm | 2 +-
code/modules/admin/admin.dm | 2 +-
code/modules/admin/check_antagonists.dm | 2 +-
code/modules/admin/permissionedit.dm | 4 +++-
code/modules/admin/player_panel.dm | 2 +-
code/modules/admin/verbs/adminhelp.dm | 4 ++--
code/modules/admin/verbs/randomverbs.dm | 6 +++---
.../antagonists/wizard/equipment/spellbook.dm | 2 +-
code/modules/client/verbs/ooc.dm | 2 +-
code/modules/events/holiday/vday.dm | 4 ++--
.../integrated_electronics/core/assemblies.dm | 2 +-
.../core/integrated_circuit.dm | 2 +-
code/modules/mapping/minimaps.dm | 3 ++-
code/modules/mob/dead/new_player/new_player.dm | 2 +-
code/modules/mob/dead/new_player/poll.dm | 3 ++-
code/modules/mob/living/silicon/pai/software.dm | 3 ++-
code/modules/mob/living/silicon/silicon.dm | 2 +-
code/modules/paperwork/filingcabinet.dm | 2 +-
code/modules/paperwork/paper.dm | 8 ++++----
code/modules/photography/photos/photo.dm | 2 +-
36 files changed, 77 insertions(+), 50 deletions(-)
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index 0b784328ab..8b82c1812e 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -72,9 +72,9 @@
return {"
-
-
+
+
[head_content]
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index a9830e58dc..81db7deb68 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -175,6 +175,7 @@
var/html = {"
+
[title]
"
+ var/dat = "[src.name]"
if(screen == 0)
dat += "Tracking beacons data
"
var/list/trackerlist = list()
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index 774e30fa5d..8d6328cf08 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -5,7 +5,9 @@
/obj/mecha/proc/get_stats_html()
. = {"
- [src.name] data
+
+
+ [name] data
"
+ var/dat = "Personal Data Assistant"
dat += assets.css_tag()
dat += emoji_s.css_tag()
@@ -1192,7 +1192,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if(incapacitated())
return
if(!isnull(aiPDA))
- var/HTML = "AI PDA Message Log[aiPDA.tnote]"
+ var/HTML = "AI PDA Message Log[aiPDA.tnote]"
user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
else
to_chat(user, "You do not have a PDA. You should make an issue report about this.")
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index 9631488397..210c3d0da0 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -14,6 +14,7 @@
//book contents below
dat = {"
+