From ccfca6c124041a07511fbf7ad3e5d9a116c150f6 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Mon, 26 Oct 2020 10:03:33 +0200
Subject: [PATCH] Grille Unscrew Fix (#10349)

---
 code/game/objects/structures/grille.dm        | 1 +
 html/changelogs/geeves-grille_unscrew_fix.yml | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 html/changelogs/geeves-grille_unscrew_fix.yml

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 8b699e47e7b..223151052f8 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -114,6 +114,7 @@
 			anchored = !anchored
 			user.visible_message("<span class='notice'>[user] [anchored ? "fastens" : "unfastens"] the grille.</span>", \
 								 "<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")
+		return
 	else if(istype(W,/obj/item/stack/rods) && destroyed == 1)
 		if(!shock(user, 90))
 			var/obj/item/stack/rods/ROD = W
diff --git a/html/changelogs/geeves-grille_unscrew_fix.yml b/html/changelogs/geeves-grille_unscrew_fix.yml
new file mode 100644
index 00000000000..b187f091e5c
--- /dev/null
+++ b/html/changelogs/geeves-grille_unscrew_fix.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "Grilles no longer play an attack message after being unscrewed."
\ No newline at end of file