From 7ee906bcf9053777e78a1d36ee834602dc0be47f Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 23 Jul 2022 16:32:52 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.07.23.16.32.52"

---
 html/changelog.html                         |  4 ++
 html/changelogs/.all_changelog.yml          |  3 ++
 html/changelogs/dansemacabre-sfareturns.yml | 41 ---------------------
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/dansemacabre-sfareturns.yml

diff --git a/html/changelog.html b/html/changelog.html
index b21db79d61b..dcb409ab05a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes the RD lacking access to the Intrepid cockpit.</li>
 			</ul>
+			<h3 class="author">TheDanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">As a result of recent lore updates, the SFA ship has been enabled to spawn in the CRZ and disabled in Tau Ceti. Also adds SFA warlord armor.</li>
+			</ul>
 			<h3 class="author">WhatsUpBrotendo updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Removed the nose pixel from Skrell sprites.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 85d9fee2e92..e420aa255fa 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25257,6 +25257,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds the Vysokan Origin for IPCs
   SleepyGemmy:
   - bugfix: Fixes the RD lacking access to the Intrepid cockpit.
+  TheDanseMacabre:
+  - rscadd: As a result of recent lore updates, the SFA ship has been enabled to spawn
+      in the CRZ and disabled in Tau Ceti. Also adds SFA warlord armor.
   WhatsUpBrotendo:
   - tweak: Removed the nose pixel from Skrell sprites.
   Wowzewow (Wezzy):
diff --git a/html/changelogs/dansemacabre-sfareturns.yml b/html/changelogs/dansemacabre-sfareturns.yml
deleted file mode 100644
index 5dd3c05d6a8..00000000000
--- a/html/changelogs/dansemacabre-sfareturns.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: TheDanseMacabre
-
-# 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: "As a result of recent lore updates, the SFA ship has been enabled to spawn in the CRZ and disabled in Tau Ceti. Also adds SFA warlord armor."