From 8bc2912bff328c1ff6ef2fd4a215fc2e6fc4eae5 Mon Sep 17 00:00:00 2001
From: bagil <bagil@tgstation13.org>
Date: Thu, 30 Mar 2017 12:05:04 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 35 +++++-----------------
 html/changelogs/.all_changelog.yml         |  6 ++++
 html/changelogs/AutoChangeLog-pr-25549.yml |  8 -----
 3 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-25549.yml

diff --git a/html/changelog.html b/html/changelog.html
index e366d940df9..4895dff63b4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">30 March 2017</h2>
+			<h3 class="author">coiax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Autoimplanters have been renamed to autosurgeons. Currently only the CMO and nuclear operatives have access to autosurgeons. What is the CMO hiding?</li>
+				<li class="bugfix">All upgraded organs for purchase by nuclear operatives now actually come in an autosurgeon, for speed of surgery.</li>
+			</ul>
+
 			<h2 class="date">29 March 2017</h2>
 			<h3 class="author">BeeSting12 updated:</h3>
 			<ul class="changes bgimages16">
@@ -1831,34 +1838,6 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">There are now updated names and descriptions for the items that your plasma-based crewmembers start with and use frequently.</li>
 			</ul>
-
-			<h2 class="date">26 January 2017</h2>
-			<h3 class="author">Robustin updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Unholy Water can now be thrown or vaporized to deliver a powerful poison unto the cult's enemies - or healing and stun resistance to its acolytes.</li>
-			</ul>
-			<h3 class="author">Tofa01 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Moved Meta station AI MiniSat tracking beacon to AI MiniSat entrance. Should prevent being regular teleported into space.</li>
-				<li class="bugfix">Added missing row of pixels to Flypeople torso so head connects to body properly.</li>
-			</ul>
-			<h3 class="author">Tofa01 & XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds radio alert messages going to medical channel to the cryo tube when a patient is fully restored.</li>
-				<li class="soundadd">Adds new alert sound for cryo tube. (cryo_warning.ogg)</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Voice of God has received a few more commands.</li>
-				<li class="rscadd">You can now use job abbreviations (ex. hos > head of security) and first names (ex. Duke > Duke Hayka) to focus targets.</li>
-			</ul>
-			<h3 class="author">coiax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The nuclear operative cybernetic implant bundle now actually contains implants.</li>
-				<li class="rscdel">The cybernetic implant bundle is no longer eligible for discounts (bundles are, in general, not eligible).</li>
-				<li class="rscadd">Telecrystals can be purchased in stacks of five and twenty.</li>
-				<li class="rscadd">The entire stack of telecrystals are added to the uplink when charging them.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 051bc784a59..afd74219e58 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10400,3 +10400,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: All tophats, rather than just the ones in maintenance, hurt a tiny bit
       if you throw them at people.
   - bugfix: Supermatter anomalies are more shortlived than regular anomalies, as intended.
+2017-03-30:
+  coiax:
+  - rscadd: Autoimplanters have been renamed to autosurgeons. Currently only the CMO
+      and nuclear operatives have access to autosurgeons. What is the CMO hiding?
+  - bugfix: All upgraded organs for purchase by nuclear operatives now actually come
+      in an autosurgeon, for speed of surgery.
diff --git a/html/changelogs/AutoChangeLog-pr-25549.yml b/html/changelogs/AutoChangeLog-pr-25549.yml
deleted file mode 100644
index 01b12283ed9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25549.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - rscadd: "Autoimplanters have been renamed to autosurgeons. Currently only
-the CMO and nuclear operatives have access to autosurgeons. What is the
-CMO hiding?"
-  - bugfix: "All upgraded organs for purchase by nuclear operatives now actually
-come in an autosurgeon, for speed of surgery."