From 0bc6453f66834bfa5d8cd8ec15fb3ba71e571953 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 30 Jul 2020 12:30:38 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.30.12.30.38"

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

diff --git a/html/changelog.html b/html/changelog.html
index 4f1c2d4b060..c12cfbddd04 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -68,6 +68,10 @@
 				<li class="rscadd">The Who and Staff Who actions now output into a window rather than into the chat.</li>
 				<li class="admin">The extra info button for admins now also outputs to a window rather than into the chat.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Species that do not respect brainmed, excluding dionae and things like zombies that have less, should now have 200 health again.</li>
+			</ul>
 			<h3 class="author">Stryker, Mwahahahaha updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added several loadout items, hanboks, hoodies (sleeveless, short-sleeved, crop-top), colorable gloves, and colorable, pinnable tag accessories.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3935962fb82..fbe93a84b5b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14547,6 +14547,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       the chat.
   - admin: The extra info button for admins now also outputs to a window rather than
       into the chat.
+  MattAtlas:
+  - bugfix: Species that do not respect brainmed, excluding dionae and things like
+      zombies that have less, should now have 200 health again.
   Stryker, Mwahahahaha:
   - rscadd: Added several loadout items, hanboks, hoodies (sleeveless, short-sleeved,
       crop-top), colorable gloves, and colorable, pinnable tag accessories.
diff --git a/html/changelogs/mattatlas-fuckthisshit.yml b/html/changelogs/mattatlas-fuckthisshit.yml
deleted file mode 100644
index a07c98cbcd8..00000000000
--- a/html/changelogs/mattatlas-fuckthisshit.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: 
-  - bugfix: "Species that do not respect brainmed, excluding dionae and things like zombies that have less, should now have 200 health again."