Skip to content

Comments

add underclothing#23

Merged
MilonPL merged 4 commits intomasterfrom
next-week
Feb 10, 2025
Merged

add underclothing#23
MilonPL merged 4 commits intomasterfrom
next-week

Conversation

@MilonPL
Copy link
Collaborator

@MilonPL MilonPL commented Jan 25, 2025

About the PR

adds over 100 new clothing items and 3 new clothing slots:

  • underpants
  • undershirt
  • socks

sprites taken from tg, original idea from parkstation

still need to do the item slot sprites for clockwork and ashen themes
also fix stripping because the new slots dont show, i messed something up

Why / Balance

that one upstream PR is never getting merged and i like the slots approach over the markings approach anyways :godo:

Media

image

@MilonPL MilonPL requested review from a team as code owners January 25, 2025 11:29
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi size/M 100-999 lines and removed S: Needs Review labels Jan 25, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jan 25, 2025 •
edited
Loading

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

Resources/Textures/_Emberfall/Clothing/Under/Socks/green_striped.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/green_striped_high.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/green_striped_knee.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/knee.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/knee_bee.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/knee_striped.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/rainbow_knee.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/red_striped.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/red_striped_high.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/red_striped_knee.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/socks.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_blue.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_cyan.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_green.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_orange.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_purple.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_striped.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Socks/thigh_highs_yellow.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/bee_shorts.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/boxer_briefs.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/boxers.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/boxers_striped.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/briefs.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/long_john.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/panties.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/panties_bee.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/panties_neko.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/panties_striped.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Underpants/panties_swimming.rsi

State Old New Status
equipped-UNDERPANTS Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/bra.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/bra_bee.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/bra_binder.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/bra_binder_strapless.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/bra_neko.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/bra_swimming.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_alien.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_band.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_bee.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_blue.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_blue_striped.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_bowling_navy.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_bowling_pink.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_bowling_red.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_bowling_white.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_clown.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_cowboy_red.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_cowboy_red_alt.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_cowboy_white.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_cowboy_white_alt.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_green.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_ian.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_long_john.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_lover.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_peace.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_polo.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_question.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_red.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_shortsleeve.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_skull.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/shirt_striped.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/swimming_black.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/swimming_blue.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/swimming_red.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/tank_fire.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/tank_rainbow.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/tank_striped.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Resources/Textures/_Emberfall/Clothing/Under/Undershirts/tank_sun.rsi

State Old New Status
equipped-UNDERSHIRT Added
icon Added

Edit: diff updated after 594b516

@github-actions github-actions bot added size/L 1000-4999 lines Changes: Localization Changes any ftl files and removed size/L 1000-4999 lines size/M 100-999 lines labels Feb 9, 2025
@MilonPL MilonPL added the size/L 1000-4999 lines label Feb 10, 2025
@MilonPL MilonPL merged commit 18f4279 into master Feb 10, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files size/L 1000-4999 lines

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@MilonPL