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

Update Submodule to 218.2.0 #535

Merged

Conversation

VMSolidus
Copy link
Member

Requires: #534
No Cherry-Picks needed for this engine version.

@github-actions github-actions bot added the Changes: C# Changes any cs files label Jul 10, 2024
The rounding at 0,0 got memed.
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 11, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT changed the title Update Submodule To 218.2.0 Update Submodule to 218.2.0 Jul 12, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 12, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed Changes: C# Changes any cs files Status: Merge Conflict FIX YOUR PR AAAGH labels Jul 12, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 50ec3cd into Simple-Station:master Jul 12, 2024
9 of 10 checks passed
DEATHB4DEFEAT added a commit that referenced this pull request Jul 12, 2024
Uses the following Cherry-Picks:
space-wizards/space-station-14#26994
space-wizards/space-station-14#26518
space-wizards/space-station-14#26279
space-wizards/space-station-14#24946
space-wizards/space-station-14#27188

Requires:
#535
#534

---------

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: Jake Huxell <[email protected]>
Co-authored-by: Tayrtahn <[email protected]>
Co-authored-by: 0x6273 <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Vaaankas pushed a commit to machination-of-ruin/errorgate that referenced this pull request Sep 3, 2024
Uses the following Cherry-Picks:
space-wizards/space-station-14#26994
space-wizards/space-station-14#26518
space-wizards/space-station-14#26279
space-wizards/space-station-14#24946
space-wizards/space-station-14#27188

Requires:
Simple-Station/Einstein-Engines#535
Simple-Station/Einstein-Engines#534

---------

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: Jake Huxell <[email protected]>
Co-authored-by: Tayrtahn <[email protected]>
Co-authored-by: 0x6273 <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>

(cherry picked from commit 30fa120)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants