cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7429 from VOREStation/aro-inducerhit

Browse Source 
Prevent accidental whaps with inducers
This commit is contained in:
Aronai Sieyes
2020-04-25 15:06:06 -04:00
committed by GitHub
parent 2b4be2639b 8a7d4f08cb
commit a2498bbb79
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/inducer_vr.dm
+6
View File
@@ -43,6 +43,12 @@
if(cell)
cell.emp_act(severity)
/obj/item/device/sleevemate/attack(mob/living/M, mob/living/user)
if(user.a_intent == I_HURT)
return ..()
else
return 0 //No accidental bludgeons!
/obj/item/weapon/inducer/afterattack(atom/A, mob/living/carbon/user, proximity)
if(user.a_intent == I_HURT)
return ..()