Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602

[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
This commit is contained in:
deathride58
2018-05-17 18:11:24 +00:00
committed by GitHub
6 changed files with 1048 additions and 973 deletions
@@ -153,6 +153,9 @@
req_access = null
req_one_access = null
/obj/machinery/airalarm/syndicate //general syndicate access
req_access = list(ACCESS_SYNDICATE)
//all air alarms in area are connected via magic
/area
var/list/air_vent_names = list()
+3
View File
@@ -105,6 +105,9 @@
/obj/machinery/power/apc/unlocked
locked = FALSE
/obj/machinery/power/apc/syndicate //general syndicate access
req_access = list(ACCESS_SYNDICATE)
/obj/machinery/power/apc/highcap/five_k
cell_type = /obj/item/stock_parts/cell/upgraded/plus