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
@@ -131,6 +131,10 @@
 	port_id = "mining"
 	can_be_bought = FALSE

+/datum/map_template/shuttle/mining_common
+	port_id = "mining_common"
+	can_be_bought = FALSE
+
 /datum/map_template/shuttle/cargo
 	port_id = "cargo"
 	can_be_bought = FALSE
@@ -493,6 +497,10 @@
 	suffix = "delta"
 	name = "labour shuttle (Delta)"

+/datum/map_template/shuttle/mining_common/meta
+	suffix = "meta"
+	name = "lavaland shuttle (Meta)"
+
 /datum/map_template/shuttle/arrival/delta
 	suffix = "delta"
 	name = "arrival shuttle (Delta)"