From 080e365911bc66f9ebd60c4fc809ed6c92d23671 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 8 Sep 2015 23:51:40 -0400 Subject: [PATCH] Prevents attacking yourself with items unless on harm intent --- code/_onclick/item_attack.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 95421ced48d..8c0b5d84382 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -52,6 +52,8 @@ avoid code duplication. This includes items that may sometimes act as a standard /obj/item/proc/attack(mob/living/M, mob/living/user, var/target_zone) if(!force || (flags & NOBLUDGEON)) return 0 + if(M == user && user.a_intent != I_HURT) + return 0 ///////////////////////// user.lastattacked = M