From 8dd6627e19d3fb2fae298ad16ae619e33c2c6faf Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 11 Jun 2020 19:24:41 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.11.19.24.41"

---
 html/changelog.html                 | 13 +++++++++++++
 html/changelogs/.all_changelog.yml  | 14 ++++++++++++++
 html/changelogs/geeves-no_flare.yml | 15 ---------------
 3 files changed, 27 insertions(+), 15 deletions(-)
 delete mode 100644 html/changelogs/geeves-no_flare.yml

diff --git a/html/changelog.html b/html/changelog.html
index 747372c8a63..46ab0da5a0c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,19 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">11 June 2020</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Emergency flares have been replaced by red glowsticks.</li>
+				<li class="tweak">Flares are now slightly less bright and last slightly less longer.</li>
+				<li class="tweak">Glowsticks are now more slightly more bright.</li>
+				<li class="bugfix">Glowsticks now only show one message after being activated.</li>
+				<li class="rscadd">Flashlights now face the direction you're facing when dropped. They also face a random direction after being thrown.</li>
+				<li class="tweak">Desk lamps are slightly less bright.</li>
+				<li class="tweak">Candles now last twice as long.</li>
+				<li class="tweak">Lanterns are now less bright and only shed light in 120 degrees.</li>
+				<li class="rscdel">Diona no longer spawn with flares, as they spawn with the glowstick in their emergency box. And can make their own light.</li>
+				<li class="rscadd">You can now hit a light fixture with a broken light again to completely shatter the light bulb.</li>
+			</ul>
 			<h3 class="author">Geeves, sprites by Kyres updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added heavy arm guards and heavy leg guards to the syndicate heavy armour kit.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ed9f4eedfdf..b6df09a2c9b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13585,6 +13585,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   aleksix:
   - bugfix: Cyborg wire expose messages now also show wires being covered.
 2020-06-11:
+  Geeves:
+  - tweak: Emergency flares have been replaced by red glowsticks.
+  - tweak: Flares are now slightly less bright and last slightly less longer.
+  - tweak: Glowsticks are now more slightly more bright.
+  - bugfix: Glowsticks now only show one message after being activated.
+  - rscadd: Flashlights now face the direction you're facing when dropped. They also
+      face a random direction after being thrown.
+  - tweak: Desk lamps are slightly less bright.
+  - tweak: Candles now last twice as long.
+  - tweak: Lanterns are now less bright and only shed light in 120 degrees.
+  - rscdel: Diona no longer spawn with flares, as they spawn with the glowstick in
+      their emergency box. And can make their own light.
+  - rscadd: You can now hit a light fixture with a broken light again to completely
+      shatter the light bulb.
   Geeves, sprites by Kyres:
   - rscadd: Added heavy arm guards and heavy leg guards to the syndicate heavy armour
       kit.
diff --git a/html/changelogs/geeves-no_flare.yml b/html/changelogs/geeves-no_flare.yml
deleted file mode 100644
index 64926d9fe8f..00000000000
--- a/html/changelogs/geeves-no_flare.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - tweak: "Emergency flares have been replaced by red glowsticks."
-  - tweak: "Flares are now slightly less bright and last slightly less longer."
-  - tweak: "Glowsticks are now more slightly more bright."
-  - bugfix: "Glowsticks now only show one message after being activated."
-  - rscadd: "Flashlights now face the direction you're facing when dropped. They also face a random direction after being thrown."
-  - tweak: "Desk lamps are slightly less bright."
-  - tweak: "Candles now last twice as long."
-  - tweak: "Lanterns are now less bright and only shed light in 120 degrees."
-  - rscdel: "Diona no longer spawn with flares, as they spawn with the glowstick in their emergency box. And can make their own light."
-  - rscadd: "You can now hit a light fixture with a broken light again to completely shatter the light bulb."
\ No newline at end of file