From e7c5eb56f8ae7894fe0d728fb72c2f2eebf51191 Mon Sep 17 00:00:00 2001
From: Jordie0608 <Jordie0608@gmail.com>
Date: Sun, 15 Mar 2015 17:34:56 +1100
Subject: [PATCH] changelog compiled

---
 html/changelog.html                          | 36 ++++++++++++++++++++
 html/changelogs/.all_changelog.yml           | 33 ++++++++++++++++++
 html/changelogs/Ahammer18 - Droneasses.yml   |  5 ---
 html/changelogs/Gun_Hog-LoyaltyPins.yml      |  7 ----
 html/changelogs/Incoming5643-magicmirror.yml |  9 -----
 html/changelogs/miauw likes butts.yml        |  6 ----
 html/changelogs/phil235-DoughChange.yml      |  6 ----
 html/changelogs/phil235-TablecraftFix.yml    |  6 ----
 html/changelogs/phil235-bookbag.yml          |  6 ----
 html/changelogs/phil235-mech.yml             |  6 ----
 html/changelogs/remie ninja.yml              |  9 -----
 11 files changed, 69 insertions(+), 60 deletions(-)
 delete mode 100644 html/changelogs/Ahammer18 - Droneasses.yml
 delete mode 100644 html/changelogs/Gun_Hog-LoyaltyPins.yml
 delete mode 100644 html/changelogs/Incoming5643-magicmirror.yml
 delete mode 100644 html/changelogs/miauw likes butts.yml
 delete mode 100644 html/changelogs/phil235-DoughChange.yml
 delete mode 100644 html/changelogs/phil235-TablecraftFix.yml
 delete mode 100644 html/changelogs/phil235-bookbag.yml
 delete mode 100644 html/changelogs/phil235-mech.yml
 delete mode 100644 html/changelogs/remie ninja.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4978c9b7418..747b08271b8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,42 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">15 March 2015</h2>
+			<h3 class="author">Ahammer18 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Adds ass photocopying for drones</li>
+			</ul>
+			<h3 class="author">Gun Hog updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Nanotrasen has approved distribution of Loyalty Implant Firing Pin designs. They can be fabricated with sufficient research into weapons technology. If inserted into a firearm, it will only fire upon successful interface with a user's Loyalty Implant.</li>
+			</ul>
+			<h3 class="author">Incoming5643 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Utilizing a new magic mirror found in the den, wizards can now customize their appearance to a high degree before descending upon the station.</li>
+			</ul>
+			<h3 class="author">Miauw updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Firing delay for tasers has been shortened.</li>
+			</ul>
+			<h3 class="author">RemieRichards updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="wip">Beginning major rework and refactor of messy Ninja code.</li>
+				<li class="rscdel">Roleplay based, kill deathsquad and kill alien queen objectives removed.</li>
+				<li class="rscdel">Kamikaze mode removed.</li>
+				<li class="rscdel">AIs and pAIs can no longer be integrated into a ninja suit.</li>
+				<li class="tweak">Energy blade power replaced by an energy katana that can be dropped but is more deadly.</li>
+				<li class="rscadd">Energy katana can emag any object it hits.</li>
+			</ul>
+			<h3 class="author">phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Bookbags have a new sprite and can hold bibles.</li>
+				<li class="rscadd">Adds egg yolk reagent. You can break eggs in open reagent containers or blend them to get egg yolk.</li>
+				<li class="tweak">Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively soymilk instead of the eggyolk for vegans).</li>
+				<li class="tweak">Change customizable snack max volume to 60 and buffs nutriment amount in doughs.</li>
+				<li class="rscadd">Doors can damage mechs by crushing them now.</li>
+				<li class="rscadd">The tablecrafting window now also shows partial recipes in grey, if there's some of the things required for the recipe on the table. Recipe requirements are now also shown next to the names of recipes listed in the window.</li>
+			</ul>
+
 			<h2 class="date">11 March 2015</h2>
 			<h3 class="author">MMMiracles updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b91c3d3fa55..f66f9649055 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1737,3 +1737,36 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Miauw:
   - rscadd: Added a toggle for ghosts that allows them to hear radio chatter without
       having to hover near intercoms/over people with headsets.
