From e55b7e55c33aa766414e4b42dcebcd24fdfa479b Mon Sep 17 00:00:00 2001
From: sybil <sybil@tgstation13.org>
Date: Mon, 27 Feb 2017 03:50:54 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 20 ++++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 14 ++++++++++++++
 html/changelogs/AutoChangeLog-pr-24379.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-24450.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-24463.yml |  4 ----
 html/changelogs/supermatter-2447.yml       |  5 -----
 6 files changed, 34 insertions(+), 18 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-24379.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-24450.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-24463.yml
 delete mode 100644 html/changelogs/supermatter-2447.yml

diff --git a/html/changelog.html b/html/changelog.html
index f5b75a30068..fe37d9e4f73 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,26 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">27 February 2017</h2>
+			<h3 class="author">Kor, Jordie0608 and Tokiko1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Singularity containment has been replaced on box, meta, and delta with a supermatter room. The supermatter gives ample warning when melting down, so hopefully we'll see fewer 15 minute rounds ended by a loose singularity.</li>
+				<li class="rscadd">Supermatter crystals now collapse into singularities when they fail, rather than explode.</li>
+			</ul>
+			<h3 class="author">Tofa01 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Stops AI And Borgs From Interfacing With Ferry Console</li>
+			</ul>
+			<h3 class="author">TrustyGun updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Box sprites are improved.</li>
+			</ul>
+			<h3 class="author">coiax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Drone shells are now points of interest in the orbit list.</li>
+				<li class="rscadd">Derelict drone shells now spawn with appropriate headgear.</li>
+			</ul>
+
 			<h2 class="date">26 February 2017</h2>
 			<h3 class="author">Ausops updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index db2cc626cbe..bcfaf5d5da4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9819,3 +9819,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: '[Delta] Fixes varedited tiles causing tiles to appear as if they have
       no texture'
   - bugfix: Fixes robotic limb repair grammar issue
+2017-02-27:
+  Kor, Jordie0608 and Tokiko1:
+  - rscadd: Singularity containment has been replaced on box, meta, and delta with
+      a supermatter room. The supermatter gives ample warning when melting down, so
+      hopefully we'll see fewer 15 minute rounds ended by a loose singularity.
+  - rscadd: Supermatter crystals now collapse into singularities when they fail, rather
+      than explode.
+  Tofa01:
+  - bugfix: Stops AI And Borgs From Interfacing With Ferry Console
+  TrustyGun:
+  - imageadd: Box sprites are improved.
+  coiax:
+  - rscadd: Drone shells are now points of interest in the orbit list.
+  - rscadd: Derelict drone shells now spawn with appropriate headgear.
diff --git a/html/changelogs/AutoChangeLog-pr-24379.yml b/html/changelogs/AutoChangeLog-pr-24379.yml
deleted file mode 100644
index 5e38fdb311b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-24379.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - rscadd: "Drone shells are now points of interest in the orbit list."
-  - rscadd: "Derelict drone shells now spawn with appropriate headgear."
diff --git a/html/changelogs/AutoChangeLog-pr-24450.yml b/html/changelogs/AutoChangeLog-pr-24450.yml
deleted file mode 100644
index 072f1a3da95..00000000000
--- a/html/changelogs/AutoChangeLog-pr-24450.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TrustyGun"
-delete-after: True
-changes: 
-  - imageadd: "Box sprites are improved."
diff --git a/html/changelogs/AutoChangeLog-pr-24463.yml b/html/changelogs/AutoChangeLog-pr-24463.yml
deleted file mode 100644
index cea1e210047..00000000000
--- a/html/changelogs/AutoChangeLog-pr-24463.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tofa01"
-delete-after: True
-changes: 
-  - bugfix: "Stops AI And Borgs From Interfacing With Ferry Console"
diff --git a/html/changelogs/supermatter-2447.yml b/html/changelogs/supermatter-2447.yml
deleted file mode 100644
index 9571682c1e6..00000000000
--- a/html/changelogs/supermatter-2447.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Kor, Jordie0608 and Tokiko1"
-delete-after: True
-changes: 
-  - rscadd: "Singularity containment has been replaced on box, meta, and delta with a supermatter room. The supermatter gives ample warning when melting down, so hopefully we'll see fewer 15 minute rounds ended by a loose singularity."
-  - rscadd: "Supermatter crystals now collapse into singularities when they fail, rather than explode."