From a49ba119797b3ffe5b7d29d77df6f458023878ec Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 5 May 2016 16:45:20 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                           | 23 ++++++++++++
 html/changelogs/.all_changelog.yml            | 19 ++++++++++
 html/changelogs/Dat-MoreMixedModes.yml        |  4 ---
 html/changelogs/Hubblenaut-hydro.yml          | 36 -------------------
 html/changelogs/Kelenius-runFaster.yml        | 36 -------------------
 .../PsiOmegaDelta-LoadoutDrinks.yml           |  4 ---
 html/changelogs/Yoshax-gendertweak.yml        |  4 ---
 html/changelogs/Yoshax-smokegrenades.yml      |  4 ---
 8 files changed, 42 insertions(+), 88 deletions(-)
 delete mode 100644 html/changelogs/Dat-MoreMixedModes.yml
 delete mode 100644 html/changelogs/Hubblenaut-hydro.yml
 delete mode 100644 html/changelogs/Kelenius-runFaster.yml
 delete mode 100644 html/changelogs/PsiOmegaDelta-LoadoutDrinks.yml
 delete mode 100644 html/changelogs/Yoshax-gendertweak.yml
 delete mode 100644 html/changelogs/Yoshax-smokegrenades.yml

diff --git a/html/changelog.html b/html/changelog.html
index c743aadeef..38b2166002 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,29 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 May 2016</h2>
+			<h3 class="author">Datraen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added three mixed modes, 'Mercenaries & Wizard', 'Mercenaries & Renegades', and 'Traitors & Renegades'.</li>
+			</ul>
+			<h3 class="author">Hubblenaut updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Hydroponics vendor and biogenerator offer full bottles of fertilizer. Prices and amount available adjusted to accomodate.</li>
+			</ul>
+			<h3 class="author">Kelenius updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Move delay after clicking has been removed.</li>
+			</ul>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Splits gender into biological gender and gender identity. Biological gender modifies the sprite (for between male and female) and gender identity determines what pronouns show up when examined or suchlike. Both are displayed in medical records and such.</li>
+				<li class="tweak">Smoke grenades can now have their smoke color set by using a multitool on them.</li>
+			</ul>
+
 			<h2 class="date">17 April 2016</h2>
 			<h3 class="author">Datraen updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5a36a0a5b7..eb9a43d8ae 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2238,3 +2238,22 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Bulky items can now go in your backpack, however it will require twice
       the space of a normal sized item.
   - rscdel: Spacesuits, RIGs, and sniper rifles made heavier.
+2016-05-05:
+  Datraen:
+  - rscadd: Added three mixed modes, 'Mercenaries & Wizard', 'Mercenaries & Renegades',
+      and 'Traitors & Renegades'.
+  Hubblenaut:
+  - tweak: Hydroponics vendor and biogenerator offer full bottles of fertilizer. Prices
+      and amount available adjusted to accomodate.
+  Kelenius:
+  - tweak: Move delay after clicking has been removed.
+  PsiOmegaDelta:
+  - rscadd: Can now prefill the loadout flask and vacuum-flask with a relevant liquid
+      of your choice.
+  Yoshax:
+  - tweak: 'Splits gender into biological gender and gender identity. Biological gender
+      modifies the sprite (for between male and female) and gender identity determines
+      what pronouns show up when examined or suchlike. Both are displayed in medical
+      records and such. '
+  - tweak: Smoke grenades can now have their smoke color set by using a multitool
+      on them.
diff --git a/html/changelogs/Dat-MoreMixedModes.yml b/html/changelogs/Dat-MoreMixedModes.yml
deleted file mode 100644
index 2be981df6a..0000000000
--- a/html/changelogs/Dat-MoreMixedModes.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Datraen
-delete-after: True
-changes: 
-  - rscadd: "Added three mixed modes, 'Mercenaries & Wizard', 'Mercenaries & Renegades', and 'Traitors & Renegades'."
diff --git a/html/changelogs/Hubblenaut-hydro.yml b/html/changelogs/Hubblenaut-hydro.yml
deleted file mode 100644
index dd0bb9fac6..0000000000
--- a/html/changelogs/Hubblenaut-hydro.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: 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: 
-  - tweak: "Hydroponics vendor and biogenerator offer full bottles of fertilizer. Prices and amount available adjusted to accomodate."
\ No newline at end of file
diff --git a/html/changelogs/Kelenius-runFaster.yml b/html/changelogs/Kelenius-runFaster.yml
deleted file mode 100644
index 3b2be96733..0000000000
--- a/html/changelogs/Kelenius-runFaster.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: Kelenius
-
-# 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: "Move delay after clicking has been removed."
diff --git a/html/changelogs/PsiOmegaDelta-LoadoutDrinks.yml b/html/changelogs/PsiOmegaDelta-LoadoutDrinks.yml
deleted file mode 100644
index 50927ecb26..0000000000
--- a/html/changelogs/PsiOmegaDelta-LoadoutDrinks.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes:
-  - rscadd: "Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice."
diff --git a/html/changelogs/Yoshax-gendertweak.yml b/html/changelogs/Yoshax-gendertweak.yml
deleted file mode 100644
index ab67fda57a..0000000000
--- a/html/changelogs/Yoshax-gendertweak.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Yoshax
-delete-after: True
-changes:
-  - tweak: "Splits gender into biological gender and gender identity. Biological gender modifies the sprite (for between male and female) and gender identity determines what pronouns show up when examined or suchlike. Both are displayed in medical records and such. "
diff --git a/html/changelogs/Yoshax-smokegrenades.yml b/html/changelogs/Yoshax-smokegrenades.yml
deleted file mode 100644
index df5a741b34..0000000000
--- a/html/changelogs/Yoshax-smokegrenades.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Yoshax
-delete-after: True
-changes:
-  - tweak: "Smoke grenades can now have their smoke color set by using a multitool on them."