From 665632b58dbbaa00361ddde830dbcaae9225c5e3 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 9 Apr 2017 17:40:51 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 5 +++++
 html/changelogs/.all_changelog.yml        | 5 +++++
 html/changelogs/AutoChangeLog-pr-7061.yml | 8 --------
 3 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7061.yml

diff --git a/html/changelog.html b/html/changelog.html
index 014217de016..11dff528cb3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -76,6 +76,11 @@
 				<li class="rscadd">Can make abductor surgery tables from regular tables by adding silver sheets to an abductor table frame</li>
 				<li class="rscadd">Added a bunch more abductee objectives</li>
 				<li class="tweak">abductors no long scream like girls</li>
+				<li class="tweak">High capacity cells have 10,000 charge instead of 15,000</li>
+				<li class="tweak">Mech equipment power costs minorly adjusted</li>
+				<li class="tweak">APCs charge a bit faster</li>
+				<li class="tweak">EMPs less effective against pods and mechs</li>
+				<li class="bugfix">Fixes not being able to recharge modular laptops/tablets</li>
 			</ul>
 
 			<h2 class="date">06 April 2017</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 802259efe40..ac1feee47d6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4448,3 +4448,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       sheets to an abductor table frame
   - rscadd: Added a bunch more abductee objectives
   - tweak: abductors no long scream like girls
+  - tweak: High capacity cells have 10,000 charge instead of 15,000
+  - tweak: Mech equipment power costs minorly adjusted
+  - tweak: APCs charge a bit faster
+  - tweak: EMPs less effective against pods and mechs
+  - bugfix: Fixes not being able to recharge modular laptops/tablets
diff --git a/html/changelogs/AutoChangeLog-pr-7061.yml b/html/changelogs/AutoChangeLog-pr-7061.yml
deleted file mode 100644
index 4ce7507aa29..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7061.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - tweak: "High capacity cells have 10,000 charge instead of 15,000"
-  - tweak: "Mech equipment power costs minorly adjusted"
-  - tweak: "APCs charge a bit faster"
-  - tweak: "EMPs less effective against pods and mechs"
-  - bugfix: "Fixes not being able to recharge modular laptops/tablets"