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

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

diff --git a/html/changelog.html b/html/changelog.html
index 5e0086d2d85..ff4c9b90660 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -73,6 +73,10 @@
 				<li class="bugfix">Cloning will now correctly assign a characters species' genetic quirks.</li>
 				<li class="bugfix">Changing a character's species (via C.M.A. or whatever might call the set_species proc) will now correctly assign their species' genetic quirks.</li>
 			</ul>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ruins no longer trigger power alarms.</li>
+			</ul>
 
 			<h2 class="date">20 December 2016</h2>
 			<h3 class="author">TullyBurnalot updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4ee48f203f6..66ad8377979 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3202,3 +3202,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Cloning will now correctly assign a characters species' genetic quirks.
   - bugfix: Changing a character's species (via C.M.A. or whatever might call the
       set_species proc) will now correctly assign their species' genetic quirks.
+  Markolie:
+  - bugfix: Ruins no longer trigger power alarms.
diff --git a/html/changelogs/AutoChangeLog-pr-6020.yml b/html/changelogs/AutoChangeLog-pr-6020.yml
deleted file mode 100644
index 57838fefeb1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6020.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - bugfix: "Ruins no longer trigger power alarms."