From 51655172afeaf376294bfe5ef0d2158f5fabfecb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 17 Aug 2021 17:08:29 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.08.17.17.08.29"

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

diff --git a/html/changelog.html b/html/changelog.html
index e8511be334e..e4711f4d960 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,10 @@
 				<li class="rscadd">Certain weapons, such as cannons and the anti-materiel rifle, will do extra damage to mechas, structures, and synthetics.</li>
 				<li class="rscadd">Added two new anti-materiel weapons: the point entry anti-materiel cannon and the adhomian recoilless rifle.</li>
 			</ul>
+			<h3 class="author">DanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Recolored the mercenary heavy armor.</li>
+			</ul>
 			<h3 class="author">Desven updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Changed the premium lunchbox from the Dinnerware from NT lunchbox to SCC lunchbox.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 18bf55c5b98..493009c0c5e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -21139,6 +21139,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       extra damage to mechas, structures, and synthetics.
   - rscadd: 'Added two new anti-materiel weapons: the point entry anti-materiel cannon
       and the adhomian recoilless rifle.'
+  DanseMacabre:
+  - tweak: Recolored the mercenary heavy armor.
   Desven:
   - rscadd: Changed the premium lunchbox from the Dinnerware from NT lunchbox to SCC
       lunchbox.
diff --git a/html/changelogs/dansemacabre-recolor.yml b/html/changelogs/dansemacabre-recolor.yml
deleted file mode 100644
index 3c508d6faea..00000000000
--- a/html/changelogs/dansemacabre-recolor.yml
+++ /dev/null
@@ -1,41 +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: DanseMacabre
-
-# 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:
-  - tweak: "Recolored the mercenary heavy armor."