Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Renames AsteroidStation to ManateeStation (also moves it out of beta) #22700

Merged
ToasterBiome merged 4 commits into from
Oct 14, 2024
Merged

Renames AsteroidStation to ManateeStation (also moves it out of beta) #22700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b4c1ef
manateestation
ToasterBiome Oct 11, 2024
9fcc400
Merge remote-tracking branch 'upstream/master' into manateestation
ToasterBiome Oct 14, 2024
00df865
Update ManateeStation.dmm
ToasterBiome Oct 14, 2024
5c0dcd6
Merge remote-tracking branch 'upstream/master' into manateestation
ToasterBiome Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/_basemap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "map_files\YogStation\Yogstation.dmm"
#include "map_files\IceMeta\IceMeta.dmm"
#include "map_files\GaxStation\GaxStation.dmm"
#include "map_files\AsteroidStation\AsteroidStation.dmm"
#include "map_files\ManateeStation\ManateeStation.dmm"
#include "map_files\DonutStation\DonutStation.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
Expand Down
1 change: 0 additions & 1 deletion _maps/asteroidstation.dm
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions _maps/manateestation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "manateestation"
6 changes: 3 additions & 3 deletions _maps/asteroidstation.json → _maps/manateestation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map_name": "[BETA] AsteroidStation",
"map_path": "map_files/AsteroidStation",
"map_file": "AsteroidStation.dmm",
"map_name": "ManateeStation",
"map_path": "map_files/ManateeStation",
"map_file": "ManateeStation.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
Expand Down
0 ...files/AsteroidStation/AsteroidStation.dmm → ...p_files/ManateeStation/ManateeStation.dmm
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion config/maps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ map gaxstation
votable
endmap

map asteroidstation
map manateestation
minplayers 40
votable
endmap
Expand Down