From 0ef4d2edcc4548d767ee3b1eac2087ec6d44943d Mon Sep 17 00:00:00 2001
From: Ryan <53062374+FlameArrow57@users.noreply.github.com>
Date: Wed, 6 Apr 2022 19:19:37 -0700
Subject: [PATCH] fix block shocking you (#114)

---
 code/mob/living/critter/flock/flockdrone.dm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/code/mob/living/critter/flock/flockdrone.dm b/code/mob/living/critter/flock/flockdrone.dm
index 20bae844b5..76d7d6ffbf 100644
--- a/code/mob/living/critter/flock/flockdrone.dm
+++ b/code/mob/living/critter/flock/flockdrone.dm
@@ -355,14 +355,17 @@
 /mob/living/critter/flock/drone/process_move(keys)
 	if(keys && length(src.grabbed_by))
 		// someone is grabbing us, and we want to move
-		++src.antigrab_counter
-		if(src.antigrab_counter >= src.antigrab_fires_at)
-			playsound(src, "sound/effects/electric_shock.ogg", 40, 1, -3)
-			boutput(src, "<span class='flocksay'><b>\[SYSTEM: Anti-grapple countermeasures deployed.\]</b></span>")
-			for(var/obj/item/grab/G in src.grabbed_by)
-				var/mob/living/L = G.assailant
-				L.shock(src, 5000)
+		if (length(src.grabbed_by) == 1 && src.find_type_in_hand(/obj/item/grab/block))
 			src.antigrab_counter = 0
+		else
+			++src.antigrab_counter
+			if(src.antigrab_counter >= src.antigrab_fires_at)
+				playsound(src, "sound/effects/electric_shock.ogg", 40, 1, -3)
+				boutput(src, "<span class='flocksay'><b>\[SYSTEM: Anti-grapple countermeasures deployed.\]</b></span>")
+				for(var/obj/item/grab/G in src.grabbed_by)
+					var/mob/living/L = G.assailant
+					L.shock(src, 5000)
+				src.antigrab_counter = 0
 	else
 		src.antigrab_counter = 0
 	if(keys & KEY_RUN)