Merge branch 'master' into upstream-merge-26131

This commit is contained in:
LetterJay
2017-05-02 09:19:49 -05:00
committed by GitHub
422 changed files with 16923 additions and 9597 deletions
@@ -93,6 +93,7 @@
connect_to_network()
sparks = new
sparks.attach(src)
sparks.set_up(5, TRUE, src)
/obj/machinery/power/emitter/Destroy()