Prevent blocking from shocking Flockdrones

code/mob/living/critter/flock/flockdrone.dm

@@ -359,14 +359,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)