From ecf597aa44191dd4d8c73261f6679691ab6d0c19 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 29 Jun 2017 18:02:30 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 6 ++++++
 html/changelogs/.all_changelog.yml        | 5 +++++
 html/changelogs/AutoChangeLog-pr-7670.yml | 7 -------
 3 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7670.yml

diff --git a/html/changelog.html b/html/changelog.html
index afa450bfa5f..32acb18bdb1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,6 +60,12 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes limbs being an open wound after augmentation</li>
 			</ul>
+			<h3 class="author">Kluys updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Bob ross painting in the captains office called "calming painting".
+Also changes around the entertainment monitor and light switch to accomodate.</li>
+				<li class="bugfix">Clown painting was named "\improper mech painting"</li>
+			</ul>
 
 			<h2 class="date">28 June 2017</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ed6871bcdcb..eb525938e29 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5062,3 +5062,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-06-29:
   Fox McCloud:
   - bugfix: Fixes limbs being an open wound after augmentation
+  Kluys:
+  - rscadd: 'Bob ross painting in the captains office called "calming painting".
+
+      Also changes around the entertainment monitor and light switch to accomodate.'
+  - bugfix: Clown painting was named "\improper mech painting"
diff --git a/html/changelogs/AutoChangeLog-pr-7670.yml b/html/changelogs/AutoChangeLog-pr-7670.yml
deleted file mode 100644
index 182f0b1460c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7670.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Kluys"
-delete-after: True
-changes: 
-  - rscadd: "Bob ross painting in the captains office called \"calming painting\".
-
-Also changes around the entertainment monitor and light switch to accomodate."
-  - bugfix: "Clown painting was named \"\\improper mech painting\""