From 722d85da3b04dde5ae3e8f29b54fca42b22afa47 Mon Sep 17 00:00:00 2001
From: sybil <sybil@tgstation13.org>
Date: Tue, 21 Mar 2017 17:14:47 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-25297.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-25306.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-25309.yml |  4 ----
 5 files changed, 24 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-25297.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-25306.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-25309.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5754cdce257..c27aaddeb96 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -74,6 +74,20 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Everyone's eyes aren't white anymore.</li>
 			</ul>
+			<h3 class="author">Penguaro updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Box Station - The Vents and Scrubbers for the Supermatter Air Alarm are now isolated from the rest of the Air Alarms in Engineering.</li>
+			</ul>
+			<h3 class="author">Supermichael777 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Chasms now smooth properly.</li>
+			</ul>
+			<h3 class="author">Tokiko1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Minor supermatter balancing changes.</li>
+				<li class="tweak">Supermatter now announces its damage half as frequently.</li>
+				<li class="tweak">Badly unstable supermatter now occasionally zaps nearby engineers and causes anomalies to appear nearby, similar to overcharged supermatter.</li>
+			</ul>
 			<h3 class="author">XDTM updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Golem Shells can now be completed with medical gauze or cloth to form cloth golems, which are weaker and extremely flammable. However, if they die, they turn into a pile of cloth that will eventually re-animate back into full health. That is, unless someone lights it on fire.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 92cdc6dc7cd..8a871efcf7c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10252,6 +10252,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: The tentacle changeling mutation now changes the arm appearance when activated.
   MrPerson:
   - bugfix: Everyone's eyes aren't white anymore.
+  Penguaro:
+  - tweak: Box Station - The Vents and Scrubbers for the Supermatter Air Alarm are
+      now isolated from the rest of the Air Alarms in Engineering.
+  Supermichael777:
+  - bugfix: Chasms now smooth properly.
+  Tokiko1:
+  - tweak: Minor supermatter balancing changes.
+  - tweak: Supermatter now announces its damage half as frequently.
+  - tweak: Badly unstable supermatter now occasionally zaps nearby engineers and causes
+      anomalies to appear nearby, similar to overcharged supermatter.
   XDTM:
   - rscadd: Golem Shells can now be completed with medical gauze or cloth to form
       cloth golems, which are weaker and extremely flammable. However, if they die,
diff --git a/html/changelogs/AutoChangeLog-pr-25297.yml b/html/changelogs/AutoChangeLog-pr-25297.yml
deleted file mode 100644
index c04bc83365d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25297.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Supermichael777"
-delete-after: True
-changes: 
-  - bugfix: "Chasms now smooth properly."
diff --git a/html/changelogs/AutoChangeLog-pr-25306.yml b/html/changelogs/AutoChangeLog-pr-25306.yml
deleted file mode 100644
index f5f5a58f76b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25306.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Tokiko1"
-delete-after: True
-changes: 
-  - tweak: "Minor supermatter balancing changes."
-  - tweak: "Supermatter now announces its damage half as frequently."
-  - tweak: "Badly unstable supermatter now occasionally zaps nearby engineers and causes anomalies to appear nearby, similar to overcharged supermatter."
diff --git a/html/changelogs/AutoChangeLog-pr-25309.yml b/html/changelogs/AutoChangeLog-pr-25309.yml
deleted file mode 100644
index 907a134ebe5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25309.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Penguaro"
-delete-after: True
-changes: 
-  - tweak: "Box Station - The Vents and Scrubbers for the Supermatter Air Alarm are now isolated from the rest of the Air Alarms in Engineering."