Merge branch 'master' into pr/1143

SPLURT-Station · Aug 22, 2024 · ab3ec3a · ab3ec3a
2 parents 4251ebd + c0f7c47
commit ab3ec3a
Show file tree

Hide file tree

Showing 254 changed files with 6,793 additions and 94,191 deletions.
diff --git a/_maps/lambdastation.json b/_maps/lambdastation.json
@@ -1,10 +1,7 @@
 {
     "map_name": "Lambda Station",
     "map_path": "map_files/LambdaStation",
-    "map_file":[
-        "lambda.dmm",
-        "dorms.dmm"
-	],
+    "map_file": "lambda.dmm",
     "shuttles": {
         "cargo": "cargo_box",
         "ferry": "ferry_fancy",
@@ -13,7 +10,8 @@
     },
     "traits":[
         {
-            "Up":1
+            "Up":1,
+			"Baseturf":"/turf/open/openspace"
         },
         {
             "Down":-1