From 4f5674b2b351c300170f8c19c4090d6a50bdadf2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 31 May 2021 19:58:46 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.05.31.19.58.46"

---
 html/changelog.html                      |  6 ++++
 html/changelogs/.all_changelog.yml       |  4 +++
 html/changelogs/CPRMachineLocker.yml     |  6 ----
 html/changelogs/geeves-scrunchy_buff.yml |  6 ----
 html/changelogs/mattatlas-logochange.yml | 41 ------------------------
 5 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 html/changelogs/CPRMachineLocker.yml
 delete mode 100644 html/changelogs/geeves-scrunchy_buff.yml
 delete mode 100644 html/changelogs/mattatlas-logochange.yml

diff --git a/html/changelog.html b/html/changelog.html
index da17c773619..1ea1da3d2f1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -52,6 +52,11 @@
 				<li class="imageadd">The boulder has been given a resprite.</li>
 				<li class="rscadd">Added anomaly containers, mapped in two into long term artifact storage, but you&#x27;re allowed to cart them anywhere. An additional one can be found in the xenoarch closet.</li>
 				<li class="rscadd">Artifact batteries and power utilizers have been resprited.</li>
+				<li class="rscadd">Skrell Tentacle Ties now auto-adapt to the type of headtails you have.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">New logo!</li>
 			</ul>
 			<h3 class="author">SueTheCake updated:</h3>
 			<ul class="changes bgimages16">
@@ -60,6 +65,7 @@
 			<h3 class="author">TheGreyWolf updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">The Adhomian watch will now properly display the hour.</li>
+				<li class="bugfix">The auto compressor should now properly show up in the FR lockers.</li>
 			</ul>
 			<h3 class="author">TheGreyWolf & SomeoneRandom updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bb0a557d38a..e537fef491b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -20218,11 +20218,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       but you&#x27;re allowed to cart them anywhere. An additional one can be found
       in the xenoarch closet.
   - rscadd: Artifact batteries and power utilizers have been resprited.
+  - rscadd: Skrell Tentacle Ties now auto-adapt to the type of headtails you have.
+  MattAtlas:
+  - imageadd: New logo!
   SueTheCake:
   - rscadd: Auto-Compressors, which automatically perform CPR, can be found in medical
       bay.
   TheGreyWolf:
   - bugfix: The Adhomian watch will now properly display the hour.
+  - bugfix: The auto compressor should now properly show up in the FR lockers.
   TheGreyWolf & SomeoneRandom:
   - rscadd: Added the Idris Ordering Terminal &amp; mapped it in by the kitchen &amp;
       bar.
diff --git a/html/changelogs/CPRMachineLocker.yml b/html/changelogs/CPRMachineLocker.yml
deleted file mode 100644
index a518847239c..00000000000
--- a/html/changelogs/CPRMachineLocker.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - bugfix: "The auto compressor should now properly show up in the FR lockers."
diff --git a/html/changelogs/geeves-scrunchy_buff.yml b/html/changelogs/geeves-scrunchy_buff.yml
deleted file mode 100644
index 312e8bbe35a..00000000000
--- a/html/changelogs/geeves-scrunchy_buff.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - rscadd: "Skrell Tentacle Ties now auto-adapt to the type of headtails you have."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-logochange.yml b/html/changelogs/mattatlas-logochange.yml
deleted file mode 100644
index c1d535cc39d..00000000000
--- a/html/changelogs/mattatlas-logochange.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:
-  - imageadd: "New logo!"