From 78769e089673b2cc7e5c4b9d6d6da45adba5a494 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 17 Dec 2022 19:02:29 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.12.17.19.02.29"

---
 html/changelog.html                     | 2 ++
 html/changelogs/.all_changelog.yml      | 4 ++++
 html/changelogs/johnwildkins-fixboi.yml | 7 -------
 3 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/johnwildkins-fixboi.yml

diff --git a/html/changelog.html b/html/changelog.html
index 22b9b531e70..284caf39e8b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,6 +47,8 @@
 				<li class="bugfix">Fixed alarm consoles not displaying any alarms.</li>
 				<li class="bugfix">Fixed looping sounds not initializing properly.</li>
 				<li class="bugfix">Fixed the missing HOS jacket sprite.</li>
+				<li class="bugfix">Discord bot (and other things that interact with the staff list) no longer break when a de-admined staff member leaves the server.</li>
+				<li class="bugfix">Fixed the bot runtiming the server by asking about the evacuation controller before it existed.</li>
 			</ul>
 			<h3 class="author">Peppermint updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 961908f4f14..96ba2c173f1 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -27141,6 +27141,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed alarm consoles not displaying any alarms.
   - bugfix: Fixed looping sounds not initializing properly.
   - bugfix: Fixed the missing HOS jacket sprite.
+  - bugfix: Discord bot (and other things that interact with the staff list) no longer
+      break when a de-admined staff member leaves the server.
+  - bugfix: Fixed the bot runtiming the server by asking about the evacuation controller
+      before it existed.
   Peppermint:
   - maptweak: Remaps the SFA away ship.
   - maptweak: Rebalances the SFA away ship.
diff --git a/html/changelogs/johnwildkins-fixboi.yml b/html/changelogs/johnwildkins-fixboi.yml
deleted file mode 100644
index 8b78436913b..00000000000
--- a/html/changelogs/johnwildkins-fixboi.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: JohnWildkins
-
-delete-after: True
-
-changes:
-  - bugfix: "Discord bot (and other things that interact with the staff list) no longer break when a de-admined staff member leaves the server."
-  - bugfix: "Fixed the bot runtiming the server by asking about the evacuation controller before it existed."