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

Fixes minor mapping errors #4873

Merged
merged 5 commits into from
Nov 13, 2023
Merged

Conversation

Releasethesea
Copy link
Contributor

@Releasethesea Releasethesea commented Nov 7, 2023

About the pull request

The last one i put up had merge conflicts so i decided to just close it and make a new one since i couldnt figure out how to fix them lmao

Explain why it's good for the game

Mapping errors bad, fixing them good

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑

fix: Fixxed the improperly area'd hull south of construction site, adds fire shutters to north fueling pod to make it mirror the south one

/:cl:

@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 changed the title Fixes minor mapping erroes Fixes minor mapping errors Nov 7, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 9, 2023
@cm13-github
Copy link
Contributor

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

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

Conflicts have been resolved. A maintainer will review the pull request shortly.

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

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

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

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added the Mapping Approved adds 500 new dict keys label Nov 13, 2023
@harryob harryob added this pull request to the merge queue Nov 13, 2023
Merged via the queue into cmss13-devs:master with commit 99a0f11 Nov 13, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 13, 2023
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 Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants