-
Notifications
You must be signed in to change notification settings - Fork 146
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
Mirror: Fix StrippableSystem Blunders #224
Mirror: Fix StrippableSystem Blunders #224
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs to be tested with Felinids
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…04-22 Signed-off-by: VMSolidus <[email protected]>
Oh for fucks sakes. |
I accidentally bungled this in a way that's hard to untangle. So I have just made a new PR where I redid the cherrypicks and did the merge conflict handling through VSCode rather than github's web UI. In the future, let's not use the web UI for that lol. It's waaay too easy to screw it up. |
Mirror of PR #26166: Fix StrippableSystem blunders from space-wizards/space-station-14
8ecb78ee5ac879ef0c79e9c35f3d05e72faf72fd
PR opened by Krunklehorn at 2024-03-16 02:33:20 UTC
PR changed 2 files with 13 additions and 7 deletions.
The PR had the following labels:
Original Body