From fe64acefd6eb1fe992ae53942c67d376393d32bc Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 29 May 2020 20:01:45 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.05.29.20.01.45"

---
 html/changelog.html                      | 1 +
 html/changelogs/.all_changelog.yml       | 1 +
 html/changelogs/geeves-merch_shuttle.yml | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/geeves-merch_shuttle.yml

diff --git a/html/changelog.html b/html/changelog.html
index c081eb057a7..58cd6804c88 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,7 @@
 				<li class="bugfix">Most simple mobs can no longer communicate via floating messages.</li>
 				<li class="bugfix">Burning into a skeleton now properly makes you unidentifiable, and no longer keeps your species torso.</li>
 				<li class="bugfix">Fixes Acolytes incorrectly spawning a wizard. It should now properly be borer and cult.</li>
+				<li class="bugfix">Shuttles no longer drag bluespace along with them.</li>
 			</ul>
 			<h3 class="author">PoZe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 49e49ab3a94..db700eaa578 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13347,6 +13347,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       longer keeps your species torso.
   - bugfix: Fixes Acolytes incorrectly spawning a wizard. It should now properly be
       borer and cult.
+  - bugfix: Shuttles no longer drag bluespace along with them.
   PoZe:
   - bugfix: Building modular gun no longer spams admins.
   - bugfix: Holding mouse in build mode no longer causes server lag or hanging.
diff --git a/html/changelogs/geeves-merch_shuttle.yml b/html/changelogs/geeves-merch_shuttle.yml
deleted file mode 100644
index 9bb1a2f1610..00000000000
--- a/html/changelogs/geeves-merch_shuttle.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Shuttles no longer drag bluespace along with them."