Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2020-01-18 22:14:06 +01:00
parent 9c0b78bc09 4d06c2d2d3
commit 3ee855ab77
54 changed files with 4114 additions and 2584 deletions
@@ -87,6 +87,14 @@
 		return
 	. = ..()

+/obj/machinery/computer/shuttle/mining/common
+	name = "lavaland shuttle console"
+	desc = "Used to call and send the lavaland shuttle."
+	req_access = list()
+	circuit = /obj/item/circuitboard/computer/mining_shuttle/common
+	shuttleId = "mining_common"
+	possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"
+
 /**********************Mining car (Crate like thing, not the rail car)**************************/

 /obj/structure/closet/crate/miningcar