From b25765d31b7a0833c96fc9aedf9d496ec6c8017e Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Tue, 25 Oct 2016 01:21:29 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                   |  7 ++++++
 html/changelogs/.all_changelog.yml    |  4 +++
 html/changelogs/Anewbe - Disarm.yml   | 36 ---------------------------
 html/changelogs/Anewbe - Sec Gear.yml | 36 ---------------------------
 4 files changed, 11 insertions(+), 72 deletions(-)
 delete mode 100644 html/changelogs/Anewbe - Disarm.yml
 delete mode 100644 html/changelogs/Anewbe - Sec Gear.yml

diff --git a/html/changelog.html b/html/changelog.html
index 219f90fc52..55e4362038 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 October 2016</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The effects from empty-handed disarming now have a cooldown.</li>
+				<li class="rscdel">HoS and Detective equipment is less protective.</li>
+			</ul>
+
 			<h2 class="date">24 October 2016</h2>
 			<h3 class="author">Anewbe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f82857cbbb..4e1af0f90e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3011,3 +3011,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Redstryker:
   - rscadd: Added a blue variant of the Medical voidsuit called the 'Emergency Medical
       Response Voidsuit' that can be obtained from the suit cycler.
+2016-10-25:
+  Anewbe:
+  - tweak: The effects from empty-handed disarming now have a cooldown.
+  - rscdel: HoS and Detective equipment is less protective.
diff --git a/html/changelogs/Anewbe - Disarm.yml b/html/changelogs/Anewbe - Disarm.yml
deleted file mode 100644
index f611b4dfe9..0000000000
--- a/html/changelogs/Anewbe - Disarm.yml	
+++ /dev/null
@@ -1,36 +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: Anewbe
-
-# 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: "The effects from empty-handed disarming now have a cooldown."
\ No newline at end of file
diff --git a/html/changelogs/Anewbe - Sec Gear.yml b/html/changelogs/Anewbe - Sec Gear.yml
deleted file mode 100644
index 5e8ecc93ce..0000000000
--- a/html/changelogs/Anewbe - Sec Gear.yml	
+++ /dev/null
@@ -1,36 +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: Anewbe
-
-# 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: 
-  - rscdel: "HoS and Detective equipment is less protective."