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

View File

@@ -20,14 +20,14 @@
var/detail_color = COLOR_ASSEMBLY_BLACK
/obj/item/device/electronic_assembly/initialize()
/obj/item/device/electronic_assembly/Initialize()
battery = new(src)
processing_objects |= src
START_PROCESSING(SSobj, src)
return ..()
/obj/item/device/electronic_assembly/Destroy()
battery = null // It will be qdel'd by ..() if still in our contents
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/device/electronic_assembly/process()