From b3b67a6a4f31a615eb5156238d4e73cd7b730207 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 12 Jun 2020 00:07:23 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 13 +++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-12494.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12499.yml |  7 -------
 4 files changed, 23 insertions(+), 11 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12494.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12499.yml

diff --git a/html/changelog.html b/html/changelog.html
index 185a09f973..2756b9fd04 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">12 June 2020</h2>
+			<h3 class="author">EmeraldSundisk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The Detective's Office has been commandeered in order to serve a Head of Security. Detectives will find their new office within starboard maintenance.</li>
+				<li class="rscadd">Adds the Head of Security's standard equipment to their new office.</li>
+				<li class="tweak">Slight adjustment/expansion to the main security department</li>
+				<li class="rscadd">Additional maintenance work</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Crabs, cockroaches, slimes and crabs are now small enough to fit in pet carriers</li>
+			</ul>
+
 			<h2 class="date">11 June 2020</h2>
 			<h3 class="author">Ghommie updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0f734d92a5..110b59a716 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25888,3 +25888,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Ghommie:
   - balance: Balanced vending machine prices to be generally more affordable, a minority
       has been priced up though.
+2020-06-12:
+  EmeraldSundisk:
+  - tweak: The Detective's Office has been commandeered in order to serve a Head of
+      Security. Detectives will find their new office within starboard maintenance.
+  - rscadd: Adds the Head of Security's standard equipment to their new office.
+  - tweak: Slight adjustment/expansion to the main security department
+  - rscadd: Additional maintenance work
+  timothyteakettle:
+  - rscadd: Crabs, cockroaches, slimes and crabs are now small enough to fit in pet
+      carriers
diff --git a/html/changelogs/AutoChangeLog-pr-12494.yml b/html/changelogs/AutoChangeLog-pr-12494.yml
deleted file mode 100644
index 563e17a55a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12494.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "Crabs, cockroaches, slimes and crabs are now small enough to fit in pet carriers"
diff --git a/html/changelogs/AutoChangeLog-pr-12499.yml b/html/changelogs/AutoChangeLog-pr-12499.yml
deleted file mode 100644
index f888896b2f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12499.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes: 
-  - tweak: "The Detective's Office has been commandeered in order to serve a Head of Security. Detectives will find their new office within starboard maintenance."
-  - rscadd: "Adds the Head of Security's standard equipment to their new office."
-  - tweak: "Slight adjustment/expansion to the main security department"
-  - rscadd: "Additional maintenance work"