From 269cb290305bc480b519ea63bdc25db1b4a6c1ac Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 28 Sep 2017 21:18:13 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 11 +++++++++++
 html/changelogs/.all_changelog.yml        |  8 ++++++++
 html/changelogs/AutoChangeLog-pr-8127.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-8156.yml |  4 ----
 4 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8127.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8156.yml

diff --git a/html/changelog.html b/html/changelog.html
index a96ba9290cb..ddfe4d992bf 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">28 September 2017</h2>
+			<h3 class="author">MarsM0nd updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Stops the electrified arm from combat and stunbaton implant from runtiming.</li>
+			</ul>
+			<h3 class="author">uraniummeltdown updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Changelings have a new power, Biodegrade, for 2 evolution points. For 30 chemicals you can vomit acid onto restraints, welded/locked lockers and spider cocoons to escape them.</li>
+				<li class="bugfix">Hivemind Link for changelings has been readded, it was removed in error</li>
+			</ul>
+
 			<h2 class="date">05 September 2017</h2>
 			<h3 class="author">Kyep updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index df392575fe4..692b7f64655 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5479,3 +5479,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-09-05:
   Kyep:
   - rscadd: Adds alternative military shuttle, NT Navy troop transport.
+2017-09-28:
+  MarsM0nd:
+  - bugfix: Stops the electrified arm from combat and stunbaton implant from runtiming.
+  uraniummeltdown:
+  - rscadd: Changelings have a new power, Biodegrade, for 2 evolution points. For
+      30 chemicals you can vomit acid onto restraints, welded/locked lockers and spider
+      cocoons to escape them.
+  - bugfix: Hivemind Link for changelings has been readded, it was removed in error
diff --git a/html/changelogs/AutoChangeLog-pr-8127.yml b/html/changelogs/AutoChangeLog-pr-8127.yml
deleted file mode 100644
index 5b1267b95a5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8127.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes: 
-  - rscadd: "Changelings have a new power, Biodegrade, for 2 evolution points. For 30 chemicals you can vomit acid onto restraints, welded/locked lockers and spider cocoons to escape them."
-  - bugfix: "Hivemind Link for changelings has been readded, it was removed in error"
diff --git a/html/changelogs/AutoChangeLog-pr-8156.yml b/html/changelogs/AutoChangeLog-pr-8156.yml
deleted file mode 100644
index 683f6d86540..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8156.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MarsM0nd"
-delete-after: True
-changes: 
-  - bugfix: "Stops the electrified arm from combat and stunbaton implant from runtiming."