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

Revert "FTL + AI fixes (#31952)" #31968

Merged
merged 1 commit into from
Sep 8, 2024
Merged

Revert "FTL + AI fixes (#31952)" #31968

merged 1 commit into from
Sep 8, 2024

Conversation

slarticodefast
Copy link
Member

This reverts commit f7a87b5.

The arrivals shuttle was eating everything around it.
The engine change does not have to be reverted since it only added new functions.

Screenshot (279)

@github-actions github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged. label Sep 8, 2024
@deltanedas
Copy link
Contributor

arrivaloose

@0x6273 0x6273 mentioned this pull request Sep 8, 2024
Closed
@0x6273
Copy link
Contributor

0x6273 commented Sep 8, 2024

I think this reintroduces #31683 and #31860 ?

@slarticodefast
Copy link
Member Author

I think this reintroduces #31683 and #31860 ?

Yes, but it makes the game playable at least. Every single docking port on the station was removed by the shuttle. The servers have been reverted a few commits in the meantime.
Sloth is coming up with a fix, so I hope this PR won't be needed.

@0x6273
Copy link
Contributor

0x6273 commented Sep 8, 2024

I think this reintroduces #31683 and #31860 ?

Yes, but it makes the game playable at least. Every single docking port on the station was removed by the shuttle. The servers have been reverted a few commits in the meantime. Sloth is coming up with a fix, so I hope this PR won't be needed.

Yeah I agree with you that reverting is better than doing nothing. But those issues I linked should be reopened in case this revert PR does get merged.

@VasilisThePikachu VasilisThePikachu merged commit c46a4ab into space-wizards:master Sep 8, 2024
14 checks passed
@VasilisThePikachu
Copy link
Member

Merging so that no downstreams get bugged

@slarticodefast slarticodefast deleted the hungryhungryarrivalsshuttle branch September 8, 2024 19:55
de0rix pushed a commit to de0rix/space-station-14 that referenced this pull request Sep 11, 2024
@slarticodefast
Revert "FTL + AI fixes (space-wizards#31952)" (space-wizards#31968)
be53298
metalgearsloth added a commit to metalgearsloth/space-station-14 that referenced this pull request Sep 11, 2024
@metalgearsloth
Reapply "FTL + AI fixes (space-wizards#31952)" (space-wizards#31968)
d3d897d 
This reverts commit c46a4ab.
metalgearsloth added a commit that referenced this pull request Sep 12, 2024
@metalgearsloth
Reapply "FTL + AI fixes (#31952)" (#31968) (#32094)
2a58fa1 
* Reapply "FTL + AI fixes (#31952)" (#31968)

This reverts commit c46a4ab.

* Update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalgearsloth metalgearsloth Awaiting requested review from metalgearsloth metalgearsloth is a code owner

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf is a code owner

Assignees
No one assigned
Labels
Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@slarticodefast @deltanedas @0x6273 @VasilisThePikachu