From a6bf8f3ce8d9ed0042a5c840edfb091d2115f3c0 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 28 Jan 2021 19:10:15 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.01.28.19.10.15"

---
 html/changelog.html                          |  4 ++
 html/changelogs/.all_changelog.yml           |  3 ++
 html/changelogs/mattatlas-thankseveryone.yml | 41 --------------------
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-thankseveryone.yml

diff --git a/html/changelog.html b/html/changelog.html
index 68977bc6b22..597d4f811f7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -59,6 +59,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed ban / kick messages not showing up on goonchat.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The freelancer mercenary description has been changed so as to no longer allow self-antagonistic actions.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds more variations of hearing aids. Moved them to the earwear section.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5fb5879c3dd..de06d461b73 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18091,5 +18091,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       of HappyFox, who made the sprite.
   Karolis2011:
   - bugfix: Fixed ban / kick messages not showing up on goonchat.
+  MattAtlas:
+  - tweak: The freelancer mercenary description has been changed so as to no longer
+      allow self-antagonistic actions.
   Wowzewow (Wezzy):
   - rscadd: Adds more variations of hearing aids. Moved them to the earwear section.
diff --git a/html/changelogs/mattatlas-thankseveryone.yml b/html/changelogs/mattatlas-thankseveryone.yml
deleted file mode 100644
index a98d1666c58..00000000000
--- a/html/changelogs/mattatlas-thankseveryone.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: MattAtlas
-
-# 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: "The freelancer mercenary description has been changed so as to no longer allow self-antagonistic actions."