From a50c6a2c6f14ed93a800cea0f6262d452f76965c Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 24 Sep 2016 00:54:12 -0700 Subject: [PATCH] Grills now properly tesla bolt when things are tossed at them (#20634) * tesla_grills * balance --- code/game/objects/structures/grille.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index c6284f25056..91a840b1e3c 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -264,17 +264,8 @@ var/turf/T = get_turf(src) var/obj/structure/cable/C = T.get_cable_node() if(C) - var/mob/living/closest_mob - for(var/A in oview(src, 3)) - if(istype(A, /mob/living)) - var/dist = get_dist(src, A) - if(dist <= 3) - closest_mob = A - if(closest_mob) - var/shock_damage = C.powernet.avail * 0.0002//setting shock damage for later. equals 1/5000 the power in the grid - src.Beam(closest_mob, icon_state="lightning[rand(1,12)]", time=5) - closest_mob.electrocute_act(shock_damage, src, 1)//ZAP, damage should be about 40 with 200000W - playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5) + 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. take_damage(tforce) /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)