From 2a824c5fe07fad3d226435bb7028cdac3f60e6c5 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 2 Aug 2015 19:10:31 +0200 Subject: [PATCH] Tweak electrocution damage from power gloves, GC update --- code/modules/power/powernet.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index e80113b3057..0c65a49b251 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -21,7 +21,7 @@ /datum/powernet/Destroy() powernets -= src - ..() + return ..() //Returns the amount of excess power (before refunding to SMESs) from last tick. //This is for machines that might adjust their power consumption using this data. @@ -121,7 +121,11 @@ /datum/powernet/proc/get_electrocute_damage() switch(avail) - if (1000000 to INFINITY) + if (5000000 to INFINITY) + return min(rand(200,300),rand(200,300)) + if (4000000 to 5000000) + return min(rand(80,180),rand(80,180)) + if (1000000 to 4000000) return min(rand(50,160),rand(50,160)) if (200000 to 1000000) return min(rand(25,80),rand(25,80))