From 5131f91725019b95d43ef2bf55d2f60d6a225ca9 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 13 Jun 2017 01:46:13 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 11 +++++++++++
 html/changelogs/.all_changelog.yml        |  8 ++++++++
 html/changelogs/AutoChangeLog-pr-7466.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-7539.yml |  4 ----
 4 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7466.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7539.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8321bac3afd..9af10b246e0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">13 June 2017</h2>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Moves a hidden emergency locker to where it is visible.</li>
+			</ul>
+			<h3 class="author">Vivalas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Brig timers will now update the records of those who are imprisoned in their cell, as long as their name is entered correctly.</li>
+				<li class="rscadd">Sentences and arresting officers are announced over the security channel by brig timers, as well as the names of those who end timers manually.</li>
+			</ul>
+
 			<h2 class="date">10 June 2017</h2>
 			<h3 class="author">Alffd updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e05ac7eb89b..441df3d78e7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4907,3 +4907,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       FOR THE HONOR OF THE HIGHLANDERS!
   - tweak: Highlander now equips combatants with a Highlander claymore instead of
       a normal claymore. FIGHT ON BROTHERS!
+2017-06-13:
+  KasparoVy:
+  - bugfix: Moves a hidden emergency locker to where it is visible.
+  Vivalas:
+  - rscadd: Brig timers will now update the records of those who are imprisoned in
+      their cell, as long as their name is entered correctly.
+  - rscadd: Sentences and arresting officers are announced over the security channel
+      by brig timers, as well as the names of those who end timers manually.
diff --git a/html/changelogs/AutoChangeLog-pr-7466.yml b/html/changelogs/AutoChangeLog-pr-7466.yml
deleted file mode 100644
index 1d8d9336859..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7466.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Vivalas"
-delete-after: True
-changes: 
-  - rscadd: "Brig timers will now update the records of those who are imprisoned in their cell, as long as their name is entered correctly."
-  - rscadd: "Sentences and arresting officers are announced over the security channel by brig timers, as well as the names of those who end timers manually."
diff --git a/html/changelogs/AutoChangeLog-pr-7539.yml b/html/changelogs/AutoChangeLog-pr-7539.yml
deleted file mode 100644
index 2d82f9dd58e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7539.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "KasparoVy"
-delete-after: True
-changes: 
-  - bugfix: "Moves a hidden emergency locker to where it is visible."