diff --git a/code/defines/procs/captain_announce.dm b/code/defines/procs/captain_announce.dm
index 820196a7f8..4ca0595937 100644
--- a/code/defines/procs/captain_announce.dm
+++ b/code/defines/procs/captain_announce.dm
@@ -1,6 +1,6 @@
/proc/captain_announce(var/text)
world << "
Captain Announces
"
- world << "[sanitize(text)]"
+ world << "[html_encode(text)]"
world << "
"
diff --git a/code/defines/procs/command_alert.dm b/code/defines/procs/command_alert.dm
index 5e9809592a..23ee3c1119 100644
--- a/code/defines/procs/command_alert.dm
+++ b/code/defines/procs/command_alert.dm
@@ -2,8 +2,8 @@
world << "[command_name()] Update
"
if (title && length(title) > 0)
- world << "[sanitize(title)]
"
+ world << "[html_encode(title)]
"
- world << "[sanitize(text)]"
+ world << "[html_encode(text)]"
world << "
"
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 4e07cd66a5..203c982f68 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -694,6 +694,7 @@ Neutralize All Unidentified Life Signs: []
"},
Turret.cover=new/obj/machinery/porta_turret_cover(src.loc)
Turret.cover.Parent_Turret=Turret
+ Turret.cover.name = finish_name
del(src)
else if(istype(W, /obj/item/weapon/crowbar))
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 847339b208..0fe117fb05 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -207,7 +207,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
screen = 0
priority = -1
if(href_list["writeAnnouncement"])
- src.message = strip_html(input(usr, "Write your message", "Messanger", ""))
+ src.message = input(usr, "Write your message", "Messanger", "")
src.priority = href_list["priority"]
while (findtext(src.message," ") == 1)
src.message = copytext(src.message,2,lentext(src.message)+1)
@@ -217,8 +217,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announceAuth = 0;
screen = 0
if(href_list["sendAnnouncement"])
- src.message = strip_html(message)
- world << "[department] announcement: [sanitize(message)]"
+ world << " [department] announcement: [html_encode(message)]"
announceAuth = 0
message = ""
screen = 0
diff --git a/html/changelog.html b/html/changelog.html
index 632739920c..d63526c68a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -66,6 +66,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
Doohl updated:
- More hairs added and a very long beard.
+ - Finally fixed the request console announcements going AMP AMP AMP all the time when you use punctuation.