From 3e8b2edf11d76c61abc58f28bd65c8e3d2ab5af5 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 5 May 2016 10:49:00 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 34 ++++++++++------------
 html/changelogs/.all_changelog.yml         | 11 +++++++
 html/changelogs/AutoChangeLog-pr-16933.yml |  7 -----
 html/changelogs/AutoChangeLog-pr-17372.yml |  6 ----
 4 files changed, 26 insertions(+), 32 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16933.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17372.yml

diff --git a/html/changelog.html b/html/changelog.html
index 77420299ef1..98666b981de 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,21 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 May 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Revenants are slower while revealed.</li>
+				<li class="rscdel">Revenants can no longer cast inside dense objects.</li>
+				<li class="tweak">Lying down will cure Blight much, much faster.</li>
+			</ul>
+			<h3 class="author">\"Macho Man\" Randy Savage updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">OOOHHH YEAAAAHHHH</li>
+				<li class="rscadd">SNAP INTO A JLIM SIM WITH THE ALL NEW WRESTLING BELT</li>
+				<li class="rscadd">YOU CAN FREAKOUT YOUR OPPONENTS WITH THE 5 HOT MOVES ON THIS BELT YEAH</li>
+				<li class="rscadd">PRAY TO THE LOCAL SPACE GODS TO EXCHANGE YOUR TELECRYSTALS TO ENSURE THE CREAM RISES TO THE TOP</li>
+			</ul>
+
 			<h2 class="date">04 May 2016</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
 			<ul class="changes bgimages16">
@@ -596,25 +611,6 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">An experimental plant DNA manipulator, based on machinery recovered from ancient seed vaults, has been installed in the Botany department.</li>
 			</ul>
-
-			<h2 class="date">07 April 2016</h2>
-			<h3 class="author">Kor updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The Laser Cannon in RD has been replaced with the Accelerator Laser Cannon. Try it out!</li>
-				<li class="rscadd">Mechas now have armour facings. Attacking the front will deal far less damage, while attacking the back will deal massive bonus damage.</li>
-				<li class="rscadd">EMPs now deal far less damage/drain to mechas.</li>
-			</ul>
-			<h3 class="author">Kor and Ausops updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Survival pod interiors have been redone.</li>
-				<li class="rscadd">Survival pods now contain a stationary GPS computer.</li>
-				<li class="rscadd">You can now toggle your GPS off with alt+click.</li>
-			</ul>
-			<h3 class="author">bgobandit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Due to budget cuts, Nanotrasen is no longer utilizing copy-protected paper for its classified documents. Fortunately, our world-class security team has always prevented any thefts or photocopies from being made!</li>
-				<li class="rscadd">Secret documents can be photocopied. If you have an objective to steal any set of documents, a photocopy will be accepted. If you must steal red or blue documents, a photocopy will NOT be accepted. Enterprising traitors can forge the red/blue seal with a crayon to take advantage of this.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bdf0b3efabc..04a637821c3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4881,3 +4881,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       kill yourself with a hand labeler.'
   xxalpha:
   - bugfix: Fixed the mk-honk prototype shoes.
+2016-05-05:
+  Joan:
+  - tweak: Revenants are slower while revealed.
+  - rscdel: Revenants can no longer cast inside dense objects.
+  - tweak: Lying down will cure Blight much, much faster.
+  \"Macho Man\" Randy Savage:
+  - rscadd: OOOHHH YEAAAAHHHH
+  - rscadd: SNAP INTO A JLIM SIM WITH THE ALL NEW WRESTLING BELT
+  - rscadd: YOU CAN FREAKOUT YOUR OPPONENTS WITH THE 5 HOT MOVES ON THIS BELT YEAH
+  - rscadd: PRAY TO THE LOCAL SPACE GODS TO EXCHANGE YOUR TELECRYSTALS TO ENSURE THE
+      CREAM RISES TO THE TOP
diff --git a/html/changelogs/AutoChangeLog-pr-16933.yml b/html/changelogs/AutoChangeLog-pr-16933.yml
deleted file mode 100644
index c567dfe1193..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16933.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: \"Macho Man\" Randy Savage
-delete-after: True
-changes: 
-  - rscadd: "OOOHHH YEAAAAHHHH"
-  - rscadd: "SNAP INTO A JLIM SIM WITH THE ALL NEW WRESTLING BELT"
-  - rscadd: "YOU CAN FREAKOUT YOUR OPPONENTS WITH THE 5 HOT MOVES ON THIS BELT YEAH"
-  - rscadd: "PRAY TO THE LOCAL SPACE GODS TO EXCHANGE YOUR TELECRYSTALS TO ENSURE THE CREAM RISES TO THE TOP"
diff --git a/html/changelogs/AutoChangeLog-pr-17372.yml b/html/changelogs/AutoChangeLog-pr-17372.yml
deleted file mode 100644
index 30f3940fd67..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17372.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - tweak: "Revenants are slower while revealed."
-  - rscdel: "Revenants can no longer cast inside dense objects."
-  - tweak: "Lying down will cure Blight much, much faster."