Updated MetaStation/MetaStation.v41A.dmm to MetaStation/MetaStation.v41A... #8813
Conversation
This file contains 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
…41A.II.dmm Added extra hammer and gavel to the courtroom locker Fixed disconnected APC in secure lab / xenobiology Fixed bar camera names Fixed name of newly added basketball
|
Can someone confirm if this can be pushed through, or close it if it can't? |
|
You have to fix your merge conflicts first :P |
|
Close then, right. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
....II.dmm
Added extra hammer and gavel to the courtroom locker
Fixed disconnected APC in secure lab / xenobiology
Fixed bar camera names
Fixed name of newly added basketball
This is just a quick fix for an APC issue with a few other minor tweaks.