From db4d78e1fff0632f91d804bb61f799149fbd45a7 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Mon, 20 Jul 2020 11:31:25 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 8 ++++++++
 html/changelogs/.all_changelog.yml         | 5 +++++
 html/changelogs/AutoChangeLog-pr-52297.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-52356.yml | 4 ----
 4 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-52297.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-52356.yml

diff --git a/html/changelog.html b/html/changelog.html
index d9ac3451405..43e9e626415 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -88,6 +88,14 @@
 				<li class="bugfix">Defibbing someone will no longer work if their chest is covered by thick clothing. Used to just check to see if they had a spacesuit someone on their person (even if they weren't wearing it / only had it stuck to their hands.)</li>
 				<li class="bugfix">Defibbing someone will now actually require you to hold the shock paddles for the entire duration of the process. No more defibbing someone if you were disarmed during the charge time.</li>
 			</ul>
+			<h3 class="author">stylemistake updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">tgui: Fixed a very rare case of exceptions thrown due to bugged localStorage. No more NTOS bluescreens.</li>
+			</ul>
+			<h3 class="author">tralezab updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">landmark cleanup on mafia</li>
+			</ul>
 
 			<h2 class="date">19 July 2020</h2>
 			<h3 class="author">ArcaneMusic updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index de8e485870d..c246a46aadb 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -40958,3 +40958,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Defibbing someone will now actually require you to hold the shock paddles
       for the entire duration of the process. No more defibbing someone if you were
       disarmed during the charge time.
+  stylemistake:
+  - bugfix: 'tgui: Fixed a very rare case of exceptions thrown due to bugged localStorage.
+      No more NTOS bluescreens.'
+  tralezab:
+  - bugfix: landmark cleanup on mafia
diff --git a/html/changelogs/AutoChangeLog-pr-52297.yml b/html/changelogs/AutoChangeLog-pr-52297.yml
deleted file mode 100644
index 928f8c39784..00000000000
--- a/html/changelogs/AutoChangeLog-pr-52297.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "tralezab"
-delete-after: True
-changes: 
-  - bugfix: "landmark cleanup on mafia"
diff --git a/html/changelogs/AutoChangeLog-pr-52356.yml b/html/changelogs/AutoChangeLog-pr-52356.yml
deleted file mode 100644
index 518b1ea7823..00000000000
--- a/html/changelogs/AutoChangeLog-pr-52356.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "stylemistake"
-delete-after: True
-changes: 
-  - bugfix: "tgui: Fixed a very rare case of exceptions thrown due to bugged localStorage. No more NTOS bluescreens."