Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER

This commit is contained in:
kevinz000
2018-12-09 20:34:39 -08:00
234 changed files with 1365 additions and 477 deletions
@@ -20,7 +20,7 @@
var/detail_color = COLOR_ASSEMBLY_BLACK
/obj/item/device/electronic_assembly/initialize()
/obj/item/device/electronic_assembly/Initialize()
battery = new(src)
START_PROCESSING(SSobj, src)
return ..()