Eaglerock holopads and small maints expansion#1001
Closed
Generic-Eagle wants to merge 8 commits intoHardLightSector:masterfrom
Closed
Eaglerock holopads and small maints expansion#1001Generic-Eagle wants to merge 8 commits intoHardLightSector:masterfrom
Generic-Eagle wants to merge 8 commits intoHardLightSector:masterfrom
Conversation
github-actions
bot
added
size/L
S: Untriaged
No C#
YML
S: Merge Conflict
and removed
size/L
labels
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Author
|
Um.... ok... I made a new branch and based it on master so no idea where that first commit came from? |
Contributor
Author
|
Yeah I'm at a loss, not even a solid idea how this happened in the first place. I'm not even getting the option to fix merge conflicts on VS. |
Contributor
Author
|
Put to a draft until that can be fixed |
github-actions
bot
added
Map-Shuttle
Sprites
UI
C#
FTL
S: Merge Conflict
and removed
S: Merge Conflict
labels
Collaborator
|
Yeah this PR is... kinda fucked, you're best redoing it on a diff branch |
Contributor
Author
|
As per al "I GOT IT" and then "OH GOD |
Collaborator
|
I dont understand how your forks are so fucked whenever merge master occurs |
Contributor
Author
|
Only when you do it 🥀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Added holopads to Eaglerock
Also added a new maints corridor connecting the reporter hallway and the medical maints area
Something something backend fixes with the ships
Media
Changelog
🆑 Generic_Eagle
-->