From 514ac1f90b38f185e6374bcd5d3fb0b98ce79ecc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 3 Sep 2021 04:56:36 +0200
Subject: [PATCH] [MIRROR] Fixes crowbars hitting toilets when opening the
 cistern (#7939)

* Fixes crowbars hitting toilets (#61171)

fixes #61125
It returns an attack chain cancel now

* Fixes crowbars hitting toilets when opening the cistern

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
---
 code/game/objects/structures/watercloset.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 67f52c36204..a2c3f481bb5 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -103,6 +103,7 @@
 			user.visible_message(span_notice("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), span_notice("You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), span_hear("You hear grinding porcelain."))
 			cistern = !cistern
 			update_appearance()
+		return COMPONENT_CANCEL_ATTACK_CHAIN
 	else if(I.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
 		I.play_tool_sound(src)
 		deconstruct()