cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6484 from parasitoide/master

Browse Source 
Can now attack robots with welders and crowbars on harm intent
This commit is contained in:
Atermonera
2019-10-23 15:17:57 -08:00
committed by VirgoBot
parent 931fcbfdc4
commit 9452af85b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -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, "<span class='warning'>You lack the reach to be able to repair yourself.</span>")
return
@@ -531,7 +531,7 @@
for(var/mob/O in viewers(user, null))
O.show_message(text("<font color='red'>[user] has fixed some of the burnt wires on [src]!</font>"), 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.")