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

(Barratry/Core/Meta/Packed/Reach/Union) Add the Supply/Administrative Assistant #1645

Merged
merged 2 commits into from
Feb 11, 2025
Merged

(Barratry/Core/Meta/Packed/Reach/Union) Add the Supply/Administrative Assistant #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d0ad9e
Add the supply and administrative assistants to maps
EpicToastTM Feb 11, 2025
37b98d4
More consistent comments
EpicToastTM Feb 11, 2025
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
423 changes: 246 additions & 177 deletions Resources/Maps/_Harmony/barratry.yml
View file
Open in desktop

Large diffs are not rendered by default.

450 changes: 236 additions & 214 deletions Resources/Maps/_Impstation/core.yml
View file
Open in desktop

Large diffs are not rendered by default.

394 changes: 228 additions & 166 deletions Resources/Maps/_Impstation/meta.yml
View file
Open in desktop

Large diffs are not rendered by default.

297 changes: 168 additions & 129 deletions Resources/Maps/_Impstation/packed.yml
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 40 additions & 33 deletions Resources/Maps/_Impstation/reach.yml
View file
Open in desktop

Large diffs are not rendered by default.

385 changes: 221 additions & 164 deletions Resources/Maps/_Impstation/union.yml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Resources/Prototypes/Maps/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
Janitor: [ 2, 2 ]
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ] # imp
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Expand Down Expand Up @@ -54,9 +55,10 @@
Brigmedic: [ 1, 1 ]
#supply
CargoTechnician: [ 3, 3 ]
SupplyAssistant: [ 3, 3 ] # imp
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
Courier: [ 2, 2 ]
Courier: [ 2, 2 ] # imp
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Maps/meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ] # imp
Bartender: [ 2, 2 ]
Botanist: [ 2, 3 ]
Chef: [ 2, 2 ]
Expand Down Expand Up @@ -55,7 +56,8 @@
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 5 ]
Courier: [ 2, 2 ]
SupplyAssistant: [ 3, 3 ] # imp
Courier: [ 2, 2 ] # imp
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Maps/packed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ] # imp
Bartender: [ 1, 1 ]
Botanist: [ 1, 2 ]
Chef: [ 1, 1 ]
Expand Down Expand Up @@ -54,7 +55,8 @@
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
CargoTechnician: [ 2, 2 ]
Courier: [ 1, 1 ]
SupplyAssistant: [ 2, 2 ] # imp
Courier: [ 1, 1 ] # imp
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Maps/reach.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
SecurityOfficer: [ 1, 3 ]
SecurityCadet: [ 1, 1 ]
CargoTechnician: [ 1, 1 ]
Courier: [ 1, 1 ]
SupplyAssistant: [ 1, 1 ] # imp
Courier: [ 1, 1 ] # imp
SalvageSpecialist: [ 1, 1 ]
Bartender: [ 1, 1 ]
Botanist: [ 1, 1 ]
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/_Harmony/Maps/barratry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ] # imp
Bartender: [ 2, 2 ]
Botanist: [ 2, 2 ]
Chef: [ 2, 2 ]
Expand Down Expand Up @@ -56,7 +57,8 @@
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 2, 2 ]
Courier: [ 2, 2 ]
SupplyAssistant: [ 2, 2 ] # imp
Courier: [ 2, 2 ] # imp
#civillian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/_Impstation/Maps/union.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
Janitor: [ 2, 2 ]
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Expand Down Expand Up @@ -53,6 +54,7 @@
Brigmedic: [ 1, 1 ]
#supply
CargoTechnician: [ 3, 3 ]
SupplyAssistant: [ 3, 3 ]
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Courier: [ 2, 2 ]
Expand Down
Loading