From de9d34ef2eca529a8b29957728d191329c4c773e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 25 Jun 2022 20:13:11 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.06.25.20.13.11"

---
 html/changelog.html                     |  8 +++++
 html/changelogs/.all_changelog.yml      |  8 +++++
 html/changelogs/FlamingLily-Cleaner.yml | 44 -------------------------
 html/changelogs/wickedcybs_nometeor.yml |  6 ----
 4 files changed, 16 insertions(+), 50 deletions(-)
 delete mode 100644 html/changelogs/FlamingLily-Cleaner.yml
 delete mode 100644 html/changelogs/wickedcybs_nometeor.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6eac7579e4c..a112b5b3b53 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,13 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">25 June 2022</h2>
+			<h3 class="author">FlamingLily updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a space cleaner refiller tank to the janitor&#x27;s closet.</li>
+				<li class="imageadd">Added a sprite for the aforementioned space cleaner refiller.</li>
+				<li class="maptweak">Moved the air alarm in the janitor&#x27;s closet slightly.</li>
+				<li class="tweak">Changed the name and description of the janitor&#x27;s backpack water tank to reflect the fact that it spawns with space cleaner, not water.</li>
+			</ul>
 			<h3 class="author">SleepyGemmy updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="backend">Adds the impoverished economic status as an option in the SQL database, so it can save properly.</li>
@@ -43,6 +50,7 @@
 			<h3 class="author">WickedCybs updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Painkillers in pill form should last far longer than it did before now. It won&#x27;t be as long as injecting it, but it should be at least triple the amount of time it used to when ingested.</li>
+				<li class="tweak">Meteors and ship debris have been removed from the random event rotation the Horizon experiences.</li>
 			</ul>
 
 			<h2 class="date">23 June 2022</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 192e1250714..2076f7c1f40 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24973,6 +24973,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Yonnimer:
   - rscadd: Adds a wrecked NT ship awaysite.
 2022-06-25:
+  FlamingLily:
+  - rscadd: Added a space cleaner refiller tank to the janitor&#x27;s closet.
+  - imageadd: Added a sprite for the aforementioned space cleaner refiller.
+  - maptweak: Moved the air alarm in the janitor&#x27;s closet slightly.
+  - tweak: Changed the name and description of the janitor&#x27;s backpack water tank
+      to reflect the fact that it spawns with space cleaner, not water.
   SleepyGemmy:
   - backend: Adds the impoverished economic status as an option in the SQL database,
       so it can save properly.
@@ -24980,3 +24986,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: 'Painkillers in pill form should last far longer than it did before now.
       It won&#x27;t be as long as injecting it, but it should be at least triple the
       amount of time it used to when ingested. '
+  - tweak: Meteors and ship debris have been removed from the random event rotation
+      the Horizon experiences.
diff --git a/html/changelogs/FlamingLily-Cleaner.yml b/html/changelogs/FlamingLily-Cleaner.yml
deleted file mode 100644
index 2bb318202f3..00000000000
--- a/html/changelogs/FlamingLily-Cleaner.yml
+++ /dev/null
@@ -1,44 +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: FlamingLily
-
-# 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: "Added a space cleaner refiller tank to the janitor's closet."
-  - imageadd: "Added a sprite for the aforementioned space cleaner refiller."
-  - maptweak: "Moved the air alarm in the janitor's closet slightly."
-  - tweak: "Changed the name and description of the janitor's backpack water tank to reflect the fact that it spawns with space cleaner, not water."
diff --git a/html/changelogs/wickedcybs_nometeor.yml b/html/changelogs/wickedcybs_nometeor.yml
deleted file mode 100644
index d27980902fd..00000000000
--- a/html/changelogs/wickedcybs_nometeor.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: WickedCybs
-
-delete-after: True
-
-changes:
-  - tweak: "Meteors and ship debris have been removed from the random event rotation the Horizon experiences."