From cc052cb22d808337fe0d940c282250ce9ebeec4f Mon Sep 17 00:00:00 2001
From: Jordie0608 <Jordie0608@gmail.com>
Date: Thu, 5 Mar 2015 20:24:42 +1100
Subject: [PATCH] Changelog compiled

---
 html/changelog.html                           | 25 ++++++++++++++++++-
 html/changelogs/.all_changelog.yml            | 22 ++++++++++++++++
 html/changelogs/Jordie0608 changelogpop.yml   |  6 -----
 html/changelogs/MrPerson.yml                  |  4 +--
 .../RemieRichards-NecromanticStone.yml        |  9 -------
 html/changelogs/RemieRichards-PR-7607.yml     |  7 ------
 html/changelogs/phil235-NewPlants.yml         |  6 -----
 html/changelogs/phil235-tase.yml              |  6 -----
 8 files changed, 47 insertions(+), 38 deletions(-)
 delete mode 100644 html/changelogs/Jordie0608 changelogpop.yml
 delete mode 100644 html/changelogs/RemieRichards-NecromanticStone.yml
 delete mode 100644 html/changelogs/RemieRichards-PR-7607.yml
 delete mode 100644 html/changelogs/phil235-NewPlants.yml
 delete mode 100644 html/changelogs/phil235-tase.yml

diff --git a/html/changelog.html b/html/changelog.html
index 50bf80024fb..253fa100cca 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,29 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 March 2015</h2>
+			<h3 class="author">Jordie0608 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Server hosts can set a config option to make an unseen changelog pop up on connection.</li>
+			</ul>
+			<h3 class="author">MrPerson updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Expanded the on-screen alerts you get on the top-right of your screen. You can shift-click them to get a description of what's wrong and maybe how to fix it.</li>
+				<li class="rscadd">Getting buckled to something will show an alert of what you're buckled to. If you're not handcuffed, you can click the alert to unbuckle.</li>
+			</ul>
+			<h3 class="author">RemieRichards updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added Necromantic Stones as a buyable item for wizards</li>
+				<li class="rscadd">Necromantic Stones can cause up to 3 people to rise up as Skeleton Thralls bound to the wielder of the stone</li>
+				<li class="rscadd">Skeleton Thralls have a 33% Chance to drop all their gear on the floor and autoequip a more fitting thematic uniform</li>
+				<li class="rscadd">Allows the blob to reroll it's chemical for a cost.</li>
+			</ul>
+			<h3 class="author">phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a lot of new plants to botany (red beet, parsnip, snap corn, blumpkin, rice, oat, vanilla, steel cap, mimana, blue cherries, holy melon, geranium, lily, sweet potato) and two new reagents (vanilla, rice).</li>
+				<li class="bugfix">Fixes taser stun duration being longer due to jitter animation.</li>
+			</ul>
+
 			<h2 class="date">03 March 2015</h2>
 			<h3 class="author">Delimusca updated:</h3>
 			<ul class="changes bgimages16">
@@ -62,7 +85,7 @@
 			</ul>
 			<h3 class="author">Gun Hog updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="tweak">We have perged the xenomicrobes contamination in the E.X.P.E.R.I-MENTOR using sulfuric acid. Take care not to be exposed should it leak!</li>
+				<li class="tweak">We have purged the xenomicrobes contamination in the E.X.P.E.R.I-MENTOR using sulfuric acid. Take care not to be exposed should it leak!</li>
 			</ul>
 			<h3 class="author">Iamgoofball updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b2c336f8aec..9c7e1968233 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1638,3 +1638,25 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Added Engineering Scanner Goggles to Engivend, Engineering Secure Closets
       and Research.
   - tweak: Doubled T-ray scanner range.
