From a1130300eec711e07e994cdacdbbf10dce7afc5b Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 23 Mar 2017 03:52:59 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 8 ++++++++
 html/changelogs/.all_changelog.yml        | 7 +++++++
 html/changelogs/AutoChangeLog-pr-6076.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-6858.yml | 7 -------
 4 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6076.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6858.yml

diff --git a/html/changelog.html b/html/changelog.html
index c2d288bce0f..6cef5d2179a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -59,6 +59,10 @@
 			<h3 class="author">Fox McCloud updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Floors are now fully properly cleaned with mops and soap</li>
+				<li class="rscadd">Adds in emergency welding tool, fork, trays, drinking glasses, shot glasses, shakers, butcher cleavers, and riot darts to the autolathe</li>
+				<li class="rscadd">Adds all basic stock parts to the autolathe</li>
+				<li class="tweak">re-arranges the autolathe menu to be more logical</li>
+				<li class="tweak">light bulbs no longer require metal to produce</li>
 			</ul>
 			<h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
@@ -68,6 +72,10 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Chaplain's armor is no longer riot-grade. In addition, their nullrods do less damage.</li>
 			</ul>
+			<h3 class="author">Norgad updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Maintenance areas near arrivals, science, and the bar have been revamped.</li>
+			</ul>
 
 			<h2 class="date">22 March 2017</h2>
 			<h3 class="author">Crazylemon64 updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5555e1eb118..0f8494677ed 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4222,9 +4222,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-03-23:
   Fox McCloud:
   - bugfix: Floors are now fully properly cleaned with mops and soap
+  - rscadd: Adds in emergency welding tool, fork, trays, drinking glasses, shot glasses,
+      shakers, butcher cleavers, and riot darts to the autolathe
+  - rscadd: Adds all basic stock parts to the autolathe
+  - tweak: re-arranges the autolathe menu to be more logical
+  - tweak: light bulbs no longer require metal to produce
   KasparoVy:
   - tweak: Unathi Security, Medical, Engineering and Syndicate side-facing hardsuit
       sprites have undergone weight reduction.
   Kyep:
   - tweak: Chaplain's armor is no longer riot-grade. In addition, their nullrods do
       less damage.
+  Norgad:
+  - tweak: Maintenance areas near arrivals, science, and the bar have been revamped.
diff --git a/html/changelogs/AutoChangeLog-pr-6076.yml b/html/changelogs/AutoChangeLog-pr-6076.yml
deleted file mode 100644
index 87a7b62223c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6076.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Norgad"
-delete-after: True
-changes: 
-  - tweak: "Maintenance areas near arrivals, science, and the bar have been revamped."
diff --git a/html/changelogs/AutoChangeLog-pr-6858.yml b/html/changelogs/AutoChangeLog-pr-6858.yml
deleted file mode 100644
index 4870f2df6a9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6858.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - rscadd: "Adds in emergency welding tool, fork, trays, drinking glasses, shot glasses, shakers, butcher cleavers, and riot darts to the autolathe"
-  - rscadd: "Adds all basic stock parts to the autolathe"
-  - tweak: "re-arranges the autolathe menu to be more logical"
-  - tweak: "light bulbs no longer require metal to produce"