cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #212 from CHOMPStation2/Razgriz1032-patch-21

Browse Source 
Stun baton: Taking the harm out of disarm
This commit is contained in:
Razgriz
2020-02-07 17:43:00 -07:00
committed by GitHub
parent a0751cbf0b d7ccdf028a
commit f76eef5236
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,7 @@
var/mob/living/carbon/human/H = target var/mob/living/carbon/human/H = target
affecting = H.get_organ(hit_zone) affecting = H.get_organ(hit_zone)
if(user.a_intent == I_HURT || user.a_intent == I_DISARM) if(user.a_intent == I_HURT) //CHOMPEdit: No disarm. ONLY HARM.
. = ..() . = ..()
//whacking someone causes a much poorer electrical contact than deliberately prodding them. //whacking someone causes a much poorer electrical contact than deliberately prodding them.
agony *= 0.5 agony *= 0.5
@@ -274,4 +274,4 @@
// Borg version, for the lost module. // Borg version, for the lost module.
/obj/item/weapon/melee/baton/shocker/robot /obj/item/weapon/melee/baton/shocker/robot
use_external_power = TRUE use_external_power = TRUE