Merge branch 'master' into clockcultrework_v2

2021-01-14 19:30:47 -05:00
parent 6ddfa8170f 4a1dd4885b
commit 6a7ec73889
2 changed files with 19 additions and 19 deletions
@@ -1,11 +1,11 @@
-{
-    "map_name": "Box Station",
-    "map_path": "map_files/BoxStation",
-    "map_file": "BoxStation.dmm",
-    "shuttles": {
-	    "cargo": "cargo_box",
-	    "ferry": "ferry_fancy",
-	    "whiteship": "whiteship_box",
-	    "emergency": "emergency_box"
-    }
-}
+{
+    "map_name": "Box Station",
+    "map_path": "map_files/BoxStation",
+    "map_file": "BoxStation.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_box",
+	    "emergency": "emergency_box"
+    }
+}
@@ -1,8 +1,8 @@
-{
-    "map_name": "Runtime Station",
-    "map_path": "map_files/debug",
-    "map_file": "runtimestation.dmm",
-	"shuttles": {
-	    "cargo": "cargo_delta"
-    }
-}
+{
+    "map_name": "Runtime Station",
+    "map_path": "map_files/debug",
+    "map_file": "runtimestation.dmm",
+	"shuttles": {
+	    "cargo": "cargo_delta"
+    }
+}