From fbc27e6b34932f1327f5ddbc0dc9cdf7fe445a09 Mon Sep 17 00:00:00 2001
From: parasitoide <46656614+parasitoide@users.noreply.github.com>
Date: Fri, 18 Oct 2019 10:48:58 -0400
Subject: [PATCH] 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 76bc2254e8..99a8b1cfb0 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -487,7 +487,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
@@ -519,7 +519,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.")