+2015-03-05:
+  Jordie0608:
+  - rscadd: Server hosts can set a config option to make an unseen changelog pop up
+      on connection.
+  MrPerson:
+  - rscadd: Expanded the on-screen alerts you get on the top-right of your screen.
+      You can shift-click them to get a description of what's wrong and maybe how
+      to fix it.
+  - rscadd: Getting buckled to something will show an alert of what you're buckled
+      to. If you're not handcuffed, you can click the alert to unbuckle.
+  RemieRichards:
+  - rscadd: Added Necromantic Stones as a buyable item for wizards
+  - rscadd: Necromantic Stones can cause up to 3 people to rise up as Skeleton Thralls
+      bound to the wielder of the stone
+  - rscadd: Skeleton Thralls have a 33% Chance to drop all their gear on the floor
+      and autoequip a more fitting thematic uniform
+  - rscadd: Allows the blob to reroll it's chemical for a cost.
+  phil235:
+  - rscadd: Adds a lot of new plants to botany (red beet, parsnip, snap corn, blumpkin,
+      rice, oat, vanilla, steel cap, mimana, blue cherries, holy melon, geranium,
+      lily, sweet potato) and two new reagents (vanilla, rice).
+  - bugfix: Fixes taser stun duration being longer due to jitter animation.
diff --git a/html/changelogs/Jordie0608 changelogpop.yml b/html/changelogs/Jordie0608 changelogpop.yml
deleted file mode 100644
index 1754c9dc2e7..00000000000
--- a/html/changelogs/Jordie0608 changelogpop.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Jordie0608
-
-delete-after: True
-
-changes:
-  - rscadd: "Server hosts can set a config option to make an unseen changelog pop up on connection."
\ No newline at end of file
diff --git a/html/changelogs/MrPerson.yml b/html/changelogs/MrPerson.yml
index e4290930325..6378584f30e 100644
--- a/html/changelogs/MrPerson.yml
+++ b/html/changelogs/MrPerson.yml
@@ -1,4 +1,2 @@
 author: MrPerson
-changes:
-  - rscadd: "Expanded the on-screen alerts you get on the top-right of your screen. You can shift-click them to get a description of what's wrong and maybe how to fix it."
-  - rscadd: "Getting buckled to something will show an alert of what you're buckled to. If you're not handcuffed, you can click the alert to unbuckle."
\ No newline at end of file
+changes: []
diff --git a/html/changelogs/RemieRichards-NecromanticStone.yml b/html/changelogs/RemieRichards-NecromanticStone.yml
deleted file mode 100644
index c88f92154cd..00000000000
--- a/html/changelogs/RemieRichards-NecromanticStone.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-author: RemieRichards
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added Necromantic Stones as a buyable item for wizards"
-  - rscadd: "Necromantic Stones can cause up to 3 people to rise up as Skeleton Thralls bound to the wielder of the stone"
-  - rscadd: "Skeleton Thralls have a 33% Chance to drop all their gear on the floor and autoequip a more fitting thematic uniform"
diff --git a/html/changelogs/RemieRichards-PR-7607.yml b/html/changelogs/RemieRichards-PR-7607.yml
deleted file mode 100644
index b2b9aa0910c..00000000000
--- a/html/changelogs/RemieRichards-PR-7607.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: RemieRichards
-
-delete-after: True
-
-changes: 
-  - rscadd: 'Allows the blob to reroll it's chemical for a cost'
\ No newline at end of file
diff --git a/html/changelogs/phil235-NewPlants.yml b/html/changelogs/phil235-NewPlants.yml
deleted file mode 100644
index 23dd1e38e31..00000000000
--- a/html/changelogs/phil235-NewPlants.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes: 
-  - rscadd: "Adds a lot of new plants to botany (red beet, parsnip, snap corn, blumpkin, rice, oat, vanilla, steel cap, mimana, blue cherries, holy melon, geranium, lily, sweet potato) and two new reagents (vanilla, rice)."
diff --git a/html/changelogs/phil235-tase.yml b/html/changelogs/phil235-tase.yml
deleted file mode 100644
index f598cbded75..00000000000
--- a/html/changelogs/phil235-tase.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixes taser stun duration being longer due to jitter animation."