From 246b598aaa80b75bdcd460c78567278abe07c8a3 Mon Sep 17 00:00:00 2001 From: tralezab <40974010+tralezab@users.noreply.github.com> Date: Fri, 9 Nov 2018 13:16:54 -0800 Subject: [PATCH] fixes ninja apc drain (#41362) * the coders send their regards *shanks the king of the bugs* * leave one bug alive and the code is never safe * He did this. He poisoned my code. Take him, take him! TAKE HIM! TAKE HIM! * owie my brain hurty - olenna tyrell, probably --- code/modules/ninja/suit/ninjaDrainAct.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 861ffb9446c..a229d744629 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -44,8 +44,8 @@ They *could* go in their appropriate files, but this is supposed to be modular if (do_after(H,10, target = src)) spark_system.start() playsound(loc, "sparks", 50, 1) - cell.charge -= drain - S.cell.charge += drain + cell.use(drain) + S.cell.give(drain) . += drain else break @@ -89,7 +89,7 @@ They *could* go in their appropriate files, but this is supposed to be modular spark_system.start() playsound(loc, "sparks", 50, 1) charge -= drain - S.cell.charge += drain + S.cell.give(drain) . += drain else @@ -109,7 +109,7 @@ They *could* go in their appropriate files, but this is supposed to be modular if(S.cell.charge + charge > S.cell.maxcharge) S.cell.charge = S.cell.maxcharge else - S.cell.charge += charge + S.cell.give(charge) charge = 0 corrupt() update_icon() @@ -181,7 +181,7 @@ They *could* go in their appropriate files, but this is supposed to be modular else break - S.cell.charge += drained + S.cell.give(drain) if(S.cell.charge > S.cell.maxcharge) . += (drained-(S.cell.charge - S.cell.maxcharge)) S.cell.charge = S.cell.maxcharge @@ -212,7 +212,7 @@ They *could* go in their appropriate files, but this is supposed to be modular spark_system.start() playsound(loc, "sparks", 50, 1) cell.use(drain) - S.cell.charge += drain + S.cell.give(drain) . += drain else break @@ -239,8 +239,8 @@ They *could* go in their appropriate files, but this is supposed to be modular if (do_after(H,10)) spark_system.start() playsound(loc, "sparks", 50, 1) - cell.charge -= drain - S.cell.charge += drain + cell.use(drain) + S.cell.give(drain) . += drain else break