From 1eebcf8dd67e7608b4f140a5ec07b2f85071dc11 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 30 Dec 2016 10:31:37 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 9 +++++++++
 html/changelogs/.all_changelog.yml        | 7 +++++++
 html/changelogs/AutoChangeLog-pr-5631.yml | 5 -----
 html/changelogs/AutoChangeLog-pr-6040.yml | 4 ----
 4 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5631.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6040.yml

diff --git a/html/changelog.html b/html/changelog.html
index fa0da938341..7dfa8e4504d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,15 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">30 December 2016</h2>
+			<h3 class="author">Crazylemon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The shuttle manipulator can now only be used by admins</li>
+			</ul>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds Nano-Mob Hunter GO! PDA game cartridges and related stuff. Grab a cartridge from the cartridge vendor or loadout and join in on the hunt!</li>
+				<li class="rscadd">Adds Nano-Mob Hunter GO! Battle Terminals to the Holodeck and a Nano-Mob Hunter GO! Restoration Terminal to medbay's lobby.</li>
+			</ul>
 			<h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Taking off noir glasses while noir mode is on will now give you your colour vision back.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5f51f285964..1f623dd1bff 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3223,6 +3223,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       switching cameras.
   - bugfix: The camera console should no longer lag for several seconds.
 2016-12-30:
+  Crazylemon:
+  - bugfix: The shuttle manipulator can now only be used by admins
+  FalseIncarnate:
+  - rscadd: Adds Nano-Mob Hunter GO! PDA game cartridges and related stuff. Grab a
+      cartridge from the cartridge vendor or loadout and join in on the hunt!
+  - rscadd: Adds Nano-Mob Hunter GO! Battle Terminals to the Holodeck and a Nano-Mob
+      Hunter GO! Restoration Terminal to medbay's lobby.
   KasparoVy:
   - bugfix: Taking off noir glasses while noir mode is on will now give you your colour
       vision back.
diff --git a/html/changelogs/AutoChangeLog-pr-5631.yml b/html/changelogs/AutoChangeLog-pr-5631.yml
deleted file mode 100644
index 1a030bbdfcc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5631.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "FalseIncarnate"
-delete-after: True
-changes: 
-  - rscadd: "Adds Nano-Mob Hunter GO! PDA game cartridges and related stuff. Grab a cartridge from the cartridge vendor or loadout and join in on the hunt!"
-  - rscadd: "Adds Nano-Mob Hunter GO! Battle Terminals to the Holodeck and a Nano-Mob Hunter GO! Restoration Terminal to medbay's lobby."
diff --git a/html/changelogs/AutoChangeLog-pr-6040.yml b/html/changelogs/AutoChangeLog-pr-6040.yml
deleted file mode 100644
index a61f4e5ba76..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6040.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Crazylemon"
-delete-after: True
-changes: 
-  - bugfix: "The shuttle manipulator can now only be used by admins"