From a00f2555ea8f268d476a7f18d95d4130b0d98ca1 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 17 Jun 2020 10:27:02 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.17.10.27.02"

---
 html/changelog.html                      | 11 +++++++
 html/changelogs/.all_changelog.yml       |  8 +++++
 html/changelogs/Yonnimer - nymph_hud.yml | 42 ------------------------
 html/changelogs/mattatlas-paper.yml      | 41 -----------------------
 4 files changed, 19 insertions(+), 83 deletions(-)
 delete mode 100644 html/changelogs/Yonnimer - nymph_hud.yml
 delete mode 100644 html/changelogs/mattatlas-paper.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0805cd5cc40..d193065f465 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 June 2020</h2>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Renaming paper now adds the new name to the end of the paper name, so you get paper (fragmentation grenade), instead of just fragmentation grenade. To reset the name, just input a blank name.</li>
+			</ul>
+			<h3 class="author">Yonnimer updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a new health hud for nymphs.</li>
+				<li class="bugfix">Fixes the nymph hud always being low.</li>
+			</ul>
+
 			<h2 class="date">16 June 2020</h2>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f4ba7c2ed42..c884bd9514c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13687,3 +13687,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       has minor side effects like better headbutts.
   Geeves, Sprites by Kyres:
   - imageadd: The bluespace sprite has been updated.
+2020-06-17:
+  MattAtlas:
+  - tweak: Renaming paper now adds the new name to the end of the paper name, so you
+      get paper (fragmentation grenade), instead of just fragmentation grenade. To
+      reset the name, just input a blank name.
+  Yonnimer:
+  - rscadd: Adds a new health hud for nymphs.
+  - bugfix: Fixes the nymph hud always being low.
diff --git a/html/changelogs/Yonnimer - nymph_hud.yml b/html/changelogs/Yonnimer - nymph_hud.yml
deleted file mode 100644
index f71de58ce6c..00000000000
--- a/html/changelogs/Yonnimer - nymph_hud.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: Yonnimer
-
-# 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: "Adds a new health hud for nymphs."
-  - bugfix: "Fixes the nymph hud always being low."
diff --git a/html/changelogs/mattatlas-paper.yml b/html/changelogs/mattatlas-paper.yml
deleted file mode 100644
index 0640e030e6f..00000000000
--- a/html/changelogs/mattatlas-paper.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: 
-  - tweak: "Renaming paper now adds the new name to the end of the paper name, so you get paper (fragmentation grenade), instead of just fragmentation grenade. To reset the name, just input a blank name."