From 2e52dbbefc3c7f17d02ef787c5cfd5fa1ada9a2b Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sun, 22 May 2016 04:19:44 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 7 +++++++
 html/changelogs/.all_changelog.yml         | 4 ++++
 html/changelogs/AutoChangeLog-pr-17688.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-17775.yml | 4 ----
 4 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17688.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-17775.yml

diff --git a/html/changelog.html b/html/changelog.html
index a7fccab664d..d632ed9323c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">22 May 2016</h2>
+			<h3 class="author">coiax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Lavaland monsters now give ruins a wide berth.</li>
+				<li class="bugfix">Glass tables now break when people are pushed onto them.</li>
+			</ul>
+
 			<h2 class="date">21 May 2016</h2>
 			<h3 class="author">Iamsaltball updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index aa8559f07f7..a956033c8e0 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5124,3 +5124,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: About 5 seconds of wetness are removed from a tile for each unit of drying
       agent. Absorbant Galoshes remain the most effective method of drying, and dry
       tiles instantly regardless of wetness.
+2016-05-22:
+  coiax:
+  - rscdel: Lavaland monsters now give ruins a wide berth.
+  - bugfix: Glass tables now break when people are pushed onto them.
diff --git a/html/changelogs/AutoChangeLog-pr-17688.yml b/html/changelogs/AutoChangeLog-pr-17688.yml
deleted file mode 100644
index 139c5f4beed..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17688.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: coiax
-delete-after: True
-changes: 
-  - rscdel: "Lavaland monsters now give ruins a wide berth."
diff --git a/html/changelogs/AutoChangeLog-pr-17775.yml b/html/changelogs/AutoChangeLog-pr-17775.yml
deleted file mode 100644
index eb2af033cba..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17775.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: coiax
-delete-after: True
-changes: 
-  - bugfix: "Glass tables now break when people are pushed onto them."