cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1185 from Datraen/HarmBatonHallos

Browse Source 
Harmbatons no longer cause hallos while not on.
This commit is contained in:
EmperorJon
2016-03-14 22:41:55 +00:00
parent 634bab54e5 370d58f54a
commit 11ddfae6eb
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/stunbaton.dm
+4 -1
View File
@@ -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.