Skip to content

Commit

Permalink
Merge remote-tracking branch 'BeeStation/master' into ai_statusdisplays
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsar-Salat committed Apr 6, 2024
2 parents 905c6ca + 6ac3134 commit 7f075a5
Show file tree
Hide file tree
Showing 176 changed files with 5,673 additions and 2,044 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/Fast_Food.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/boxstation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Box Station",
"map_link": "BoxStation",
"map_link": "boxstation",
"map_path": "map_files/BoxStation",
"map_file": "BoxStation.dmm",
"shuttles": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/corgstation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Corg Station",
"map_link": "CorgStation",
"map_link": "corgstation",
"map_path": "map_files/CorgStation",
"map_file": "CorgStation.dmm",
"shuttles": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/deltastation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Delta Station",
"map_link": "DeltaStation",
"map_link": "deltsatation",
"map_path": "map_files/Deltastation",
"map_file": "DeltaStation2.dmm",
"shuttles": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/echostation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Echo Station",
"map_link": "EchoStation",
"map_link": "echostation",
"map_path": "map_files/EchoStation",
"map_file": "EchoStation.dmm",
"shuttles": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/flandstation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Fland Station",
"map_link": "FlandStation",
"map_link": "flandstation",
"map_path": "map_files/FlandStation",
"map_file": "FlandStation.dmm",
"shuttles": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/kilostation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Kilo Station",
"map_link": "KiloStation",
"map_link": "kilostation",
"map_path": "map_files/KiloStation",
"map_file": "KiloStation.dmm",
"shuttles": {
Expand Down
31 changes: 18 additions & 13 deletions _maps/map_files/BoxStation/BoxStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7f075a5

Please sign in to comment.