From f49d75ac76fb7ad998bd3ffe7f92659ec32f270d Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 11 Oct 2018 04:26:42 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 8038afc3672..c8641737056 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,9 +65,14 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">NPC's now initialise correctly. Removing a lot of runtime errors.</li>
 			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the admin ERT panel not working correctly if the admin using it was playing as a carbon mob.</li>
+			</ul>
 			<h3 class="author">Triiodine updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscdel">SLOT_MASK from necklaces.</li>
+				<li class="rscadd">thatdanguy23's fluff item</li>
 			</ul>
 
 			<h2 class="date">10 October 2018</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d1e14c733ab..feb82429084 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7429,5 +7429,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes an oversight in autopsy report drawer's description.
   Farie82:
   - bugfix: NPC's now initialise correctly. Removing a lot of runtime errors.
+  Kyep:
+  - bugfix: Fixed the admin ERT panel not working correctly if the admin using it
+      was playing as a carbon mob.
   Triiodine:
   - rscdel: SLOT_MASK from necklaces.
+  - rscadd: thatdanguy23's fluff item
diff --git a/html/changelogs/AutoChangeLog-pr-9726.yml b/html/changelogs/AutoChangeLog-pr-9726.yml
deleted file mode 100644
index a8ce7730aba..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9726.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Triiodine"
-delete-after: True
-changes: 
-  - rscadd: "thatdanguy23's fluff item"
diff --git a/html/changelogs/AutoChangeLog-pr-9811.yml b/html/changelogs/AutoChangeLog-pr-9811.yml
deleted file mode 100644
index 6200a43cfa1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9811.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "Fixed the admin ERT panel not working correctly if the admin using it was playing as a carbon mob."