From 1bd218876c0572776c8d433f46b85fa4dc27a9ca Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 19 Jan 2018 02:36:45 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml        | 11 +++++++++++
 html/changelogs/AutoChangeLog-pr-8546.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8550.yml |  8 --------
 4 files changed, 25 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8546.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8550.yml

diff --git a/html/changelog.html b/html/changelog.html
index 950024426de..c4723ff6068 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">19 January 2018</h2>
+			<h3 class="author">Citinited updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Using a syndicate balloon while it's in your hand allows you to play with it.</li>
+			</ul>
+			<h3 class="author">uraniummeltdown updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Wooden holodeck table sprites show up properly</li>
+				<li class="tweak">Table construction has been changed a bit, apply stack items (carpet, metal, glass, wood) to table frames to build tables instead of using table parts.</li>
+				<li class="tweak">Slightly increased the health of racks and tables with low health</li>
+				<li class="tweak">Holodeck tables will now smooth with one another</li>
+				<li class="tweak">Holodeck tables and racks can be interacted with in more ways</li>
+			</ul>
+
 			<h2 class="date">13 January 2018</h2>
 			<h3 class="author">Citinited updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e179f142b46..9c9424a2042 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5953,3 +5953,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Signing up for ERT, then going AFK, such that your AFKness prevents you
       and/or others spawning as ERT within a reasonable (2 minute) period of time,
       now generates a warning to online admins.
+2018-01-19:
+  Citinited:
+  - tweak: Using a syndicate balloon while it's in your hand allows you to play with
+      it.
+  uraniummeltdown:
+  - bugfix: Wooden holodeck table sprites show up properly
+  - tweak: Table construction has been changed a bit, apply stack items (carpet, metal,
+      glass, wood) to table frames to build tables instead of using table parts.
+  - tweak: Slightly increased the health of racks and tables with low health
+  - tweak: Holodeck tables will now smooth with one another
+  - tweak: Holodeck tables and racks can be interacted with in more ways
diff --git a/html/changelogs/AutoChangeLog-pr-8546.yml b/html/changelogs/AutoChangeLog-pr-8546.yml
deleted file mode 100644
index 71289c218c8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8546.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Citinited"
-delete-after: True
-changes: 
-  - tweak: "Using a syndicate balloon while it's in your hand allows you to play with it."
diff --git a/html/changelogs/AutoChangeLog-pr-8550.yml b/html/changelogs/AutoChangeLog-pr-8550.yml
deleted file mode 100644
index 40be531646c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8550.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes: 
-  - bugfix: "Wooden holodeck table sprites show up properly"
-  - tweak: "Table construction has been changed a bit, apply stack items (carpet, metal, glass, wood) to table frames to build tables instead of using table parts."
-  - tweak: "Slightly increased the health of racks and tables with low health"
-  - tweak: "Holodeck tables will now smooth with one another"
-  - tweak: "Holodeck tables and racks can be interacted with in more ways"