Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into xenotypes
Browse files Browse the repository at this point in the history
  • Loading branch information
ToasterBan committed Apr 9, 2024
2 parents 0eb3fa5 + 6e39eea commit 7272e83
Show file tree
Hide file tree
Showing 67 changed files with 3,071 additions and 564 deletions.
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
2 changes: 1 addition & 1 deletion _maps/map_files/BoxStation/BoxStation.dmm

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

4 changes: 2 additions & 2 deletions _maps/map_files/CorgStation/CorgStation.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/map_files/Deltastation/DeltaStation2.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/map_files/EchoStation/EchoStation.dmm

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

10 changes: 5 additions & 5 deletions _maps/map_files/FlandStation/FlandStation.dmm

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

12 changes: 4 additions & 8 deletions _maps/map_files/KiloStation/KiloStation.dmm

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

4 changes: 2 additions & 2 deletions _maps/map_files/MetaStation/MetaStation.dmm

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

4 changes: 2 additions & 2 deletions _maps/map_files/RadStation/RadStation.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/metastation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "MetaStation",
"map_link": "MetaStation",
"map_link": "metastation",
"map_path": "map_files/MetaStation",
"map_file": "MetaStation.dmm",
"shuttles": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/radstation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"map_name": "Rad Station",
"map_link": "RadStation",
"map_link": "radstation",
"map_path": "map_files/RadStation",
"map_file": "RadStation.dmm",
"shuttles": {
Expand Down
Loading

0 comments on commit 7272e83

Please sign in to comment.