From 8b16120b72807d4a7784af91cf73d1e423d35dac Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Wed, 25 May 2016 22:40:48 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                      | 13 +++++++++
 html/changelogs/.all_changelog.yml       | 13 +++++++++
 html/changelogs/Serithi - lavender.yml   | 36 -----------------------
 html/changelogs/Yoshax - cablecoil.yml   | 37 ------------------------
 html/changelogs/Yoshax - suitsensors.yml | 36 -----------------------
 html/changelogs/Yoshax - towels.yml      | 36 -----------------------
 6 files changed, 26 insertions(+), 145 deletions(-)
 delete mode 100644 html/changelogs/Serithi - lavender.yml
 delete mode 100644 html/changelogs/Yoshax - cablecoil.yml
 delete mode 100644 html/changelogs/Yoshax - suitsensors.yml
 delete mode 100644 html/changelogs/Yoshax - towels.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8a5a9b6746..82e7175c06 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,19 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 May 2016</h2>
+			<h3 class="author">Serithi updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds in lavender.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Cables of any color can now be merged.</li>
+				<li class="tweak">More and different colors are now available to be used by cable.</li>
+				<li class="tweak">Adjusting your suit sensors now displays a message to other people in range that you did so. In addition, seeing someone else adjust someone's suit sensors no longer informs you to what level.</li>
+				<li class="rscadd">Added towels to the loadout. These can be worn on the head, belt or outwear slots. You can also whip people with them for a special message and sound! In addition, using them in-hand will produce an emote where your towel yourself off.</li>
+			</ul>
+
 			<h2 class="date">17 May 2016</h2>
 			<h3 class="author">SilveryFerret updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 44db272df5..af31065fbe 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2305,3 +2305,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Added shotglasses. These can contain 10 units. They have their whole contents
       swalloed in one gulp. They can be produced in the autolathe or found in the
       booze vending machine in the bar.
+2016-05-25:
+  Serithi:
+  - rscadd: Adds in lavender.
+  Yoshax:
+  - tweak: Cables of any color can now be merged.
+  - tweak: More and different colors are now available to be used by cable.
+  - tweak: Adjusting your suit sensors now displays a message to other people in range
+      that you did so. In addition, seeing someone else adjust someone's suit sensors
+      no longer informs you to what level.
+  - rscadd: Added towels to the loadout. These can be worn on the head, belt or outwear
+      slots. You can also whip people with them for a special message and sound! In
+      addition, using them in-hand will produce an emote where your towel yourself
+      off.
diff --git a/html/changelogs/Serithi - lavender.yml b/html/changelogs/Serithi - lavender.yml
deleted file mode 100644
index 3595dd3147..0000000000
--- a/html/changelogs/Serithi - lavender.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: Serithi
-
-# 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 in lavender."
diff --git a/html/changelogs/Yoshax - cablecoil.yml b/html/changelogs/Yoshax - cablecoil.yml
deleted file mode 100644
index 9033f36b8a..0000000000
--- a/html/changelogs/Yoshax - cablecoil.yml	
+++ /dev/null
@@ -1,37 +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: 
-  - tweak: "Cables of any color can now be merged."
-  - tweak: "More and different colors are now available to be used by cable."
diff --git a/html/changelogs/Yoshax - suitsensors.yml b/html/changelogs/Yoshax - suitsensors.yml
deleted file mode 100644
index bac6fe3ff8..0000000000
--- a/html/changelogs/Yoshax - suitsensors.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: 
-  - tweak: "Adjusting your suit sensors now displays a message to other people in range that you did so. In addition, seeing someone else adjust someone's suit sensors no longer informs you to what level."
diff --git a/html/changelogs/Yoshax - towels.yml b/html/changelogs/Yoshax - towels.yml
deleted file mode 100644
index 2de7e3fa8c..0000000000
--- a/html/changelogs/Yoshax - towels.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: 
-  - rscadd: "Added towels to the loadout. These can be worn on the head, belt or outwear slots. You can also whip people with them for a special message and sound! In addition, using them in-hand will produce an emote where your towel yourself off."