From 64e2464758e3942fe68cfbb840e79ad1f04f111d Mon Sep 17 00:00:00 2001
From: Jordie0608 <jordie0608@gmail.com>
Date: Sun, 13 Sep 2015 22:42:22 +1000
Subject: [PATCH 1/2] changelog

---
 html/changelog.html                   | 18 +++++++++++++++++-
 html/changelogs/.all_changelog.yml    | 15 ++++++++++++++-
 html/changelogs/Gun-Hog-AE-Gun-PR.yml |  7 -------
 html/changelogs/Jordie jobban.yml     |  5 -----
 4 files changed, 31 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/Gun-Hog-AE-Gun-PR.yml
 delete mode 100644 html/changelogs/Jordie jobban.yml

diff --git a/html/changelog.html b/html/changelog.html
index c7df0b67e97..3c82caed619 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,22 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">13 September 2015</h2>
+			<h3 class="author">Gun Hog updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Nanotrasen scientists have proposed a refined prototype design for the nuclear powered Advanced Energy guns to include a taser function along with the disable and kill modes. Addtionally, they have modified the chassis blueprint to include a hardpoint for attachable seclites.</li>
+			</ul>
+			<h3 class="author">Iamgoofball updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Reduced the cost of changeling armor to 1 and increased it's armor values.</li>
+			</ul>
+			<h3 class="author">Jordie0608 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now view the reason of a jobban from character setup.</li>
+				<li class="rscadd">Drying agent splashed on galoshes will turn them into absorbent galoshes that dry wet floors they walk on.</li>
+				<li class="rscadd">Drying agent can be made with ethanol, sodium and stable plasma.</li>
+			</ul>
+
 			<h2 class="date">11 September 2015</h2>
 			<h3 class="author">CosmicScientist updated:</h3>
 			<ul class="changes bgimages16">
@@ -87,7 +103,7 @@
 			<h2 class="date">06 September 2015</h2>
 			<h3 class="author">Fox P McCloud updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="bugfix">fixes gold sheets having plasma as their material.</li>
+				<li class="bugfix">Fixes gold sheets having plasma as their material.</li>
 			</ul>
 			<h3 class="author">Xhuis updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 812ca8a0bb0..7c15772731b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1704,7 +1704,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       have managed to combine all of its upgrades into one!
 2015-09-06:
   Fox P McCloud:
-  - bugfix: fixes gold sheets having plasma as their material.
+  - bugfix: Fixes gold sheets having plasma as their material.
   Xhuis:
   - bugfix: Nanotrasen inspectors have discovered a fault in the buckles of chairs
       and beds. This has been fixed and you are now able to buckle again.
@@ -1734,3 +1734,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2015-09-11:
   CosmicScientist:
   - tweak: Drone dispenser now has a var for its cooldown, get var editing.
+2015-09-13:
+  Gun Hog:
+  - tweak: Nanotrasen scientists have proposed a refined prototype design for the
+      nuclear powered Advanced Energy guns to include a taser function along with
+      the disable and kill modes. Addtionally, they have modified the chassis blueprint
+      to include a hardpoint for attachable seclites.
+  Iamgoofball:
+  - tweak: Reduced the cost of changeling armor to 1 and increased it's armor values.
+  Jordie0608:
+  - rscadd: You can now view the reason of a jobban from character setup.
+  - rscadd: Drying agent splashed on galoshes will turn them into absorbent galoshes
+      that dry wet floors they walk on.
+  - rscadd: Drying agent can be made with ethanol, sodium and stable plasma.
diff --git a/html/changelogs/Gun-Hog-AE-Gun-PR.yml b/html/changelogs/Gun-Hog-AE-Gun-PR.yml
deleted file mode 100644
index 8af2390b6c9..00000000000
--- a/html/changelogs/Gun-Hog-AE-Gun-PR.yml
+++ /dev/null
@@ -1,7 +0,0 @@
- 
-author: Gun Hog
-
-delete-after: True
-
-changes: 
-  - tweak: "Nanotrasen scientists have proposed a refined prototype design for the nuclear powered Advanced Energy guns to include a taser function along with the disable and kill modes. Addtionally, they have modified the chassis blueprint to include a hardpoint for attachable seclites."
diff --git a/html/changelogs/Jordie jobban.yml b/html/changelogs/Jordie jobban.yml
deleted file mode 100644
index 79a8f787e9c..00000000000
--- a/html/changelogs/Jordie jobban.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Jordie0608
-delete-after: True
-
-changes: 
-  - rscadd: "You can now view the reason of a jobban from character setup."
\ No newline at end of file

From b2ed005f6a7fed0ad608875b31f8affbb2349b01 Mon Sep 17 00:00:00 2001
From: Jordie0608 <jordie0608@gmail.com>
Date: Sun, 13 Sep 2015 22:44:23 +1000
Subject: [PATCH 2/2] whoops

---
 html/changelog.html                | 3 +++
 html/changelogs/.all_changelog.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/html/changelog.html b/html/changelog.html
index 3c82caed619..f33b95916ee 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -67,6 +67,9 @@
 			<h3 class="author">Jordie0608 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">You can now view the reason of a jobban from character setup.</li>
+			</ul>
+			<h3 class="author">xxalpha updated:</h3>
+			<ul class="changes bgimages16">
 				<li class="rscadd">Drying agent splashed on galoshes will turn them into absorbent galoshes that dry wet floors they walk on.</li>
 				<li class="rscadd">Drying agent can be made with ethanol, sodium and stable plasma.</li>
 			</ul>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7c15772731b..427b21ed64a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1744,6 +1744,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Reduced the cost of changeling armor to 1 and increased it's armor values.
   Jordie0608:
   - rscadd: You can now view the reason of a jobban from character setup.
+  xxalpha:
   - rscadd: Drying agent splashed on galoshes will turn them into absorbent galoshes
       that dry wet floors they walk on.
   - rscadd: Drying agent can be made with ethanol, sodium and stable plasma.