Merge remote-tracking branch 'citadel/master' into hijack

This commit is contained in:
kevinz000
2020-01-23 17:15:49 -07:00
105 changed files with 13966 additions and 10227 deletions
+7
View File
@@ -34,3 +34,10 @@
id = "engine_tesla"
suffix = "Box/Engine/engine_tesla.dmm"
name = "Box Tesla"
// Lavaland
// Mining Base
/datum/map_template/ruin/station/lavaland/mining_base
id = "mining_public_01"
suffix = "Lavaland/Mining_Station/Mining_Station_Public_01.dmm"
name = "Public Mining Base"