From bcb78f9f1966f8bddf6a6c3d4bdae08152b22aa7 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 25 Jan 2017 12:23:14 -0200 Subject: [PATCH] Fix constructs being unable to hit things (#1639) Pretty much settle over any issues with constructs and attacking things, also, the juggernaut proc is pretty much useless and snowflake code, since, they can just break and pry open airlocks just fine without it. --- .../living/simple_animal/constructs/constructs.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/modules/mob/living/simple_animal/constructs/constructs.dm b/code/modules/mob/living/simple_animal/constructs/constructs.dm index 80c4a30b202..b70bb3bc188 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs.dm @@ -85,7 +85,6 @@ user << msg /mob/living/simple_animal/construct/UnarmedAttack(var/atom/A, var/proximity) - user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(istype(A, /obj/effect/rune)) var/obj/effect/rune/R = A do_attack_animation(R) @@ -145,19 +144,6 @@ return (..(P)) -/mob/living/simple_animal/construct/armoured/UnarmedAttack(var/atom/A, var/proximity) - user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - if(istype(A, /obj/machinery)) - // Destroy machines instead of opening their UI - var/obj/machinery/M = A - do_attack_animation(M) - playsound(loc, attack_sound, 50, 1, 1) - M.ex_act(3.0) - else - ..() - - - ////////////////////////Wraith/////////////////////////////////////////////