From 15c34cf953a92c9e29b49e4bb9926ee2d3fa072b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 7 Dec 2022 17:09:01 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.12.07.17.09.01"

---
 html/changelog.html                       |  9 +++++
 html/changelogs/.all_changelog.yml        |  9 +++++
 html/changelogs/dansemacabre-ssmd.yml     | 43 -----------------------
 html/changelogs/leftover_sign_removal.yml |  6 ----
 html/changelogs/sol_floor_decals.yml      |  6 ----
 html/changelogs/turf_init_dirty.yml       |  6 ----
 6 files changed, 18 insertions(+), 61 deletions(-)
 delete mode 100644 html/changelogs/dansemacabre-ssmd.yml
 delete mode 100644 html/changelogs/leftover_sign_removal.yml
 delete mode 100644 html/changelogs/sol_floor_decals.yml
 delete mode 100644 html/changelogs/turf_init_dirty.yml

diff --git a/html/changelog.html b/html/changelog.html
index 1c82337314b..4e95a33a3f3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,15 @@
 				<li class="bugfix">Fixes abyss turfs not respecting lattices and its children, only catwalks.</li>
 				<li class="bugfix">Fixes rollerbed inhands being mirrored.</li>
 				<li class="bugfix">Fixes a table in the brig communal room.</li>
+				<li class="backend">Adds a generic preset for the turf initializer.</li>
+				<li class="rscadd">Adds some Sol floor decals to the code.</li>
+				<li class="bugfix">Removes a leftover sign where cryo used to be on deck 3.</li>
+			</ul>
+			<h3 class="author">TheDanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a Southern Solarian Military District third party ship. Also adds a Visegrad flag, and a Solarian military IPC uniform.</li>
+				<li class="bugfix">Fixes a problem with the TCFL ship roles not all being able to spawn at the same time.</li>
+				<li class="tweak">Changed the shading slightly on a few Solarian uniforms.</li>
 			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7e42befff3d..f9ed43b6c2f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26936,5 +26936,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes abyss turfs not respecting lattices and its children, only catwalks.
   - bugfix: Fixes rollerbed inhands being mirrored.
   - bugfix: Fixes a table in the brig communal room.
+  - backend: Adds a generic preset for the turf initializer.
+  - rscadd: Adds some Sol floor decals to the code.
+  - bugfix: Removes a leftover sign where cryo used to be on deck 3.
+  TheDanseMacabre:
+  - rscadd: Added a Southern Solarian Military District third party ship. Also adds
+      a Visegrad flag, and a Solarian military IPC uniform.
+  - bugfix: Fixes a problem with the TCFL ship roles not all being able to spawn at
+      the same time.
+  - tweak: Changed the shading slightly on a few Solarian uniforms.
   Wowzewow (Wezzy):
   - tweak: Elevator doors are now see-through again.
diff --git a/html/changelogs/dansemacabre-ssmd.yml b/html/changelogs/dansemacabre-ssmd.yml
deleted file mode 100644
index 658a174561b..00000000000
--- a/html/changelogs/dansemacabre-ssmd.yml
+++ /dev/null
@@ -1,43 +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: "Added a Southern Solarian Military District third party ship. Also adds a Visegrad flag, and a Solarian military IPC uniform."
-  - bugfix: "Fixes a problem with the TCFL ship roles not all being able to spawn at the same time."
-  - tweak: "Changed the shading slightly on a few Solarian uniforms."
diff --git a/html/changelogs/leftover_sign_removal.yml b/html/changelogs/leftover_sign_removal.yml
deleted file mode 100644
index c210d350bd5..00000000000
--- a/html/changelogs/leftover_sign_removal.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: SleepyGemmy
-
-delete-after: True
-
-changes:
-  - bugfix: "Removes a leftover sign where cryo used to be on deck 3."
\ No newline at end of file
diff --git a/html/changelogs/sol_floor_decals.yml b/html/changelogs/sol_floor_decals.yml
deleted file mode 100644
index d72704f7a3a..00000000000
--- a/html/changelogs/sol_floor_decals.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: SleepyGemmy
-
-delete-after: True
-
-changes:
-  - rscadd: "Adds some Sol floor decals to the code."
\ No newline at end of file
diff --git a/html/changelogs/turf_init_dirty.yml b/html/changelogs/turf_init_dirty.yml
deleted file mode 100644
index e745d68d619..00000000000
--- a/html/changelogs/turf_init_dirty.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: SleepyGemmy
-
-delete-after: True
-
-changes:
-  - backend: "Adds a generic preset for the turf initializer."
\ No newline at end of file