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

Merge pull request #20434 from ChangelingRain/idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

Browse Source 
Moves all beam icon states to beams.dmi
This commit is contained in:
Cheridan
2016-09-13 11:55:24 -05:00
committed by GitHub
parent 6ba0861449 179b0b532d
commit 2a0168abdb
22 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -272,7 +272,7 @@
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)]", icon='icons/effects/effects.dmi', time=5)
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)
take_damage(tforce)