Merge branch 'master' into digileg-runtime

This commit is contained in:
Poojawa
2018-03-19 21:33:50 -05:00
committed by GitHub
1329 changed files with 2726 additions and 1986 deletions
@@ -48,21 +48,35 @@ PROCESSING_SUBSYSTEM_DEF(circuit)
/obj/item/device/electronic_assembly/calc,
/obj/item/device/electronic_assembly/clam,
/obj/item/device/electronic_assembly/simple,
/obj/item/device/electronic_assembly/hook,
/obj/item/device/electronic_assembly/pda,
/obj/item/device/electronic_assembly/medium/default,
/obj/item/device/electronic_assembly/medium/box,
/obj/item/device/electronic_assembly/medium/clam,
/obj/item/device/electronic_assembly/medium/medical,
/obj/item/device/electronic_assembly/medium/gun,
/obj/item/device/electronic_assembly/medium/radio,
/obj/item/device/electronic_assembly/large/default,
/obj/item/device/electronic_assembly/large/scope,
/obj/item/device/electronic_assembly/large/terminal,
/obj/item/device/electronic_assembly/large/arm,
/obj/item/device/electronic_assembly/large/tall,
/obj/item/device/electronic_assembly/large/industrial,
/obj/item/device/electronic_assembly/drone/default,
/obj/item/device/electronic_assembly/drone/arms
/obj/item/device/electronic_assembly/drone/arms,
/obj/item/device/electronic_assembly/drone/secbot,
/obj/item/device/electronic_assembly/drone/medbot,
/obj/item/device/electronic_assembly/drone/genbot,
/obj/item/device/electronic_assembly/drone/android,
/obj/item/device/electronic_assembly/wallmount/light,
/obj/item/device/electronic_assembly/wallmount,
/obj/item/device/electronic_assembly/wallmount/heavy
///obj/item/weapon/implant/integrated_circuit
)
circuit_fabricator_recipe_list["Tools"] = list(
/obj/item/device/integrated_electronics/wirer,
/obj/item/device/integrated_electronics/debugger,
/obj/item/device/integrated_electronics/analyzer
/obj/item/device/integrated_electronics/analyzer,
/obj/item/device/integrated_electronics/detailer
)