Merge remote-tracking branch 'BeeStation/master' into life_delta-time

BeeStation · Dec 8, 2024 · bfe32d5 · bfe32d5
2 parents 711bfc1 + e41354b
commit bfe32d5
Show file tree

Hide file tree

Showing 365 changed files with 8,273 additions and 2,908 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
diff --git a/_maps/boxstation.json b/_maps/boxstation.json
@@ -5,7 +5,7 @@
 	"map_file": "BoxStation.dmm",
 	"shuttles": {
 		"cargo": "cargo_box",
-		"ferry": "ferry_fancy",
+		"ferry": "ferry_standard",
 		"whiteship": "whiteship_box",
 		"emergency": "emergency_box"
 	}

diff --git a/_maps/corgstation.json b/_maps/corgstation.json
@@ -5,7 +5,7 @@
 	"map_file": "CorgStation.dmm",
 	"shuttles": {
 		"cargo": "cargo_corg",
-		"ferry": "ferry_fancy",
+		"ferry": "ferry_standard",
 		"whiteship": "whiteship_box",
 		"emergency": "emergency_corg"
 	}

diff --git a/_maps/deltastation.json b/_maps/deltastation.json
@@ -5,7 +5,7 @@
 	"map_file": "DeltaStation2.dmm",
 	"shuttles": {
 		"emergency": "emergency_delta",
-		"ferry": "ferry_fancy",
+		"ferry": "ferry_standard",
 		"cargo": "cargo_delta",
 		"whiteship": "whiteship_delta"
 	}

diff --git a/_maps/echostation.json b/_maps/echostation.json
@@ -8,7 +8,7 @@
 	"planet_radius": "100",
 	"shuttles": {
 		"cargo": "cargo_tiny",
-		"ferry": "ferry_fancy",
+		"ferry": "ferry_standard",
 		"whiteship": "whiteship_box",
 		"emergency": "emergency_tiny"
 	},

diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm