From ced5247f0b7ba23ef5a2eeaa35e00c54e82e280a Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Wed, 25 Oct 2017 20:21:25 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 1 +
 html/changelogs/.all_changelog.yml        | 2 ++
 html/changelogs/AutoChangeLog-pr-8273.yml | 4 ----
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8273.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4b29675cbbc..530acc745bd 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -67,6 +67,7 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">ERTs now support janitor, paranormal, and cyborg ERT units, as well as specific slot configurations.</li>
 				<li class="tweak">Heads of staff who are editing another admin's permissions in the admin panel can now toggle several permissions for a person without re-finding them in the list. Hitting 'cancel' at any point drops out of the loop. It also notifies admins whether they're toggling a permission on, or off.</li>
+				<li class="rscadd">ERT spawn area now shows ERT request reasons, and admins can enable the use of a teleporter or grav catapult without mechs.</li>
 			</ul>
 
 			<h2 class="date">22 October 2017</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 07b8f54fdde..5ae62ee5af3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5628,3 +5628,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       panel can now toggle several permissions for a person without re-finding them
       in the list. Hitting 'cancel' at any point drops out of the loop. It also notifies
       admins whether they're toggling a permission on, or off.
+  - rscadd: ERT spawn area now shows ERT request reasons, and admins can enable the
+      use of a teleporter or grav catapult without mechs.
diff --git a/html/changelogs/AutoChangeLog-pr-8273.yml b/html/changelogs/AutoChangeLog-pr-8273.yml
deleted file mode 100644
index a0e26567ea2..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8273.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - rscadd: "ERT spawn area now shows ERT request reasons, and admins can enable the use of a teleporter or grav catapult without mechs."