shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11132 from Ghommie/Ghommie-cit585

Browse Source 
Something about tesla revolvers and tk.
This commit is contained in:
kevinz000
2020-02-19 18:59:44 -07:00
committed by GitHub
parent a7cf5b63ee 5dc271124a
commit 1c2dca4a00
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/energy/tesla.dm
+5 -4
View File
@@ -7,10 +7,11 @@
var/zap_range = 3 var/zap_range = 3
var/power = 10000 var/power = 10000
/obj/item/projectile/energy/tesla/fire(setAngle) /obj/item/projectile/energy/tesla/fire(setAngle, atom/direct_target)
if(firer) var/atom/source = fired_from || firer
chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY) if(source)
..() chain = source.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
return ..()
/obj/item/projectile/energy/tesla/on_hit(atom/target) /obj/item/projectile/energy/tesla/on_hit(atom/target)
. = ..() . = ..()