From bc828607785dfd1bd5fd52f1cb6206b8891efcc2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 28 Jan 2020 22:07:12 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.01.28.22.07.12"

---
 html/changelog.html                | 11 +++++++++++
 html/changelogs/.all_changelog.yml | 12 ++++++++++++
 html/changelogs/geeves-laptops.yml | 13 -------------
 3 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/geeves-laptops.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8a4be42bfbd..9e147b4293f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,17 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes nanopaste not using charge when used for internal robotic repairs.</li>
 			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a default NTNet Relay IRC channel, for everyone to access and congregate at.</li>
+				<li class="rscdel">Removed the user has joined and user has left the channel messages, so you can freely move in the IRC without spamming people.</li>
+				<li class="rscadd">Added the IRC client as a default program to the Private enrollment preset, so you don't have to download it seperately.</li>
+				<li class="tweak">Renamed the Computer Configuration Tool to Hardware Configuration Tool.</li>
+				<li class="rscadd">Added a basic laptop to the loadout.</li>
+				<li class="tweak">Increased the DDOS program's DDOSing power a bit.</li>
+				<li class="rscadd">Added Sudoku to the CE's laptop.</li>
+				<li class="tweak">Ports Bay Modular Computer component sprites.</li>
+			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Commune and Psiping no longer spam staff logs.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 878fe991659..c81bc80e29e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11511,6 +11511,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-01-28:
   BoryaTheSlayer:
   - bugfix: Fixes nanopaste not using charge when used for internal robotic repairs.
+  Geeves:
+  - rscadd: Added a default NTNet Relay IRC channel, for everyone to access and congregate
+      at.
+  - rscdel: Removed the user has joined and user has left the channel messages, so
+      you can freely move in the IRC without spamming people.
+  - rscadd: Added the IRC client as a default program to the Private enrollment preset,
+      so you don't have to download it seperately.
+  - tweak: Renamed the Computer Configuration Tool to Hardware Configuration Tool.
+  - rscadd: Added a basic laptop to the loadout.
+  - tweak: Increased the DDOS program's DDOSing power a bit.
+  - rscadd: Added Sudoku to the CE's laptop.
+  - tweak: Ports Bay Modular Computer component sprites.
   MattAtlas:
   - tweak: Commune and Psiping no longer spam staff logs.
   Pratepresidenten:
diff --git a/html/changelogs/geeves-laptops.yml b/html/changelogs/geeves-laptops.yml
deleted file mode 100644
index 6c18ae9bd98..00000000000
--- a/html/changelogs/geeves-laptops.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - rscadd: "Added a default NTNet Relay IRC channel, for everyone to access and congregate at."
-  - rscdel: "Removed the user has joined and user has left the channel messages, so you can freely move in the IRC without spamming people."
-  - rscadd: "Added the IRC client as a default program to the Private enrollment preset, so you don't have to download it seperately."
-  - tweak: "Renamed the Computer Configuration Tool to Hardware Configuration Tool."
-  - rscadd: "Added a basic laptop to the loadout."
-  - tweak: "Increased the DDOS program's DDOSing power a bit."
-  - rscadd: "Added Sudoku to the CE's laptop."
-  - tweak: "Ports Bay Modular Computer component sprites."