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

Jump to bottom

Ftlkeys #4

Merged
merged 6 commits into from
Mar 30, 2024
Merged

Ftlkeys #4

merged 6 commits into from
Mar 30, 2024

Conversation

Fragoler
Copy link
Contributor

No description provided.

Lokilife
Lokilife requested changes Mar 28, 2024
View reviewed changes
Content.Server/Exodus/FTLKeys/StationFTLKeysSystem.cs Outdated Show resolved Hide resolved
Content.Server/Exodus/Shuttle/MapSpawnComponent.cs Outdated Show resolved Hide resolved
Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs Outdated Show resolved Hide resolved
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs Show resolved Hide resolved
Resources/Prototypes/Exodus/Entities/Stations/base.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Exodus/Maps/Pools/classic.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Exodus/Maps/exodus_spectrum.yml Outdated Show resolved Hide resolved
Content.Server/Exodus/FTLKeys/Components/FTLMarkerComponent.cs Outdated Show resolved Hide resolved
Content.Server/Exodus/FTLKeys/Components/StationFTLKeysComponent.cs Outdated Show resolved Hide resolved
@Lokilife Lokilife merged commit 9726cfa into space-exodus:master Mar 30, 2024
0 of 3 checks passed
Lokilife added a commit that referenced this pull request Apr 1, 2024
@Lokilife
Revert "Ftlkeys (#4)"
5a67974 
This reverts commit 9726cfa.
@Lokilife Lokilife mentioned this pull request Apr 1, 2024
Merged
Lokilife added a commit that referenced this pull request Apr 1, 2024
@Lokilife
Revert "Ftlkeys" (#10)
e3cf3c4 
* Revert "Ftlkeys (#4)"

This reverts commit 9726cfa.

* Fix integration tests errors
@Fragoler Fragoler deleted the ftlkeys branch April 7, 2024 05:45
Lokilife pushed a commit to Lokilife/space-exodus that referenced this pull request Sep 8, 2024
@Ko4ergaPunk
[Maps] Pilgrim update space-exodus#4 (#2560)
4ef5794
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lokilife Lokilife Lokilife requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Fragoler @Lokilife