Merge resolution.

This commit is contained in:
Zuhayr
2014-11-22 07:31:44 +10:30
68 changed files with 1641 additions and 1318 deletions
+2
View File
@@ -168,6 +168,8 @@
var/obj/structure/cable/C = T.get_cable_node()
if(C)
if(electrocute_mob(user, C, src))
if(C.powernet)
C.powernet.trigger_warning()
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()