Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

This commit is contained in:
deathride58
2018-07-05 00:17:44 -04:00
18 changed files with 99 additions and 25 deletions
@@ -14,7 +14,7 @@
name = "Machine Design (Circulator Board)"
desc = "The circuit board for a circulator."
id = "circulator"
build_path = /obj/machinery/atmospherics/components/binary/circulator
build_path = /obj/item/circuitboard/machine/circulator
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -22,7 +22,7 @@
name = "Machine Design (TEG Board)"
desc = "The circuit board for a TEG."
id = "teg"
build_path = /obj/machinery/power/generator
build_path = /obj/item/circuitboard/machine/generator
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING