From cd71a83dec31a1cea9fba707f9b44605596ef2b1 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 8 Dec 2016 23:00:11 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index ce12ceec7be..9b4d1d8e268 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">08 December 2016</h2>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ensures cryo pods will properly auto-eject people whose organic parts (limbs) have been healed, but who still have damaged mechanical limbs.</li>
+				<li class="bugfix">Disabler shots no longer damage mechs.</li>
+				<li class="bugfix">On impact, both taser and disabler shots now produce a message saying that the mech is undamaged by them, instead of a message saying they 'hit'.</li>
+				<li class="bugfix">Fixed runtimes created when SIT, ERT, and some other mobs are spawned.</li>
+				<li class="bugfix">Fixed a bug causing SITs to be spawned with one less person than desired in some cases.</li>
+			</ul>
+
 			<h2 class="date">07 December 2016</h2>
 			<h3 class="author">Markolie updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a4290989c94..9ce1bbab711 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3152,3 +3152,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   TullyBurnalot:
   - bugfix: Unpowered Mining Vendors no longer accept IDs
   - bugfix: Ore Redemption Machine and Mining Vendor can now be deconstructed if unpowered
+2016-12-08:
+  Kyep:
+  - bugfix: Ensures cryo pods will properly auto-eject people whose organic parts
+      (limbs) have been healed, but who still have damaged mechanical limbs.
+  - bugfix: Disabler shots no longer damage mechs.
+  - bugfix: On impact, both taser and disabler shots now produce a message saying
+      that the mech is undamaged by them, instead of a message saying they 'hit'.
+  - bugfix: Fixed runtimes created when SIT, ERT, and some other mobs are spawned.
+  - bugfix: Fixed a bug causing SITs to be spawned with one less person than desired
+      in some cases.
diff --git a/html/changelogs/AutoChangeLog-pr-5938.yml b/html/changelogs/AutoChangeLog-pr-5938.yml
deleted file mode 100644
index 82fff3a552d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5938.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: Ensures cryo pods will properly auto-eject people whose organic parts (limbs) have been healed, but who still have damaged mechanical limbs.
-  - bugfix: Disabler shots no longer damage mechs.
-  - bugfix: On impact, both taser and disabler shots now produce a message saying that the mech is undamaged by them, instead of a message saying they 'hit'.
-  - bugfix: Fixed runtimes created when SIT, ERT, and some other mobs are spawned.
-  - bugfix: Fixed a bug causing SITs to be spawned with one less person than desired in some cases.