From 09b37e27b409aeed0e2c8181f9d62e3a6588e313 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 9 Dec 2020 14:13:57 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.12.09.14.13.57"

---
 html/changelog.html                | 1 +
 html/changelogs/.all_changelog.yml | 1 +
 html/changelogs/geeves-oops.yml    | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/geeves-oops.yml

diff --git a/html/changelog.html b/html/changelog.html
index efc762dcdcf..ac1afbaf6df 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,7 @@
 				<li class="bugfix">Floating chat messages will now appear properly above resting humanoids.</li>
 				<li class="bugfix">Fixed maintenance-, mining-, and construction drones having weird lit up eyes. They should now update correctly.</li>
 				<li class="bugfix">Fixed the hat overlay of mining drones.</li>
+				<li class="bugfix">You can now punch people again.</li>
 			</ul>
 			<h3 class="author">JohnWildkins updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 09040518d6d..3712019e3df 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17368,6 +17368,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed maintenance-, mining-, and construction drones having weird lit
       up eyes. They should now update correctly.
   - bugfix: Fixed the hat overlay of mining drones.
+  - bugfix: You can now punch people again.
   JohnWildkins:
   - bugfix: Vending machines spawned after mapload and/or by admins should no longer
       have missing icons.
diff --git a/html/changelogs/geeves-oops.yml b/html/changelogs/geeves-oops.yml
deleted file mode 100644
index f5adbf899a5..00000000000
--- a/html/changelogs/geeves-oops.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - bugfix: "You can now punch people again."
\ No newline at end of file