From 6c40761e54b46c2aae7452e78c2b01e2af82abfe Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 18 May 2022 10:52:51 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.05.18.10.52.51"

---
 html/changelog.html                         | 11 +++++++++++
 html/changelogs/.all_changelog.yml          |  8 ++++++++
 html/changelogs/Ben10083 - Workshop.yml     | 13 -------------
 html/changelogs/johnwildkins-firealarms.yml |  7 -------
 4 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 html/changelogs/Ben10083 - Workshop.yml
 delete mode 100644 html/changelogs/johnwildkins-firealarms.yml

diff --git a/html/changelog.html b/html/changelog.html
index a66d658f4af..7aa2dc3c323 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">18 May 2022</h2>
+			<h3 class="author">Ben10083 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">Machinist can now use the airlocks south west of their workshop.</li>
+			</ul>
+			<h3 class="author">JohnWildkins updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Adds missing fire alarms and emergency shutters to several rooms on the Horizon, Aurora, and Runtime.</li>
+				<li class="backend">Adds a unit test to check that all rooms that should have a fire alarm, do.</li>
+			</ul>
+
 			<h2 class="date">17 May 2022</h2>
 			<h3 class="author">JohnWildkins updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3ab5c2e35a5..fc09dc6eb97 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24112,3 +24112,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   WowzewoW (Wezzy):
   - tweak: Changed terminal sprites.
   - imageadd: Ringer has a new sprite.
+2022-05-18:
+  Ben10083:
+  - maptweak: Machinist can now use the airlocks south west of their workshop.
+  JohnWildkins:
+  - bugfix: Adds missing fire alarms and emergency shutters to several rooms on the
+      Horizon, Aurora, and Runtime.
+  - backend: Adds a unit test to check that all rooms that should have a fire alarm,
+      do.
diff --git a/html/changelogs/Ben10083 - Workshop.yml b/html/changelogs/Ben10083 - Workshop.yml
deleted file mode 100644
index f38249b75ed..00000000000
--- a/html/changelogs/Ben10083 - Workshop.yml	
+++ /dev/null
@@ -1,13 +0,0 @@
-# Your name.
-author: Ben10083
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - maptweak: "Machinist can now use the airlocks south west of their workshop."
diff --git a/html/changelogs/johnwildkins-firealarms.yml b/html/changelogs/johnwildkins-firealarms.yml
deleted file mode 100644
index 57e7b5a9f05..00000000000
--- a/html/changelogs/johnwildkins-firealarms.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: JohnWildkins
-
-delete-after: True
-
-changes:
-  - bugfix: "Adds missing fire alarms and emergency shutters to several rooms on the Horizon, Aurora, and Runtime."
-  - backend: "Adds a unit test to check that all rooms that should have a fire alarm, do."