Merge branch 'master' into upstream-merge-5897

This commit is contained in:
Novacat
2019-03-28 14:39:41 -04:00
committed by GitHub
1471 changed files with 49032 additions and 48743 deletions
@@ -189,7 +189,7 @@
var/obj/machinery/power/circuit_io/IO = null // Dummy power machine to move energy in/out without a bunch of code duplication.
var/throughput = 10000 // Give/take up to 10kW.
/obj/item/integrated_circuit/passive/power/powernet/initialize()
/obj/item/integrated_circuit/passive/power/powernet/Initialize()
IO = new(src)
return ..()