From a2dcb59607e52c61a7beadb5c7443032d2c8ed3c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 14 Jul 2020 18:57:53 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.14.18.57.53"

---
 html/changelog.html                        |  5 +++
 html/changelogs/.all_changelog.yml         |  7 ++++
 html/changelogs/geeves-mech_misc_fixes.yml |  9 -----
 html/changelogs/mattatlas-ghostfix.yml     | 41 ----------------------
 4 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 html/changelogs/geeves-mech_misc_fixes.yml
 delete mode 100644 html/changelogs/mattatlas-ghostfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index b7029787939..c9a552a8115 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -44,11 +44,16 @@
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Soulstones now apply a 2 second click cooldown when used to suck up a soul, whether it was successful or not.</li>
+				<li class="bugfix">Spiderbots now appear on the radio with the name of the one controlling them.</li>
+				<li class="bugfix">Mechs can now operate windoors.</li>
+				<li class="bugfix">Remote mechs can now use mounted health analyzers.</li>
+				<li class="bugfix">Mech rechargers will now charge the mech on top of them if there is a power change and the power is back.</li>
 			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Bishops now have the martian accent.</li>
 				<li class="bugfix">Talisman runes no longer delete themselves.</li>
+				<li class="bugfix">Ghosts no longer phase out of reality when exiting bluespace.</li>
 			</ul>
 			<h3 class="author">SynysterSparx updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 02907590c11..366eae0b588 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14166,9 +14166,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Geeves:
   - tweak: Soulstones now apply a 2 second click cooldown when used to suck up a soul,
       whether it was successful or not.
+  - bugfix: Spiderbots now appear on the radio with the name of the one controlling
+      them.
+  - bugfix: Mechs can now operate windoors.
+  - bugfix: Remote mechs can now use mounted health analyzers.
+  - bugfix: Mech rechargers will now charge the mech on top of them if there is a
+      power change and the power is back.
   MattAtlas:
   - bugfix: Bishops now have the martian accent.
   - bugfix: Talisman runes no longer delete themselves.
+  - bugfix: Ghosts no longer phase out of reality when exiting bluespace.
   SynysterSparx:
   - bugfix: GPS Move Event registered to target when surgically implanted.
   Wowzewow (Wezzy):
diff --git a/html/changelogs/geeves-mech_misc_fixes.yml b/html/changelogs/geeves-mech_misc_fixes.yml
deleted file mode 100644
index 7b6fe8d643a..00000000000
--- a/html/changelogs/geeves-mech_misc_fixes.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Spiderbots now appear on the radio with the name of the one controlling them."
-  - bugfix: "Mechs can now operate windoors."
-  - bugfix: "Remote mechs can now use mounted health analyzers."
-  - bugfix: "Mech rechargers will now charge the mech on top of them if there is a power change and the power is back."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-ghostfix.yml b/html/changelogs/mattatlas-ghostfix.yml
deleted file mode 100644
index cdb2e9a1b3b..00000000000
--- a/html/changelogs/mattatlas-ghostfix.yml
+++ /dev/null
@@ -1,41 +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: MattAtlas
-
-# 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: 
-  - bugfix: "Ghosts no longer phase out of reality when exiting bluespace."