From 92ea0f6e9ace4acfb90f03bb9a4d2d3ea8044e31 Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Sat, 10 Oct 2015 10:15:14 +0200
Subject: [PATCH] Updates changelog.

---
 html/changelog.html                          |  8 ++++++++
 html/changelogs/.all_changelog.yml           |  7 +++++++
 html/changelogs/HarpyEagle-rubberbullets.yml | 20 -------------------
 html/changelogs/HarpyEagle-ttv.yml           | 21 --------------------
 4 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/HarpyEagle-rubberbullets.yml
 delete mode 100644 html/changelogs/HarpyEagle-ttv.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5c6a149e93..64639f2244 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,14 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">10 October 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Rubber bullets and beanbags now are now resisted by melee armour.</li>
+				<li class="bugfix">Fixed a couple of bugs causing phoron gas fires to burn cooler and slower than they were supposed to.</li>
+				<li class="bugfix">Merc bombs are now appropriately explosive again. Same goes for bombs made by toxins.</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 4c024323f5..2db1c6ec28 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2017,3 +2017,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2015-09-11:
   HarpyEagle:
   - tweak: Made flares brighter.
+2015-10-10:
+  HarpyEagle:
+  - tweak: Rubber bullets and beanbags now are now resisted by melee armour.
+  - bugfix: Fixed a couple of bugs causing phoron gas fires to burn cooler and slower
+      than they were supposed to.
+  - bugfix: Merc bombs are now appropriately explosive again. Same goes for bombs
+      made by toxins.
diff --git a/html/changelogs/HarpyEagle-rubberbullets.yml b/html/changelogs/HarpyEagle-rubberbullets.yml
deleted file mode 100644
index 841373a9f9..0000000000
--- a/html/changelogs/HarpyEagle-rubberbullets.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-################################
-# 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
-delete-after: True
-changes: 
-  - tweak: "Rubber bullets and beanbags now are now resisted by melee armour."
diff --git a/html/changelogs/HarpyEagle-ttv.yml b/html/changelogs/HarpyEagle-ttv.yml
deleted file mode 100644
index 67d426e234..0000000000
--- a/html/changelogs/HarpyEagle-ttv.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-################################
-# 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
-delete-after: True
-changes: 
-  - bugfix: "Fixed a couple of bugs causing phoron gas fires to burn cooler and slower than they were supposed to."
-  - bugfix: "Merc bombs are now appropriately explosive again. Same goes for bombs made by toxins."