From 24d14441dd28b70b60d4155aee378d29049bbd28 Mon Sep 17 00:00:00 2001
From: sybil <sybil@tgstation13.org>
Date: Fri, 31 Mar 2017 11:07:14 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 26 +++++-----------------
 html/changelogs/.all_changelog.yml         |  3 +++
 html/changelogs/AutoChangeLog-pr-25555.yml |  4 ----
 3 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-25555.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4895dff63b4..ed38980b62c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">31 March 2017</h2>
+			<h3 class="author">Cobby updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Shot glasses are now more ambiguous [EASIER TO MAINTAIN]</li>
+			</ul>
+
 			<h2 class="date">30 March 2017</h2>
 			<h3 class="author">coiax updated:</h3>
 			<ul class="changes bgimages16">
@@ -1818,26 +1824,6 @@
 				<li class="rscadd">Tesla coils will shoot lightning when pulsed, if it is connected to a cable that has power.</li>
 				<li class="bugfix">Bolas no longer restrain your hands for 10 seconds when you try to remove them and fail.</li>
 			</ul>
-
-			<h2 class="date">27 January 2017</h2>
-			<h3 class="author">Joan updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Buckshot now does a maximum of 75 damage, from 90.</li>
-				<li class="tweak">The unique cyborg scriptures(Linked Vanguard, Judicial Marker) take 3 seconds to invoke, from 4.</li>
-				<li class="tweak">Invoking Inath-neq and Invoking Nzcrentr now both take 10 seconds to invoke, from 15.</li>
-			</ul>
-			<h3 class="author">Lzimann updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Now you can choose what department you want to be as security! (This may not be completly reliable).</li>
-			</ul>
-			<h3 class="author">RemieRichards updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Emagging a sleeper now randomises the buttons, the buttons remain the same until randomised again so you can "learn" the new button config if you're a masochist, Inject omnizine but realise far too late that it's all morphine, woops! (Note: Epinephrine can always be injected, regardless of chem levels, this means if something !!FUN!! ends up on the Epinephrine button, it will always be injectable!)</li>
-			</ul>
-			<h3 class="author">Sweaterkittens updated:</h3>
-			<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>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index afd74219e58..7dc371a86e7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10406,3 +10406,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       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.
+2017-03-31:
+  Cobby:
+  - tweak: Shot glasses are now more ambiguous [EASIER TO MAINTAIN]
diff --git a/html/changelogs/AutoChangeLog-pr-25555.yml b/html/changelogs/AutoChangeLog-pr-25555.yml
deleted file mode 100644
index 1db7192ab68..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25555.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cobby"
-delete-after: True
-changes: 
-  - tweak: "Shot glasses are now more ambiguous [EASIER TO MAINTAIN]"