-
Notifications
You must be signed in to change notification settings - Fork 368
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.
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
Halloween PR #320
Halloween PR #320
Conversation
Costumes, Pumpkins and more!
RSI Diff Bot; head commit 780e5b6 merging into 4e032a3 Resources/Textures/DeltaV/Clothing/Hands/Gloves/lobster_claws.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/blondegigapompodour.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/gigapompodour.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/gorillamask.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/scarecrowhat.rsi
Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/cowmask.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/gigapompodour.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/gorillamask.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/jackolantern_mask.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/lobster_helm.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/monitorhelm.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/nemes_headdress.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/pigmask.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/skeletonmask.rsi
Resources/Textures/DeltaV/Clothing/Head/Misc/xeno_helm.rsi
Resources/Textures/DeltaV/Clothing/Mask/balaclava.rsi
Resources/Textures/DeltaV/Clothing/Mask/facial_bandages.rsi
Resources/Textures/DeltaV/Clothing/Mask/hockey_mask.rsi
Resources/Textures/DeltaV/Clothing/Mask/retro_hockey_mask.rsi
Resources/Textures/DeltaV/Clothing/Mask/scarecrow_hood.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/amonggrande.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/gorillasuit.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/lobstersuit.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/xenosuit.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/bloody_clothes.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/old_bandages.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pilgrim.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pizzadelivery.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/retro_bloody_clothes.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/scarecrow_clothes.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/skeletoncostume.rsi
Resources/Textures/DeltaV/Objects/Decoration/Seasonal/jackolantern.rsi
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/spookydrobe.rsi
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Remove punctuation immediately after links, many things and people may interpret it as a part of the link
- Make sure every link to a GitHub file/commit is a permalink to the file you got the sprites from, I think I marked every with a few examples but double-check
- Replace
@<name>
in all copyrights with something to signify where that username is from, egDSC@DEATHB4DEFEAT#4404
- Merge related files/RSIs
Resources/Locale/en-US/deltav/advertisements/vending/spookydrobe.ftl
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/spookydrobe.yml
Outdated
Show resolved
Hide resolved
Resources/Textures/DeltaV/Objects/Decoration/Misc/jackolantern.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/DeltaV/Objects/Decoration/Misc/jackolantern.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/DeltaV/Objects/Decoration/Misc/jackolanternunlit.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/spookydrobe.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/spookydrobe.rsi/meta.json
Outdated
Show resolved
Hide resolved
…be.ftl Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…robe.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…s/spookydrobe.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
….rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
….rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…spookydrobe.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…spookydrobe.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…ts.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…ood/Baked/misc.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
…ood/candy.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
….rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
….rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Ps3Moira <[email protected]>
This comment was marked as resolved.
This comment was marked as resolved.
Signed-off-by: Debug <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This adds a ton of stuff I don't want to see long term, so it'd likely be a temporary merge
The costumes added are only accessible through the spooky-drobe. Other vending machines that have new clothing are deemed fine for year-round by Leo, like the kilt, pizza delivery uniform and pilgrim clothes. |
Which at that point become unrelated content and will be reverted alongside the rest. Leo isn't a maintainer |
I mainly just want to see the kilt year-round. Kilts are a timeless fashion that will be worn long into the future. |
Kilt variant gladiator drip |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
I think we could have a Spookydrobe with some unique outfits to it, and I think that we can also use the spookydrobe to move some of the outfits that exist in the Clothesmate and Autodrobe so their inventories aren't as massive as they are now. |
@Colin-Tel (for when you get back) and @leonardo-dabepis what're we gonna do with this? |
save it for next year |
Costumes, Pumpkins and more!
About the PR
I added costumes, jack-o'-lanterns and Spooky Drobe.
Media
Changelog
🆑