From 2f83492451d06c13fe546e53ba6e0f2ef1565d84 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 6 Mar 2020 06:23:13 -0700 Subject: [PATCH 1/2] Update ninjaDrainAct.dm --- code/modules/ninja/suit/ninjaDrainAct.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 6553211c07..1c529ef745 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -264,7 +264,6 @@ They *could* go in their appropriate files, but this is supposed to be modular electrocute_act(15, H) DefaultCombatKnockdown(G.stunforce) - adjustStaminaLoss(G.stunforce*0.1, affected_zone = (istype(H) ? H.zone_selected : BODY_ZONE_CHEST)) apply_effect(EFFECT_STUTTER, G.stunforce) SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK) From 5aacdded63c0856917783073dbadd3d2574d1386 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 6 Mar 2020 06:23:56 -0700 Subject: [PATCH 2/2] Update gloves.dm --- code/modules/ninja/suit/gloves.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index e819fe55fd..4e7f1dc9ea 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -37,8 +37,7 @@ var/mindrain = 200 var/maxdrain = 400 - var/stunforce = 140 //Same as stunbaton, adjustable. - + var/stunforce = 100 /obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity) if(!candrain || draining)