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

Harpy Customization Pack 1 #175

Merged
merged 16 commits into from
Oct 17, 2023
Merged

Conversation

VMSolidus
Copy link
Contributor

@VMSolidus VMSolidus commented Oct 14, 2023

About the PR

This is the first of the promised content PRs for harpies, and also includes some bugfixes.

Why / Balance

-5 new wing patterns are added. Two Tone, Three Tone, Speckled, Undertone, and Feather Tips
-The HUD bug has been fixed
-Sparrow Tail has been removed for REASONS.
-Harpies can now choose what instrument they want to imitate(From within a list of options). Presumably this means multiple harpies can start a band together! Right click yourself to select what instrument you'll mimic.

Media

New customization
swappableharpies

@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 14, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 14, 2023

RSI Diff Bot; head commit 5833160 merging into 0a71952
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi

State Old New Status
harpy_tail_swallow Removed

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi

State Old New Status
harpy Removed

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi

State Old New Status
harpy Added
harpy2tone1 Added
harpy2tone2 Added
harpy3tone1 Added
harpy3tone2 Added
harpy3tone3 Added
harpyspeckled1 Added
harpyspeckled2 Added
harpyundertone1 Added
harpyundertone2 Added
harpywingtip1 Added
harpywingtip2 Added

Edit: diff updated after 5833160

@Colin-Tel
Copy link
Contributor

image
The "Phoenix Tail" seems to be the default tail, the only reason a player would add it again is if they want to change the color of the tail. It comes across as a bug-at-first-sight, which I think could be addressed by just calling it "Basic Tail" much like the "Basic Wings"

@Colin-Tel
Copy link
Contributor

image
There's also missing localization strings when it comes to all harpy markings.

Also I remembered to add Vulpakin mimicry
@VMSolidus
Copy link
Contributor Author

I've made the requested changes.

@VMSolidus VMSolidus mentioned this pull request Oct 15, 2023
6 tasks
@github-actions github-actions bot removed the Changes: YML Changes any yml files label Oct 16, 2023
@DebugOk
Copy link
Contributor

DebugOk commented Oct 16, 2023

I still like how the customization code makes markings flesh colored by default. Flesh wings!

@DebugOk
Copy link
Contributor

DebugOk commented Oct 16, 2023

image There's also missing localization strings when it comes to all harpy markings.

This is a bug:tm: unrelated to harpies (probably)

I also saw it on moths

@VMSolidus
Copy link
Contributor Author

This is a bug™️ unrelated to harpies (probably)
I also saw it on moths

Oh it's not, check the localization files on this PR for the fix. You can also apply that to moths

DebugOk
DebugOk previously approved these changes Oct 16, 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.

Code looks good enough, the rest Colin can review

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.

muh formatting

Content.Server/DeltaV/Harpy/HarpySingerSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Harpy/HarpySingerSystem.cs Outdated Show resolved Hide resolved
VMSolidus and others added 2 commits October 16, 2023 19:27
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐦

@Colin-Tel Colin-Tel enabled auto-merge (squash) October 17, 2023 21:05
@Colin-Tel Colin-Tel merged commit 992c582 into DeltaV-Station:master Oct 17, 2023
12 checks passed
@VMSolidus VMSolidus deleted the harpy-bugfixing branch November 28, 2023 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants