From 452e2e36dfd664947e696c96dcbcfa0a5433c5ea Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Sun, 11 Oct 2015 17:41:35 +0200
Subject: [PATCH] Updates changelog.

---
 html/changelog.html                           | 21 ++++++++--
 html/changelogs/.all_changelog.yml            |  8 ++++
 .../changelogs/HarpyEagle-powercellsanity.yml | 27 -------------
 html/changelogs/Hubblenaut-dev.yml            | 39 -------------------
 4 files changed, 26 insertions(+), 69 deletions(-)
 delete mode 100644 html/changelogs/HarpyEagle-powercellsanity.yml
 delete mode 100644 html/changelogs/Hubblenaut-dev.yml

diff --git a/html/changelog.html b/html/changelog.html
index faa206c7a0..7710b44956 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,10 +56,19 @@
 		
 		-->
 		<div class="commit sansserif">
-			<h2 class="date">26 September 2015</h2>
-			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<h2 class="date">11 October 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="tweak">Meteor events now select a map edge to arrive from, with a probability for each individual wave to come from either neighboring edge. Meteors will never arrive from opposite the starting edge.</li>
+				<li class="tweak">Fabricated power cells start uncharged.</li>
+			</ul>
+			<h3 class="author">Hubblenaut updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Light replacers can be refilled by clicking on a storage item.</li>
+				<li class="tweak">Light replacers now hold up to 32 light bulbs.</li>
+				<li class="tweak">Light replacers can be obtained through janitorial supply crates.</li>
+				<li class="tweak">A sheet of glass fills the light replacer by 16 bulbs.</li>
+			</ul>
+
 			<h2 class="date">10 October 2015</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
@@ -68,6 +77,12 @@
 				<li class="bugfix">Merc bombs are now appropriately explosive again. Same goes for bombs made by toxins.</li>
 			</ul>
 
+			<h2 class="date">26 September 2015</h2>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Meteor events now select a map edge to arrive from, with a probability for each individual wave to come from either neighboring edge. Meteors will never arrive from opposite the starting edge.</li>
+			</ul>
+
 			<h2 class="date">11 September 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 e02c47c2dd..476f5b886f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2319,3 +2319,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-11:
+  HarpyEagle:
+  - tweak: Fabricated power cells start uncharged.
+  Hubblenaut:
+  - rscadd: Light replacers can be refilled by clicking on a storage item.
+  - tweak: Light replacers now hold up to 32 light bulbs.
+  - tweak: Light replacers can be obtained through janitorial supply crates.
+  - tweak: A sheet of glass fills the light replacer by 16 bulbs.
diff --git a/html/changelogs/HarpyEagle-powercellsanity.yml b/html/changelogs/HarpyEagle-powercellsanity.yml
deleted file mode 100644
index fba91c796d..0000000000
--- a/html/changelogs/HarpyEagle-powercellsanity.yml
+++ /dev/null
@@ -1,27 +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
-#################################
-
-author: HarpyEagle
-changes:
-  - tweak: "Fabricated power cells start uncharged."
-delete-after: true
diff --git a/html/changelogs/Hubblenaut-dev.yml b/html/changelogs/Hubblenaut-dev.yml
deleted file mode 100644
index 5c87376685..0000000000
--- a/html/changelogs/Hubblenaut-dev.yml
+++ /dev/null
@@ -1,39 +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: 
-  - rscadd: "Light replacers can be refilled by clicking on a storage item."
-  - tweak: "Light replacers now hold up to 32 light bulbs."
-  - tweak: "Light replacers can be obtained through janitorial supply crates."
-  - tweak: "A sheet of glass fills the light replacer by 16 bulbs."