From aa10a6bbe692d77d0cd00bd85cd076283471a51c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 31 Oct 2020 13:39:01 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.10.31.13.39.01"

---
 html/changelog.html                        | 4 ++++
 html/changelogs/.all_changelog.yml         | 2 ++
 html/changelogs/hockaa-airlockcrushfix.yml | 6 ------
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/hockaa-airlockcrushfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index ef833f64acc..1e50b88dff9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,10 @@
 			<ul class="changes bgimages16">
 				<li class="admin">Projectiles hitting mobs will now not display an admin log if both the firer and the target has no client connected.</li>
 			</ul>
+			<h3 class="author">Hocka updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Airlocks now display messages when crushing people.</li>
+			</ul>
 			<h3 class="author">JohnWildkins updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Vending machines now have a graphical, icon-based item interface based in VueUI.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 00cc76e7451..f6afd5609f1 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -16510,6 +16510,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Geeves:
   - admin: Projectiles hitting mobs will now not display an admin log if both the
       firer and the target has no client connected.
+  Hocka:
+  - tweak: Airlocks now display messages when crushing people.
   JohnWildkins:
   - rscadd: Vending machines now have a graphical, icon-based item interface based
       in VueUI.
diff --git a/html/changelogs/hockaa-airlockcrushfix.yml b/html/changelogs/hockaa-airlockcrushfix.yml
deleted file mode 100644
index e46e419f624..00000000000
--- a/html/changelogs/hockaa-airlockcrushfix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Hocka
-
-delete-after: True
-
-changes: 
-  - tweak: "Airlocks now display messages when crushing people."