Merge branch 'Aurorastation/development' into Map-Development

This commit is contained in:
LordFowl
2017-01-29 15:38:37 -05:00
218 changed files with 5025 additions and 5528 deletions
+2
View File
@@ -2,8 +2,10 @@
name = "skipjack control console"
req_access = list(access_syndicate)
shuttle_tag = "Skipjack"
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "mercenary shuttle control console"
req_access = list(access_syndicate)
shuttle_tag = "Mercenary"
light_color = LIGHT_COLOR_RED
+1
View File
@@ -2,6 +2,7 @@
name = "shuttle control console"
icon = 'icons/obj/computer.dmi'
light_color = LIGHT_COLOR_CYAN
icon_screen = "shuttle"
circuit = null