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

More minor map fixes #4862

Closed
wants to merge 2 commits into from

Conversation

Releasethesea
Copy link
Contributor

@Releasethesea Releasethesea commented Nov 7, 2023

About the pull request

Fixes the hull wall south of that big empty room in hanger aswell as the emergency shutter that didnt close properly in briefing

Explain why it's good for the game

No more leaky almayer when it rains and properly maintained fire prevention systems is needed for a ship to run smoothly

in all seriousness this just makes it so the map does map things properly

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑

fix: Fixed the wall not properly marked as hull in its area as well as the emergency shutter in briefing that didnt close properly

/:cl:

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 7, 2023
@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more labels Nov 7, 2023
@Releasethesea Releasethesea reopened this Nov 7, 2023
@Huffie56
Copy link
Contributor

Huffie56 commented Nov 7, 2023

your deleting the sentries defending fuel pomps but it's not in your PR description...
image

my guess is that you used and old version of the code to start your PR wish would explain the merge conflict to.
it's preferable to synch with upstream and take the master code in upstream to start a PR.

@Releasethesea
Copy link
Contributor Author

your deleting the sentries defending fuel pomps but it's not in your PR description... image

my guess is that you used and old version of the code to start your PR it's preferable to synch with upstream and take the master code in upstream to start a PR.

I was waiting for someone to tell me what I'd do wrong LMAO, I think I branched this off of the pre updated master, thank you for the help though! : D

@Releasethesea Releasethesea deleted the mappingtime branch November 7, 2023 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants