From db1bfa590cccc7558090278282368fb1be0567f4 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 25 Jul 2017 15:19:11 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 10 ++++++++++
 html/changelogs/.all_changelog.yml        |  8 ++++++++
 html/changelogs/AutoChangeLog-pr-7523.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-7805.yml |  5 -----
 4 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7523.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7805.yml

diff --git a/html/changelog.html b/html/changelog.html
index 34a08605456..f0354c42605 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,11 +61,21 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Reduces the volume of the electric guitars</li>
 			</ul>
+			<h3 class="author">FlattestGuitar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Antagonists will no longer get the objective to steal slime extracts and plasma tanks.</li>
+				<li class="rscadd">The Captain has a swanky high-tech jetpack now. Antagonists will try to steal this one instead of *any* jetpack.</li>
+			</ul>
 			<h3 class="author">Fox McCloud updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">You can now point while voluntarily lying down</li>
 				<li class="tweak">shotgun darts and syringe darts no longer react their reagents on hit (they will still transfer reagents)</li>
 			</ul>
+			<h3 class="author">FreeStylaLT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed sci outpost and dock from Metastation and Cyberiad</li>
+				<li class="rscadd">Added a Mining Outpost to the northernmost point of the Asteroid.</li>
+			</ul>
 			<h3 class="author">Kluys, Kyep & DarkLordpyro updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Emagged drones are now readily identifiable, as their lights turn red.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 83230a1d2c4..f1f0906b3b4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5271,10 +5271,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-07-25:
   Birdtalon:
   - tweak: Reduces the volume of the electric guitars
+  FlattestGuitar:
+  - tweak: Antagonists will no longer get the objective to steal slime extracts and
+      plasma tanks.
+  - rscadd: The Captain has a swanky high-tech jetpack now. Antagonists will try to
+      steal this one instead of *any* jetpack.
   Fox McCloud:
   - tweak: You can now point while voluntarily lying down
   - tweak: shotgun darts and syringe darts no longer react their reagents on hit (they
       will still transfer reagents)
+  FreeStylaLT:
+  - rscdel: Removed sci outpost and dock from Metastation and Cyberiad
+  - rscadd: Added a Mining Outpost to the northernmost point of the Asteroid.
   Kluys, Kyep & DarkLordpyro:
   - tweak: Emagged drones are now readily identifiable, as their lights turn red.
   Kyep:
diff --git a/html/changelogs/AutoChangeLog-pr-7523.yml b/html/changelogs/AutoChangeLog-pr-7523.yml
deleted file mode 100644
index e197c3b1ab6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7523.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "FlattestGuitar"
-delete-after: True
-changes: 
-  - tweak: "Antagonists will no longer get the objective to steal slime extracts and plasma tanks."
-  - rscadd: "The Captain has a swanky high-tech jetpack now. Antagonists will try to steal this one instead of *any* jetpack."
diff --git a/html/changelogs/AutoChangeLog-pr-7805.yml b/html/changelogs/AutoChangeLog-pr-7805.yml
deleted file mode 100644
index 89c8fa3ab02..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7805.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "FreeStylaLT"
-delete-after: True
-changes: 
-  - rscdel: "Removed sci outpost and dock from Metastation and Cyberiad"
-  - rscadd: "Added a Mining Outpost to the northernmost point of the Asteroid."