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.

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

Closed
wants to merge 73 commits into from
Closed

Halloween PR #320

wants to merge 73 commits into from

Conversation

ps3moira
Copy link
Contributor

Costumes, Pumpkins and more!

About the PR

I added costumes, jack-o'-lanterns and Spooky Drobe.

Media

Screenshot 2023-10-20 235104

Changelog
🆑

  • add: Added costumes!
  • add: Added jack-o'-lanterns
  • add: Added Spooky Drobe

Costumes, Pumpkins and more!
@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 26, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 26, 2023

RSI Diff Bot; head commit 780e5b6 merging into 4e032a3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Hands/Gloves/lobster_claws.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/blondegigapompodour.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/DeltaV/Clothing/Head/Hats/gigapompodour.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/DeltaV/Clothing/Head/Hats/gorillamask.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/scarecrowhat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hoods/amonggrande.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/cowmask.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/gigapompodour.rsi

State Old New Status
blonde-equipped-HELMET Added
blonde-icon Added
blonde-inhand-left Added
blonde-inhand-right Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/gorillamask.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/jackolantern_mask.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/lobster_helm.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/monitorhelm.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/nemes_headdress.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/pigmask.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/skeletonmask.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Misc/xeno_helm.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Mask/balaclava.rsi

State Old New Status
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Mask/facial_bandages.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/DeltaV/Clothing/Mask/hockey_mask.rsi

State Old New Status
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Mask/retro_hockey_mask.rsi

State Old New Status
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Mask/scarecrow_hood.rsi

State Old New Status
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/amonggrande.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/gorillasuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/lobstersuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/xenosuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/bloody_clothes.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/old_bandages.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pilgrim.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pizzadelivery.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/retro_bloody_clothes.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/scarecrow_clothes.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/skeletoncostume.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Decoration/Seasonal/jackolantern.rsi

State Old New Status
icon Added
unlit-icon Added

Resources/Textures/DeltaV/Structures/Machines/VendingMachines/spookydrobe.rsi

State Old New Status
broken Added
deny-unshaded Added
normal-unshaded Added
off Added
panel Added

Edit: diff updated after 780e5b6

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 26, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a 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, eg DSC@DEATHB4DEFEAT#4404
  • Merge related files/RSIs

ps3moira and others added 11 commits October 26, 2023 19:36
…s/spookydrobe.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]>
…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]>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 27, 2023
ps3moira and others added 9 commits October 26, 2023 20:34
…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.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 1, 2023
Copy link
Contributor

@DebugOk DebugOk left a 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

@ps3moira
Copy link
Contributor Author

ps3moira commented Nov 1, 2023

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.

@DebugOk
Copy link
Contributor

DebugOk commented Nov 1, 2023

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

@ps3moira ps3moira closed this Nov 1, 2023
@ps3moira ps3moira reopened this Nov 1, 2023
@leonardo-dabepis
Copy link
Contributor

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.

I mainly just want to see the kilt year-round. Kilts are a timeless fashion that will be worn long into the future.

@IamVelcroboy
Copy link
Member

Kilt variant gladiator drip

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 1, 2023
Copy link
Contributor

github-actions bot commented Nov 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added S: Merge Conflict Fix your PR! and removed S: Merge Conflict Fix your PR! labels Nov 1, 2023
Copy link
Contributor

github-actions bot commented Nov 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 1, 2023
@Colin-Tel
Copy link
Contributor

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.

@DebugOk
Copy link
Contributor

DebugOk commented Nov 4, 2023

@Colin-Tel (for when you get back) and @leonardo-dabepis what're we gonna do with this?

@deltanedas
Copy link
Member

save it for next year :trollface:

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Nov 9, 2023
@ps3moira ps3moira closed this by deleting the head repository Dec 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants