From 51177488de4d5223fd9d601f4a9cc960649cc6e2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 21 Nov 2020 15:31:02 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.11.21.15.31.02"

---
 html/changelog.html                                 | 1 +
 html/changelogs/.all_changelog.yml                  | 1 +
 html/changelogs/Ferner-201120-bugfix_combatmech.yml | 4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/Ferner-201120-bugfix_combatmech.yml

diff --git a/html/changelog.html b/html/changelog.html
index 86450ea59dc..7bddc67be05 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -39,6 +39,7 @@
 			<h3 class="author">Ferner updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">The security maintenance exterior airlock now has an outward facing access button.</li>
+				<li class="bugfix">Fixed premade combat mechs spawning without weapons.</li>
 			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 425a718280d..23ccfdb9f05 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17085,6 +17085,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Ferner:
   - bugfix: The security maintenance exterior airlock now has an outward facing access
       button.
+  - bugfix: Fixed premade combat mechs spawning without weapons.
   Geeves:
   - bugfix: Fake death lings should now be slightly harder to detect by medical.
   - rscadd: Engineering apprentice, lab assistant, and medical intern slots have been
diff --git a/html/changelogs/Ferner-201120-bugfix_combatmech.yml b/html/changelogs/Ferner-201120-bugfix_combatmech.yml
deleted file mode 100644
index f1c0a6eadfd..00000000000
--- a/html/changelogs/Ferner-201120-bugfix_combatmech.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Ferner
-delete-after: True
-changes:
-  - bugfix: "Fixed premade combat mechs spawning without weapons."
\ No newline at end of file