[PORT / FEATURE] Prebase Plushies: Teddy bears, smiley guys, smiley ball, ovinia, alien germ, Azalea, Whistler#31
Merged
portfiend merged 18 commits intoTheDenSS14:masterfrom Jan 23, 2026
Conversation
arcades, toy spawner, plushie crate, and presents
github-actions
bot
added
S: Needs Review
S: Untriaged
size/M
Changes: No C#
Changes: Sprites
labels
Contributor
|
RSI Diff Bot; head commit 30247f8 merging into daa2749 Resources/Textures/_DEN/Clothing/Neck/Misc/teddyribbon.rsi
Resources/Textures/_DEN/Objects/Fun/azaleaplushie.rsi
Resources/Textures/_DEN/Objects/Fun/littlesteve.rsi
Resources/Textures/_DEN/Objects/Fun/oviniaplushie.rsi
Resources/Textures/_DEN/Objects/Fun/smileyball.rsi
Resources/Textures/_DEN/Objects/Fun/teddybear.rsi
Resources/Textures/_DEN/Objects/Fun/ufoplushie.rsi
Resources/Textures/_DEN/Objects/Fun/whistlerplushie.rsi
|
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Author
|
ready for review |
portfiend
changed the title
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
sleepyyapril
approved these changes
Jan 23, 2026
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.
About the PR
This PR ports the following items from the following PRs from prebase to rebase:
These are then added where plushies are found: in the toy spawner, plushie crate, arcade machines, and presents.
Winter (@ SubspaceEmber), the author of the PR for Whistler's plushie, has agreed that her changes can be relicensed to MIT for the rebase here.
Technical details
BaseSqueakyToy, thenBasePlushieWithoutStashinherits from squeaky toy to give it cloth composition, thenBasePlushieis that with a stash added.toys.ymland not the plushie files.)Media
Requirements
Breaking changes
BasePlushie has been moved into the DEN namespace. It should be identical in component composition as it was before, just inherited instead. Future changes to BasePlushie should be ported to the DEN namespace prototype, and the coder should use their best judgement to figure out which prototype should receive the changes.
Changelog
🆑