From a17fa121e42e9d892d0aadd56272556eb829c8f4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 13 Sep 2021 14:07:34 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.09.13.14.07.34"

---
 html/changelog.html                           |  2 +
 html/changelogs/.all_changelog.yml            |  4 ++
 .../changelogs/geeves-killspesscafe_redux.yml |  6 ---
 .../nerocavalier-watercoolercupport.yml       | 42 -------------------
 4 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 html/changelogs/geeves-killspesscafe_redux.yml
 delete mode 100644 html/changelogs/nerocavalier-watercoolercupport.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9f625bc37c1..3af1c18c5c5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,7 @@
 				<li class="bugfix">You can no longer remove corrective lenses by hand.</li>
 				<li class="refactor">Refactored drone speech, affecting maintenance drones, construction drones, mining drones and the matriarch drone. Everything should still work as expected.</li>
 				<li class="tweak">Maintenance drones laws have been modified, they are now allowed to interact with both maintenance and mining drones by law, now.</li>
+				<li class="rscadd">Spesscafe Dark Blend has been renamed to Ganymede Dark Blend, additionally the reagent container&#x27;s name has been changed to &#x27;jar of coffee beans.&#x27;</li>
 			</ul>
 			<h3 class="author">Lucaken updated:</h3>
 			<ul class="changes bgimages16">
@@ -69,6 +70,7 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds the normal baby penguin&#x27;s name and desc to holodeck baby penguins.</li>
 				<li class="rscadd">You are now able to handcuff people being aggressively grabbed by other players.</li>
+				<li class="rscadd">Ports water coolers holding paper cups from bay. You can take out up to 12 cups from a water cooler by clicking on one with an empty hand.</li>
 			</ul>
 			<h3 class="author">WickedCybs updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1759ae80d52..a6984c25f2e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -21503,6 +21503,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       as expected.
   - tweak: Maintenance drones laws have been modified, they are now allowed to interact
       with both maintenance and mining drones by law, now.
+  - rscadd: Spesscafe Dark Blend has been renamed to Ganymede Dark Blend, additionally
+      the reagent container&#x27;s name has been changed to &#x27;jar of coffee beans.&#x27;
   Lucaken:
   - rscadd: Added a Vysokan flag and banner to the loadout.
   Megarop:
@@ -21512,6 +21514,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds the normal baby penguin&#x27;s name and desc to holodeck baby penguins.
   - rscadd: You are now able to handcuff people being aggressively grabbed by other
       players.
+  - rscadd: Ports water coolers holding paper cups from bay. You can take out up to
+      12 cups from a water cooler by clicking on one with an empty hand.
   WickedCybs:
   - tweak: The tesla spine cost has been reduced from four loadout points to two.
   - rscadd: Adds a new hairstyle called the Tajaran Swoop as well as a few variations
diff --git a/html/changelogs/geeves-killspesscafe_redux.yml b/html/changelogs/geeves-killspesscafe_redux.yml
deleted file mode 100644
index e17096daf46..00000000000
--- a/html/changelogs/geeves-killspesscafe_redux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - rscadd: "Spesscafe Dark Blend has been renamed to Ganymede Dark Blend, additionally the reagent container's name has been changed to 'jar of coffee beans.'"
\ No newline at end of file
diff --git a/html/changelogs/nerocavalier-watercoolercupport.yml b/html/changelogs/nerocavalier-watercoolercupport.yml
deleted file mode 100644
index e2916e810b5..00000000000
--- a/html/changelogs/nerocavalier-watercoolercupport.yml
+++ /dev/null
@@ -1,42 +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: NeroCavalier
-
-# 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: "Ports water coolers holding paper cups from bay. You can take out up to 12 cups from a water cooler by clicking on one with an empty hand."
-