From 00af730cca7bb110062183dbde6348abeb543f43 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Mon, 1 Oct 2018 01:29:38 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 15 +++++++++++++++
 html/changelogs/.all_changelog.yml        | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-9647.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9649.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9651.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9656.yml |  4 ----
 6 files changed, 25 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9647.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9649.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9651.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9656.yml

diff --git a/html/changelog.html b/html/changelog.html
index e235aaa282b..39071360432 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,21 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">01 October 2018</h2>
+			<h3 class="author">Dapocalypse updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Added a grille cooldown to prevent alt-click spam someone on a grille to instantly husk people.</li>
+			</ul>
+			<h3 class="author">Purpose updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">CPU Performance in get_area proc</li>
+				<li class="tweak">Excavates a few relics from area code.</li>
+			</ul>
+			<h3 class="author">TDSSS updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">RnD server control console's data management now works, allowing for deletion of research levels and known techs.</li>
+			</ul>
+
 			<h2 class="date">30 September 2018</h2>
 			<h3 class="author">Crazylemon updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4e3fe14c693..339d6b3d2d4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7138,3 +7138,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Made the poison pen available to traitor librarians
   variableundefined:
   - bugfix: One click antagonist giving antag to people in restricted job.
+2018-10-01:
+  Dapocalypse:
+  - bugfix: Added a grille cooldown to prevent alt-click spam someone on a grille
+      to instantly husk people.
+  Purpose:
+  - tweak: CPU Performance in get_area proc
+  - tweak: Excavates a few relics from area code.
+  TDSSS:
+  - bugfix: RnD server control console's data management now works, allowing for deletion
+      of research levels and known techs.
diff --git a/html/changelogs/AutoChangeLog-pr-9647.yml b/html/changelogs/AutoChangeLog-pr-9647.yml
deleted file mode 100644
index 9aebabeb5b5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9647.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TDSSS"
-delete-after: True
-changes: 
-  - bugfix: "RnD server control console's data management now works, allowing for deletion of research levels and known techs."
diff --git a/html/changelogs/AutoChangeLog-pr-9649.yml b/html/changelogs/AutoChangeLog-pr-9649.yml
deleted file mode 100644
index f83503c23c3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9649.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Purpose"
-delete-after: True
-changes: 
-  - tweak: "CPU Performance in get_area proc"
diff --git a/html/changelogs/AutoChangeLog-pr-9651.yml b/html/changelogs/AutoChangeLog-pr-9651.yml
deleted file mode 100644
index 4659160cef5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9651.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Purpose"
-delete-after: True
-changes: 
-  - tweak: "Excavates a few relics from area code."
diff --git a/html/changelogs/AutoChangeLog-pr-9656.yml b/html/changelogs/AutoChangeLog-pr-9656.yml
deleted file mode 100644
index 31b59ca1563..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9656.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Dapocalypse"
-delete-after: True
-changes: 
-  - bugfix: "Added a grille cooldown to prevent alt-click spam someone on a grille to instantly husk people."