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 #1973

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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",
// Corvax-End
"Dev",
"TestTeg",
Expand Down
7,279 changes: 7,279 additions & 0 deletions Resources/Maps/Shuttles/emergency_pilgrim.yml

Large diffs are not rendered by default.

137,335 changes: 137,335 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,4 +11,5 @@
- CorvaxMaus
- CorvaxIshimura
- CorvaxPaper
- CorvaxPilgrim
- 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
- Atlas
- Bagel
- Box
Expand Down
67 changes: 67 additions & 0 deletions Resources/Prototypes/Corvax/Maps/pilgrim.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
- type: gameMap
id: CorvaxPilgrim
mapName: 'Pilgrim'
mapPath: /Maps/corvax_pilgrim.yml
minPlayers: 20
maxPlayers: 100
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 ]
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 52 files
+1 −1 MSBuild/Robust.Engine.Version.props
+0 −79 RELEASE-NOTES.md
+0 −6 Resources/Locale/en-US/commands.ftl
+0 −57 Robust.Client/Audio/AudioSystem.Limits.cs
+14 −30 Robust.Client/Audio/AudioSystem.cs
+1 −1 Robust.Client/Console/Commands/UITestCommand.cs
+0 −19 Robust.Client/GameObjects/ClientEntityManager.cs
+1 −1 Robust.Client/GameStates/ClientGameStateManager.cs
+1 −13 Robust.Client/UserInterface/Controls/Range.cs
+15 −8 Robust.Client/UserInterface/Controls/SpriteView.cs
+1 −8 Robust.Client/UserInterface/Controls/TextEdit.cs
+12 −9 Robust.Client/UserInterface/Tooltips.cs
+0 −16 Robust.Client/ViewVariables/ClientViewVariablesManager.cs
+0 −28 Robust.Client/ViewVariables/Editors/VVPropEditorEntProtoId.cs
+0 −38 Robust.Client/ViewVariables/Editors/VVPropEditorProtoId.cs
+1 −2 Robust.Server/Audio/AudioSystem.cs
+2 −2 Robust.Server/BaseServer.cs
+0 −3 Robust.Server/GameObjects/EntitySystems/VisibilitySystem.cs
+2 −43 Robust.Server/GameObjects/ServerEntityManager.cs
+9 −16 Robust.Server/GameStates/PvsChunk.cs
+22 −56 Robust.Server/GameStates/PvsData.cs
+0 −59 Robust.Server/GameStates/PvsOverrideSystem.cs
+5 −6 Robust.Server/GameStates/PvsSystem.Ack.cs
+0 −384 Robust.Server/GameStates/PvsSystem.DataStorage.cs
+0 −6 Robust.Server/GameStates/PvsSystem.Dirty.cs
+5 −11 Robust.Server/GameStates/PvsSystem.Entity.cs
+2 −5 Robust.Server/GameStates/PvsSystem.Leave.cs
+11 −18 Robust.Server/GameStates/PvsSystem.Overrides.cs
+2 −3 Robust.Server/GameStates/PvsSystem.Pooling.cs
+2 −4 Robust.Server/GameStates/PvsSystem.Session.cs
+37 −56 Robust.Server/GameStates/PvsSystem.ToSendSet.cs
+12 −35 Robust.Server/GameStates/PvsSystem.cs
+1 −2 Robust.Server/Replays/ReplayRecordingManager.cs
+0 −26 Robust.Shared.Maths/MathHelper.cs
+1 −1 Robust.Shared/Audio/Systems/SharedAudioSystem.cs
+1 −31 Robust.Shared/CVars.cs
+51 −12 Robust.Shared/Containers/BaseContainer.cs
+1 −23 Robust.Shared/GameObjects/Components/MetaDataComponent.cs
+0 −1 Robust.Shared/GameObjects/EntityManager.Network.cs
+0 −10 Robust.Shared/GameObjects/EntityManager.cs
+1 −13 Robust.Shared/GameObjects/Systems/EntityLookup.Queries.cs
+1 −1 Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
+18 −40 Robust.Shared/Network/NetChannelArgs.cs
+0 −259 Robust.Shared/Network/NetDisconnectMessage.cs
+3 −9 Robust.Shared/Network/NetManager.ServerAuth.cs
+119 −0 Robust.Shared/Network/NetStructuredDisconnectMessages.cs
+0 −68 Robust.Shared/Physics/Systems/SharedPhysicsSystem.Fixtures.cs
+0 −338 Robust.Shared/Utility/ResizableMemoryRegion.cs
+0 −52 Robust.UnitTesting/Client/UserInterface/Controls/TextEditTest.cs
+1 −0 Robust.UnitTesting/Shared/Map/SingleTileRemoveTest.cs
+0 −113 Robust.UnitTesting/Shared/Networking/NetDisconnectMessageTest.cs
+0 −19 Robust.UnitTesting/Shared/Utility/MathHelper_Test.cs
Loading