From 16603bcba9a3ba34ef3e01b1e3b5259204dcf1e4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 8 Jul 2019 20:04:58 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.07.08.20.04.58"

---
 html/changelog.html                       |  5 +++
 html/changelogs/.all_changelog.yml        |  4 +++
 html/changelogs/arrow768-shuttleforce.yml | 42 -----------------------
 3 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/arrow768-shuttleforce.yml

diff --git a/html/changelog.html b/html/changelog.html
index 87d9fe6b277..f3a958fdf0e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,11 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed the zweihander having unlimited range when attacking after being unwielded.</li>
 			</ul>
+			<h3 class="author">Arrow768 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The emergency shuttle will now force its launch if it is delayed for too long.</li>
+				<li class="tweak">The crew transfer shuttle can not be delayed anymore.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Made tablets keep their colour after being made. Rejoice.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a3d924fe4b0..b94f2ea67e2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8356,6 +8356,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Alberyk:
   - bugfix: Fixed the zweihander having unlimited range when attacking after being
       unwielded.
+  Arrow768:
+  - tweak: The emergency shuttle will now force its launch if it is delayed for too
+      long.
+  - tweak: The crew transfer shuttle can not be delayed anymore.
   Geeves:
   - bugfix: Made tablets keep their colour after being made. Rejoice.
   PoZe:
diff --git a/html/changelogs/arrow768-shuttleforce.yml b/html/changelogs/arrow768-shuttleforce.yml
deleted file mode 100644
index 0938dce964d..00000000000
--- a/html/changelogs/arrow768-shuttleforce.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.  
-author: Arrow768
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "The emergency shuttle will now force its launch if it is delayed for too long."
-  - tweak: "The crew transfer shuttle can not be delayed anymore."