From c4c785ea18eaef131dd9f5864b2985ffa95f48ce Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 14 Feb 2021 15:55:27 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.02.14.15.55.27"

---
 html/changelog.html                     |  9 +++++
 html/changelogs/.all_changelog.yml      | 12 +++++++
 html/changelogs/mattatlas-armortime.yml | 46 -------------------------
 3 files changed, 21 insertions(+), 46 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-armortime.yml

diff --git a/html/changelog.html b/html/changelog.html
index d152ebfca52..de5d4ca0a66 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,15 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">14 February 2021</h2>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="experiment">Ported a new armor system from Baystation. It&#x27;s far more modular and allows for more granularity. Armor is now exponential and will block damage better the lower it is from the armor rating.</li>
+				<li class="balance">Notably, armor now removes damage flags if the damage is blocked significantly. This means no more bleeding from a 2 damage projectile.</li>
+				<li class="balance">Due to this, a lot of guns were buffed, including Security and antagonist guns alike. Some things may be a bit too strong or a bit too weak.</li>
+				<li class="balance">Likewise, a lot of armor has received buffs. Mech armor should now be considerably more durable.</li>
+				<li class="balance">Re-added laser organ damage.</li>
+				<li class="tweak">Increased the cost of the sharpened bear trap.</li>
+			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="backend">Permissions sync disable functionality should now work.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 520c7eab09e..cf78c712844 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18280,5 +18280,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       menu.
   - rscadd: Adds toeless winter boots to the xenowear section.
 2021-02-14:
+  MattAtlas:
+  - experiment: Ported a new armor system from Baystation. It&#x27;s far more modular
+      and allows for more granularity. Armor is now exponential and will block damage
+      better the lower it is from the armor rating.
+  - balance: Notably, armor now removes damage flags if the damage is blocked significantly.
+      This means no more bleeding from a 2 damage projectile.
+  - balance: Due to this, a lot of guns were buffed, including Security and antagonist
+      guns alike. Some things may be a bit too strong or a bit too weak.
+  - balance: Likewise, a lot of armor has received buffs. Mech armor should now be
+      considerably more durable.
+  - balance: Re-added laser organ damage.
+  - tweak: Increased the cost of the sharpened bear trap.
   Skull132:
   - backend: Permissions sync disable functionality should now work.
diff --git a/html/changelogs/mattatlas-armortime.yml b/html/changelogs/mattatlas-armortime.yml
deleted file mode 100644
index 4406e6c3078..00000000000
--- a/html/changelogs/mattatlas-armortime.yml
+++ /dev/null
@@ -1,46 +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:
-  - experiment: "Ported a new armor system from Baystation. It's far more modular and allows for more granularity. Armor is now exponential and will block damage better the lower it is from the armor rating."
-  - balance: "Notably, armor now removes damage flags if the damage is blocked significantly. This means no more bleeding from a 2 damage projectile."
-  - balance: "Due to this, a lot of guns were buffed, including Security and antagonist guns alike. Some things may be a bit too strong or a bit too weak."
-  - balance: "Likewise, a lot of armor has received buffs. Mech armor should now be considerably more durable."
-  - balance: "Re-added laser organ damage."
-  - tweak: "Increased the cost of the sharpened bear trap."
\ No newline at end of file