From cb4af9bfb9b25e1fe7aa8af5b17570c8e6e1192c Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 1 Nov 2018 08:25:50 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 956c5e1ca04..2665eebe93a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -64,6 +64,11 @@
 			<h3 class="author">Mitchs98 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds.</li>
+				<li class="bugfix">Headslugs no longer teleport out of closed lockers upon bursting.</li>
+			</ul>
+			<h3 class="author">Warior4356 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ghosts can no longer re-enter a drone that has been shut down.</li>
 			</ul>
 
 			<h2 class="date">31 October 2018</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 40c06e240ea..140391b5c45 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7806,3 +7806,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Mitchs98:
   - tweak: Lowers the spam you receive from entering a warm or cold pool. You will
       no longer receive 'The water is quite warm.' nearly every few seconds.
+  - bugfix: Headslugs no longer teleport out of closed lockers upon bursting.
+  Warior4356:
+  - bugfix: Ghosts can no longer re-enter a drone that has been shut down.
diff --git a/html/changelogs/AutoChangeLog-pr-10057.yml b/html/changelogs/AutoChangeLog-pr-10057.yml
deleted file mode 100644
index c7811f103cd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10057.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Warior4356"
-delete-after: True
-changes: 
-  - bugfix: "Ghosts can no longer re-enter a drone that has been shut down."
diff --git a/html/changelogs/AutoChangeLog-pr-10085.yml b/html/changelogs/AutoChangeLog-pr-10085.yml
deleted file mode 100644
index b10e1c5c8dd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10085.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Mitchs98"
-delete-after: True
-changes: 
-  - bugfix: "Headslugs no longer teleport out of closed lockers upon bursting."