From d0360687c0e00a562204ea081736778cab4b435d Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Wed, 24 Jan 2018 20:28:55 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 15 +++++++++++++++
 html/changelogs/AutoChangeLog-pr-8531.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8543.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-8586.yml |  5 -----
 5 files changed, 34 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8531.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8543.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8586.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5d32f81ab22..3de29b6fc30 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,25 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">24 January 2018</h2>
+			<h3 class="author">IK3I updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Cancel means Cancel on admeme console reports!</li>
+				<li class="bugfix">When eldritch gods, demons, handsy aliens, and incarnations of darkness tell you it's time to go, you go</li>
+				<li class="tweak">Comms Console will tell you when the shuttle can't be recalled</li>
+				<li class="tweak">Admemes can now designate whether a shuttle they call is recallable</li>
+				<li class="tweak">Admemes can exercise their power to recall any shuttle, even in defiance of spooky ghosts!</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added config option to limit the amount of time shadowlings can remain unhatched before they start getting pushed to hatch.</li>
+			</ul>
+			<h3 class="author">Tayyyyyyy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Energy beams of all types emit light.</li>
+				<li class="tweak">Flashbangs emit a burst of light when detonated</li>
+			</ul>
+
 			<h2 class="date">21 January 2018</h2>
 			<h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 93f3d0a4361..422b2ea54c2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5983,3 +5983,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       to remove the hidden diamond drill module and rewritten its drone control code
       so that drones that don't call home and verify their programming after a certain
       amount of time are destroyed automatically.
+2018-01-24:
+  IK3I:
+  - bugfix: Cancel means Cancel on admeme console reports!
+  - bugfix: When eldritch gods, demons, handsy aliens, and incarnations of darkness
+      tell you it's time to go, you go
+  - tweak: Comms Console will tell you when the shuttle can't be recalled
+  - tweak: Admemes can now designate whether a shuttle they call is recallable
+  - tweak: Admemes can exercise their power to recall any shuttle, even in defiance
+      of spooky ghosts!
+  Kyep:
+  - rscadd: Added config option to limit the amount of time shadowlings can remain
+      unhatched before they start getting pushed to hatch.
+  Tayyyyyyy:
+  - tweak: Energy beams of all types emit light.
+  - tweak: Flashbangs emit a burst of light when detonated
diff --git a/html/changelogs/AutoChangeLog-pr-8531.yml b/html/changelogs/AutoChangeLog-pr-8531.yml
deleted file mode 100644
index 844c8577421..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8531.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - rscadd: "Added config option to limit the amount of time shadowlings can remain unhatched before they start getting pushed to hatch."
diff --git a/html/changelogs/AutoChangeLog-pr-8543.yml b/html/changelogs/AutoChangeLog-pr-8543.yml
deleted file mode 100644
index 65610b11ae7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8543.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "IK3I"
-delete-after: True
-changes: 
-  - bugfix: "Cancel means Cancel on admeme console reports!"
-  - bugfix: "When eldritch gods, demons, handsy aliens, and incarnations of darkness tell you it's time to go, you go"
-  - tweak: "Comms Console will tell you when the shuttle can't be recalled"
-  - tweak: "Admemes can now designate whether a shuttle they call is recallable"
-  - tweak: "Admemes can exercise their power to recall any shuttle, even in defiance of spooky ghosts!"
diff --git a/html/changelogs/AutoChangeLog-pr-8586.yml b/html/changelogs/AutoChangeLog-pr-8586.yml
deleted file mode 100644
index 77bfb5f0cf9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8586.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - tweak: "Energy beams of all types emit light."
-  - tweak: "Flashbangs emit a burst of light when detonated"