From 5429135383b624ca9672feae2a4e768cc166bf44 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 29 Dec 2016 05:00:13 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 13 +++++++++++++
 html/changelogs/.all_changelog.yml        |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-5414.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-5806.yml |  5 -----
 4 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5414.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5806.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8d9646f5c89..5e5007eae87 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,19 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 December 2016</h2>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Alternate shuttle/ferry template system from TG</li>
+				<li class="rscadd">Shuttle Manipulator</li>
+				<li class="rscadd">Better shuttle kills</li>
+			</ul>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The camera console has been refactored so there's no longer a delay when switching cameras.</li>
+				<li class="bugfix">The camera console should no longer lag for several seconds.</li>
+			</ul>
+
 			<h2 class="date">25 December 2016</h2>
 			<h3 class="author">FalseIncarnate updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9737ae8e264..fff174d9e41 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3213,3 +3213,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Cameras will no longer be able to take photos of stuff outside your line
       of sight.
   - tweak: Cameras will now render disguises as you see them.
+2016-12-29:
+  Fethas:
+  - rscadd: Alternate shuttle/ferry template system from TG
+  - rscadd: Shuttle Manipulator
+  - rscadd: Better shuttle kills
+  Markolie:
+  - tweak: The camera console has been refactored so there's no longer a delay when
+      switching cameras.
+  - bugfix: The camera console should no longer lag for several seconds.
diff --git a/html/changelogs/AutoChangeLog-pr-5414.yml b/html/changelogs/AutoChangeLog-pr-5414.yml
deleted file mode 100644
index 0b6fefe90fb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5414.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - rscadd: "Alternate shuttle/ferry template system from TG"
-  - rscadd: "Shuttle Manipulator"
-  - rscadd: "Better shuttle kills"
diff --git a/html/changelogs/AutoChangeLog-pr-5806.yml b/html/changelogs/AutoChangeLog-pr-5806.yml
deleted file mode 100644
index dbe0146173f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5806.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - tweak: "The camera console has been refactored so there's no longer a delay when switching cameras."
-  - bugfix: "The camera console should no longer lag for several seconds."