Merge branch 'master' into upstream-merge-37476

This commit is contained in:
LetterJay
2018-05-20 23:12:07 -05:00
committed by GitHub
172 changed files with 6336 additions and 4958 deletions
+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