From 4474c7cec9dc86d6f36873ea3d132c8d86891e47 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 19 May 2022 13:47:09 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.05.19.13.47.09"

---
 html/changelog.html                     | 11 +++++++
 html/changelogs/.all_changelog.yml      |  7 +++++
 html/changelogs/johnwildkins-UT.yml     |  7 -----
 html/changelogs/mattatlas-matriarhc.yml | 41 -------------------------
 4 files changed, 18 insertions(+), 48 deletions(-)
 delete mode 100644 html/changelogs/johnwildkins-UT.yml
 delete mode 100644 html/changelogs/mattatlas-matriarhc.yml

diff --git a/html/changelog.html b/html/changelog.html
index a99698a70d1..64482ebfd3e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">19 May 2022</h2>
+			<h3 class="author">JohnWildkins updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="backend">Fixed code_check not having proper arguments passed to it, added a check for non-TGM mapfiles.</li>
+				<li class="backend">Added a unit test for testing all away sites.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Matriarch drones are not whitelisted anymore.</li>
+			</ul>
+
 			<h2 class="date">18 May 2022</h2>
 			<h3 class="author">Ben10083 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7b4f8681226..e312d8d6d17 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24127,3 +24127,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes the CCIA shuttle venting the mining shuttle dock.
   mikomyazaki:
   - tweak: Sped up code related to pain, dislocation and shock.
+2022-05-19:
+  JohnWildkins:
+  - backend: Fixed code_check not having proper arguments passed to it, added a check
+      for non-TGM mapfiles.
+  - backend: Added a unit test for testing all away sites.
+  MattAtlas:
+  - tweak: Matriarch drones are not whitelisted anymore.
diff --git a/html/changelogs/johnwildkins-UT.yml b/html/changelogs/johnwildkins-UT.yml
deleted file mode 100644
index 471f1f67967..00000000000
--- a/html/changelogs/johnwildkins-UT.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: JohnWildkins
-
-delete-after: True
-
-changes:
-  - backend: "Fixed code_check not having proper arguments passed to it, added a check for non-TGM mapfiles."
-  - backend: "Added a unit test for testing all away sites."
diff --git a/html/changelogs/mattatlas-matriarhc.yml b/html/changelogs/mattatlas-matriarhc.yml
deleted file mode 100644
index 3b06b839e80..00000000000
--- a/html/changelogs/mattatlas-matriarhc.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: MattAtlas
-
-# 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:
-  - tweak: "Matriarch drones are not whitelisted anymore."