Merged
Conversation
github-actions
Bot
added
S: Needs Review
Contributor
deltanedas
suggested changes
Dec 22, 2024
Contributor
Author
|
should be fixed now in the newest commit! |
Fixed but for realer this time Signed-off-by: juniwoofs <jakbroeder@gmail.com>
Contributor
Author
|
fixed it for real now o7 |
deltanedas
suggested changes
Dec 22, 2024
Signed-off-by: juniwoofs <jakbroeder@gmail.com>
Radezolid
reviewed
Dec 22, 2024
Radezolid
reviewed
Dec 22, 2024
Contributor
Author
|
LETS FUCKING GOOOOOOOOOOOOOOOOOO |
Lyndomen
approved these changes
Dec 22, 2024
Contributor
Lyndomen
left a comment
Lyndomen
left a comment
There was a problem hiding this comment.
finally, morty plushie real
Contributor
Author
|
question also for anyone. when adding this to the plushie spawner, do i just add it into the normal ss14 one as i would on EE or is there a special DeltaV version? |
deltanedas
approved these changes
Dec 22, 2024
Contributor
|
i think its maintenance loot entity table + plushies crate cargo order |
Contributor
|
Hey @juniwoofs, hopefully you're already aware that you'd committed your personal access token as your email here. |
little-meow-meow
pushed a commit
to teamstarcup/starcup
that referenced
this pull request
Aug 28, 2025
* morty plushie :3 * Morty Plushie fixed real * Update toys.yml Fixed but for realer this time Signed-off-by: juniwoofs <jakbroeder@gmail.com> * Update toys.yml Signed-off-by: juniwoofs <jakbroeder@gmail.com> * fixedbutforrealipromise * fixedbutforrealrealrealtrustme * jessiepleaseworkjessie * waitwasthisthefix * imhonestlyembarassed --------- Signed-off-by: juniwoofs <jakbroeder@gmail.com> Co-authored-by: juniwoofs <[redacted]> (cherry picked from commit 895935bb28c44968428bb2318ecce36ba0eec90f) Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> # Conflicts: # Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
github-merge-queue Bot
pushed a commit
to teamstarcup/starcup
that referenced
this pull request
Aug 28, 2025
* morty plushie :3 (DeltaV-Station/Delta-v#2506) * morty plushie :3 * Morty Plushie fixed real * Update toys.yml Fixed but for realer this time Signed-off-by: juniwoofs <jakbroeder@gmail.com> * Update toys.yml Signed-off-by: juniwoofs <jakbroeder@gmail.com> * fixedbutforrealipromise * fixedbutforrealrealrealtrustme * jessiepleaseworkjessie * waitwasthisthefix * imhonestlyembarassed --------- Signed-off-by: juniwoofs <jakbroeder@gmail.com> Co-authored-by: juniwoofs <[redacted]> (cherry picked from commit 895935bb28c44968428bb2318ecce36ba0eec90f) Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> # Conflicts: # Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml * fix: move prototype Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> * add morty plushie to plushie crate Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> --------- Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> Co-authored-by: juniwoofs <jakbroeder@gmail.com>
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
7 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.
About the PR
Adds a plush in for the beautiful station pet Morty!
Why / Balance
Because Morty is adorable
Technical details
yml changes + png addition
Media
Requirements
Breaking changes
N/A
Changelog
🆑