From 8321484d4d47eff40cb349da914c84770b6ae37b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 22 Mar 2018 19:30:37 -0500 Subject: [PATCH] [MIRROR] Fixes swarmers getting killed by shocks (#6075) * Fixes swarmer electrocution (#36596) * Fixes swarmers getting killed by shocks --- code/modules/antagonists/swarmer/swarmer.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 8d301c934a..e456dfee51 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -479,6 +479,11 @@ playsound(src,'sound/effects/sparks4.ogg',50,1) do_teleport(target, F, 0) +/mob/living/simple_animal/hostile/swarmer/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) + if(!tesla_shock) + return FALSE + return ..() + /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(obj/machinery/target) do_attack_animation(target) to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.")