From e5ef8d5485014e3ec8e22a071c25512aab942f6c Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Wed, 14 Oct 2015 08:22:28 +0200
Subject: [PATCH] Updates changelog.

---
 html/changelog.html                         | 13 ++++++++
 html/changelogs/.all_changelog.yml          |  8 +++++
 html/changelogs/Hubblenaut-master.yml       | 37 ---------------------
 html/changelogs/Hubblenaut-stacks.yml       | 37 ---------------------
 html/changelogs/TheWelp-secRemoveMaster.yml |  6 ----
 5 files changed, 21 insertions(+), 80 deletions(-)
 delete mode 100644 html/changelogs/Hubblenaut-master.yml
 delete mode 100644 html/changelogs/Hubblenaut-stacks.yml
 delete mode 100644 html/changelogs/TheWelp-secRemoveMaster.yml

diff --git a/html/changelog.html b/html/changelog.html
index 64639f2244a..372d1d37624 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,19 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">14 October 2015</h2>
+			<h3 class="author">Hubblenaut updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Airlock backup power test light properly offline when backup power down.</li>
+				<li class="bugfix">Empty flavor texts no longer draw an empty line on examination.</li>
+				<li class="bugfix">Material stacks now properly merge upon creation.</li>
+				<li class="bugfix">Messages for adding to existing stack appear again.</li>
+			</ul>
+			<h3 class="author">TheWelp updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed higher Secret player requirements.</li>
+			</ul>
+
 			<h2 class="date">10 October 2015</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2db1c6ec288..4dc9f9dac63 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2024,3 +2024,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       than they were supposed to.
   - bugfix: Merc bombs are now appropriately explosive again. Same goes for bombs
       made by toxins.
+2015-10-14:
+  Hubblenaut:
+  - bugfix: Airlock backup power test light properly offline when backup power down.
+  - bugfix: Empty flavor texts no longer draw an empty line on examination.
+  - bugfix: Material stacks now properly merge upon creation.
+  - bugfix: Messages for adding to existing stack appear again.
+  TheWelp:
+  - rscdel: Removed higher Secret player requirements.
diff --git a/html/changelogs/Hubblenaut-master.yml b/html/changelogs/Hubblenaut-master.yml
deleted file mode 100644
index 783ec67eead..00000000000
--- a/html/changelogs/Hubblenaut-master.yml
+++ /dev/null
@@ -1,37 +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
-#################################
-
-# Your name.  
-author: Hubblenaut
-
-# 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: "Airlock backup power test light properly offline when backup power down."
-  - bugfix: "Empty flavor texts no longer draw an empty line on examination."
diff --git a/html/changelogs/Hubblenaut-stacks.yml b/html/changelogs/Hubblenaut-stacks.yml
deleted file mode 100644
index 10426fff707..00000000000
--- a/html/changelogs/Hubblenaut-stacks.yml
+++ /dev/null
@@ -1,37 +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
-#################################
-
-# Your name.  
-author: Hubblenaut
-
-# 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: "Material stacks now properly merge upon creation."
-  - bugfix: "Messages for adding to existing stack appear again."
diff --git a/html/changelogs/TheWelp-secRemoveMaster.yml b/html/changelogs/TheWelp-secRemoveMaster.yml
deleted file mode 100644
index bcf7c7a0294..00000000000
--- a/html/changelogs/TheWelp-secRemoveMaster.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheWelp
-
-delete-after: True
-
-changes: 
-  - rscdel: "Removed Higher Secret Player Requirements"