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

Omnichurch beacon update #741

Closed
wants to merge 10 commits into from
Closed

Omnichurch beacon update #741

wants to merge 10 commits into from

Conversation

DustScoundrel
Copy link
Contributor

@DustScoundrel DustScoundrel commented Dec 22, 2023 •
edited by dvir001
Loading

About the PR

  • Fixed the connection to the outer APC to ensure the entire station is powered.
  • Added two signs to the docking entrance welcoming visitors to the Beacon outpost, to give a little flavor.
  • Changed names and descriptions of the APCs and air alarms to help define rooms.

Why / Balance

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
N/A

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Jan 1, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 1, 2024

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

@dvir001 dvir001 removed the Map label Jan 2, 2024
@github-actions github-actions bot added No C# YML and removed Map-POI Map - POI labels Jan 7, 2024
@github-actions github-actions bot added Map-POI Map - POI and removed YML labels Jan 7, 2024
dvir001
dvir001 requested changes Jan 7, 2024
View reviewed changes
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the file to the new location, deleted the extra files, I need you to please fix the warp and the fax so we can get this update in,

Thanks.

Resources/Maps/_NF/POI/beacon.yml Outdated Show resolved Hide resolved
Resources/Maps/_NF/POI/beacon.yml Outdated Show resolved Hide resolved
@dvir001
Copy link
Contributor

dvir001 commented Jan 7, 2024

@DustScoundrel If you can update your PR to solve conflicts its good to go.

@dvir001 dvir001 mentioned this pull request Jan 14, 2024
Merged
@dvir001
Copy link
Contributor

dvir001 commented Jan 14, 2024

Moved this to a new PR #880
So I can keep it merged with master.

@dvir001 dvir001 added the Duplicate This issue or pull request already exists label Jan 14, 2024
@dvir001
Copy link
Contributor

dvir001 commented Jan 14, 2024

Closed this for the active PR.

@dvir001 dvir001 closed this Jan 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cheackraze Cheackraze Cheackraze left review comments

@dvir001 dvir001 dvir001 requested changes

Assignees
No one assigned
Labels
Duplicate This issue or pull request already exists Map-POI Map - POI No C# S: Merge Conflict This PR has conflicts that prevent merging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DustScoundrel @dvir001 @Cheackraze @MagnusCrowe