From 5ae68f23fff4cb77b70b8237d7c6bf2c3085aa8c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 7 Jan 2021 09:05:12 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.01.07.09.05.12"

---
 html/changelog.html                           | 10 +++++
 html/changelogs/.all_changelog.yml            |  7 ++++
 html/changelogs/arrow768-synap-liver.yml      | 41 -------------------
 .../geeves-emergency_shield_fix.yml           |  6 ---
 4 files changed, 17 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/arrow768-synap-liver.yml
 delete mode 100644 html/changelogs/geeves-emergency_shield_fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9c59d39e389..46495b2de0f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 January 2021</h2>
+			<h3 class="author">Arrow768 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes the liver damage from the synaptizine as it regularly kills antags that use the Sideeffect-Be-Gone Injectors.</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Emergency shield generators no longer infinitely stack shields when you use tape.</li>
+			</ul>
+
 			<h2 class="date">06 January 2021</h2>
 			<h3 class="author">Arrow768 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fff00863831..58d41a73ce9 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17809,3 +17809,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   MattAtlas:
   - rscadd: Added a language selector to the appearance editor that you get when you
       spawn in as a mercenary or use a plastic surgery machine.
+2021-01-07:
+  Arrow768:
+  - rscdel: Removes the liver damage from the synaptizine as it regularly kills antags
+      that use the Sideeffect-Be-Gone Injectors.
+  Geeves:
+  - bugfix: Emergency shield generators no longer infinitely stack shields when you
+      use tape.
diff --git a/html/changelogs/arrow768-synap-liver.yml b/html/changelogs/arrow768-synap-liver.yml
deleted file mode 100644
index a91c56437e8..00000000000
--- a/html/changelogs/arrow768-synap-liver.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:
-  - rscdel: "Removes the liver damage from the synaptizine as it regularly kills antags that use the Sideeffect-Be-Gone Injectors."
diff --git a/html/changelogs/geeves-emergency_shield_fix.yml b/html/changelogs/geeves-emergency_shield_fix.yml
deleted file mode 100644
index 0a6627f827c..00000000000
--- a/html/changelogs/geeves-emergency_shield_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - bugfix: "Emergency shield generators no longer infinitely stack shields when you use tape."
\ No newline at end of file