From 0874227e9a0e972c0f2d640d15cbcbd44087aa69 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 5 Jun 2020 18:54:54 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.05.18.54.54"

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

diff --git a/html/changelog.html b/html/changelog.html
index 7b757bbf937..e1ff9e66c8c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,13 @@
 				<li class="maptweak">The Virology department is now the Abandoned Sector and has been modified to resemble such.</li>
 				<li class="tweak">The Biochemist job has been replaced with the old Chemist job again.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="experiment">Lasers now have a chance to not boil blood based on the armor penetration and armor values.</li>
+				<li class="tweak">Stasis bags now actually do damage, and will actually kill.</li>
+				<li class="backend">Burn damage now counts as total damage when hitting robotic limbs.</li>
+				<li class="tweak">Sharp weapons now have a harder time penetrating to organs.</li>
+			</ul>
 			<h3 class="author">ParadoxSpace updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds Cargo Technician back to the list of available Hephaestus jobs.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7e9c80621e8..73770650951 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13484,5 +13484,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - maptweak: The Virology department is now the Abandoned Sector and has been modified
       to resemble such.
   - tweak: The Biochemist job has been replaced with the old Chemist job again.
+  MattAtlas:
+  - experiment: Lasers now have a chance to not boil blood based on the armor penetration
+      and armor values.
+  - tweak: Stasis bags now actually do damage, and will actually kill.
+  - backend: Burn damage now counts as total damage when hitting robotic limbs.
+  - tweak: Sharp weapons now have a harder time penetrating to organs.
   ParadoxSpace:
   - rscadd: Adds Cargo Technician back to the list of available Hephaestus jobs.
diff --git a/html/changelogs/mattatlas-bloodandfury.yml b/html/changelogs/mattatlas-bloodandfury.yml
deleted file mode 100644
index 1adf8f92a93..00000000000
--- a/html/changelogs/mattatlas-bloodandfury.yml
+++ /dev/null
@@ -1,44 +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: "Lasers now have a chance to not boil blood based on the armor penetration and armor values."
-  - tweak: "Stasis bags now actually do damage, and will actually kill."
-  - backend: "Burn damage now counts as total damage when hitting robotic limbs."
-  - tweak: "Sharp weapons now have a harder time penetrating to organs."