From c5c2f52500be8a0294ed0dc20d7cd5e76b8c986f Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 22 Apr 2014 11:02:11 -0400 Subject: [PATCH] Fixed some bugged intents --- code/_onclick/click.dm | 2 +- code/game/objects/structures/window.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index a39fee5163e..bed775a6094 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -168,7 +168,7 @@ */ /mob/proc/RangedAttack(var/atom/A, var/params) if(!mutations.len) return - if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "hurt") + if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "harm") PowerGlove(A) if((M_LASER in mutations) && a_intent == "harm") LaserEyes(A) // moved into a proc below diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9c9e2c49952..e53779be272 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -119,7 +119,7 @@ message_admins("Window destroyed by hulk [user.real_name] ([formatPlayerPanel(user,user.ckey)]) with pdiff [pdiff] at [formatJumpTo(loc)]!") log_admin("Window destroyed by hulk [user.real_name] ([user.ckey]) with pdiff [pdiff] at [loc]!") destroy() - else if (usr.a_intent == "hurt") + else if (usr.a_intent == "harm") playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("\red [usr.name] bangs against the [src.name]!", \ "\red You bang against the [src.name]!", \