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

---
 html/changelog.html                       | 10 ++++++++++
 html/changelogs/.all_changelog.yml        |  7 +++++++
 html/changelogs/AutoChangeLog-pr-5966.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-5969.yml |  4 ----
 4 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5966.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5969.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5f7d8607c83..e5b33949b04 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">12 December 2016</h2>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Xenomorph resin walls no longer take damage from disabler beams. Only proper BRUTE or BURN damage hurts them now.</li>
+			</ul>
+			<h3 class="author">TullyBurnalot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Throwing mobs behind you force moves them to behind you before actually throwing them, preventing throw-shoving</li>
+			</ul>
+
 			<h2 class="date">09 December 2016</h2>
 			<h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a3b6a5c8aea..c50256330ec 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3170,3 +3170,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       rendered on top of hair or not.
   - bugfix: Glasses no longer render on top of all hair styles, only sufficiently
       short ones.
+2016-12-12:
+  Kyep:
+  - bugfix: Xenomorph resin walls no longer take damage from disabler beams. Only
+      proper BRUTE or BURN damage hurts them now.
+  TullyBurnalot:
+  - bugfix: Throwing mobs behind you force moves them to behind you before actually
+      throwing them, preventing throw-shoving
diff --git a/html/changelogs/AutoChangeLog-pr-5966.yml b/html/changelogs/AutoChangeLog-pr-5966.yml
deleted file mode 100644
index 3c8c3d8a6f5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5966.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TullyBurnalot"
-delete-after: True
-changes: 
-  - bugfix: "Throwing mobs behind you force moves them to behind you before actually throwing them, preventing throw-shoving"
diff --git a/html/changelogs/AutoChangeLog-pr-5969.yml b/html/changelogs/AutoChangeLog-pr-5969.yml
deleted file mode 100644
index 30ae348901f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5969.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "Xenomorph resin walls no longer take damage from disabler beams. Only proper BRUTE or BURN damage hurts them now."