From 030f825c1d8f232bf3a951f76fb6c5572f51ea54 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 18 May 2018 04:41:47 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 663a4b11154..627bcc3df55 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">18 May 2018</h2>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes engineering and police tape</li>
+				<li class="rscadd">Adds security, atmospheric, and engineering holoprojectors</li>
+			</ul>
+			<h3 class="author">tigercat2000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now lock a facing direction with shift+middle mouse button, or lock your direction towards an object by clicking on it with shift + ctrl + middle mouse button.</li>
+			</ul>
+
 			<h2 class="date">15 May 2018</h2>
 			<h3 class="author">Tayyyyyyy updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 77de385b0cc..38e3a0f7a49 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6402,3 +6402,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2018-05-15:
   Tayyyyyyy:
   - bugfix: Pun pun is back!
+2018-05-18:
+  Fox McCloud:
+  - rscdel: Removes engineering and police tape
+  - rscadd: Adds security, atmospheric, and engineering holoprojectors
+  tigercat2000:
+  - rscadd: You can now lock a facing direction with shift+middle mouse button, or
+      lock your direction towards an object by clicking on it with shift + ctrl +
+      middle mouse button.
diff --git a/html/changelogs/AutoChangeLog-pr-8898.yml b/html/changelogs/AutoChangeLog-pr-8898.yml
deleted file mode 100644
index 38e31dbbe8e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8898.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "tigercat2000"
-delete-after: True
-changes: 
-  - rscadd: "You can now lock a facing direction with shift+middle mouse button, or lock your direction towards an object by clicking on it with shift + ctrl + middle mouse button."
diff --git a/html/changelogs/AutoChangeLog-pr-8974.yml b/html/changelogs/AutoChangeLog-pr-8974.yml
deleted file mode 100644
index 04bcdc3ff63..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8974.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - rscdel: "Removes engineering and police tape"
-  - rscadd: "Adds security, atmospheric, and engineering holoprojectors"