From d0be33f480910f03db2b71736cab1f40c357679b Mon Sep 17 00:00:00 2001
From: bagil <bagil@tgstation13.org>
Date: Sun, 18 Jun 2017 05:19:54 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 15 +++++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-28508.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-28515.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-28526.yml |  5 -----
 5 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-28508.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-28515.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-28526.yml

diff --git a/html/changelog.html b/html/changelog.html
index 1637ca55b37..b2af42102f3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,21 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">18 June 2017</h2>
+			<h3 class="author">Expletive updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Stacks of space cash now tell you their total value and their value per bill when you examine them.</li>
+			</ul>
+			<h3 class="author">RandomMarine updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Compressed matter cartridge production costs now reflect their material worth at basic efficiency.</li>
+				<li class="bugfix">Compressed matter cartridges can now be exported.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Puny windows will no longer stop the progress of Ratvar.</li>
+			</ul>
+
 			<h2 class="date">17 June 2017</h2>
 			<h3 class="author">Cyberboss updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 87c1891f032..d95485547d3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11929,3 +11929,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       with that tablet in their ID slot, similar to a PDA would.
   bandit:
   - tweak: Default short/medium/long brig times are now, in order, 2, 3, and 5 minutes.
+2017-06-18:
+  Expletive:
+  - tweak: Stacks of space cash now tell you their total value and their value per
+      bill when you examine them.
+  RandomMarine:
+  - tweak: Compressed matter cartridge production costs now reflect their material
+      worth at basic efficiency.
+  - bugfix: Compressed matter cartridges can now be exported.
+  Xhuis:
+  - bugfix: Puny windows will no longer stop the progress of Ratvar.
diff --git a/html/changelogs/AutoChangeLog-pr-28508.yml b/html/changelogs/AutoChangeLog-pr-28508.yml
deleted file mode 100644
index eff586b78eb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28508.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Expletive"
-delete-after: True
-changes: 
-  - tweak: "Stacks of space cash now tell you their total value and their value per bill when you examine them."
diff --git a/html/changelogs/AutoChangeLog-pr-28515.yml b/html/changelogs/AutoChangeLog-pr-28515.yml
deleted file mode 100644
index 6355c7b05c9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28515.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xhuis"
-delete-after: True
-changes: 
-  - bugfix: "Puny windows will no longer stop the progress of Ratvar."
diff --git a/html/changelogs/AutoChangeLog-pr-28526.yml b/html/changelogs/AutoChangeLog-pr-28526.yml
deleted file mode 100644
index be038b571f5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28526.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "RandomMarine"
-delete-after: True
-changes: 
-  - tweak: "Compressed matter cartridge production costs now reflect their material worth at basic efficiency."
-  - bugfix: "Compressed matter cartridges can now be exported."