From 8d1ee2267ad7231824b725baffd96daa643cdfc2 Mon Sep 17 00:00:00 2001
From: sybil <sybil@tgstation13.org>
Date: Sun, 9 Apr 2017 15:28:40 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 8 ++++++++
 html/changelogs/.all_changelog.yml         | 4 ++++
 html/changelogs/AutoChangeLog-pr-25804.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-26018.yml | 4 ----
 4 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-25804.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-26018.yml

diff --git a/html/changelog.html b/html/changelog.html
index d87213cc05d..cc29e9de8d9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -64,6 +64,14 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed a bug where getting caught between two shield generators as they activated wouldn't cause you to gib and die.</li>
 			</ul>
+			<h3 class="author">QV updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Refactored the way limbs that aren't limbs work</li>
+			</ul>
+			<h3 class="author">octareenroon91 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Hackable wires should work as intended again.</li>
+			</ul>
 
 			<h2 class="date">07 April 2017</h2>
 			<h3 class="author">Qbopper updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 76f833d861a..efce6dface2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10509,3 +10509,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Joan:
   - bugfix: Fixed a bug where getting caught between two shield generators as they
       activated wouldn't cause you to gib and die.
+  QV:
+  - tweak: Refactored the way limbs that aren't limbs work
+  octareenroon91:
+  - bugfix: Hackable wires should work as intended again.
diff --git a/html/changelogs/AutoChangeLog-pr-25804.yml b/html/changelogs/AutoChangeLog-pr-25804.yml
deleted file mode 100644
index dce0a4850f5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-25804.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "QV"
-delete-after: True
-changes: 
-  - tweak: "Refactored the way limbs that aren't limbs work"
diff --git a/html/changelogs/AutoChangeLog-pr-26018.yml b/html/changelogs/AutoChangeLog-pr-26018.yml
deleted file mode 100644
index e103b9a35f5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-26018.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "octareenroon91"
-delete-after: True
-changes: 
-  - bugfix: "Hackable wires should work as intended again."