From 3e4a67ebf5184ca0fa0faab7d6c46adea1914650 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 10 Jun 2022 11:01:34 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.06.10.11.01.34"

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

diff --git a/html/changelog.html b/html/changelog.html
index 72dc41dd055..8a8f5bff667 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -44,6 +44,10 @@
 				<li class="bugfix">Fixed the generic shuttle landing point for away ships not appearing as a valid destination, and renamed them to better describe the landing area.</li>
 				<li class="bugfix">Fixed bugs relating to airlocks disappearing or not functioning once one leaves the &#x27;faint ship activity&#x27; area, since this no longer happens.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Headshots no longer stun with weapons that do equal to or over 40 damage.</li>
+			</ul>
 			<h3 class="author">SleepyGemmy updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Custodians can now put their tape roll inside their utility belt.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ef9610afdc8..10d9ab42a9d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24727,6 +24727,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       a valid destination, and renamed them to better describe the landing area.
   - bugfix: Fixed bugs relating to airlocks disappearing or not functioning once one
       leaves the &#x27;faint ship activity&#x27; area, since this no longer happens.
+  MattAtlas:
+  - rscdel: Headshots no longer stun with weapons that do equal to or over 40 damage.
   SleepyGemmy:
   - bugfix: Custodians can now put their tape roll inside their utility belt.
   Wowzewow (Wezzy):
diff --git a/html/changelogs/mattatlas-baycoderemnants.yml b/html/changelogs/mattatlas-baycoderemnants.yml
deleted file mode 100644
index 9c4232dcf9a..00000000000
--- a/html/changelogs/mattatlas-baycoderemnants.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: "Headshots no longer stun with weapons that do equal to or over 40 damage."