From d2a11b787afb667700fbbdeff9ef8fd34e4fa6f1 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Fri, 5 Jan 2018 14:44:06 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-34056.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-34081.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-34084.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-34089.yml |  4 ----
 6 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34056.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34081.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34084.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34089.yml

diff --git a/html/changelog.html b/html/changelog.html
index 02f28aa9528..0c3ccd04aad 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,12 +56,26 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">05 January 2018</h2>
+			<h3 class="author">Cruix updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Chameleon PDAs now have their chameleon action.</li>
+			</ul>
 			<h3 class="author">Okand37 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added a fully functioning A.I. satellite to Omegastation!</li>
 				<li class="rscadd">Added the CE's magboots to the gravity room on Omegastation!</li>
 				<li class="rscadd">Added a medical wrench to cryo for Omegastation!</li>
 			</ul>
+			<h3 class="author">Shadowlight213 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Devils will no longer be permanently stuck if interrupted while trying to jaunt.</li>
+				<li class="bugfix">Devils will now properly clear the fake fire if failing to jaunt.</li>
+			</ul>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The startup load time of away missions has been drastically reduced.</li>
+				<li class="bugfix">The admin notification for the pulse rifle prize now shows the correct coordinates.</li>
+			</ul>
 			<h3 class="author">deathride58 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Explosions now function properly again!</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 081c8f7d5ce..0c2090efb4b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14743,9 +14743,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       explosive with them, they're practically identical to the real disk if not examined
       closely.
 2018-01-05:
+  Cruix:
+  - bugfix: Chameleon PDAs now have their chameleon action.
   Okand37:
   - rscadd: Added a fully functioning A.I. satellite to Omegastation!
   - rscadd: Added the CE's magboots to the gravity room on Omegastation!
   - rscadd: Added a medical wrench to cryo for Omegastation!
+  Shadowlight213:
+  - bugfix: Devils will no longer be permanently stuck if interrupted while trying
+      to jaunt.
+  - bugfix: Devils will now properly clear the fake fire if failing to jaunt.
+  SpaceManiac:
+  - bugfix: The startup load time of away missions has been drastically reduced.
+  - bugfix: The admin notification for the pulse rifle prize now shows the correct
+      coordinates.
   deathride58:
   - bugfix: Explosions now function properly again!
diff --git a/html/changelogs/AutoChangeLog-pr-34056.yml b/html/changelogs/AutoChangeLog-pr-34056.yml
deleted file mode 100644
index ea9587f4da2..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34056.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Shadowlight213"
-delete-after: True
-changes: 
-  - bugfix: "Devils will no longer be permanently stuck if interrupted while trying to jaunt."
-  - bugfix: "Devils will now properly clear the fake fire if failing to jaunt."
diff --git a/html/changelogs/AutoChangeLog-pr-34081.yml b/html/changelogs/AutoChangeLog-pr-34081.yml
deleted file mode 100644
index e88f33f7e6c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34081.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cruix"
-delete-after: True
-changes: 
-  - bugfix: "Chameleon PDAs now have their chameleon action."
diff --git a/html/changelogs/AutoChangeLog-pr-34084.yml b/html/changelogs/AutoChangeLog-pr-34084.yml
deleted file mode 100644
index aeb1a1a307c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34084.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "The startup load time of away missions has been drastically reduced."
diff --git a/html/changelogs/AutoChangeLog-pr-34089.yml b/html/changelogs/AutoChangeLog-pr-34089.yml
deleted file mode 100644
index c64938d77de..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34089.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "The admin notification for the pulse rifle prize now shows the correct coordinates."