From e4f99d90237a6035ad7e2d29ca2a1b2c791ffd7b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 12 Apr 2020 17:37:00 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.04.12.17.37.00"

---
 html/changelog.html                            | 6 ++++++
 html/changelogs/.all_changelog.yml             | 4 ++++
 html/changelogs/geeves-runtime_shuttle_fix.yml | 6 ------
 3 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/geeves-runtime_shuttle_fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 014c8937fd2..07db29e94b2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">12 April 2020</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed null emergency shuttles causing runtime errors when the game checks for status displays.</li>
+			</ul>
+
 			<h2 class="date">11 April 2020</h2>
 			<h3 class="author">Ferner updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d8ad3e37cb4..e16865cd043 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -12684,3 +12684,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       spices are shaken.
   Wowzewow (Wezzy):
   - imageadd: Adds inhands for some welders, drills, and combitools.
+2020-04-12:
+  Geeves:
+  - bugfix: Fixed null emergency shuttles causing runtime errors when the game checks
+      for status displays.
diff --git a/html/changelogs/geeves-runtime_shuttle_fix.yml b/html/changelogs/geeves-runtime_shuttle_fix.yml
deleted file mode 100644
index 0999c4f015f..00000000000
--- a/html/changelogs/geeves-runtime_shuttle_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixed null emergency shuttles causing runtime errors when the game checks for status displays."