From 1be14aa46aa22c42a8db036eb6a8e11020cc3c8e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 6 Jun 2022 09:51:29 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.06.06.09.51.29"

---
 html/changelog.html                |  5 ++++
 html/changelogs/.all_changelog.yml |  4 +++
 html/changelogs/kyres1-#14087.yml  | 42 ------------------------------
 3 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/kyres1-#14087.yml

diff --git a/html/changelog.html b/html/changelog.html
index 836db3b9b3f..2c685d84149 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -107,6 +107,11 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">You can now take butanol in your loadout flask, just like yummy toothpaste or ethanol.</li>
 			</ul>
+			<h3 class="author">kyres1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">Remapped the TCFL Peacekeeper ship, and its respective shuttle.</li>
+				<li class="maptweak">Adds a new docking arm outside the Operations Lobby where big shuttles of different shapes can dock.</li>
+			</ul>
 
 			<h2 class="date">05 June 2022</h2>
 			<h3 class="author">ClemTheDuck, The Stryker updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e5f884b352d..d70a34c5d2e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24581,3 +24581,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   anconfuzedrock:
   - tweak: You can now take butanol in your loadout flask, just like yummy toothpaste
       or ethanol.
+  kyres1:
+  - maptweak: Remapped the TCFL Peacekeeper ship, and its respective shuttle.
+  - maptweak: Adds a new docking arm outside the Operations Lobby where big shuttles
+      of different shapes can dock.
diff --git a/html/changelogs/kyres1-#14087.yml b/html/changelogs/kyres1-#14087.yml
deleted file mode 100644
index 8a5dfabdecc..00000000000
--- a/html/changelogs/kyres1-#14087.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: kyres1
-
-# 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:
-  - maptweak: "Remapped the TCFL Peacekeeper ship, and its respective shuttle."
-  - maptweak: "Adds a new docking arm outside the Operations Lobby where big shuttles of different shapes can dock."
\ No newline at end of file