From dca8594a8abe2ce5e076dd6ef2666a56a8709ec8 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 7 Sep 2020 18:34:34 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.09.07.18.34.34"

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

diff --git a/html/changelog.html b/html/changelog.html
index b7e18620163..5b2d4e1f343 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,7 @@
 				<li class="bugfix">Drinking glasses, wine bottles and such now shatter when thrown.</li>
 				<li class="bugfix">Beakers now properly shatter when thrown as well.</li>
 				<li class="bugfix">Reagent containers should break properly when hit. Be careful when pouring drinks, don't use harm intent.</li>
+				<li class="bugfix">Fixes no-client human pain emotes not working.</li>
 			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2fdf67f7785..4de0646c45b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15403,6 +15403,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Beakers now properly shatter when thrown as well.
   - bugfix: Reagent containers should break properly when hit. Be careful when pouring
       drinks, don't use harm intent.
+  - bugfix: Fixes no-client human pain emotes not working.
   Skull132:
   - bugfix: Reload Admins will now update the admins from the forumsuser API when
       enabled.
diff --git a/html/changelogs/mattatlas-emotefixes.yml b/html/changelogs/mattatlas-emotefixes.yml
deleted file mode 100644
index 3cdc8dfa536..00000000000
--- a/html/changelogs/mattatlas-emotefixes.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: "Fixes no-client human pain emotes not working."