From 528ff9732b9df95c9c09dce8b1e4335887cf6cfc Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 14 Oct 2020 20:42:00 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.10.14.20.42.00"

---
 html/changelog.html                     | 10 ++++++++++
 html/changelogs/.all_changelog.yml      |  8 ++++++++
 html/changelogs/alberyk-tajconsular.yml |  8 --------
 html/changelogs/geeves-super_meat.yml   |  6 ------
 4 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/alberyk-tajconsular.yml
 delete mode 100644 html/changelogs/geeves-super_meat.yml

diff --git a/html/changelog.html b/html/changelog.html
index 03054e5d174..eca18de2c22 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,16 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">14 October 2020</h2>
+			<h3 class="author">Alberyk, Happyfox updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new Tajaran food and recipe: m'sai scout ration.</li>
+				<li class="rscadd">Added new items to Tajaran consular officers.</li>
+				<li class="tweak">Changed Tajaran consular officer directives to be more of a guideline instead of objectives.</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="admin">Added a super meat locker for admins to spawn, comes with all the ingredients needed for a grilling party.</li>
+			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">pAIs can now actually use the atmospherics sensor program.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 772a5b6ed94..39d482df258 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -16156,5 +16156,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Wowzewow (Wezzy):
   - tweak: Makes UI titles white again for better contrast.
 2020-10-14:
+  Alberyk, Happyfox:
+  - rscadd: 'Added a new Tajaran food and recipe: m''sai scout ration.'
+  - rscadd: Added new items to Tajaran consular officers.
+  - tweak: Changed Tajaran consular officer directives to be more of a guideline instead
+      of objectives.
+  Geeves:
+  - admin: Added a super meat locker for admins to spawn, comes with all the ingredients
+      needed for a grilling party.
   MattAtlas:
   - bugfix: pAIs can now actually use the atmospherics sensor program.
diff --git a/html/changelogs/alberyk-tajconsular.yml b/html/changelogs/alberyk-tajconsular.yml
deleted file mode 100644
index 9576bd1876f..00000000000
--- a/html/changelogs/alberyk-tajconsular.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Alberyk, Happyfox
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added a new Tajaran food and recipe: m'sai scout ration."
-  - rscadd: "Added new items to Tajaran consular officers."
-  - tweak: "Changed Tajaran consular officer directives to be more of a guideline instead of objectives."
diff --git a/html/changelogs/geeves-super_meat.yml b/html/changelogs/geeves-super_meat.yml
deleted file mode 100644
index b24bdcc17c3..00000000000
--- a/html/changelogs/geeves-super_meat.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - admin: "Added a super meat locker for admins to spawn, comes with all the ingredients needed for a grilling party."
\ No newline at end of file