From e550f019b0fec3efbfed112c02455f6ee37c845d Mon Sep 17 00:00:00 2001
From: bagil <bagil@tgstation13.org>
Date: Fri, 7 Apr 2017 00:52:42 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 80e7360f9a3..3d38ab7be40 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">07 April 2017</h2>
+			<h3 class="author">Qbopper updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Secure lockers will no longer have multiple lines about being broken.</li>
+			</ul>
+
 			<h2 class="date">05 April 2017</h2>
 			<h3 class="author">Cyberboss updated:</h3>
 			<ul class="changes bgimages16">
@@ -1647,56 +1653,6 @@
 				<li class="tweak">The deadchat notification of randomly triggered events now uses the deadsay span.</li>
 				<li class="rscdel">The wizard spell "Rod Form" does not produce a message in deadchat everytime it is used.</li>
 			</ul>
-
-			<h2 class="date">03 February 2017</h2>
-			<h3 class="author">Cobby updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Ghosts will now be informed when an event has been triggered by our lovely RNG system.</li>
-			</ul>
-			<h3 class="author">Cyberboss updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Firedoors will eventually reseal themselves if left open during a fire alarm</li>
-			</ul>
-			<h3 class="author">Joan updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Clockwork Marauders have 25% less health, 300 health from 400.</li>
-				<li class="wip">The Vitality Matrix scripture is now a Script, from an Application. Its cost has been accordingly adjusted.</li>
-				<li class="tweak">Vitality Matrices will be consumed upon successfully reviving a Servant. They also drain and heal conscious targets slightly slower.</li>
-				<li class="wip">The Fellowship Armory scripture is now an Application, from a Script. Its cost has been accordingly adjusted.</li>
-				<li class="tweak">Fellowship Armory now affects all Servants in view of the invoker, and will replace weaker gear and armor with its Ratvarian armor. Also, clockwork treads now allow you to move in no gravity like magboots.</li>
-				<li class="rscdel">Mania Motors no longer instantly convert people next to them.</li>
-				<li class="rscadd">Instead, you have to remain next to them for several seconds, after which you will be knocked out, then converted if possible.</li>
-				<li class="tweak">Mania Motors now cost slightly less power to run.</li>
-			</ul>
-			<h3 class="author">Jordie0608 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Admin notes, memos and watchlist entries now use a generalized system, they can all be accessed from the former notes browser.</li>
-				<li class="rscadd">Added to this are messages, which allow admins to leave a message for players that is delivered to them when they next connect.</li>
-			</ul>
-			<h3 class="author">Lexorion updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Laser projectiles have a new sprite! They also have a new effect when they hit a wall.</li>
-			</ul>
-			<h3 class="author">Sweaterkittens and Joan updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Ocular Wardens will now provide auditory feedback when they acquire targets and deal damage.</li>
-				<li class="soundadd">adds ocularwarden-target.ogg, ocularwarden-dot1.ogg and ocularwarden-dot2.ogg to the game sound files.</li>
-			</ul>
-			<h3 class="author">Tofa01 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">[Delta] Allows Station Engineers to access Delta Atmospherics Solar Panel Array Room.</li>
-				<li class="rscadd">[Omega] Adds a Massdriver room to chapel on Omegastation.</li>
-			</ul>
-			<h3 class="author">bgobandit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">All art storage facilities offer construction paper now!</li>
-			</ul>
-			<h3 class="author">coiax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">A victim of a transformation disease will retain their name.</li>
-				<li class="tweak">The slime transformation disease can turn you into any colour or age of slime.</li>
-				<li class="rscadd">The Abductor event can now happen at any time, rather than thirty (30) minute plus rounds.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b2fd716cbcf..232e01b3bcd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10500,3 +10500,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   coiax:
   - bugfix: Emergency shuttles will now forget early launch authorizations if they
       cannot launch due to a hostile environment.
+2017-04-07:
+  Qbopper:
+  - bugfix: Secure lockers will no longer have multiple lines about being broken.
diff --git a/html/changelogs/AutoChangeLog-pr-25919.yml b/html/changelogs/AutoChangeLog-pr-25919.yml
deleted file mode 100644
index 0442235cc2f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25919.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Qbopper"
-delete-after: True
-changes: 
-  - bugfix: "Secure lockers will no longer have multiple lines about being broken."