Merge remote-tracking branch 'upstream/master'

ClownMoff · Nov 19, 2024 · b61745a · b61745a
2 parents 3e19cdc + 1127c33
commit b61745a
Show file tree

Hide file tree

Showing 39 changed files with 44,423 additions and 54,232 deletions.
diff --git a/_maps/RandomRooms/5x4/rdm_kilo.dmm b/_maps/RandomRooms/5x4/rdm_kilo.dmm
diff --git a/_maps/deltastation.json b/_maps/deltastation.json
@@ -1,6 +1,6 @@
 {
 	"map_name": "Delta Station",
-	"map_link": "deltsatation",
+	"map_link": "deltastation",
 	"map_path": "map_files/Deltastation",
 	"map_file": "DeltaStation2.dmm",
 	"shuttles": {

diff --git a/_maps/holodeck/workshop/donut.dmm b/_maps/holodeck/workshop/donut.dmm