From a89ed2ff5cac530f81aef5f53c111dae17065ed2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 27 May 2023 12:46:10 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2023.05.27.12.46.10"

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

diff --git a/html/changelog.html b/html/changelog.html
index 9a0e0e8fb87..9b7928c3301 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -45,6 +45,10 @@
 				<li class="maptweak">Fixes piping errors and access restrictions on the Tarwa Conglomerate ship.</li>
 				<li class="bugfix">The Tarwa Conglomerate Shuttle Hangar navpoint now works correctly.</li>
 			</ul>
+			<h3 class="author">SimpleMaroon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added six new banners and flags to the loadout: Port Antillia, San Colette, Mictlan, Zo&#x27;ra, K&#x27;lax, and C&#x27;thur.</li>
+			</ul>
 			<h3 class="author">kyres1 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed tactical turtlenecks not being an option anymore in the loadout.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a680b3ddde0..1900473eb5c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -29375,5 +29375,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - maptweak: Fixes piping errors and access restrictions on the Tarwa Conglomerate
       ship.
   - bugfix: The Tarwa Conglomerate Shuttle Hangar navpoint now works correctly.
+  SimpleMaroon:
+  - rscadd: 'Added six new banners and flags to the loadout: Port Antillia, San Colette,
+      Mictlan, Zo&#x27;ra, K&#x27;lax, and C&#x27;thur.'
   kyres1:
   - bugfix: Fixed tactical turtlenecks not being an option anymore in the loadout.
diff --git a/html/changelogs/SimpleMaroon-flagchamp.yml b/html/changelogs/SimpleMaroon-flagchamp.yml
deleted file mode 100644
index da548ba0359..00000000000
--- a/html/changelogs/SimpleMaroon-flagchamp.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: 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: "Added six new banners and flags to the loadout: Port Antillia, San Colette, Mictlan, Zo'ra, K'lax, and C'thur."