From 370d58f54a21276c90d79b5713a5f999f206952f Mon Sep 17 00:00:00 2001 From: Datraen Date: Mon, 14 Mar 2016 17:31:58 -0400 Subject: [PATCH] Harmbatons no longer cause hallos while not on. --- code/game/objects/items/weapons/stunbaton.dm | 5 ++++- html/changelogs/Datraen-HarmBatonStunFix.yml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Datraen-HarmBatonStunFix.yml diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 7a128d7cfa0..a4d771aa81e 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -122,8 +122,11 @@ if(user.a_intent == I_HURT) if (!..()) //item/attack() does it's own messaging and logs return 0 // item/attack() will return 1 if they hit, 0 if they missed. - agony *= 0.5 //whacking someone causes a much poorer contact than prodding them. stun *= 0.5 + if(status) //Checks to see if the stunbaton is on. + agony *= 0.5 //whacking someone causes a much poorer contact than prodding them. + else + agony = 0 //Shouldn't really stun if it's off, should it? //we can't really extract the actual hit zone from ..(), unfortunately. Just act like they attacked the area they intended to. else //copied from human_defense.dm - human defence code should really be refactored some time. diff --git a/html/changelogs/Datraen-HarmBatonStunFix.yml b/html/changelogs/Datraen-HarmBatonStunFix.yml new file mode 100644 index 00000000000..18e4c773b92 --- /dev/null +++ b/html/changelogs/Datraen-HarmBatonStunFix.yml @@ -0,0 +1,6 @@ +author: Datraen + +delete-after: True + +changes: + - bugfix: "Harmbaton no longer causes halloss while inactive."