Merge upstream 5 29 2024 #10
Merged
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
Co-authored-by: DEATHB4DEFEAT <[email protected]>
## Mirror of PR #26382: [Run `fixgridatmos` for cargo & emergency shuttle](space-wizards/space-station-14#26382) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `ec761114eacdeed6e68f9c94dddfdbec8a6e26be` PR opened by <img src="https://avatars.githubusercontent.com/u/60421075?v=4" width="16"/><a href="https://github.com/ElectroJr"> ElectroJr</a> at 2024-03-24 07:27:14 UTC --- PR changed 6 files with 60 additions and 575 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > This PR also changes fixgridatmos so that it trimms empty/invalid tiles. > > :cl: > - fix: Fixed the cargo & emergency shuttle not being airtight. > </details> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 1da4c07 merging into b5e50f4 Resources/Textures/Clothing/Ears/Headsets/base.rsi
Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi
Resources/Textures/Clothing/Ears/Headsets/cargo.rsi
Resources/Textures/Clothing/Ears/Headsets/centcom.rsi
Resources/Textures/Clothing/Ears/Headsets/command.rsi
Resources/Textures/Clothing/Ears/Headsets/engineering.rsi
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi
Resources/Textures/Clothing/Ears/Headsets/medical.rsi
Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi
Resources/Textures/Clothing/Ears/Headsets/mining.rsi
|
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.
WE ARE BACK