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

Moth and stuff. #2629

Merged
merged 8 commits into from
Dec 28, 2024
Merged

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Dec 27, 2024

About the PR

DeltaV-Station/Delta-v#349
DeltaV-Station/Delta-v#2478
DeltaV-Station/Delta-v#2313

Why / Balance

I dont know I dont even play any of this races

How to test

N/A

Media

In 3 pr's

Requirements

Breaking changes

Changelog
🆑 FluffiestFloof, boogiebogus and Emily9031

  • add: Added the classic DeltaV Moth markings.
  • add: Added "Selene" wing customization option for moths
  • fix: Felinids and vulpkanin now have gasping sounds.

Emily9031 and others added 5 commits December 28, 2024 00:07
Adds gasps to felinids, harpies, vulpkanins, and rodentia.
* add selene wings

* brighten primary and secondary recolorable sprites

* correct meta.json whitespace

* bruh

* hopefully correct for real this time
* Nyano port of every moth markings

* update path

* Classic-ify everything

* Make sprite 32, update locale, classic

* Truly make them uncolorable

moth happy +1

* Remove duplicate coloring
Copy link
Contributor

github-actions bot commented Dec 27, 2024

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

Resources/Textures/DeltaV/Mobs/Customization/Moth/moth_wings.rsi

State Old New Status
selene Added
selene_primary Added
selene_secondary Added
selene_tertiary Added

Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi

State Old New Status
aspen Added
brown Added
deathshead Added
feathery Added
firewatch Added
gothic Added
jungle Added
lovers Added
mint Added
moffra Added
moonfly Added
oakworm Added
plain Added
plasmafire Added
poison Added
reddish Added
regal Added
rosy Added
royal Added
snow Added
whitefly Added
witchking Added

Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi

State Old New Status
deathshead-chest Added
deathshead-head Added
deathshead-leftarm Added
deathshead-leftleg Added
deathshead-rightarm Added
deathshead-rightleg Added
firewatch-chest Added
firewatch-head Added
firewatch-leftarm Added
firewatch-leftleg Added
firewatch-rightarm Added
firewatch-rightleg Added
gothic-chest Added
gothic-head Added
gothic-leftarm Added
gothic-leftleg Added
gothic-rightarm Added
gothic-rightleg Added
jungle-chest Added
jungle-head Added
jungle-leftarm Added
jungle-leftleg Added
jungle-rightarm Added
jungle-rightleg Added
lovers-chest Added
lovers-head Added
lovers-leftarm Added
lovers-leftleg Added
lovers-rightarm Added
lovers-rightleg Added
moonfly-chest Added
moonfly-head Added
moonfly-leftarm Added
moonfly-leftleg Added
moonfly-rightarm Added
moonfly-rightleg Added
oakworm-chest Added
oakworm-head Added
oakworm-leftarm Added
oakworm-leftleg Added
oakworm-rightarm Added
oakworm-rightleg Added
poison-chest Added
poison-head Added
poison-leftarm Added
poison-leftleg Added
poison-rightarm Added
poison-rightleg Added
ragged-chest Added
ragged-head Added
ragged-leftarm Added
ragged-leftleg Added
ragged-rightarm Added
ragged-rightleg Added
reddish-chest Added
reddish-head Added
reddish-leftarm Added
reddish-leftleg Added
reddish-rightarm Added
reddish-rightleg Added
royal-chest Added
royal-head Added
royal-leftarm Added
royal-leftleg Added
royal-rightarm Added
royal-rightleg Added
whitefly-chest Added
whitefly-head Added
whitefly-leftarm Added
whitefly-leftleg Added
whitefly-rightarm Added
whitefly-rightleg Added
witchking-chest Added
witchking-head Added
witchking-leftarm Added
witchking-leftleg Added
witchking-rightarm Added
witchking-rightleg Added

Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi

State Old New Status
aspen Added
atlas Added
brown Added
deathshead Added
feathery Added
firewatch Added
gothic Added
jungle Added
lovers Added
luna Added
mint Added
moffra Added
monarch Added
moonfly Added
oakworm Added
plain Added
plasmafire Added
poison Added
ragged Added
reddish Added
rosy Added
royal Added
snow Added
whitefly Added
witchking Added

Edit: diff updated after 572962f

@dvir001 dvir001 requested a review from whatston3 December 28, 2024 01:42
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 28, 2024
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Made a few small changes:

The Nyano classic markings that shared a name with a different spelling (e.g. Deathshead vs. Death's-Head), I overwrote the existing FTL entries with the existing upstream values.

One of the entries (jungle left leg) had an ID that didn't match an FTL entry, that's been fixed.

Also added the original authors to the changelog.

Seems alright by me.

@dvir001 dvir001 merged commit 5f5199f into new-frontiers-14:master Dec 28, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Dec 28, 2024
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.

5 participants