From 85f34dc871a121f5fe39792abc4dcb9d8ee7092c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 10 May 2022 10:59:29 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.05.10.10.59.29"

---
 html/changelog.html                           | 12 ++++++
 html/changelogs/.all_changelog.yml            |  7 ++++
 .../changelogs/FearTheBlackout-thereserve.yml | 42 -------------------
 html/changelogs/johnwildkins-speciesage.yml   |  7 ----
 4 files changed, 19 insertions(+), 49 deletions(-)
 delete mode 100644 html/changelogs/FearTheBlackout-thereserve.yml
 delete mode 100644 html/changelogs/johnwildkins-speciesage.yml

diff --git a/html/changelog.html b/html/changelog.html
index 939d3ce9918..fc9a3a638ec 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">10 May 2022</h2>
+			<h3 class="author">JohnWildkins updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds species-based age restriction for jobs, for now only affecting Skrell.</li>
+				<li class="tweak">Skrell minimum age raised from 30 to 50.</li>
+			</ul>
+			<h3 class="author">SimpleMaroon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a reservist version of the TCFL service card.</li>
+				<li class="tweak">Swaps the active service card in loadout with the reservist card.</li>
+			</ul>
+
 			<h2 class="date">09 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 95a5828c177..e7cf9b1886e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -23830,3 +23830,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       getting a door bolt control added. It will control whether the airlocks underneath
       the blast doors are bolted. There&#x27;s been camereas added to each combustion
       chamber and an airlock leading to space added to the starboard propulsion area.
+2022-05-10:
+  JohnWildkins:
+  - rscadd: Adds species-based age restriction for jobs, for now only affecting Skrell.
+  - tweak: Skrell minimum age raised from 30 to 50.
+  SimpleMaroon:
+  - rscadd: Adds a reservist version of the TCFL service card.
+  - tweak: Swaps the active service card in loadout with the reservist card.
diff --git a/html/changelogs/FearTheBlackout-thereserve.yml b/html/changelogs/FearTheBlackout-thereserve.yml
deleted file mode 100644
index 1fba023fa67..00000000000
--- a/html/changelogs/FearTheBlackout-thereserve.yml
+++ /dev/null
@@ -1,42 +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: SimpleMaroon
-
-# 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:
-  - rscadd: Adds a reservist version of the TCFL service card.
-  - tweak: Swaps the active service card in loadout with the reservist card.
diff --git a/html/changelogs/johnwildkins-speciesage.yml b/html/changelogs/johnwildkins-speciesage.yml
deleted file mode 100644
index 3c106758dc4..00000000000
--- a/html/changelogs/johnwildkins-speciesage.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: JohnWildkins
-
-delete-after: True
-
-changes:
-  - rscadd: "Adds species-based age restriction for jobs, for now only affecting Skrell."
-  - tweak: "Skrell minimum age raised from 30 to 50."