From 9ceda7d1e04dfe1ade7b5dece53d7ac07ad974b2 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 30 Apr 2016 01:13:42 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 19 ++++++++++++-------
 html/changelogs/.all_changelog.yml         |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-17058.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-17205.yml |  5 -----
 4 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17058.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17205.yml

diff --git a/html/changelog.html b/html/changelog.html
index ea23b62efcd..dec2902c511 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,18 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">30 April 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Blobs attempting to attack the supermatter will instead be eaten by it.</li>
+				<li class="experiment">This doesn't mean throwing a supermatter shard at the blob is a good idea; blobs attacking it will gradually damage it, eventually resulting in a massive explosion, and it will not consume blobs if on a space turf.</li>
+			</ul>
+			<h3 class="author">Mercenaryblue updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a basic paper plane to the game. Fold paper with alt-clicking.</li>
+				<li class="rscadd">Paper planes are now fully compatible with every stamps on station.</li>
+			</ul>
+
 			<h2 class="date">29 April 2016</h2>
 			<h3 class="author">Bawhoppen updated:</h3>
 			<ul class="changes bgimages16">
@@ -584,13 +596,6 @@
 				<li class="bugfix">Fixed rudimentary transform not working properly on ghosts with minds.</li>
 				<li class="rscadd">Admin logs for bluespace capsules not activated on the mining Z level.</li>
 			</ul>
-
-			<h2 class="date">02 April 2016</h2>
-			<h3 class="author">Eaglendia updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Central Command has released a new, more functional run of their most stylish fashion line.</li>
-				<li class="rscadd">Head of Staff cloaks can now hold specific items - the antique laser gun for the Captain, the replica energy gun for the Head of Security, the hypospray for the Chief Medical Officer, the Hand Teleporter or RPED for the Research Director, and the RCD or RPD for the Chief Engineer.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 869f3eebc5b..94109b63f59 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4782,3 +4782,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   nullbear:
   - rscadd: Adds a preference option, allowing players to toggle whether recipes with
       no matching components should be hidden.
+2016-04-30:
+  Joan:
+  - rscadd: Blobs attempting to attack the supermatter will instead be eaten by it.
+  - experiment: This doesn't mean throwing a supermatter shard at the blob is a good
+      idea; blobs attacking it will gradually damage it, eventually resulting in a
+      massive explosion, and it will not consume blobs if on a space turf.
+  Mercenaryblue:
+  - rscadd: Adds a basic paper plane to the game. Fold paper with alt-clicking.
+  - rscadd: Paper planes are now fully compatible with every stamps on station.
diff --git a/html/changelogs/AutoChangeLog-pr-17058.yml b/html/changelogs/AutoChangeLog-pr-17058.yml
deleted file mode 100644
index b176f08a4b8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17058.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Mercenaryblue
-delete-after: True
-changes: 
-  - rscadd: "Adds a basic paper plane to the game. Fold paper with alt-clicking."
-  - rscadd: "Paper planes are now fully compatible with every stamps on station."
diff --git a/html/changelogs/AutoChangeLog-pr-17205.yml b/html/changelogs/AutoChangeLog-pr-17205.yml
deleted file mode 100644
index bcdad1634a0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17205.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - rscadd: "Blobs attempting to attack the supermatter will instead be eaten by it."
-  - experiment: "This doesn't mean throwing a supermatter shard at the blob is a good idea; blobs attacking it will gradually damage it, eventually resulting in a massive explosion, and it will not consume blobs if on a space turf."