From 60ae0d2f60de261d810e31a037f761d0320bb350 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 1 Jun 2017 16:21:34 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 95351f87790..826eadfc10a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,10 +60,21 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Ian's hardsuit is no longer invisible</li>
 			</ul>
+			<h3 class="author">FreeStylaLT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Gamma armory no longer affected by brig events.</li>
+				<li class="tweak">Outer armory windoor access has been lowered to Security Officer+, instead of Warden+.</li>
+				<li class="tweak">Removed a redundant door in the brig's main hallway.</li>
+				<li class="tweak">Removed a redundant fire alarm, placed it elsewhere in the north hallway.</li>
+			</ul>
 			<h3 class="author">Kyep updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">ERTs no longer start penniless, unable to afford even basic food, or coffee.</li>
 			</ul>
+			<h3 class="author">Purpose2 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adds a build-time on Tables & Racks.</li>
+			</ul>
 
 			<h2 class="date">31 May 2017</h2>
 			<h3 class="author">FalseIncarnate updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b5c6b96fc65..dc4460bf0dd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4811,5 +4811,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-06-01:
   Alexshreds:
   - bugfix: Ian's hardsuit is no longer invisible
+  FreeStylaLT:
+  - bugfix: Gamma armory no longer affected by brig events.
+  - tweak: Outer armory windoor access has been lowered to Security Officer+, instead
+      of Warden+.
+  - tweak: Removed a redundant door in the brig's main hallway.
+  - tweak: Removed a redundant fire alarm, placed it elsewhere in the north hallway.
   Kyep:
   - bugfix: ERTs no longer start penniless, unable to afford even basic food, or coffee.
+  Purpose2:
+  - tweak: Adds a build-time on Tables & Racks.
diff --git a/html/changelogs/AutoChangeLog-pr-7384.yml b/html/changelogs/AutoChangeLog-pr-7384.yml
deleted file mode 100644
index 46b54ad0708..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7384.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "FreeStylaLT"
-delete-after: True
-changes: 
-  - bugfix: "Gamma armory no longer affected by brig events."
-  - tweak: "Outer armory windoor access has been lowered to Security Officer+, instead of Warden+."
-  - tweak: "Removed a redundant door in the brig's main hallway."
-  - tweak: "Removed a redundant fire alarm, placed it elsewhere in the north hallway."
diff --git a/html/changelogs/AutoChangeLog-pr-7414.yml b/html/changelogs/AutoChangeLog-pr-7414.yml
deleted file mode 100644
index 1d1695aa6ed..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7414.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - tweak: "Adds a build-time on Tables & Racks."