From c5db00bd00d5dfa245dce7f677a7e64ec3501e04 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 2 Jul 2016 22:46:18 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 46 +++++++++++-----------
 html/changelogs/.all_changelog.yml         | 21 ++++++++++
 html/changelogs/AutoChangeLog-pr-18980.yml |  4 --
 html/changelogs/AutoChangeLog-pr-19013.yml |  4 --
 html/changelogs/AutoChangeLog-pr-19043.yml |  5 ---
 html/changelogs/AutoChangeLog-pr-19055.yml |  4 --
 html/changelogs/AutoChangeLog-pr-19056.yml |  4 --
 html/changelogs/AutoChangeLog-pr-19059.yml |  5 ---
 8 files changed, 43 insertions(+), 50 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-18980.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-19013.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-19043.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-19055.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-19056.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-19059.yml

diff --git a/html/changelog.html b/html/changelog.html
index c131b2c3357..40f098208c6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,28 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">02 July 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Clockwork Proselytizers can now reform stored alloy into usable component alloy when used in-hand.</li>
+				<li class="rscdel">Mending motors start with 2500W of power in alloy, from 5000. Sigils of Transmission start with 2500W of power, from 4000. Clockwork Proselytizers start with 90 alloy, from 100.</li>
+				<li class="rscdel">Umbras have been removed.</li>
+				<li class="rscadd">Revenants have been readded, though they are now vulnerable to salt piles.</li>
+			</ul>
+			<h3 class="author">MMMiracles updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added the power fist, a gauntlet with a piston-powered ram attached to the top for traitors to punch people across the station. Punch people into walls for added fun.</li>
+			</ul>
+			<h3 class="author">incoming5643 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Nuke ops can now harness the power of METAL BOXES: special versions of cardboard boxes that can take a lot of abuse and can fit the whole team if need be. They're not nearly as light as their cardboard brothers though...</li>
+			</ul>
+			<h3 class="author">kevinz000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Some new emojis have been added to OOC for your enjoyment. Try them out.</li>
+				<li class="rscadd">New emojis are : coffee, trophy, tea, gear, supermatter, forceweapon, gift, kudzu, dosh, chrono, nya, and tophat. Type :nameofemoji: in OOC to use.</li>
+			</ul>
+
 			<h2 class="date">01 July 2016</h2>
 			<h3 class="author">Flavo updated:</h3>
 			<ul class="changes bgimages16">
@@ -1208,30 +1230,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 ff286f6dab7..dc0ea5d7394 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5954,3 +5954,24 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       tends to re-materialise in safe pressurised areas that aren't on fire.
   'name: Lzimann':
   - tweak: Mulebots with pAI cards no longer stun people
+2016-07-02:
+  Joan:
+  - rscadd: Clockwork Proselytizers can now reform stored alloy into usable component
+      alloy when used in-hand.
+  - rscdel: Mending motors start with 2500W of power in alloy, from 5000. Sigils of
+      Transmission start with 2500W of power, from 4000. Clockwork Proselytizers start
+      with 90 alloy, from 100.
+  - rscdel: Umbras have been removed.
+  - rscadd: Revenants have been readded, though they are now vulnerable to salt piles.
+  MMMiracles:
+  - rscadd: Added the power fist, a gauntlet with a piston-powered ram attached to
+      the top for traitors to punch people across the station. Punch people into walls
+      for added fun.
+  incoming5643:
+  - rscadd: 'Nuke ops can now harness the power of METAL BOXES: special versions of
+      cardboard boxes that can take a lot of abuse and can fit the whole team if need
+      be. They''re not nearly as light as their cardboard brothers though...'
+  kevinz000:
+  - rscadd: Some new emojis have been added to OOC for your enjoyment. Try them out.
+  - rscadd: 'New emojis are : coffee, trophy, tea, gear, supermatter, forceweapon,
+      gift, kudzu, dosh, chrono, nya, and tophat. Type :nameofemoji: in OOC to use.'
diff --git a/html/changelogs/AutoChangeLog-pr-18980.yml b/html/changelogs/AutoChangeLog-pr-18980.yml
deleted file mode 100644
index edde9010e3c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18980.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "incoming5643"
-delete-after: True
-changes: 
-  - rscadd: "Nuke ops can now harness the power of METAL BOXES: special versions of cardboard boxes that can take a lot of abuse and can fit the whole team if need be. They're not nearly as light as their cardboard brothers though..."
diff --git a/html/changelogs/AutoChangeLog-pr-19013.yml b/html/changelogs/AutoChangeLog-pr-19013.yml
deleted file mode 100644
index e063ed74def..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19013.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MMMiracles"
-delete-after: True
-changes: 
-  - rscadd: "Added the power fist, a gauntlet with a piston-powered ram attached to the top for traitors to punch people across the station. Punch people into walls for added fun."
diff --git a/html/changelogs/AutoChangeLog-pr-19043.yml b/html/changelogs/AutoChangeLog-pr-19043.yml
deleted file mode 100644
index d664bde3a9c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19043.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes: 
-  - rscadd: "Some new emojis have been added to OOC for your enjoyment. Try them out."
-  - rscadd: "New emojis are : coffee, trophy, tea, gear, supermatter, forceweapon, gift, kudzu, dosh, chrono, nya, and tophat. Type :nameofemoji: in OOC to use."
diff --git a/html/changelogs/AutoChangeLog-pr-19055.yml b/html/changelogs/AutoChangeLog-pr-19055.yml
deleted file mode 100644
index 65110ca7452..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19055.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscadd: "Clockwork Proselytizers can now reform stored alloy into usable component alloy when used in-hand."
diff --git a/html/changelogs/AutoChangeLog-pr-19056.yml b/html/changelogs/AutoChangeLog-pr-19056.yml
deleted file mode 100644
index cd4d0f18bf6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19056.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscdel: "Mending motors start with 2500W of power in alloy, from 5000. Sigils of Transmission start with 2500W of power, from 4000. Clockwork Proselytizers start with 90 alloy, from 100."
diff --git a/html/changelogs/AutoChangeLog-pr-19059.yml b/html/changelogs/AutoChangeLog-pr-19059.yml
deleted file mode 100644
index 70f6664ceac..00000000000
--- a/html/changelogs/AutoChangeLog-pr-19059.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscdel: "Umbras have been removed."
-  - rscadd: "Revenants have been readded, though they are now vulnerable to salt piles."