From 04a8115f62d0ed1612b99b8f4ece103d3db7dfa5 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 29 Jul 2022 22:03:41 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.07.29.22.03.41"

---
 html/changelog.html                      |  6 ++++
 html/changelogs/.all_changelog.yml       |  5 +++
 html/changelogs/dansemacabre-byebomb.yml | 43 ------------------------
 3 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/dansemacabre-byebomb.yml

diff --git a/html/changelog.html b/html/changelog.html
index ec638908459..9fe2ec5a6a0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -63,6 +63,12 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Adds the Jovian accent to an overlooked IPC origin.</li>
 			</ul>
+			<h3 class="author">TheDanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Minor changes to the Sol equipment locker at the mercenary base.</li>
+				<li class="tweak">The nuclear bomb no longer spawns on the mercenary shuttle. It now spawns in the base itself.</li>
+				<li class="rscdel">Mercenaries no longer get 3 maxcap TTVs for free.</li>
+			</ul>
 			<h3 class="author">WhatsUpBrotendo updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added Tattuqig accent as an option for Traverse Skrell.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 12c5d45e315..851ffef76a6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25316,6 +25316,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       vampire more freedom in how to frame it.
   Omicega:
   - bugfix: Adds the Jovian accent to an overlooked IPC origin.
+  TheDanseMacabre:
+  - rscadd: Minor changes to the Sol equipment locker at the mercenary base.
+  - tweak: The nuclear bomb no longer spawns on the mercenary shuttle. It now spawns
+      in the base itself.
+  - rscdel: Mercenaries no longer get 3 maxcap TTVs for free.
   WhatsUpBrotendo:
   - rscadd: Added Tattuqig accent as an option for Traverse Skrell.
   Wowzewow (Wezzy):
diff --git a/html/changelogs/dansemacabre-byebomb.yml b/html/changelogs/dansemacabre-byebomb.yml
deleted file mode 100644
index 10b4aaa4b72..00000000000
--- a/html/changelogs/dansemacabre-byebomb.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: "Minor changes to the Sol equipment locker at the mercenary base."
-  - tweak: "The nuclear bomb no longer spawns on the mercenary shuttle. It now spawns in the base itself."
-  - rscdel: "Mercenaries no longer get 3 maxcap TTVs for free."