From 13b704d45bb81dfc7cdce5cfd4a98523c044d7d1 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 21 Jun 2020 15:33:58 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.21.15.33.58"

---
 html/changelog.html                           | 10 +++++
 html/changelogs/.all_changelog.yml            |  6 +++
 html/changelogs/geeves-admin_jobs_outfits.yml |  6 ---
 html/changelogs/mattatlas-shellbadshell.yml   | 41 -------------------
 4 files changed, 16 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/geeves-admin_jobs_outfits.yml
 delete mode 100644 html/changelogs/mattatlas-shellbadshell.yml

diff --git a/html/changelog.html b/html/changelog.html
index d4e3b06b7c2..86197555b86 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">21 June 2020</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="admin">Admins can now assign job outfits via the Set Human Outfit command.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Shells no longer fake a pulse on the medhud. In addition, they no longer fake a pulse or blood oxygenation on health analyzers.</li>
+			</ul>
+
 			<h2 class="date">20 June 2020</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cc31d897864..63d47e26dcc 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13759,3 +13759,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   MattAtlas:
   - rscdel: Cat ears have been removed from the game.
   - bugfix: Pointing now has a cooldown.
+2020-06-21:
+  Geeves:
+  - admin: Admins can now assign job outfits via the Set Human Outfit command.
+  MattAtlas:
+  - rscdel: Shells no longer fake a pulse on the medhud. In addition, they no longer
+      fake a pulse or blood oxygenation on health analyzers.
diff --git a/html/changelogs/geeves-admin_jobs_outfits.yml b/html/changelogs/geeves-admin_jobs_outfits.yml
deleted file mode 100644
index 9fb1ed39c0b..00000000000
--- a/html/changelogs/geeves-admin_jobs_outfits.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - admin: "Admins can now assign job outfits via the Set Human Outfit command."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-shellbadshell.yml b/html/changelogs/mattatlas-shellbadshell.yml
deleted file mode 100644
index 033f7b91bf4..00000000000
--- a/html/changelogs/mattatlas-shellbadshell.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: 
-  - rscdel: "Shells no longer fake a pulse on the medhud. In addition, they no longer fake a pulse or blood oxygenation on health analyzers."