From 029c755e15734f91a4b68744dd4a5483a8983773 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 16 Dec 2020 02:49:37 -0700
Subject: [PATCH 1/2] Update ninjaDrainAct.dm
---
code/modules/ninja/suit/ninjaDrainAct.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
index 1c529ef745..c691e3ebb7 100644
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ b/code/modules/ninja/suit/ninjaDrainAct.dm
@@ -261,9 +261,9 @@ They *could* go in their appropriate files, but this is supposed to be modular
spark_system.set_up(5, 0, loc)
playsound(src, "sparks", 50, 1)
visible_message("[H] electrocutes [src] with [H.p_their()] touch!", "[H] electrocutes you with [H.p_their()] touch!")
- electrocute_act(15, H)
+ electrocute_act(15, H, flags = SHOCK_NOSTUN)
- DefaultCombatKnockdown(G.stunforce)
+ DefaultCombatKnockdown(G.stunforce, override_hardstun = 0)
apply_effect(EFFECT_STUTTER, G.stunforce)
SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)
From a41e1b1077dbbbdfd834f0b7a8a0f26de2c46d1f Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Fri, 18 Dec 2020 05:00:16 -0700
Subject: [PATCH 2/2] Update ninjaDrainAct.dm
---
code/modules/ninja/suit/ninjaDrainAct.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
index c691e3ebb7..4462987cbf 100644
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ b/code/modules/ninja/suit/ninjaDrainAct.dm
@@ -254,7 +254,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
. = DRAIN_MOB_SHOCK_FAILED
//Default cell = 10,000 charge, 10,000/1000 = 10 uses without charging/upgrading
- if(S.cell && S.cell.charge && S.cell.use(1000))
+ if(S.cell && S.cell.charge && S.cell.use(500))
. = DRAIN_MOB_SHOCK
//Got that electric touch
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()