From 7f1f92062be995c705b2d3f118024e91a3cf2829 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:01:12 +0200
Subject: [PATCH] [MIRROR] Fixed walking into grilles to destroy them [MDB
 IGNORE] (#23538)

* Fixed walking into grilles to destroy them (#78086)

* Fixed walking into grilles to destroy them

---------

Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com>
---
 code/game/objects/structures/grille.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 2a4ee9c53ac..c1941e834d0 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -133,8 +133,6 @@
 		return
 	var/mob/M = AM
 	shock(M, 70)
-	if(prob(50))
-		take_damage(1, BURN, FIRE, sound_effect = FALSE)
 
 /obj/structure/grille/attack_animal(mob/user, list/modifiers)
 	. = ..()
@@ -321,6 +319,9 @@
 	var/turf/T = get_turf(src)
 	if(T.overfloor_placed)//cant be a floor in the way!
 		return FALSE
+	// Shocking hurts the grille (to weaken monkey powersinks)
+	if(prob(50))
+		take_damage(1, BURN, FIRE, sound_effect = FALSE)
 	var/obj/structure/cable/C = T.get_cable_node()
 	if(C)
 		if(electrocute_mob(user, C, src, 1, TRUE))