[FEATURE] Costume Bundles + Rearrange AutoDrobe#79
Draft
portfiend wants to merge 17 commits intoTheDenSS14:masterfrom
Draft
[FEATURE] Costume Bundles + Rearrange AutoDrobe#79portfiend wants to merge 17 commits intoTheDenSS14:masterfrom
portfiend wants to merge 17 commits intoTheDenSS14:masterfrom
Conversation
This PR adds "costume bundles", a storage item for full costumes in a single bag. Many items in the AutoDrobe have been replaced with their respective costume bundles. You can also equip costume bundles in loadouts. In addition, the AutoDrobe's stock has been completely rearranged, ideally to make things more intuitive. Clown / mime / musician stuff first, then costume bundles, then everything else (roughly grouped by item slot category). Halloween feature. Also, the AutoDrobe's stock was very messy and unintuitive and I felt it was good of a time as any to clean up. New base entity for costume bundles, and then individual bundle prototypes for each costume. Some non-clothing entity prototypes were given a `CostumeItem` tag to allow them to be inserted into costume bundles. Many individual items in AutoDrobe and the theatrical performance crates were replaced with bundles; ultimately, nothing should be actually "lost". Also, rearranged AutoDrobe. A new loadout category, "Costumes", with many costume bundles. You get one. Some bundles have playtime requirements - namely the jester, circus clown, and musician bundles. Added a stupid C# check to prevent a debug assert error related to attempting to set ContainerHeld's fill status before the container has been initialized. No inhands sorry I'm tired Costume bundles: <img width="744" height="616" alt="image" src="https://github.com/user-attachments/assets/2c69b214-4020-46cb-a282-284363c8bbe9" /> Loadouts: <img width="964" height="603" alt="image" src="https://github.com/user-attachments/assets/ada069de-abd6-4c91-8e7b-94628c9d07f6" /> Rearranged AutoDrobe: <details> <summary>Click to expand</summary> <img width="350" height="915" alt="image" src="https://github.com/user-attachments/assets/4c74b69c-cb17-405a-a230-5a0ce96228df" /> <img width="343" height="901" alt="image" src="https://github.com/user-attachments/assets/36ed6de4-d0c7-4c7c-aec5-e5ac4f053e7d" /> <img width="347" height="918" alt="image" src="https://github.com/user-attachments/assets/efc6072f-e503-4929-a2ae-0f43071f43ee" /> <img width="349" height="913" alt="image" src="https://github.com/user-attachments/assets/02fd95b7-e1be-4073-b119-f1125a118a4b" /> <img width="343" height="907" alt="image" src="https://github.com/user-attachments/assets/0a55bac2-4bc2-477d-94cf-e5e1ab5321f4" /> <img width="334" height="965" alt="image" src="https://github.com/user-attachments/assets/47e8d31e-6f25-4f14-9eac-ed8609d14c7f" /> </details> Theatrical Performances Crate: <img width="542" height="507" alt="image" src="https://github.com/user-attachments/assets/514e1daa-ffd6-4828-8447-8d4929e79281" /> <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. - [x] I have tested any changes or additions. - [x] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> Only thing is the massive restructure of AutoDrobe inventory and mild rearrangement of the contents of the theatrical performances crate - may cause annoying merge conflicts later **Changelog** :cl: - add: Many individual costume parts in the AutoDrobe and theatrical performances crate have been replaced with "costume bundles", a storage item for costume parts specifically. - tweak: The AutoDrobe's inventory has been majorly consolidated and rearranged. The items inside are sorted by clown, mime, and musician items first, then costume bundles, then everything else. - add: You can now take a costume bundle in your loadouts - find it under Items! You know, in case an occasion that necessitates bringing your own costume arises.
github-actions
bot
added
size/M
S: Needs Review
S: Untriaged
Changes: Sprites
and removed
S: Needs Review
size/M
labels
Contributor
|
RSI Diff Bot; head commit 26d44d7 merging into d3c99b9 Resources/Textures/_DEN/Objects/Storage/costume_bundle.rsi
|
Contributor
Author
|
dont worry ill clean up the commented-out prototypes when this gets upstreamed |
Contributor
Author
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
1 participant
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 costume bundles from prebase Den.
This was also tested on the Rebase codebase:
These were not added, but they may at a later date:
Why / Balance
They're used to consolidate the inventory of the AutoDrobe and the theatrical performances crate.
I intend to upstream this to Macrocosm.
Technical details
ContainerHeldfrom breaking shit if the item's container is pre-initialized with items in it. Apparently the literal only thing in the codebase that uses this component besides bundles is the candy bowl? Lol?Media
Requirements
Licensing
Breaking changes
Porting changes to the AutoDrobe inventory might be a little hell but we ball
Changelog
🆑