From 742f76e511a3e22b98a0e0bdcf0e56c2b9ac8511 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 3 Jul 2020 18:14:59 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.03.18.14.59"

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

diff --git a/html/changelog.html b/html/changelog.html
index d2a4fa6445f..bdad7fc16c3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,12 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed joining via cryo disconnecting people.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ported an overhauled emote backend.</li>
+				<li class="rscadd">Added automatic pain messages for all species.</li>
+				<li class="rscadd">Added a multichirp emote for dionae.</li>
+			</ul>
 			<h3 class="author">Yonnimer updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Changes the gimlet recipe to 1 gin, 1 limejuice, 1 grenadine.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e38dbdc2849..58dfc6698ef 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13963,5 +13963,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-07-03:
   Alberyk:
   - bugfix: Fixed joining via cryo disconnecting people.
+  MattAtlas:
+  - rscadd: Ported an overhauled emote backend.
+  - rscadd: Added automatic pain messages for all species.
+  - rscadd: Added a multichirp emote for dionae.
   Yonnimer:
   - tweak: Changes the gimlet recipe to 1 gin, 1 limejuice, 1 grenadine.
diff --git a/html/changelogs/mattatlas-emotedecls.yml b/html/changelogs/mattatlas-emotedecls.yml
deleted file mode 100644
index ade09ae1020..00000000000
--- a/html/changelogs/mattatlas-emotedecls.yml
+++ /dev/null
@@ -1,43 +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: 
-  - rscadd: "Ported an overhauled emote backend."
-  - rscadd: "Added automatic pain messages for all species."
-  - rscadd: "Added a multichirp emote for dionae."