cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Grills now properly tesla bolt when things are tossed at them (#20634)

Browse Source 
* tesla_grills

* balance
This commit is contained in:
kevinz000
2016-09-24 19:54:12 +12:00
committed by oranges
parent e93d200fd4
commit a50c6a2c6f
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+2 -11
View File
@@ -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)