Conversation
github-actions
bot
added
Changes: Sprite
Contributor
|
RSI Diff Bot; head commit 7c0ac3e merging into 956b334 Resources/Textures/Markers/environment.rsi
|
SimpleStation14
changed the title
VMSolidus
requested changes
Sep 6, 2024
Mnemotechnician
pushed a commit
to Mnemotechnician/Einstein-Engines
that referenced
this pull request
Sep 7, 2024
* shrinp add * Update metempsychoticNonHumanoids.yml fixed typo * Update Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: leo <[email protected]> * Update Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: leo <[email protected]> * Update fun.yml * Update meta.json remove ONE SILLY COMMA --------- Signed-off-by: leo <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: Null <[email protected]>
VMSolidus
added a commit
that referenced
this pull request
Sep 8, 2024
# Description Cherry-picks DeltaV-Station/Delta-v#862 on behalf of the author. This was not tested; need someone to check if it actually works before merging. # Changelog :cl: - add: A shrimp morphotype was added to the failure pool of the metempsychotic machine. --------- Signed-off-by: leo <[email protected]> Signed-off-by: Mnemotechnican <[email protected]> Co-authored-by: leo <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: Null <[email protected]> Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]> Signed-off-by: Peptide90 <[email protected]>
Co-authored-by: VMSolidus <[email protected]> Signed-off-by: Peptide90 <[email protected]>
Co-authored-by: VMSolidus <[email protected]> Signed-off-by: Peptide90 <[email protected]>
Contributor
Author
|
My bad for copy pasting |
VMSolidus
approved these changes
Sep 11, 2024
DEATHB4DEFEAT
approved these changes
Sep 14, 2024
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: VMSolidus <[email protected]>
VMSolidus
approved these changes
Sep 14, 2024
Member
|
HOW THE FUCK DID THIS BREAK THE PR? |
Signed-off-by: VMSolidus <[email protected]>
Contributor
Author
Odd that it is literally identical to N14 but it works there no errors. Now that I'm merging upstream though I'm gonna delete my copy. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Ported from Nuclear14 by request of @OldDanceJacket as they wanted the weather blocking markers. Tought you may as well get the rest of the stuff for rad markers and invisible walls too. Useful for planets.