From bf4eb65d9744abb34498bf08c93545dfc7415866 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 4 Sep 2019 18:21:57 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.09.04.18.21.57"

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

diff --git a/html/changelog.html b/html/changelog.html
index 129a5993303..61733bc3b50 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">04 September 2019</h2>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Intense pain messages should now be bigger.</li>
+				<li class="tweak">Re-worded some pain messages and added some others.</li>
+			</ul>
+
 			<h2 class="date">03 September 2019</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c8ea1690e65..0c8d004bdf2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8893,3 +8893,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Alberyk:
   - bugfix: Fixed hydro belts starting full when created by biogenerators.
   - bugfix: Fixed drugs' emotes no working properly.
+2019-09-04:
+  MattAtlas:
+  - tweak: Intense pain messages should now be bigger.
+  - tweak: Re-worded some pain messages and added some others.
diff --git a/html/changelogs/mattatlas-6914.yml b/html/changelogs/mattatlas-6914.yml
deleted file mode 100644
index 27f15227700..00000000000
--- a/html/changelogs/mattatlas-6914.yml
+++ /dev/null
@@ -1,42 +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: 
-  - tweak: "Intense pain messages should now be bigger."
-  - tweak: "Re-worded some pain messages and added some others."