From e0730b6032a67bdfb08bdee7681bdb7c12e41a32 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 9 Nov 2019 22:52:02 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.11.09.22.52.02"

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

diff --git a/html/changelog.html b/html/changelog.html
index d869d672036..49e9d391af5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -72,6 +72,10 @@
 				<li class="bugfix">Fixed wallets and lanyards, mining carts, the Einstein Engines ID, pAI cards, and the improvised sword having missing sprites.</li>
 				<li class="tweak">Darker outlines and color tweaks to engineering / cargo outfits, ore + sheet snatchers, the atmos fire helmet, hardhats, and safety goggles.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">You can no longer knock someone out with a melee weapon while aiming for the head if they have a helmet on.</li>
+			</ul>
 			<h3 class="author">PoZe, MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">New human sprites! Your characters will be grey until you select a preset. Please send all feedback regarding human colors to MattAtlas#6970. This is brought to you mainly by PoZe, who did most of the work.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dd1e360b1ce..1fec3c85433 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9922,6 +9922,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       cards, and the improvised sword having missing sprites.
   - tweak: Darker outlines and color tweaks to engineering / cargo outfits, ore +
       sheet snatchers, the atmos fire helmet, hardhats, and safety goggles.
+  MattAtlas:
+  - rscdel: You can no longer knock someone out with a melee weapon while aiming for
+      the head if they have a helmet on.
   PoZe, MattAtlas:
   - rscadd: New human sprites! Your characters will be grey until you select a preset.
       Please send all feedback regarding human colors to MattAtlas#6970. This is brought
diff --git a/html/changelogs/mattatlas-noheadkos.yml b/html/changelogs/mattatlas-noheadkos.yml
deleted file mode 100644
index 183ee5c04fb..00000000000
--- a/html/changelogs/mattatlas-noheadkos.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: 
-  - rscdel: "You can no longer knock someone out with a melee weapon while aiming for the head if they have a helmet on."