From dc4d01cc800dfee8787dbbb9012b515f35060806 Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Mon, 2 Nov 2015 10:09:30 +0100
Subject: [PATCH] Updates changelog.

---
 html/changelog.html                 | 21 ++++++++++++---
 html/changelogs/.all_changelog.yml  |  9 +++++++
 html/changelogs/Hubblenaut-tape.yml | 41 -----------------------------
 3 files changed, 26 insertions(+), 45 deletions(-)
 delete mode 100644 html/changelogs/Hubblenaut-tape.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0e6bddd544..623355b4b5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,16 +56,29 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">02 November 2015</h2>
+			<h3 class="author">Hubblenaut updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds tape for atmospherics.</li>
+				<li class="tweak">Tape graphics and algorithm changes. Looks a lot more appealing now.</li>
+				<li class="tweak">Starting and ending tape on the same turf will connect it to all surrounding walls/windows.</li>
+				<li class="tweak">Lifting a part of the tape will lift an entire tape section.</li>
+				<li class="tweak">Mobs on help intent do stop for tape.</li>
+				<li class="bugfix">Crumpled tape does not affect tape breaking behavior anymore.</li>
+			</ul>
+
+			<h2 class="date">27 October 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">When affected by pepperspray, eye protection now prevents blindness and face protection now prevents stun, instead of face protection doing both.</li>
+			</ul>
+
 			<h2 class="date">21 October 2015</h2>
 			<h3 class="author">Hubblenaut updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Bruise packs are now applied per wound, not per limb.</li>
 				<li class="tweak">Bruise packs now use a delay depending on wound severity for applying.</li>
 				<li class="rscdel">Removed instant healing ability from advanced bruise packs and ointment.</li>
-			<h2 class="date">27 October 2015</h2>
-			<h3 class="author">HarpyEagle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">When affected by pepperspray, eye protection now prevents blindness and face protection now prevents stun, instead of face protection doing both.</li>
 			</ul>
 
 			<h2 class="date">14 October 2015</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d12ae323eb..22c5df7502 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2356,3 +2356,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   HarpyEagle:
   - bugfix: When affected by pepperspray, eye protection now prevents blindness and
       face protection now prevents stun, instead of face protection doing both.
+2015-11-02:
+  Hubblenaut:
+  - rscadd: Adds tape for atmospherics.
+  - tweak: Tape graphics and algorithm changes. Looks a lot more appealing now.
+  - tweak: Starting and ending tape on the same turf will connect it to all surrounding
+      walls/windows.
+  - tweak: Lifting a part of the tape will lift an entire tape section.
+  - tweak: Mobs on help intent do stop for tape.
+  - bugfix: Crumpled tape does not affect tape breaking behavior anymore.
diff --git a/html/changelogs/Hubblenaut-tape.yml b/html/changelogs/Hubblenaut-tape.yml
deleted file mode 100644
index fa97c1a036..0000000000
--- a/html/changelogs/Hubblenaut-tape.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
-#################################
-
-# 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: "Adds tape for atmospherics."
-  - tweak: "Tape graphics and algorithm changes. Looks a lot more appealing now."
-  - tweak: "Starting and ending tape on the same turf will connect it to all surrounding walls/windows."
-  - tweak: "Lifting a part of the tape will lift an entire tape section."
-  - tweak: "Mobs on help intent do stop for tape."
-  - bugfix: "Crumpled tape does not affect tape breaking behavior anymore."