From 5e3084d1d19f5b6ca7043045d10cc8d00a2e8f39 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Sun, 9 Jun 2019 14:41:14 +0200
Subject: [PATCH] Apostrophe Bugfix: Plastic Variables (#6547)

---
 code/modules/acting/acting_items.dm           |  1 +
 code/modules/admin/view_variables/topic.dm    |  1 +
 .../geeves-apostrophecatastrophe.yml          | 41 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 html/changelogs/geeves-apostrophecatastrophe.yml

diff --git a/code/modules/acting/acting_items.dm b/code/modules/acting/acting_items.dm
index fb229de764e..83c44d0ddf9 100644
--- a/code/modules/acting/acting_items.dm
+++ b/code/modules/acting/acting_items.dm
@@ -30,6 +30,7 @@
 		H.change_appearance(APPEARANCE_ALL, H.loc, H, H.generate_valid_species(), state = z_state)
 		var/getName = sanitize(input(H, "Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN)
 		if(getName)
+			getName = html_decode(getName)
 			H.real_name = getName
 			H.name = getName
 			H.dna.real_name = getName
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index a277059a54a..1b95fdc3174 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -16,6 +16,7 @@
 			return
 
 		var/new_name = sanitize(input(usr,"What would you like to name this mob?","Input a name",M.real_name) as text|null, MAX_NAME_LEN)
+		new_name = html_decode(new_name)
 		if( !new_name || !M )	return
 
 		message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].")
diff --git a/html/changelogs/geeves-apostrophecatastrophe.yml b/html/changelogs/geeves-apostrophecatastrophe.yml
new file mode 100644
index 00000000000..ffbadb1ff12
--- /dev/null
+++ b/html/changelogs/geeves-apostrophecatastrophe.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Geeves
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixed VarEditing and Plastic Surgery machines giving apostrophes stupid tags. Apostrophes fixed. Yay."