From 5ef9bac517235e9abedc2052cdba255b4cbc9406 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <action@github.com>
Date: Tue, 7 Nov 2023 11:28:34 +0000
Subject: [PATCH] Automatic Changelog compile [ci skip]

---
 html/changelog.html                           | 13 +++++
 html/changelogs/.all_changelog.yml            | 11 +++++
 ...Skrell-airlock-markers-docking-shuttle.yml | 48 -------------------
 3 files changed, 24 insertions(+), 48 deletions(-)
 delete mode 100644 html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml

diff --git a/html/changelog.html b/html/changelog.html
index 54ca49cf79e..8e322a08bb3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 November 2023</h2>
+			<h3 class="author">DreamySkrell updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Airlock markers: Adds support for docking and shuttle airlocks.</li>
+				<li class="rscadd">Airlock markers: Adds support for out pumps.</li>
+				<li class="maptweak">Adds examples for docking and shuttle airlocks to the airlock guidelines helper map.</li>
+				<li class="maptweak">Remaps third deck docks to use docking airlock markers.</li>
+				<li class="maptweak">Remaps Intrepid and Spark to use docking airlock markers.</li>
+				<li class="maptweak">Changes frequencies of airlocks of antag shuttles to work with new docks.</li>
+				<li class="bugfix">Fixes bad canary and ert shuttle docking controller tags.</li>
+				<li class="rscadd">Adds merge conflict marker for use with mapmerge2.</li>
+			</ul>
+
 			<h2 class="date">06 November 2023</h2>
 			<h3 class="author">FluffyGhost updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6065bc1d490..8d6f4236d61 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -32107,3 +32107,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       as the classic jeans and jeans shorts.
   nauticall:
   - rscadd: Adds several new drinks and cocktail recipes to the bar&#x27;s arsenal.
+2023-11-07:
+  DreamySkrell:
+  - rscadd: 'Airlock markers: Adds support for docking and shuttle airlocks.'
+  - rscadd: 'Airlock markers: Adds support for out pumps.'
+  - maptweak: Adds examples for docking and shuttle airlocks to the airlock guidelines
+      helper map.
+  - maptweak: Remaps third deck docks to use docking airlock markers.
+  - maptweak: Remaps Intrepid and Spark to use docking airlock markers.
+  - maptweak: Changes frequencies of airlocks of antag shuttles to work with new docks.
+  - bugfix: Fixes bad canary and ert shuttle docking controller tags.
+  - rscadd: Adds merge conflict marker for use with mapmerge2.
diff --git a/html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml b/html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml
deleted file mode 100644
index f47cd78bae2..00000000000
--- a/html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml
+++ /dev/null
@@ -1,48 +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: DreamySkrell
-
-# 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: "Airlock markers: Adds support for docking and shuttle airlocks."
-  - rscadd: "Airlock markers: Adds support for out pumps."
-  - maptweak: "Adds examples for docking and shuttle airlocks to the airlock guidelines helper map."
-  - maptweak: "Remaps third deck docks to use docking airlock markers."
-  - maptweak: "Remaps Intrepid and Spark to use docking airlock markers."
-  - maptweak: "Changes frequencies of airlocks of antag shuttles to work with new docks."
-  - bugfix: "Fixes bad canary and ert shuttle docking controller tags."
-  - rscadd: "Adds merge conflict marker for use with mapmerge2."