From 442c8bb1fa17fcba640ab6f3122290a2f50df042 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sun, 29 May 2016 06:59:22 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 38 ++++++++--------------
 html/changelogs/.all_changelog.yml         |  7 ++++
 html/changelogs/AutoChangeLog-pr-17735.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-17954.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-17981.yml |  4 ---
 5 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17735.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17954.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17981.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9ec961fc313..ff1f9c80e26 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,20 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 May 2016</h2>
+			<h3 class="author">GunHog updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The CE, RD, and CMO have been issued megaphones.</li>
+			</ul>
+			<h3 class="author">Paprika, Crystalwarrior, Korphaeron and Bawhoppen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Pixel projectiles. This is easier to see than explain, so go fire a weapon.</li>
+			</ul>
+			<h3 class="author">pudl updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Chemicals should now have color, instead of just being pink.</li>
+			</ul>
+
 			<h2 class="date">27 May 2016</h2>
 			<h3 class="author">coiax updated:</h3>
 			<ul class="changes bgimages16">
@@ -474,30 +488,6 @@
 				<li class="bugfix">Fixes chembomb recipe to use any matter bin. Again.</li>
 				<li class="bugfix">ARG's disappear once finished reacting.</li>
 			</ul>
-
-			<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>
-				<li class="tweak">Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of trying to open it.</li>
-				<li class="imageadd">Cable coils, cablecuffs, and zipties now all have properly colored inhands.</li>
-			</ul>
-			<h3 class="author">Kor updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Megafauna have been added to lavaland.</li>
-				<li class="rscadd">Ash Drakes have been spotted roaming the wastes. Use your GPS to track their fiery signals.</li>
-				<li class="rscadd">You can now knock on the Necropolis door, but it's probably best that you don't.</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>
-			<h3 class="author">bgobandit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Nanotrasen has released Cards Against Spess! Visit your local library for a copy. Warning: may cause breakage of the fourth wall.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7cc6ca65750..7ab42ab9fc9 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5188,3 +5188,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       the resist button.
   - tweak: Someone pulling a restrained mob now swap position with them instead of
       getting blocked by the mob, unable to even push them.
+2016-05-29:
+  GunHog:
+  - rscadd: The CE, RD, and CMO have been issued megaphones.
+  Paprika, Crystalwarrior, Korphaeron and Bawhoppen:
+  - rscadd: Pixel projectiles. This is easier to see than explain, so go fire a weapon.
+  pudl:
+  - rscadd: Chemicals should now have color, instead of just being pink.
diff --git a/html/changelogs/AutoChangeLog-pr-17735.yml b/html/changelogs/AutoChangeLog-pr-17735.yml
deleted file mode 100644
index fa2f0289fd8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17735.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Paprika, Crystalwarrior, Korphaeron and Bawhoppen
-delete-after: True
-changes: 
-  - rscadd: "Pixel projectiles. This is easier to see than explain, so go fire a weapon."
diff --git a/html/changelogs/AutoChangeLog-pr-17954.yml b/html/changelogs/AutoChangeLog-pr-17954.yml
deleted file mode 100644
index 282c1214e35..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17954.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: GunHog
-delete-after: True
-changes: 
-  - rscadd: "The CE, RD, and CMO have been issued megaphones."
diff --git a/html/changelogs/AutoChangeLog-pr-17981.yml b/html/changelogs/AutoChangeLog-pr-17981.yml
deleted file mode 100644
index fe085750589..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17981.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: pudl
-delete-after: True
-changes: 
-  - rscadd: "Chemicals should now have color, instead of just being pink."