cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change

Browse Source 
Stunbatons will now only harmbaton on grab/harm intents
This commit is contained in:
Atermonera
2020-02-09 11:45:47 -08:00
committed by GitHub
parent 40eaf71335 2c65cb606b
commit af1929f74e
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -178,7 +178,7 @@
var/mob/living/carbon/human/H = target
affecting = H.get_organ(hit_zone)
if(user.a_intent == I_HURT || user.a_intent == I_DISARM)
if(user.a_intent == I_GRAB || user.a_intent == I_HURT)
. = ..()
//whacking someone causes a much poorer electrical contact than deliberately prodding them.
agony *= 0.5