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.

Sign up for GitHub

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

Jump to bottom

Harpy Peacock Tail #428

Merged
merged 9 commits into from
Jun 20, 2024
Merged

Harpy Peacock Tail #428

merged 9 commits into from
Jun 20, 2024

Conversation

VMSolidus
Copy link
Member

Courtesy of @StillIcarus

Description

This adds a new Peacock tail marking to Harpies. I'm also taking this time to update them to the recent DeltaV changes to the birbs.

Media

image
image

The backside is semi cursed, but that's something I can't do within the scope of this PR due to sprite system limitations that Death has planned improvements for. Just ignore them. :)

Have a birb as consolation.
faridaiscute

🆑 VMSolidus

  • add: Peacock Tails have been added for Harpies

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 31, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 31, 2024 •
edited
Loading

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

Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi

State Old New Status
peacock_tail_eyes Added
peacock_tail_feathers Added

Edit: diff updated after 5de2a6a

DEATHB4DEFEAT
DEATHB4DEFEAT requested changes Jun 7, 2024
View reviewed changes
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.

These shouldn't be in the DV namespace.

Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml Outdated Show resolved Hide resolved
Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi/meta.json Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 10, 2024
@DangerRevolution DangerRevolution added Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Status: Awaiting Changes Do not merge due to requested changes Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature labels Jun 14, 2024
DangerRevolution
DangerRevolution suggested changes Jun 14, 2024
View reviewed changes
Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -127,6 +128,12 @@
templateId: digitigrade
- type: HarpyVisuals
- type: UltraVision
- type: Tag
Copy link
Contributor

Choose a reason for hiding this comment

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

What does this do? Don't they inherit this from basemob?

Copy link
Member Author

Choose a reason for hiding this comment

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

If I add ANY tags, I now have to copy the entire BaseHuman tag component. Because tags aren't inherited for stupid reasons. I'm adding the NoStepShoesRequired tag for Harpies because I removed their shoes slot. This tag is a little stupidly named, but all it does it make it so that they don't get stunned by walking over glass shards. I assume the birbs with their tiny light feet just tip-claw around the shards, unlike how a clumsy human might stomp right into them.

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi/meta.json Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 15, 2024
@VMSolidus
Copy link
Member Author

These shouldn't be in the DV namespace.

That's right I'm the Harpy maintainer, and I maintain them here. I also commissioned and edited all of the Harpy sprites personally. I have therefore moved the Harpy sprites to the EE folders.

@VMSolidus
Copy link
Member Author

Should I just go all the way and migrate the entirety of Harpy code to the EE folders if I am literally the factual author and codeowner of the Birbs?

@DangerRevolution
Copy link
Contributor

Should I just go all the way and migrate the entirety of Harpy code to the EE folders if I am literally the factual author and codeowner of the Birbs?

not in this PR

@VMSolidus
Copy link
Member Author

Should I just go all the way and migrate the entirety of Harpy code to the EE folders if I am literally the factual author and codeowner of the Birbs?

not in this PR

I'll just leave it at the textures then with this PR. And move the rest later.

@github-actions github-actions bot removed the Status: Awaiting Changes Do not merge due to requested changes label Jun 16, 2024
@VMSolidus VMSolidus requested a review from DEATHB4DEFEAT June 16, 2024 22:25
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 17, 2024
@github-actions GitHub Actions
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 Status: Merge Conflict FIX YOUR PR AAAGH label Jun 17, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT changed the title Add Harpy Peacock Tail Harpy Peacock Tail Jun 17, 2024
@DangerRevolution DangerRevolution merged commit f149d46 into Simple-Station:master Jun 20, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request Jun 20, 2024
@SimpleStation14
Automatic Changelog Update (#428)
896627d
VMSolidus added a commit to VMSolidus/Einstein-Engines that referenced this pull request Jun 21, 2024
@VMSolidus @DangerRevolution
Harpy Peacock Tail (Simple-Station#428)
d1cae9a 
Courtesy of @StillIcarus

This adds a new Peacock tail marking to Harpies. I'm also taking this
time to update them to the recent DeltaV changes to the birbs.

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6)

The backside is semi cursed, but that's something I can't do within the
scope of this PR due to sprite system limitations that Death has planned
improvements for. Just ignore them. :)

Have a birb as consolation.

![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff)

:cl: VMSolidus
- add: Peacock Tails have been added for Harpies

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Jun 21, 2024
@SimpleStation14 @VMSolidus
Automatic Changelog Update (Simple-Station#428)
90bca5a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT DEATHB4DEFEAT approved these changes

Assignees

@VMSolidus VMSolidus

Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VMSolidus @DangerRevolution @DEATHB4DEFEAT