Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

morty plushie :3 #2506

Merged
merged 11 commits into from
Dec 22, 2024
Merged

morty plushie :3 #2506

merged 11 commits into from
Dec 22, 2024
+24 −0

Conversation

juniwoofs
Copy link
Contributor

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

mortplush

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

N/A

Changelog

🆑

  • add: a Morty Plushie (Sprite courtesy of a dog! code courtesy of me :3)

@juniwoofs juniwoofs requested review from a team as code owners December 22, 2024 02:51
@github-actions github-actions bot added S: Needs Review size/XS Under 16 lines Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Dec 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 22, 2024 •
edited
Loading

RSI Diff Bot; head commit 165b6f8 merging into 79c3fcc
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi

State Old New Status
icon Added

Edit: diff updated after 165b6f8

@juniwoofs
Copy link
Contributor Author

should be fixed now in the newest commit!

@juniwoofs
Copy link
Contributor Author

fixed it for real now o7

@github-actions github-actions bot added size/S 16-63 lines and removed size/XS Under 16 lines labels Dec 22, 2024
@juniwoofs
Copy link
Contributor Author

LETS FUCKING GOOOOOOOOOOOOOOOOOO

@juniwoofs juniwoofs requested a review from deltanedas December 22, 2024 17:41
Lyndomen
Lyndomen approved these changes Dec 22, 2024
View reviewed changes
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

finally, morty plushie real

@juniwoofs
Copy link
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
Copy link
Member

i think its maintenance loot entity table + plushies crate cargo order

@deltanedas deltanedas merged commit 895935b into DeltaV-Station:master Dec 22, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Avalon-Proto Avalon-Proto Avalon-Proto left review comments

@Radezolid Radezolid Radezolid left review comments

@sleepyyapril sleepyyapril sleepyyapril left review comments

@Lyndomen Lyndomen Lyndomen approved these changes

@deltanedas deltanedas deltanedas approved these changes

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/S 16-63 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@juniwoofs @deltanedas @Lyndomen @sleepyyapril @Radezolid @Avalon-Proto