From 9cf4e60074bab98d0919c6059a47a4b68c95132b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 26 Oct 2020 08:04:13 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.10.26.08.04.13"

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

diff --git a/html/changelog.html b/html/changelog.html
index f57dcfd4f89..ed54d4a0dda 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,7 @@
 				<li class="bugfix">Unlatched trolleys can now be hitched again by dragging from the trolley you want to hitch to, to the unhitched trolley.</li>
 				<li class="bugfix">Fixes the gas names on air alarms.</li>
 				<li class="bugfix">Floodlights can now be rotated with alt-click.</li>
+				<li class="bugfix">Grilles no longer play an attack message after being unscrewed.</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 2f6c683d1b9..7b3f92e04a2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -16358,6 +16358,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       you want to hitch to, to the unhitched trolley.
   - bugfix: Fixes the gas names on air alarms.
   - bugfix: Floodlights can now be rotated with alt-click.
+  - bugfix: Grilles no longer play an attack message after being unscrewed.
   MattAtlas:
   - bugfix: Fixes some emotes such as pain dropping items not working.
   Snakebittenn:
diff --git a/html/changelogs/geeves-grille_unscrew_fix.yml b/html/changelogs/geeves-grille_unscrew_fix.yml
deleted file mode 100644
index b187f091e5c..00000000000
--- a/html/changelogs/geeves-grille_unscrew_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Grilles no longer play an attack message after being unscrewed."
\ No newline at end of file