From e16e0c9712e8e9c96d9c716400734bef590eb487 Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Fri, 30 Dec 2016 15:53:36 -0500 Subject: [PATCH 1/2] OOOOPS --- code/game/objects/structures/grille.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index a10fd266d85..fa0d0a3d3b3 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -203,6 +203,7 @@ if(C) playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. + C.powernet.load += C.powernet.avail * 0.02 return ..() /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) From 38fa5d1e1af5a6d31376456a07d51dd65dd904f5 Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Fri, 30 Dec 2016 16:41:04 -0500 Subject: [PATCH 2/2] GOOFBALL --- code/game/objects/structures/grille.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index fa0d0a3d3b3..3ce3fcb6c26 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -203,7 +203,7 @@ if(C) playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. - C.powernet.load += C.powernet.avail * 0.02 + C.powernet.load += C.powernet.avail * 0.0375 // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)