From db2a5d5e9b8529e441c69bb2ec560b0dc7109915 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 23 Dec 2022 11:23:18 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.12.23.11.23.18"

---
 html/changelog.html                           |  5 +++
 html/changelogs/.all_changelog.yml            |  3 ++
 ...ngOfThePing - all_I_want_for_christmas.yml | 42 -------------------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/KingOfThePing - all_I_want_for_christmas.yml

diff --git a/html/changelog.html b/html/changelog.html
index b2902a18a90..19ee857517a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -44,6 +44,11 @@
 				<li class="bugfix">Fixed a divide-by-zero runtime with adding reagents to a full container.</li>
 				<li class="bugfix">Fixed an issue with admin proc call failing on unowned procs.</li>
 			</ul>
+			<h3 class="author">KingOfThePing updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added alcoholic eggnog.</li>
+				<li class="maptweak">Prepared the Idris Cruiser for Christmas with various additions.</li>
+			</ul>
 			<h3 class="author">listerla updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed anomaly harvesters disappearing when enabled.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a9939d4f1ac..b520456e94d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -27302,5 +27302,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Telecomms machines will now once again reboot themselves after being EMPed.
   - bugfix: Fixed a divide-by-zero runtime with adding reagents to a full container.
   - bugfix: Fixed an issue with admin proc call failing on unowned procs.
+  KingOfThePing:
+  - rscadd: Added alcoholic eggnog.
+  - maptweak: Prepared the Idris Cruiser for Christmas with various additions.
   listerla:
   - bugfix: Fixed anomaly harvesters disappearing when enabled.
diff --git a/html/changelogs/KingOfThePing - all_I_want_for_christmas.yml b/html/changelogs/KingOfThePing - all_I_want_for_christmas.yml
deleted file mode 100644
index 113cdf4d707..00000000000
--- a/html/changelogs/KingOfThePing - all_I_want_for_christmas.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: KingOfThePing
-
-# 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 alcoholic eggnog."
-  - maptweak: "Prepared the Idris Cruiser for Christmas with various additions."