From 5ffb4c4486b0239b3babfa6cacb20bac9949fc16 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 17 Jul 2020 17:27:13 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.17.17.27.13"

---
 html/changelog.html                      |  8 ++++++++
 html/changelogs/.all_changelog.yml       | 10 ++++++++++
 html/changelogs/geeves-robot_cleanup.yml | 10 ----------
 3 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/geeves-robot_cleanup.yml

diff --git a/html/changelog.html b/html/changelog.html
index 7e3b98d4dda..8cb608f33ef 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,14 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">17 July 2020</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="backend">Tweaked a lot of cyborg-related code in the backend, things should be smoother now.</li>
+				<li class="tweak">Replaced some mean robot building failure messages and replaced them with more neutral ones.</li>
+				<li class="rscadd">Examining robotic components will now tell you which components you still need to add.</li>
+				<li class="tweak">Installing robot modules have been tweaked, the error messages should be much more descriptive now.</li>
+				<li class="tweak">The illegal upgrade has been renamed to 'non-standard equipment module'.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="imageadd">Improves accent tags. They should be more legible now.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5bf7ab4c2f9..fae1fd64031 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14210,5 +14210,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Importing or exporting programs will now tell you if there isn't enough
       space or if the same file is already on the target hard drive.
 2020-07-17:
+  Geeves:
+  - backend: Tweaked a lot of cyborg-related code in the backend, things should be
+      smoother now.
+  - tweak: Replaced some mean robot building failure messages and replaced them with
+      more neutral ones.
+  - rscadd: Examining robotic components will now tell you which components you still
+      need to add.
+  - tweak: Installing robot modules have been tweaked, the error messages should be
+      much more descriptive now.
+  - tweak: The illegal upgrade has been renamed to 'non-standard equipment module'.
   Wowzewow (Wezzy):
   - imageadd: Improves accent tags. They should be more legible now.
diff --git a/html/changelogs/geeves-robot_cleanup.yml b/html/changelogs/geeves-robot_cleanup.yml
deleted file mode 100644
index 56755fb6965..00000000000
--- a/html/changelogs/geeves-robot_cleanup.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - backend: "Tweaked a lot of cyborg-related code in the backend, things should be smoother now."
-  - tweak: "Replaced some mean robot building failure messages and replaced them with more neutral ones."
-  - rscadd: "Examining robotic components will now tell you which components you still need to add."
-  - tweak: "Installing robot modules have been tweaked, the error messages should be much more descriptive now."
-  - tweak: "The illegal upgrade has been renamed to 'non-standard equipment module'."
\ No newline at end of file