From 89f3fb2b6d29e8fd4fd3faccf0df79845cbc2bd2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 23 Feb 2021 15:54:24 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.02.23.15.54.24"

---
 html/changelog.html                      |  6 ++++
 html/changelogs/.all_changelog.yml       |  7 ++++
 html/changelogs/mattatlas-teargasfix.yml | 43 ------------------------
 3 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-teargasfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index a36c6adff7c..7b2eb3c9be3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -42,6 +42,12 @@
 				<li class="rscadd">Added ore detectors to xenoarch excavation lockers.</li>
 				<li class="tweak">You can no longer toggle your hardsuit pieces while incapacitated.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Tear gas should now be much more effective.</li>
+				<li class="tweak">Stun batons now disperse pain all over the body. What happened previously was that hitting the same body part would not cause spillover, thus keeping the mob&#x27;s pain at that limb&#x27;s total pain cap.</li>
+				<li class="tweak">Adrenaline generation is now capped and will not be generated if there is more than 15u in the system.</li>
+			</ul>
 			<h3 class="author">WickedCybs updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Rectified a mistake that was missed on the Tajara Bangs Alt hairstyle. A superfluous pixel was removed.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 753fbc602f9..da7004b0e3b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18448,6 +18448,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       as major artifacts.
   - rscadd: Added ore detectors to xenoarch excavation lockers.
   - tweak: You can no longer toggle your hardsuit pieces while incapacitated.
+  MattAtlas:
+  - tweak: Tear gas should now be much more effective.
+  - tweak: Stun batons now disperse pain all over the body. What happened previously
+      was that hitting the same body part would not cause spillover, thus keeping
+      the mob&#x27;s pain at that limb&#x27;s total pain cap.
+  - tweak: Adrenaline generation is now capped and will not be generated if there
+      is more than 15u in the system.
   WickedCybs:
   - bugfix: Rectified a mistake that was missed on the Tajara Bangs Alt hairstyle.
       A superfluous pixel was removed.
diff --git a/html/changelogs/mattatlas-teargasfix.yml b/html/changelogs/mattatlas-teargasfix.yml
deleted file mode 100644
index 57b6b8c5db4..00000000000
--- a/html/changelogs/mattatlas-teargasfix.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: 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: "Tear gas should now be much more effective."
-  - tweak: "Stun batons now disperse pain all over the body. What happened previously was that hitting the same body part would not cause spillover, thus keeping the mob's pain at that limb's total pain cap."
-  - tweak: "Adrenaline generation is now capped and will not be generated if there is more than 15u in the system."
\ No newline at end of file