From 2069ea04574daa5cd6f1236f43a2431ef9cbea5a Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Wed, 11 Jan 2017 17:00:09 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 4 ++++
 html/changelogs/.all_changelog.yml        | 2 ++
 html/changelogs/AutoChangeLog-pr-6124.yml | 4 ----
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6124.yml

diff --git a/html/changelog.html b/html/changelog.html
index c8b5772e6d7..63bba8c96e0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -67,6 +67,10 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">office laptops are now traversable</li>
 			</ul>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">simple_animals now have an attack cooldown when attacking mechas.</li>
+			</ul>
 			<h3 class="author">uraniummeltdown updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Atmos Console Boards now show in Computer Boards of Circuit Imprinter</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1237c70e248..43ee9363c77 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3329,5 +3329,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: It's no longer opposite day for the karma reminder preference
   Lady Luck:
   - tweak: office laptops are now traversable
+  Markolie:
+  - bugfix: simple_animals now have an attack cooldown when attacking mechas.
   uraniummeltdown:
   - bugfix: Atmos Console Boards now show in Computer Boards of Circuit Imprinter
diff --git a/html/changelogs/AutoChangeLog-pr-6124.yml b/html/changelogs/AutoChangeLog-pr-6124.yml
deleted file mode 100644
index 67c1fa68ca7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6124.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - bugfix: "simple_animals now have an attack cooldown when attacking mechas."