From 48965fbc77e535298c60aba0bca27fdd3d873fdc Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 18 Apr 2020 16:40:56 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.04.18.16.40.56"

---
 html/changelog.html                  |  5 ++++
 html/changelogs/.all_changelog.yml   |  4 +++
 html/changelogs/geeves-tray_fix.yml  |  6 ----
 html/changelogs/mattatlas-youfir.yml | 41 ----------------------------
 4 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/geeves-tray_fix.yml
 delete mode 100644 html/changelogs/mattatlas-youfir.yml

diff --git a/html/changelog.html b/html/changelog.html
index c491c35a6e1..80b41bef9d6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,11 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">You can now remove individual items from a tray by having it in one hand, and clicking it with the other empty hand.</li>
 				<li class="rscadd">The sprites on trays are now randomly spread out instead of just going into the centre.</li>
+				<li class="bugfix">Service borgs no longer teleport items using the force when operating the tray.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="spellcheck">Fixed gun fire message wonkiness.</li>
 			</ul>
 			<h3 class="author">SpaceBaa updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a2215fb8e93..b9687f44d47 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -12735,5 +12735,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       and clicking it with the other empty hand.
   - rscadd: The sprites on trays are now randomly spread out instead of just going
       into the centre.
+  - bugfix: Service borgs no longer teleport items using the force when operating
+      the tray.
+  MattAtlas:
+  - spellcheck: Fixed gun fire message wonkiness.
   SpaceBaa:
   - bugfix: Mine drones and other bots no longer bleed when shot.
diff --git a/html/changelogs/geeves-tray_fix.yml b/html/changelogs/geeves-tray_fix.yml
deleted file mode 100644
index 77a153b12af..00000000000
--- a/html/changelogs/geeves-tray_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Service borgs no longer teleport items using the force when operating the tray."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-youfir.yml b/html/changelogs/mattatlas-youfir.yml
deleted file mode 100644
index 74e1fa0fd3b..00000000000
--- a/html/changelogs/mattatlas-youfir.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: 
-  - spellcheck: "Fixed gun fire message wonkiness."