+2015-03-15:
+  Ahammer18:
+  - bugfix: Adds ass photocopying for drones
+  Gun Hog:
+  - rscadd: Nanotrasen has approved distribution of Loyalty Implant Firing Pin designs.
+      They can be fabricated with sufficient research into weapons technology. If
+      inserted into a firearm, it will only fire upon successful interface with a
+      user's Loyalty Implant.
+  Incoming5643:
+  - rscadd: Utilizing a new magic mirror found in the den, wizards can now customize
+      their appearance to a high degree before descending upon the station.
+  Miauw:
+  - tweak: Firing delay for tasers has been shortened.
+  RemieRichards:
+  - wip: Beginning major rework and refactor of messy Ninja code.
+  - rscdel: Roleplay based, kill deathsquad and kill alien queen objectives removed.
+  - rscdel: Kamikaze mode removed.
+  - rscdel: AIs and pAIs can no longer be integrated into a ninja suit.
+  - tweak: Energy blade power replaced by an energy katana that can be dropped but
+      is more deadly.
+  - rscadd: Energy katana can emag any object it hits.
+  phil235:
+  - rscadd: Bookbags have a new sprite and can hold bibles.
+  - rscadd: Adds egg yolk reagent. You can break eggs in open reagent containers or
+      blend them to get egg yolk.
+  - tweak: Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar
+      for cake batter (or alternatively soymilk instead of the eggyolk for vegans).
+  - tweak: Change customizable snack max volume to 60 and buffs nutriment amount in
+      doughs.
+  - rscadd: Doors can damage mechs by crushing them now.
+  - rscadd: The tablecrafting window now also shows partial recipes in grey, if there's
+      some of the things required for the recipe on the table. Recipe requirements
+      are now also shown next to the names of recipes listed in the window.
diff --git a/html/changelogs/Ahammer18 - Droneasses.yml b/html/changelogs/Ahammer18 - Droneasses.yml
deleted file mode 100644
index ef9dd713f1d..00000000000
--- a/html/changelogs/Ahammer18 - Droneasses.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Ahammer18
-delete-after: true
-
-changes: 
-  - bugfix: "Adds ass photocopying for drones"
diff --git a/html/changelogs/Gun_Hog-LoyaltyPins.yml b/html/changelogs/Gun_Hog-LoyaltyPins.yml
deleted file mode 100644
index 1d310521b39..00000000000
--- a/html/changelogs/Gun_Hog-LoyaltyPins.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Gun Hog
-
-delete-after: True
-
-changes: 
-  - rscadd: "Nanotrasen has approved distribution of Loyalty Implant Firing Pin designs. They can be fabricated with sufficient research into weapons technology. If inserted into a firearm, it will only fire upon successful interface with a user's Loyalty Implant."
diff --git a/html/changelogs/Incoming5643-magicmirror.yml b/html/changelogs/Incoming5643-magicmirror.yml
deleted file mode 100644
index aad4ce79883..00000000000
--- a/html/changelogs/Incoming5643-magicmirror.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-################################
-
-
-author: Incoming5643
-
-delete-after: True
-
-changes: 
-  - rscadd: "Utilizing a new magic mirror found in the den, wizards can now customize their appearance to a high degree before descending upon the station."
diff --git a/html/changelogs/miauw likes butts.yml b/html/changelogs/miauw likes butts.yml
deleted file mode 100644
index dbd126f6ffd..00000000000
--- a/html/changelogs/miauw likes butts.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Miauw
-
-delete-after: True
-
-changes: 
-  - tweak: "Firing delay for tasers has been shortened."
diff --git a/html/changelogs/phil235-DoughChange.yml b/html/changelogs/phil235-DoughChange.yml
deleted file mode 100644
index db83d37a729..00000000000
--- a/html/changelogs/phil235-DoughChange.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-delete-after: True
-changes:
-  - rscadd: "Adds egg yolk reagent. You can break eggs in open reagent containers or blend them to get egg yolk."
-  - tweak: "Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively soymilk instead of the eggyolk for vegans)."
-  - tweak: "Change customizable snack max volume to 60 and buffs nutriment amount in doughs."
\ No newline at end of file
diff --git a/html/changelogs/phil235-TablecraftFix.yml b/html/changelogs/phil235-TablecraftFix.yml
deleted file mode 100644
index 123f9e75f55..00000000000
--- a/html/changelogs/phil235-TablecraftFix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes: 
-  - rscadd: "The tablecrafting window now also shows partial recipes in grey, if there's some of the things required for the recipe on the table. Recipe requirements are now also shown next to the names of recipes listed in the window."
diff --git a/html/changelogs/phil235-bookbag.yml b/html/changelogs/phil235-bookbag.yml
deleted file mode 100644
index 3fc15200d1b..00000000000
--- a/html/changelogs/phil235-bookbag.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes: 
-  - rscadd: "Bookbags have a new sprite and can hold bibles."
diff --git a/html/changelogs/phil235-mech.yml b/html/changelogs/phil235-mech.yml
deleted file mode 100644
index bc9a1d106ba..00000000000
--- a/html/changelogs/phil235-mech.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes: 
-  - rscadd: "Doors can damage mechs by crushing them now."
diff --git a/html/changelogs/remie ninja.yml b/html/changelogs/remie ninja.yml
deleted file mode 100644
index 9f4ab3ac34f..00000000000
--- a/html/changelogs/remie ninja.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-author: RemieRichards
-delete-after: True
-changes:
-  - wip: "Beginning major rework and refactor of messy Ninja code."
-  - rscdel: "Roleplay based, kill deathsquad and kill alien queen objectives removed."
-  - rscdel: "Kamikaze mode removed."
-  - rscdel: "AIs and pAIs can no longer be integrated into a ninja suit."
-  - tweak: "Energy blade power replaced by an energy katana that can be dropped but is more deadly."
-  - rscadd: "Energy katana can emag any object it hits."
\ No newline at end of file