From fd242cef4cade0bd58a0dff838c00b832bf9db8b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 24 Apr 2022 14:19:34 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.04.24.14.19.34"

---
 html/changelog.html                         |  5 +++
 html/changelogs/.all_changelog.yml          |  5 +++
 html/changelogs/dansemacabre-starsector.yml | 42 ---------------------
 3 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/dansemacabre-starsector.yml

diff --git a/html/changelog.html b/html/changelog.html
index 52228050cbc..ae818ce91e6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,11 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">24 April 2022</h2>
+			<h3 class="author">DanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Changed the SFA patrol ship into a unique shuttle, and gives it an extra marine. Restricted it to spawning in Tau Ceti, and adds a new FSF ship for the CRZ.</li>
+				<li class="rscadd">Added detailed shiplore to the extant ships in the game.</li>
+			</ul>
 			<h3 class="author">Doxxmedearly updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Tobacco will no longer cause liver damage.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2923605ef8d..ba06c85e161 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -23397,6 +23397,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   mikomyazaki:
   - tweak: Shuttles now undock/land on things in 20s rather than 90s.
 2022-04-24:
+  DanseMacabre:
+  - rscadd: Changed the SFA patrol ship into a unique shuttle, and gives it an extra
+      marine. Restricted it to spawning in Tau Ceti, and adds a new FSF ship for the
+      CRZ.
+  - rscadd: Added detailed shiplore to the extant ships in the game.
   Doxxmedearly:
   - bugfix: Tobacco will no longer cause liver damage.
   SleepyGemmy:
diff --git a/html/changelogs/dansemacabre-starsector.yml b/html/changelogs/dansemacabre-starsector.yml
deleted file mode 100644
index 913f709b2aa..00000000000
--- a/html/changelogs/dansemacabre-starsector.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: DanseMacabre
-
-# 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: "Changed the SFA patrol ship into a unique shuttle, and gives it an extra marine. Restricted it to spawning in Tau Ceti, and adds a new FSF ship for the CRZ."
-  - rscadd: "Added detailed shiplore to the extant ships in the game."