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.

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

New station Pilgrim #1974

Merged
merged 21 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
939f8d6
add
Ko4ergaPunk Mar 17, 2024
81c8d34
empty
Ko4ergaPunk Mar 17, 2024
1d6a96f
пусть сработает пожалуйста
Ko4ergaPunk Mar 21, 2024
a33bc13
mama
Ko4ergaPunk Mar 21, 2024
b5ca5aa
добавил шкаф нра
Ko4ergaPunk Mar 22, 2024
b9887dd
papa
Ko4ergaPunk Mar 30, 2024
c9b15ac
Merge branch 'master' into PilgrimStation
Ko4ergaPunk Apr 8, 2024
2b67ae2
Update PostMapInitTest.cs
Ko4ergaPunk Apr 8, 2024
07c29bc
Удалил шаттл СБ и изменил доступы в комнате казни
Ko4ergaPunk Apr 23, 2024
91707af
Merge branch 'PilgrimStation' of https://github.com/Ko4ergaPunk/space…
Ko4ergaPunk Apr 23, 2024
988f2e8
Ошибку не пофиксило. Вернул шаттл
Ko4ergaPunk Apr 23, 2024
a907f84
Для теста заменил Пилигрим на Дельту
Ko4ergaPunk Apr 23, 2024
f6aa88b
Забыл айдишку
Ko4ergaPunk Apr 23, 2024
5a5bc80
Дорогой дневник. Сегодня я узнал, что проблема в самой карте, так как…
Ko4ergaPunk Apr 23, 2024
6bffcdc
Пробую прототип Дельты
Ko4ergaPunk Apr 24, 2024
2ae7ad1
Я дурак
Ko4ergaPunk Apr 24, 2024
14c4eec
Мне никуда не деться от этой боли —
Ko4ergaPunk Apr 25, 2024
1781b4a
Мне так давно наплевать
Ko4ergaPunk Apr 25, 2024
1049563
Оно работает
Ko4ergaPunk Apr 25, 2024
1fb05e9
Вернул спавнер гостов
Ko4ergaPunk Apr 25, 2024
bad4fde
Добавлен резервуар ботаникам и прекол
Ko4ergaPunk Apr 25, 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
1 change: 1 addition & 0 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public sealed class PostMapInitTest
"CorvaxMaus",
"CorvaxIshimura",
"CorvaxPaper",
"CorvaxPilgrim",
"CorvaxSplit",
// Corvax-End
"Dev",
Expand Down
7,279 changes: 7,279 additions & 0 deletions Resources/Maps/Shuttles/emergency_pilgrim.yml

Large diffs are not rendered by default.

136,448 changes: 136,448 additions & 0 deletions Resources/Maps/corvax_pilgrim.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/Pools/corvax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
- CorvaxMaus
- CorvaxIshimura
- CorvaxPaper
- CorvaxPilgrim
- CorvaxSplit
- Box
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- CorvaxMaus
- CorvaxIshimura
- CorvaxPaper
- CorvaxPilgrim
- CorvaxSplit
- Atlas
- Bagel
Expand Down
66 changes: 66 additions & 0 deletions Resources/Prototypes/Corvax/Maps/pilgrim.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
- type: gameMap
id: CorvaxPilgrim
mapName: 'Pilgrim'
mapPath: /Maps/corvax_pilgrim.yml
minPlayers: 40
stations:
Pilgrim:
stationProto: StandardNanotrasenStation
components:
- type: StationNameSetup
mapNameTemplate: '{0} Пилигрим {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: 'TA'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_pilgrim.yml
- type: StationJobs
overflowJobs:
- Passenger
availableJobs:
# service
HeadOfPersonnel: [ 1, 1 ]
Passenger: [ -1, -1 ]
ServiceWorker: [ 3, 3 ]
Bartender: [ 1, 1 ]
Botanist: [ 3, 3 ]
Boxer: [ 2, 2 ]
Chef: [ 2, 2 ]
Clown: [ 1, 1 ]
Janitor: [ 2, 3 ]
Mime: [ 1, 1 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
# command
Captain: [ 1, 1 ]
IAA: [ 1, 1 ]
# engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 3, 3 ]
# medical
ChiefMedicalOfficer: [ 1, 1 ]
Paramedic: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
MedicalIntern: [ 3, 3 ]
Psychologist: [ 1, 1 ]
# science
ResearchDirector: [ 1, 1 ]
Scientist: [ 4, 4 ]
ResearchAssistant: [ 2, 2 ]
Borg: [ 1, 1 ]
# security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 7, 7 ]
SecurityCadet: [ 3, 3 ]
# cargo
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 5, 5 ]
Loading