From 127a35b7cf5900f71ac1f81363031b3cda81b103 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 6 Feb 2020 00:19:57 -0700 Subject: [PATCH 1/2] Stun baton: Taking the harm out of disarm Ports https://github.com/CHOMPstation/CHOMPstation/pull/632 It's called a HARM baton, not a DI(h)SARM baton. --- code/game/objects/items/weapons/stunbaton.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 371082f1f6..fbd89167fb 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -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_HURT) . = ..() //whacking someone causes a much poorer electrical contact than deliberately prodding them. agony *= 0.5 @@ -274,4 +274,4 @@ // Borg version, for the lost module. /obj/item/weapon/melee/baton/shocker/robot - use_external_power = TRUE \ No newline at end of file + use_external_power = TRUE From d7ccdf028af6bef8665bdff1051b1a93237ef670 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Fri, 7 Feb 2020 17:42:37 -0700 Subject: [PATCH 2/2] Update stunbaton.dm --- code/game/objects/items/weapons/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index fbd89167fb..f1615762a1 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -178,7 +178,7 @@ var/mob/living/carbon/human/H = target affecting = H.get_organ(hit_zone) - if(user.a_intent == I_HURT) + if(user.a_intent == I_HURT) //CHOMPEdit: No disarm. ONLY HARM. . = ..() //whacking someone causes a much poorer electrical contact than deliberately prodding them. agony *= 0.5