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

Elf #562

Closed
wants to merge 16 commits into from
Closed

Elf #562

wants to merge 16 commits into from

Conversation

ps3moira
Copy link
Contributor

@ps3moira ps3moira commented Dec 15, 2023

About the PR

This PR includes an entire elf-outfit (hat, jumpsuit, shoes) as well as christmas-themed variants of syndicate items like a candycane c20 that shoots candycanes, gingerbread man c4 and bauble hand-grenades.

Why / Balance

Santa needs some helpers during the holiday season.

Media

icon
equipped-HELMET
icon
icon
icon
icon

  • I have added screenshots/videos to this PR showcasing its changes ingame
    Changelog

🆑

  • add: Added Elf Costume
  • add: Added Candy Cane c20
  • add: Added Gingerbread C4
  • add: Added Baubles hand-grenade

@ps3moira ps3moira marked this pull request as draft December 15, 2023 09:55
@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Dec 15, 2023
Copy link
Contributor

github-actions bot commented Dec 15, 2023

RSI Diff Bot; head commit 35ed9f9 merging into 9f4dc00
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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

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

Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi

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

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

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

Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
primed Added

Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi

State Old New Status
equipped-BELT Added
icon Added
primed Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
suppressor Added

Edit: diff updated after 35ed9f9

@ps3moira ps3moira changed the title Elf Hat Elf Dec 15, 2023
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: UI and removed Changes: YML Changes any yml files labels Dec 18, 2023
@github-actions github-actions bot added the Changes: YML Changes any yml files label Dec 19, 2023
@github-actions github-actions bot removed Changes: Map Changes: UI Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: C# Changes any cs files labels Dec 19, 2023
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Dec 29, 2023
Copy link
Contributor

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 Jan 3, 2024
@DebugOk DebugOk closed this Feb 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants