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

Orion Mobile Station Revamp #19416

Merged
merged 27 commits into from
Aug 11, 2024
Merged

Orion Mobile Station Revamp #19416

merged 27 commits into from
Aug 11, 2024

Conversation

Ben10083
Copy link
Contributor

@Ben10083 Ben10083 commented Jun 10, 2024 •
edited
Loading

Various tweaks and improvements to the Orion Express Ship

  • New Docking Arm (with starboard and port)
  • Airlocks now use markers
  • Touchup area and add missing items to improve experience
  • Make new bugs to provide new contributors easy work

@BotBOREALIS BotBOREALIS added the WIP The PR is a work in progress and should not be reviewed yet. label Jun 10, 2024
@github-actions github-actions bot added the 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. label Jun 10, 2024
@github-actions GitHub Actions
Copy link

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

@Ben10083
Merge branch 'master' into Orion_Station_Revamp
f841e5e 
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
@Ben10083 Ben10083 requested a review from alsoandanswer as a code owner July 16, 2024 19:03
@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Jul 16, 2024
@BotBOREALIS BotBOREALIS added Review Required and removed WIP The PR is a work in progress and should not be reviewed yet. labels Jul 16, 2024
@github-actions GitHub Actions
Copy link

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

@github-actions github-actions bot removed Merge Conflict Sprites Adds new or changes existing sprites. labels Jul 25, 2024
@DreamySkrell
Copy link
Contributor

image
can't have pipes of the same type ("normal" ones in the middle) on the same tile (even if they're different color like here basic gray and purple)
they are going to form one pipe net (or cause some other unexpected behavior)

@DreamySkrell
Copy link
Contributor

image

@DreamySkrell
Copy link
Contributor

image

@DreamySkrell
Copy link
Contributor

image

@DreamySkrell
Copy link
Contributor

image

@DreamySkrell DreamySkrell added the Changes Required The PR requires changes before it can be approved and/or merged. label Jul 31, 2024
@Ben10083
Copy link
Contributor Author

@DreamySkrell fixed

@DreamySkrell DreamySkrell removed the Changes Required The PR requires changes before it can be approved and/or merged. label Aug 1, 2024
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Aug 11, 2024
Merged via the queue into Aurorastation:master with commit e089794 Aug 11, 2024
25 checks passed
@Ben10083 Ben10083 deleted the Orion_Station_Revamp branch August 11, 2024 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Arrow768 Arrow768

@DreamySkrell DreamySkrell

@NonQueueingMatt NonQueueingMatt

@alsoandanswer alsoandanswer

Assignees
No one assigned
Labels
Awaiting Merge 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Ben10083 @DreamySkrell @Arrow768 @NonQueueingMatt @BotBOREALIS