From 8fc168be4ecb6ec40d742f2dd85b89f11f7720e4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 29 Jun 2020 19:12:37 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.29.19.12.37"

---
 html/changelog.html                           | 2 ++
 html/changelogs/.all_changelog.yml            | 3 +++
 html/changelogs/geeves-flavour_text_delet.yml | 7 -------
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/geeves-flavour_text_delet.yml

diff --git a/html/changelog.html b/html/changelog.html
index c309efd9e3e..55aeca3509b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,8 @@
 				<li class="bugfix">Fixes various programs not having their computer correctly set, which should fix a wide spectrum of bugs for modular computers.</li>
 				<li class="bugfix">Replaced the non-functioning suit-cycler and voidsuit combo at the burglar base, with a simple black and red all-species syndicate softsuit.</li>
 				<li class="bugfix">Burglars can properly no longer access some of the more robust uplinks, to keep up with the lowpop theme.</li>
+				<li class="bugfix">Off-station antagonists will no longer keep the player's character's flavour text.</li>
+				<li class="bugfix">Antagonists will now be assigned random names before they pick their name.</li>
 			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c11ca157b80..2c3e70479fd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13892,6 +13892,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       base, with a simple black and red all-species syndicate softsuit.
   - bugfix: Burglars can properly no longer access some of the more robust uplinks,
       to keep up with the lowpop theme.
+  - bugfix: Off-station antagonists will no longer keep the player's character's flavour
+      text.
+  - bugfix: Antagonists will now be assigned random names before they pick their name.
   MattAtlas:
   - rscadd: Added a new, swanky main menu.
   Wowzewow (Wezzy):
diff --git a/html/changelogs/geeves-flavour_text_delet.yml b/html/changelogs/geeves-flavour_text_delet.yml
deleted file mode 100644
index e3ad1df8d59..00000000000
--- a/html/changelogs/geeves-flavour_text_delet.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Off-station antagonists will no longer keep the player's character's flavour text."
-  - bugfix: "Antagonists will now be assigned random names before they pick their name."
\ No newline at end of file