From 205368366a3497c87f95ccf5eafe4d182b0f969b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 2 Aug 2020 14:03:39 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.08.02.14.03.39"

---
 html/changelog.html                      | 7 +++++++
 html/changelogs/.all_changelog.yml       | 6 ++++++
 html/changelogs/geeves-slime_cleanup.yml | 9 ---------
 3 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/geeves-slime_cleanup.yml

diff --git a/html/changelog.html b/html/changelog.html
index 636d6cf68c7..d73901770f2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,13 @@
 				<li class="bugfix">Removed a wire crossover between the mains powernet and the civillian surface subnet, which was occuring in the emergency service dock.</li>
 				<li class="bugfix">Fixed a hanging loose end of cable which should connect telecommunications (and its solars) to civillian surface mains grid.</li>
 			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Killing a slime attached to someone will now detach it.</li>
+				<li class="tweak">Slimes will not hunt if their nutrition is more than 80% of their max nutrition, and they aren't rabid or attacked.</li>
+				<li class="bugfix">Fixed slime friendship.</li>
+				<li class="rscadd">Slime friendship is now guaranteed if you feed them.</li>
+			</ul>
 			<h3 class="author">Snakebittenn updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscdel">Deletes superfluous Black Boots from the loadout. These had the same exact sprite as jackboots, did you know?</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index af89efe2c3e..0cde8c01735 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14647,6 +14647,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       surface subnet, which was occuring in the emergency service dock.
   - bugfix: Fixed a hanging loose end of cable which should connect telecommunications
       (and its solars) to civillian surface mains grid.
+  Geeves:
+  - bugfix: Killing a slime attached to someone will now detach it.
+  - tweak: Slimes will not hunt if their nutrition is more than 80% of their max nutrition,
+      and they aren't rabid or attacked.
+  - bugfix: Fixed slime friendship.
+  - rscadd: Slime friendship is now guaranteed if you feed them.
   Snakebittenn:
   - rscdel: Deletes superfluous Black Boots from the loadout. These had the same exact
       sprite as jackboots, did you know?
diff --git a/html/changelogs/geeves-slime_cleanup.yml b/html/changelogs/geeves-slime_cleanup.yml
deleted file mode 100644
index 60f608dc12e..00000000000
--- a/html/changelogs/geeves-slime_cleanup.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Killing a slime attached to someone will now detach it."
-  - tweak: "Slimes will not hunt if their nutrition is more than 80% of their max nutrition, and they aren't rabid or attacked."
-  - bugfix: "Fixed slime friendship."
-  - rscadd: "Slime friendship is now guaranteed if you feed them."
\ No newline at end of file