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 markings update #349

Merged
merged 6 commits into from
Oct 28, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Oct 28, 2023

About the PR

Re-adds all the old Nyano moths uncolorable markings.

Follows the naming convention of the 'new' moth markings, with "Classic" to easily identify which is from Nyano or not.

Why / Balance

Technical details

closes #335

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Added the classic Moth markings back, still can't be coloured.

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

github-actions bot commented Oct 28, 2023

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

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 6c03d5f

@FluffiestFloof FluffiestFloof marked this pull request as ready for review October 28, 2023 13:11
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.

Funni

@DebugOk DebugOk merged commit ae8738e into DeltaV-Station:master Oct 28, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Oct 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Original moth markings
2 participants