From 5ccc46034e0b2da362b0865fb4a4d10d9df6f732 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 11 Dec 2017 21:48:24 +0100
Subject: [PATCH] [ci skip] Automatic changelog update.

---
 html/changelog.html                | 22 ++++++----------------
 html/changelogs/.all_changelog.yml | 16 ++++------------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 7f181f08779a..06706b323322 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -86,6 +86,12 @@ <h2>/vg/station 13 Credits</h2>
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">2017.12.11</h2>
+			<h3 class="author">MadmanMartian updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Turrets now check if you are stunned rather than if you are lying down before firing at you</li>
+			</ul>
+
 			<h2 class="date">2017.12.10</h2>
 			<h3 class="author">PJB3005 updated:</h3>
 			<ul class="changes bgimages16">
@@ -1482,22 +1488,6 @@ <h3 class="author">DeityLink updated:</h3>
 				<li class="bugfix">You won't any longer be notified that you were gonna be stunned by a briefcase if you weren't conscious and bellow the health threshold.</li>
 				<li class="bugfix">Briefcase attacks are now logged.</li>
 			</ul>
-
-			<h2 class="date">2017.07.18</h2>
-			<h3 class="author">DeityLink updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed a bug that caused emptied out Flamming B-52s to still emit light.</li>
-			</ul>
-			<h3 class="author">SarahJohnson updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Removes broken Odysseus/Ripley circuits crates from cargo. Concensus was use the imprinter if you need em. Fixes</li>
-			</ul>
-			<h3 class="author">jknpj updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds a new roller bed subype, the hover roller bed. Sprites by @Kokuten</li>
-				<li class="tweak">Updates mediborg's roller bed holder to start with a single hover roller bed. You can still hold a vanilla roller bed if you somehow lose your old one.</li>
-				<li class="imageadd">Updates the holder's icon and adds a DEPLOYED state to remember you to grab your bed when you're done. Sprites by @Kokuten</li>
-			</ul>
 		</div>
 		<!--
 		Credits Section
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 115d3e145b4a..d41420fd9ac0 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1,17 +1,5 @@
 DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 ---
-2017-07-18:
-  DeityLink:
-  - bugfix: Fixed a bug that caused emptied out Flamming B-52s to still emit light.
-  SarahJohnson:
-  - bugfix: Removes broken Odysseus/Ripley circuits crates from cargo. Concensus was
-      use the imprinter if you need em. Fixes
-  jknpj:
-  - rscadd: Adds a new roller bed subype, the hover roller bed. Sprites by @Kokuten
-  - tweak: Updates mediborg's roller bed holder to start with a single hover roller
-      bed. You can still hold a vanilla roller bed if you somehow lose your old one.
-  - imageadd: Updates the holder's icon and adds a DEPLOYED state to remember you
-      to grab your bed when you're done. Sprites by @Kokuten
 2017-07-19:
   DeityLink:
   - bugfix: Briefcases can finally be used to hit people and deal actual damage.
@@ -1206,3 +1194,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   PJB3005:
   - tweak: Lowered the find rate on the "crystal" xenoarch artifact. It did literally
       nothing except infuriate xenoarchs.
+2017-12-11:
+  MadmanMartian:
+  - tweak: Turrets now check if you are stunned rather than if you are lying down
+      before firing at you