Cherry-Pick "Shrimp Mob for Metempsychosis (#862)" #882
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
* 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]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Status: Merge Conflict
SimpleStation14
changed the title
Signed-off-by: Mnemotechnican <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
|
ah yes the one I coded while high |
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Mnemotechnican <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
VMSolidus
requested changes
Sep 8, 2024
Co-authored-by: VMSolidus <[email protected]> Signed-off-by: Mnemotechnican <[email protected]>
VMSolidus
approved these changes
Sep 8, 2024
SimpleStation14
added a commit
that referenced
this pull request
Sep 8, 2024
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.
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
🆑