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

Fix Shuttle FTL #490

Merged
merged 3 commits into from
Jun 27, 2024
Merged

Fix Shuttle FTL #490

merged 3 commits into from
Jun 27, 2024

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Jun 26, 2024

Description

The bot failed to cherry pick this, resulting in us having had broken shuttle FTL this whole time.
This PR cherrypicks space-wizards/space-station-14#26305

Fixes #410

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: UI Changes any XAML files labels Jun 26, 2024
@VMSolidus VMSolidus added the Priority: 1-Urgent Must be resolved immediately label Jun 26, 2024
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird that an April Fools PR made it into Wiz master

@VMSolidus
Copy link
Member Author

Lol, yea I grabbed that too, and was busy searching for any other relevant PRs for a good few minutes before I looked back and realized it was an April Fools PR, then reverted it.

@v0idRift
Copy link
Contributor

#410

@DangerRevolution
Copy link
Contributor

#410

Thanks for the reminder :)

@Peptide90 Peptide90 merged commit 3971ec3 into Simple-Station:master Jun 27, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: UI Changes any XAML files Priority: 1-Urgent Must be resolved immediately
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shuttle FTL Jump Fails to Reach Expedition Planets Due to Beacon Issue
5 participants