From df10933abc4b157dbb2adb3edd630a55ddd44bf7 Mon Sep 17 00:00:00 2001
From: bagil <bagil@tgstation13.org>
Date: Sun, 25 Jun 2017 16:53:01 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 6 ++++++
 html/changelogs/.all_changelog.yml         | 8 ++++++++
 html/changelogs/AutoChangeLog-pr-28584.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-28739.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-28749.yml | 4 ----
 5 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-28584.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-28739.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-28749.yml

diff --git a/html/changelog.html b/html/changelog.html
index 398006bec26..fff1d985987 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -73,10 +73,16 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Robotic legs now let you use pockets without a jumpsuit, and a robot chest now lets you use the belt slot and ID slot without a jumpsuit.</li>
 			</ul>
+			<h3 class="author">RandomMarine updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Cargo can now export mechs!</li>
+			</ul>
 			<h3 class="author">Steelpoint updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Station Engineers spawn with a Industrial Welder in their toolbelt.</li>
 				<li class="tweak">Engineering Welder Locker now only holds three standard Welders.</li>
+				<li class="rscadd">An old Nanotrasen Space Station has quietly reawoken its surviving crew one hundred years after they fell to slumber. Can the surviving crew, using old, broken and out of date equipment, overcome all odds and survive, or will the cold embrace of the stars become their new home?</li>
+				<li class="tweak">Nanotrasens Corps of Engineers has refitted and refurbished NTSS Boxstations Engineering area into, what Centcom believes,  a more efficient design.</li>
 			</ul>
 			<h3 class="author">That Really Good Soda Flavor updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 949709a9872..a4a21bb7ddf 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -12042,9 +12042,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Kor:
   - rscadd: Robotic legs now let you use pockets without a jumpsuit, and a robot chest
       now lets you use the belt slot and ID slot without a jumpsuit.
+  RandomMarine:
+  - rscadd: Cargo can now export mechs!
   Steelpoint:
   - rscadd: Station Engineers spawn with a Industrial Welder in their toolbelt.
   - tweak: Engineering Welder Locker now only holds three standard Welders.
+  - rscadd: An old Nanotrasen Space Station has quietly reawoken its surviving crew
+      one hundred years after they fell to slumber. Can the surviving crew, using
+      old, broken and out of date equipment, overcome all odds and survive, or will
+      the cold embrace of the stars become their new home?
+  - tweak: Nanotrasens Corps of Engineers has refitted and refurbished NTSS Boxstations
+      Engineering area into, what Centcom believes,  a more efficient design.
   That Really Good Soda Flavor:
   - experiment: Added the ability for a holiday to start on the nth weekday of a month.
   - experiment: Allahu ackbar! Added the ability to calculate Ramadan.
diff --git a/html/changelogs/AutoChangeLog-pr-28584.yml b/html/changelogs/AutoChangeLog-pr-28584.yml
deleted file mode 100644
index 0448670065f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28584.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes: 
-  - rscadd: "An old Nanotrasen Space Station has quietly reawoken its surviving crew one hundred years after they fell to slumber. Can the surviving crew, using old, broken and out of date equipment, overcome all odds and survive, or will the cold embrace of the stars become their new home?"
diff --git a/html/changelogs/AutoChangeLog-pr-28739.yml b/html/changelogs/AutoChangeLog-pr-28739.yml
deleted file mode 100644
index 0bf4ec32a9a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28739.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes: 
-  - tweak: "Nanotrasens Corps of Engineers has refitted and refurbished NTSS Boxstations Engineering area into, what Centcom believes,  a more efficient design."
diff --git a/html/changelogs/AutoChangeLog-pr-28749.yml b/html/changelogs/AutoChangeLog-pr-28749.yml
deleted file mode 100644
index 8ff81219e52..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28749.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "RandomMarine"
-delete-after: True
-changes: 
-  - rscadd: "Cargo can now export mechs!"