From 7fa71da2beb84c7b76c8992443654a5b335855a2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 16 Oct 2020 19:07:58 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.10.16.19.07.57"

---
 html/changelog.html                          |  8 ++++
 html/changelogs/.all_changelog.yml           |  7 ++++
 html/changelogs/TheDocOct - PsychCleanup.yml | 41 --------------------
 html/changelogs/geeves-shield_stuff.yml      |  6 ---
 4 files changed, 15 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/TheDocOct - PsychCleanup.yml
 delete mode 100644 html/changelogs/geeves-shield_stuff.yml

diff --git a/html/changelog.html b/html/changelog.html
index b6cc3a573fa..15cb2ce27f4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,10 +36,18 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">16 October 2020</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Shields can now block simple mob attacks, such as carp and spiders, as long as the attack does less than 15 damage. You won't block juggernauts or spider queens.</li>
+			</ul>
 			<h3 class="author">JohnWildkins updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="backend">Moves firearm control sorting to clientside, hopefully alleviating issues.</li>
 			</ul>
+			<h3 class="author">TheDocOct updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes the depreciated crystal therapy pod and metronome room from the psychiatric ward of medical.</li>
+			</ul>
 
 			<h2 class="date">15 October 2020</h2>
 			<h3 class="author">JohnWildkins updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a8af9f7c6a9..6ca583be1ea 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -16180,5 +16180,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds brass knuckles to the autolathe's hacked section.
   - rscdel: Removes RFDs from the autolathe, look in the protolathe.
 2020-10-16:
+  Geeves:
+  - rscadd: Shields can now block simple mob attacks, such as carp and spiders, as
+      long as the attack does less than 15 damage. You won't block juggernauts or
+      spider queens.
   JohnWildkins:
   - backend: Moves firearm control sorting to clientside, hopefully alleviating issues.
+  TheDocOct:
+  - rscdel: Removes the depreciated crystal therapy pod and metronome room from the
+      psychiatric ward of medical.
diff --git a/html/changelogs/TheDocOct - PsychCleanup.yml b/html/changelogs/TheDocOct - PsychCleanup.yml
deleted file mode 100644
index ba66b76961d..00000000000
--- a/html/changelogs/TheDocOct - PsychCleanup.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: TheDocOct
-
-# 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: "Removes the depreciated crystal therapy pod and metronome room from the psychiatric ward of medical."
diff --git a/html/changelogs/geeves-shield_stuff.yml b/html/changelogs/geeves-shield_stuff.yml
deleted file mode 100644
index d8baf670fd7..00000000000
--- a/html/changelogs/geeves-shield_stuff.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - rscadd: "Shields can now block simple mob attacks, such as carp and spiders, as long as the attack does less than 15 damage. You won't block juggernauts or spider queens."
\ No newline at end of file