From 0a759d366661a655ca42b30b879127ebfc9a13f2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 19 Dec 2020 12:58:08 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.12.19.12.58.07"

---
 html/changelog.html                  |  7 ++++-
 html/changelogs/.all_changelog.yml   |  4 +++
 html/changelogs/MDP-changelogfix.yml | 42 ----------------------------
 3 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/MDP-changelogfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 40e806a56ef..301b85d38a0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,11 @@
 				<li class="tweak">The ion rifle now has four shots.</li>
 				<li class="tweak">EMP'd guns no longer get discharged. Instead, they lock up for an amount of time depending on the strength of the EMP.</li>
 			</ul>
+			<h3 class="author">MoondancerPony updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes the changelog.</li>
+				<li class="backend">Prevents uses of &lt; and &gt;, particularly when referencing things like &lt;style&gt; tags, from breaking changelogs in the future.</li>
+			</ul>
 
 			<h2 class="date">18 December 2020</h2>
 			<h3 class="author">Furrycactus updated:</h3>
@@ -105,7 +110,7 @@
 				<li class="rscadd">Ashtrays spill their contents when destroyed.</li>
 				<li class="rscadd">Using an ashtray in hand will dump its contents onto the ground.</li>
 				<li class="rscadd">Hitting an ashtray will now produce a sound and a visible message.</li>
-				<li class="bugfix">Fixes contagious UI styling due to an erroneous unscoped <style> tag.</li>
+				<li class="bugfix">Fixes contagious UI styling due to an erroneous unscoped &ltstyle&gt tag.</li>
 				<li class="backend">Adds a check to ensure this never happens again.</li>
 				<li class="tweak">Makes all VueUI view components use scoped styles. This shouldn't change anything except for fixing the aforementioned bug.</li>
 			</ul>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 654486bcbe3..7ec9cb56a14 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17583,3 +17583,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: The ion rifle now has four shots.
   - tweak: EMP'd guns no longer get discharged. Instead, they lock up for an amount
       of time depending on the strength of the EMP.
+  MoondancerPony:
+  - bugfix: Fixes the changelog.
+  - backend: Prevents uses of &lt; and &gt;, particularly when referencing things
+      like &lt;style&gt; tags, from breaking changelogs in the future.
diff --git a/html/changelogs/MDP-changelogfix.yml b/html/changelogs/MDP-changelogfix.yml
deleted file mode 100644
index b7f8102866d..00000000000
--- a/html/changelogs/MDP-changelogfix.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-################################
-# 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: MoondancerPony
-
-# 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: "Fixes the changelog."
-  - backend: "Prevents uses of < and >, particularly when referencing things like <style> tags, from breaking changelogs in the future."