From 9452af85b441514b7366473dd40eed7feb539fa2 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 23 Oct 2019 15:17:57 -0800 Subject: [PATCH] Merge pull request #6484 from parasitoide/master Can now attack robots with welders and crowbars on harm intent --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a9097f89131..c3a66ac45ab 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -499,7 +499,7 @@ M.install(src, user) return - if (istype(W, /obj/item/weapon/weldingtool)) + if (istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HURT) if (src == user) to_chat(user, "You lack the reach to be able to repair yourself.") return @@ -531,7 +531,7 @@ for(var/mob/O in viewers(user, null)) O.show_message(text("[user] has fixed some of the burnt wires on [src]!"), 1) - else if (W.is_crowbar()) // crowbar means open or close the cover + else if (W.is_crowbar() && user.a_intent != I_HURT) // crowbar means open or close the cover if(opened) if(cell) to_chat(user, "You close the cover.")