From 7dc2aa387b72ef50e4f25673d0532ea60b6ddf41 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 14 May 2020 08:17:17 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.05.14.08.17.17"

---
 html/changelog.html                          | 14 +++++++
 html/changelogs/.all_changelog.yml           |  9 +++++
 html/changelogs/alberyk-nonslip.yml          |  6 ---
 html/changelogs/arrow768-staffwho-afk.yml    | 41 --------------------
 html/changelogs/geeves-internals_hud_fix.yml |  6 ---
 5 files changed, 23 insertions(+), 53 deletions(-)
 delete mode 100644 html/changelogs/alberyk-nonslip.yml
 delete mode 100644 html/changelogs/arrow768-staffwho-afk.yml
 delete mode 100644 html/changelogs/geeves-internals_hud_fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 067bef8db99..549e6e530d5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">14 May 2020</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Non-slip species flag should no longer grant immunity to lack of gravity effects.</li>
+			</ul>
+			<h3 class="author">Arrow768 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The staffwho function now shows if a staff member is AFK.</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes internals appearing to be off, even when they're on, when spawning or relogging.</li>
+			</ul>
+
 			<h2 class="date">13 May 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 8b68f127407..0fc3a4562fc 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13096,3 +13096,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Wowzewow (Wezzy):
   - bugfix: Fixes missing inhands for RFDs, RPED, toy sword, plant bag and briefcases.
   - bugfix: Fixes some problems with the human sprite.
+2020-05-14:
+  Alberyk:
+  - rscdel: Non-slip species flag should no longer grant immunity to lack of gravity
+      effects.
+  Arrow768:
+  - rscadd: The staffwho function now shows if a staff member is AFK.
+  Geeves:
+  - bugfix: Fixes internals appearing to be off, even when they're on, when spawning
+      or relogging.
diff --git a/html/changelogs/alberyk-nonslip.yml b/html/changelogs/alberyk-nonslip.yml
deleted file mode 100644
index f93d0f331ec..00000000000
--- a/html/changelogs/alberyk-nonslip.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Alberyk
-
-delete-after: True
-
-changes: 
-  - rscdel: "Non-slip species flag should no longer grant immunity to lack of gravity effects."
diff --git a/html/changelogs/arrow768-staffwho-afk.yml b/html/changelogs/arrow768-staffwho-afk.yml
deleted file mode 100644
index eb3e8ca35a5..00000000000
--- a/html/changelogs/arrow768-staffwho-afk.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: 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:
-  - rscadd: "The staffwho function now shows if a staff member is AFK."
diff --git a/html/changelogs/geeves-internals_hud_fix.yml b/html/changelogs/geeves-internals_hud_fix.yml
deleted file mode 100644
index e6c15ef7ce3..00000000000
--- a/html/changelogs/geeves-internals_hud_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixes internals appearing to be off, even when they're on, when spawning or relogging."
\ No newline at end of file