From 37caee9dc7d757cf3e59dca5812d146679f923fa Mon Sep 17 00:00:00 2001
From: Jordie0608 <Jordie0608@gmail.com>
Date: Thu, 19 Mar 2015 16:57:54 +1100
Subject: [PATCH] compiled

---
 html/changelog.html                           | 35 ++++++++++++++++++
 html/changelogs/.all_changelog.yml            | 20 +++++++++++
 .../changelogs/Gun_Hog_Experimentorrelics.yml | 10 ------
 html/changelogs/Menshin-PR8399.yml            | 36 -------------------
 html/changelogs/Xhuis-LockerAltClick.yml      |  5 ---
 html/changelogs/danno-glasses.yml             |  5 ---
 html/changelogs/incoming5643 slimes.yml       |  6 ----
 html/changelogs/jjrcop emoji.yml              |  6 ----
 html/changelogs/mmmiracles hardsuit.yml       |  6 ----
 html/changelogs/xxalpha-jetpacktrail.yml      |  7 ----
 10 files changed, 55 insertions(+), 81 deletions(-)
 delete mode 100644 html/changelogs/Gun_Hog_Experimentorrelics.yml
 delete mode 100644 html/changelogs/Menshin-PR8399.yml
 delete mode 100644 html/changelogs/Xhuis-LockerAltClick.yml
 delete mode 100644 html/changelogs/danno-glasses.yml
 delete mode 100644 html/changelogs/incoming5643 slimes.yml
 delete mode 100644 html/changelogs/jjrcop emoji.yml
 delete mode 100644 html/changelogs/mmmiracles hardsuit.yml
 delete mode 100644 html/changelogs/xxalpha-jetpacktrail.yml

diff --git a/html/changelog.html b/html/changelog.html
index 788b69d4c8d..035f14cd328 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,41 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">19 March 2015</h2>
+			<h3 class="author">Dannno updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a few cosmetic glasses to the autodrobe and clothing vendors.</li>
+			</ul>
+			<h3 class="author">Gun Hog updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Explosion relics will now destroy themselves in their own explosion.</li>
+				<li class="bugfix">The Experimentor can no longer re-roll the function of an already scanned relic.</li>
+			</ul>
+			<h3 class="author">Incoming5643 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Ghosts are now asked if they want to become a sentient slime.</li>
+			</ul>
+			<h3 class="author">JJRcop updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds the :rollie: and :ambrosia: emojis.</li>
+			</ul>
+			<h3 class="author">MMMiracles updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">ERT suits now use helmet toggling like hardsuits.</li>
+			</ul>
+			<h3 class="author">Menshin updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed mechs ballistic guns not firing bullets.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Allows alt-clicking to adjust breath masks, flip caps, and unlock/lock closets.</li>
+			</ul>
+			<h3 class="author">xxalpha updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed jetpack trail animation.</li>
+			</ul>
+
 			<h2 class="date">17 March 2015</h2>
 			<h3 class="author">CandyClownTG updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9ac7c188113..546d38fbd07 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1791,3 +1791,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: FRAG-12 shotgun shells are no longer duds, now explosive.
   phil235:
   - tweak: Makes the message when you're attacked slightly bigger for better visibility.
+2015-03-19:
+  Dannno:
+  - rscadd: Adds a few cosmetic glasses to the autodrobe and clothing vendors.
+  Gun Hog:
+  - tweak: Explosion relics will now destroy themselves in their own explosion.
+  - bugfix: The Experimentor can no longer re-roll the function of an already scanned
+      relic.
+  Incoming5643:
+  - tweak: Ghosts are now asked if they want to become a sentient slime.
+  JJRcop:
+  - rscadd: 'Adds the :rollie: and :ambrosia: emojis.'
+  MMMiracles:
+  - tweak: ERT suits now use helmet toggling like hardsuits.
+  Menshin:
+  - bugfix: Fixed mechs ballistic guns not firing bullets.
+  Xhuis:
+  - rscadd: Allows alt-clicking to adjust breath masks, flip caps, and unlock/lock
+      closets.
+  xxalpha:
+  - bugfix: Fixed jetpack trail animation.
diff --git a/html/changelogs/Gun_Hog_Experimentorrelics.yml b/html/changelogs/Gun_Hog_Experimentorrelics.yml
deleted file mode 100644
index 4f025a59650..00000000000
--- a/html/changelogs/Gun_Hog_Experimentorrelics.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-author: Gun Hog
-
-
-delete-after: True
-
-
-changes: 
-  - tweak: "Explosion relics will now destroy themselves in their own explosion."
-  - bugfix: "The Experimentor can no longer re-roll the function of an already scanned relic."
diff --git a/html/changelogs/Menshin-PR8399.yml b/html/changelogs/Menshin-PR8399.yml
deleted file mode 100644
index 5ca42a40366..00000000000
--- a/html/changelogs/Menshin-PR8399.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
-#   spellcheck (typo fixes)
-#   experiment
-#   tgs (TG-ported fixes?)
-#################################
-
-# Your name.  
-author: Menshin
-
-# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Fixed mechs ballistic guns not firing bullets."
diff --git a/html/changelogs/Xhuis-LockerAltClick.yml b/html/changelogs/Xhuis-LockerAltClick.yml
deleted file mode 100644
index e54cd4ba7b7..00000000000
--- a/html/changelogs/Xhuis-LockerAltClick.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Xhuis
-delete-after: true
-
-changes: 
-  - rscadd: "Allows alt-clicking to adjust breath masks, flip caps, and unlock/lock closets."
diff --git a/html/changelogs/danno-glasses.yml b/html/changelogs/danno-glasses.yml
deleted file mode 100644
index 900e4e8f236..00000000000
--- a/html/changelogs/danno-glasses.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Dannno
-
-delete-after: True
-
-  - rscadd: "Adds a few cosmetic glasses to the autodrobe and clothing vendors."
diff --git a/html/changelogs/incoming5643 slimes.yml b/html/changelogs/incoming5643 slimes.yml
deleted file mode 100644
index f60d4dd710e..00000000000
--- a/html/changelogs/incoming5643 slimes.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Incoming5643
-
-delete-after: True
-
-changes:
-  - tweak: "Ghosts are now asked if they want to become a sentient slime."
diff --git a/html/changelogs/jjrcop emoji.yml b/html/changelogs/jjrcop emoji.yml
deleted file mode 100644
index 98f134d68f5..00000000000
--- a/html/changelogs/jjrcop emoji.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: JJRcop
-
-delete-after: True
-
-changes:
-  - rscadd: "Adds the :rollie: and :ambrosia: emojis."
diff --git a/html/changelogs/mmmiracles hardsuit.yml b/html/changelogs/mmmiracles hardsuit.yml
deleted file mode 100644
index 6a833cf5b6b..00000000000
--- a/html/changelogs/mmmiracles hardsuit.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: MMMiracles
-
-delete-after: True
-
-changes:
-  - tweak: "ERT suits now use helmet toggling like hardsuits."
diff --git a/html/changelogs/xxalpha-jetpacktrail.yml b/html/changelogs/xxalpha-jetpacktrail.yml
deleted file mode 100644
index afbf3cd9f1a..00000000000
--- a/html/changelogs/xxalpha-jetpacktrail.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: xxalpha
-
-delete-after: True
-
-changes:
-  - bugfix: "Fixed jetpack trail animation."
-