Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZimaBlyat #132

Merged
merged 4 commits into from
Dec 2, 2024
Merged

ZimaBlyat #132

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
036ce4c
ZimaBlyat
Gersoon458 Dec 1, 2024
070abc2
EbalFixy
Gersoon458 Dec 2, 2024
3c97f96
Reclaimer
Gersoon458 Dec 2, 2024
724b391
FixFixFixFix
Gersoon458 Dec 2, 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
54,126 changes: 26,575 additions & 27,551 deletions Resources/Maps/DryDock.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,167 changes: 120 additions & 1,047 deletions Resources/Maps/Moose.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,263 changes: 807 additions & 456 deletions Resources/Maps/Shuttles/mining.yml
View file
Open in desktop

Large diffs are not rendered by default.

90,068 changes: 45,010 additions & 45,058 deletions Resources/Maps/WhiteBox.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Stations/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
- /Maps/Shuttles/trading_outpost.yml
mining:
paths:
- /Maps/Shuttles/pathfinder.yml
- /Maps/Shuttles/mining.yml
# Spawn last
ruins:
hide: true
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Maps/drydock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
availableJobs:
#Heads
Captain: [ 1, 1 ]
Maid: [ 1, 1 ]
Spatison marked this conversation as resolved.
Show resolved Hide resolved
HeadOfSecurity: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
Expand Down Expand Up @@ -67,4 +68,5 @@
Boxer: [ 0, 0 ]
Borg: [ 1, 2 ]
Passenger: [ -1, -1 ]
Hobo: [ 1, 1 ]

2 changes: 2 additions & 0 deletions Resources/Prototypes/Maps/moose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
availableJobs:
#Heads
Captain: [ 1, 1 ]
Maid: [ 1, 1 ]
Spatison marked this conversation as resolved.
Show resolved Hide resolved
HeadOfSecurity: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
Expand Down Expand Up @@ -66,4 +67,5 @@
Boxer: [ 1, 1 ]
Borg: [ 1, 1 ]
Passenger: [ -1, -1 ]
Hobo: [ 1, 1 ]

2 changes: 2 additions & 0 deletions Resources/Prototypes/Maps/whitebox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
Janitor: [ 3, 3 ]
Mime: [ 1, 1 ]
Captain: [ 1, 1 ]
Maid: [ 1, 1 ]
Hobo: [ 1, 1 ]
Spatison marked this conversation as resolved.
Show resolved Hide resolved
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
StationEngineer: [ 4, 4 ]
Expand Down
Loading