From 4615c94bcd667501b29b569895de22583bde6322 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 18 Feb 2017 11:55:58 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 10 ++++++++++
 html/changelogs/.all_changelog.yml        | 12 ++++++++++++
 html/changelogs/AutoChangeLog-pr-6369.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-6480.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-6496.yml |  4 ----
 5 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6369.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6480.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6496.yml

diff --git a/html/changelog.html b/html/changelog.html
index 7e7bda4afb2..a0c2cfa1aa4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -70,6 +70,16 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added a 'take' option to ahelps/mhelps, so admins/mentors can quickly let the asker know their question is being looked at.</li>
 			</ul>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Vending machines, newscasters, biogenerators, plant DNA manipulators, seed extractors, bots, fax machines, photocopiers, AI slippers, cell door timers, airlocks, pipe dispensers and atmospherics machinery that open a window can now be viewed by ghosts.</li>
+				<li class="rscadd">Admins can now interact with mass driver, crematorium, ignition, light, flashers and flasher switches and door switches, as well as airlocks, windoors, firedoors and atmospherics machinery that do not open a window if they have advanced admin interaction enabled (under the "Admin" tab).</li>
+				<li class="bugfix">Slicing disposal pipes now shows a progress bar.</li>
+			</ul>
+			<h3 class="author">uraniummeltdown updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Shuttle engines have new sprites.</li>
+			</ul>
 
 			<h2 class="date">17 February 2017</h2>
 			<h3 class="author">Crazylemon64 updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9464e5a3672..7e0cb591f66 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3767,3 +3767,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Kyep:
   - rscadd: Added a 'take' option to ahelps/mhelps, so admins/mentors can quickly
       let the asker know their question is being looked at.
+  Markolie:
+  - rscadd: Vending machines, newscasters, biogenerators, plant DNA manipulators,
+      seed extractors, bots, fax machines, photocopiers, AI slippers, cell door timers,
+      airlocks, pipe dispensers and atmospherics machinery that open a window can
+      now be viewed by ghosts.
+  - rscadd: Admins can now interact with mass driver, crematorium, ignition, light,
+      flashers and flasher switches and door switches, as well as airlocks, windoors,
+      firedoors and atmospherics machinery that do not open a window if they have
+      advanced admin interaction enabled (under the "Admin" tab).
+  - bugfix: Slicing disposal pipes now shows a progress bar.
+  uraniummeltdown:
+  - rscadd: Shuttle engines have new sprites.
diff --git a/html/changelogs/AutoChangeLog-pr-6369.yml b/html/changelogs/AutoChangeLog-pr-6369.yml
deleted file mode 100644
index cd5c824a8c6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6369.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - rscadd: "Vending machines, newscasters, biogenerators, plant DNA manipulators, seed extractors, bots, fax machines, photocopiers, AI slippers, cell door timers, airlocks, pipe dispensers and atmospherics machinery that open a window can now be viewed by ghosts."
-  - rscadd: "Admins can now interact with mass driver, crematorium, ignition, light, flashers and flasher switches and door switches, as well as airlocks, windoors, firedoors and atmospherics machinery that do not open a window if they have advanced admin interaction enabled (under the \"Admin\" tab)."
diff --git a/html/changelogs/AutoChangeLog-pr-6480.yml b/html/changelogs/AutoChangeLog-pr-6480.yml
deleted file mode 100644
index e9f42bed2ee..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6480.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes: 
-  - rscadd: "Shuttle engines have new sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-6496.yml b/html/changelogs/AutoChangeLog-pr-6496.yml
deleted file mode 100644
index be3aa93ccd4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6496.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - bugfix: "Slicing disposal pipes now shows a progress bar."