From cebdc5f5dc4e6658db5f933a71fd8207baaa7a80 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Sat, 3 Sep 2016 14:42:04 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                    | 12 +++++++++
 html/changelogs/.all_changelog.yml     | 12 +++++++++
 html/changelogs/Yoshax - Flash.yml     | 36 --------------------------
 html/changelogs/Yoshax - LingArmor.yml | 36 --------------------------
 html/changelogs/Yoshax - Vomit.yml     | 36 --------------------------
 html/changelogs/Yoshax - recursion.yml | 36 --------------------------
 6 files changed, 24 insertions(+), 144 deletions(-)
 delete mode 100644 html/changelogs/Yoshax - Flash.yml
 delete mode 100644 html/changelogs/Yoshax - LingArmor.yml
 delete mode 100644 html/changelogs/Yoshax - Vomit.yml
 delete mode 100644 html/changelogs/Yoshax - recursion.yml

diff --git a/html/changelog.html b/html/changelog.html
index ea4922317bd..fd4010ec165 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,18 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">03 September 2016</h2>
+			<h3 class="author">Yosh updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Projectile flash rounds will now do the same as a flash when it hits the target. As such, it will blind, confuse and blur the eyes of thw target. Pistol and machine gun rounds last the same length as a flash, shotgun rounds last longer.</li>
+				<li class="tweak">Changeling recursive enhancement is now a toggleable passive ability, instead of a one-time use active ability.</li>
+				<li class="rscadd">You can now vomit by using the vomit emote.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Changeling armor and space armor can now be cast off regardless of your stored chemicals.</li>
+			</ul>
+
 			<h2 class="date">02 September 2016</h2>
 			<h3 class="author">Yosh updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d418b317653..0bd938c5c14 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2814,3 +2814,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Yoshax:
   - tweak: Autotraitor now needs 0 players to start in secret.
   - tweak: Diona are now slightly faster!
+2016-09-03:
+  Yosh:
+  - tweak: Projectile flash rounds will now do the same as a flash when it hits the
+      target. As such, it will blind, confuse and blur the eyes of thw target. Pistol
+      and machine gun rounds last the same length as a flash, shotgun rounds last
+      longer.
+  - tweak: Changeling recursive enhancement is now a toggleable passive ability, instead
+      of a one-time use active ability.
+  - rscadd: You can now vomit by using the vomit emote.
+  Yoshax:
+  - bugfix: Changeling armor and space armor can now be cast off regardless of your
+      stored chemicals.
diff --git a/html/changelogs/Yoshax - Flash.yml b/html/changelogs/Yoshax - Flash.yml
deleted file mode 100644
index bffc9251e22..00000000000
--- a/html/changelogs/Yoshax - Flash.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: Yosh
-
-# 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: "Projectile flash rounds will now do the same as a flash when it hits the target. As such, it will blind, confuse and blur the eyes of thw target. Pistol and machine gun rounds last the same length as a flash, shotgun rounds last longer."
diff --git a/html/changelogs/Yoshax - LingArmor.yml b/html/changelogs/Yoshax - LingArmor.yml
deleted file mode 100644
index 6de7b5adab4..00000000000
--- a/html/changelogs/Yoshax - LingArmor.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: Yoshax
-
-# 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: "Changeling armor and space armor can now be cast off regardless of your stored chemicals."
diff --git a/html/changelogs/Yoshax - Vomit.yml b/html/changelogs/Yoshax - Vomit.yml
deleted file mode 100644
index c63388ac233..00000000000
--- a/html/changelogs/Yoshax - Vomit.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: Yosh
-
-# 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: "You can now vomit by using the vomit emote."
diff --git a/html/changelogs/Yoshax - recursion.yml b/html/changelogs/Yoshax - recursion.yml
deleted file mode 100644
index d919139986b..00000000000
--- a/html/changelogs/Yoshax - recursion.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: N3X15
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: Yoshax
-
-# 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: "Changeling recursive enhancement is now a toggleable passive ability, instead of a one-time use active ability."