From 72bfe8f5503a78519dcb098ed110a5d20c27950c Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 26 Mar 2017 18:30:42 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 17 +++++++++++++++++
 html/changelogs/AutoChangeLog-pr-6530.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-6533.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-6907.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-6913.yml |  6 ------
 6 files changed, 36 insertions(+), 20 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6530.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6533.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6907.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6913.yml

diff --git a/html/changelog.html b/html/changelog.html
index 220ef619ffb..0355545c04f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,25 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">26 March 2017</h2>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Re-adds the telescopic scythe, the pinnacle of covert reaping technologies. Currently admin-spawn only, for use in the most dire of harvest times.</li>
+				<li class="bugfix">Scythes (normal and telescopic) should once again clear swathes through all but the hardiest of vines when in proper reaping configurations, and heavily damage those they don't outright destroy.</li>
+				<li class="bugfix">Ankle-high piles of dirt will no longer prevent you from stepping over them.</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adjusted Beach awaymission so it now includes deadly (but rewarding) pirate area.</li>
+				<li class="tweak">Adjusted the centcom away mission to make it viable.</li>
+			</ul>
+			<h3 class="author">Purpose2 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">QoL: Newly built APCs come unlocked.</li>
+				<li class="tweak">QoL: Chief Engineer's locker has more building permits.</li>
+				<li class="bugfix">Assorted grammatical fixes.</li>
+			</ul>
+
 			<h2 class="date">25 March 2017</h2>
 			<h3 class="author">Crazylemon64 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ed5e1922099..3dfbc1bb603 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4266,3 +4266,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Kyep:
   - bugfix: Pipes in the Wizard Academy have been banished back under the carpet,
       where they belong.
+2017-03-26:
+  FalseIncarnate:
+  - rscadd: Re-adds the telescopic scythe, the pinnacle of covert reaping technologies.
+      Currently admin-spawn only, for use in the most dire of harvest times.
+  - bugfix: Scythes (normal and telescopic) should once again clear swathes through
+      all but the hardiest of vines when in proper reaping configurations, and heavily
+      damage those they don't outright destroy.
+  - bugfix: Ankle-high piles of dirt will no longer prevent you from stepping over
+      them.
+  Kyep:
+  - tweak: Adjusted Beach awaymission so it now includes deadly (but rewarding) pirate
+      area.
+  - tweak: Adjusted the centcom away mission to make it viable.
+  Purpose2:
+  - tweak: 'QoL: Newly built APCs come unlocked.'
+  - tweak: 'QoL: Chief Engineer''s locker has more building permits.'
+  - bugfix: Assorted grammatical fixes.
diff --git a/html/changelogs/AutoChangeLog-pr-6530.yml b/html/changelogs/AutoChangeLog-pr-6530.yml
deleted file mode 100644
index 7b02bfad91e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6530.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - tweak: "Adjusted Beach awaymission so it now includes deadly (but rewarding) pirate area."
diff --git a/html/changelogs/AutoChangeLog-pr-6533.yml b/html/changelogs/AutoChangeLog-pr-6533.yml
deleted file mode 100644
index 8d476d52c23..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6533.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - tweak: "Adjusted the centcom away mission to make it viable."
diff --git a/html/changelogs/AutoChangeLog-pr-6907.yml b/html/changelogs/AutoChangeLog-pr-6907.yml
deleted file mode 100644
index 07a215aa075..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6907.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "FalseIncarnate"
-delete-after: True
-changes: 
-  - rscadd: "Re-adds the telescopic scythe, the pinnacle of covert reaping technologies. Currently admin-spawn only, for use in the most dire of harvest times."
-  - bugfix: "Scythes (normal and telescopic) should once again clear swathes through all but the hardiest of vines when in proper reaping configurations, and heavily damage those they don't outright destroy."
-  - bugfix: "Ankle-high piles of dirt will no longer prevent you from stepping over them."
diff --git a/html/changelogs/AutoChangeLog-pr-6913.yml b/html/changelogs/AutoChangeLog-pr-6913.yml
deleted file mode 100644
index 9559e78bb4e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6913.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - tweak: "QoL: Newly built APCs come unlocked."
-  - tweak: "QoL: Chief Engineer's locker has more building permits."
-  - bugfix: "Assorted grammatical fixes."