Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

This commit is contained in:
Anewbe
2018-08-04 11:20:02 -05:00
36 changed files with 1316 additions and 887 deletions
+2 -2
View File
@@ -364,14 +364,14 @@ CIRCUITS BELOW
/datum/design/circuit/ordercomp
name = "supply ordering console"
id = "ordercomp"
build_path = /obj/item/weapon/circuitboard/ordercomp
build_path = /obj/item/weapon/circuitboard/supplycomp
sort_string = "KAAAY" // Duplicate string, really need to redo this whole thing
/datum/design/circuit/supplycomp
name = "supply control console"
id = "supplycomp"
req_tech = list(TECH_DATA = 3)
build_path = /obj/item/weapon/circuitboard/supplycomp
build_path = /obj/item/weapon/circuitboard/supplycomp/control
sort_string = "KAAAZ" // Duplicate string, really need to redo this whole thing
/datum/design/circuit/biogenerator