From a71e8b84641a4f94aa7fd5dd4b6c048a42b85f23 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Fri, 7 Aug 2015 10:04:50 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                            | 10 ++++++++++
 html/changelogs/.all_changelog.yml             |  7 +++++++
 html/changelogs/bustygoku-10944.yml            |  6 ------
 html/changelogs/phil235-PlasmaCutterChange.yml |  8 --------
 4 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/bustygoku-10944.yml
 delete mode 100644 html/changelogs/phil235-PlasmaCutterChange.yml

diff --git a/html/changelog.html b/html/changelog.html
index b7c88dc2e93..43ab33ac4bf 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">07 August 2015</h2>
+			<h3 class="author">bustygoku updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed the chance for a disease to make you a carrier on transfer.</li>
+			</ul>
+			<h3 class="author">phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The plasma cutter's fire rate is now a bit lower but its projectile can pierce multiple asteroid walls and its range isn't lowered in pressurized environment anymore.</li>
+			</ul>
+
 			<h2 class="date">05 August 2015</h2>
 			<h3 class="author">CoreOverload updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d7d1d28a246..ea102965e48 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1484,3 +1484,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   bgobandit:
   - rscadd: Nanotrasen scientists have achieved the tremendous breakthrough of injecting
       gold slime extracts with water. Pets ensued.
+2015-08-07:
+  bustygoku:
+  - rscdel: Removed the chance for a disease to make you a carrier on transfer.
+  phil235:
+  - tweak: The plasma cutter's fire rate is now a bit lower but its projectile can
+      pierce multiple asteroid walls and its range isn't lowered in pressurized environment
+      anymore.
diff --git a/html/changelogs/bustygoku-10944.yml b/html/changelogs/bustygoku-10944.yml
deleted file mode 100644
index 4a4127e9691..00000000000
--- a/html/changelogs/bustygoku-10944.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: bustygoku
-
-delete-after: True
-
-changes: 
-  - rscdel: "Removed the chance for a disease to make you a carrier on transfer."
\ No newline at end of file
diff --git a/html/changelogs/phil235-PlasmaCutterChange.yml b/html/changelogs/phil235-PlasmaCutterChange.yml
deleted file mode 100644
index caf409f659a..00000000000
--- a/html/changelogs/phil235-PlasmaCutterChange.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-author: phil235
-
-delete-after: True
-
-changes: 
-  - tweak: "The plasma cutter's fire rate is now a bit lower but its projectile can pierce multiple asteroid walls and its range isn't lowered in pressurized environment anymore."
-