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

Big WWDP Texturepack #28

Merged
merged 9 commits into from
Sep 5, 2024
Merged

Big WWDP Texturepack #28

merged 9 commits into from
Sep 5, 2024

Conversation

Gersoon458
Copy link
Contributor

Описание PR

Масштабный респрайт тайлов, декалей, некоторых структур и добавление новых тайлов, декалей и энтити.

Изменения

🆑

  • add: Добавлены новые тайлы и текстуры для них
  • add: Добавлены новые декали и текстуры для них
  • add: Добавлены растения с рандомным спрайтом
  • tweak: Изменено много спрайтов тайлов, декалей, структур из дерева и другое...

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 30, 2024 •
edited
Loading

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

Resources/Textures/_White/Clothing/Back/Backpacks/clown.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Back/Backpacks/cluwne.rsi

State Old New Status
equipped-BACKPACK Added
icon Added

Resources/Textures/_White/Clothing/Back/Duffels/clown.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Back/Satchels/clown.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Head/Hardsuits/clown.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_White/Clothing/Head/Hats/jester.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Head/Hats/jester2.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Mask/clown.rsi

State Old New Status
equipped-MASK-hamster Added
equipped-MASK-reptilian Added
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Mask/clown_banana.rsi

State Old New Status
equipped-MASK-hamster Added
equipped-MASK-reptilian Added
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Mask/cluwne.rsi

State Old New Status
equipped-MASK-reptilian Added
equipped-MASK Added
icon Added

Resources/Textures/_White/Clothing/Mask/sexyclown.rsi

State Old New Status
equipped-MASK-reptilian Added
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/OuterClothing/Coats/clownpriest.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/OuterClothing/Hardsuits/clown.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/OuterClothing/WinterCoats/coatclown.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Shoes/Specific/bling.rsi

State Old New Status
equipped-FEET-body-slim Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Shoes/Specific/clown.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Shoes/Specific/clown_banana.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Shoes/Specific/cluwne.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/_White/Clothing/Shoes/Specific/jester.rsi

State Old New Status
equipped-FEET-body-slim Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Shoes/Specific/large_clown.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Uniforms/Jumpsuit/clown.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Uniforms/Jumpsuit/cluwne.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Uniforms/Jumpsuit/jester.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Clothing/Uniforms/Jumpsuit/jester2.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_White/Decals/Drydock/harpylogo.rsi

State Old New Status
HarpyLogoPart1Bottom Added
HarpyLogoPart1Top Added
HarpyLogoPart2Bottom Added
HarpyLogoPart2Top Added
HarpyLogoPart3Bottom Added
HarpyLogoPart3Top Added
HarpyLogoPart4Bottom Added
HarpyLogoPart4Top Added
HarpyLogoPart5Bottom Added
HarpyLogoPart5Top Added
HarpyLogoPart6Bottom Added
HarpyLogoPart6Top Added

Resources/Textures/_White/Decals/Drydock/nightingalelogo.rsi

State Old New Status
NightingaleLogoPart1 Added
NightingaleLogoPart2 Added
NightingaleLogoPart3 Added
NightingaleLogoPart4 Added
NightingaleLogoPart5 Added
NightingaleLogoPart6 Added

Resources/Textures/_White/Decals/Drydock/nsvtsubamelogo.rsi

State Old New Status
TsubamePart1 Added
TsubamePart2 Added
TsubamePart3 Added
TsubamePart4 Added
TsubamePart5 Added

Resources/Textures/_White/Decals/Effects/crayondecals.rsi

State Old New Status
cyr_b Added
cyr_c Added
cyr_ch Added
cyr_d Added
cyr_eh Added
cyr_f Added
cyr_g Added
cyr_hard_sign Added
cyr_i Added
cyr_l Added
cyr_p Added
cyr_sh Added
cyr_shh Added
cyr_soft_sign Added
cyr_u Added
cyr_y Added
cyr_ya Added
cyr_z Added
cyr_zh Added

Resources/Textures/_White/Decals/Overlays/greyscale.rsi

State Old New Status
brick_box Added
brick_corner_ne Added
brick_corner_nw Added
brick_corner_se Added
brick_corner_sw Added
brick_end_e Added
brick_end_n Added
brick_end_s Added
brick_end_w Added
brick_line_e Added
brick_line_n Added
brick_line_s Added
brick_line_w Added
checkerNESW Added
checkerNWSE Added
diagonal Added
diagonal_checker_a Added
diagonal_checker_b Added
fulltile_overlay Added
halftile_overlay Added
halftile_overlay_180 Added
halftile_overlay_270 Added
halftile_overlay_90 Added
herringbone Added
minitile Added
minitile_box Added
minitile_checker_a Added
minitile_checker_b Added
minitile_corner_ne Added
minitile_corner_nw Added
minitile_corner_se Added
minitile_corner_sw Added
minitile_diagonal Added
minitile_diagonal_a Added
minitile_diagonal_b Added
minitile_end_e Added
minitile_end_n Added
minitile_end_s Added
minitile_end_w Added
minitile_inner_ne Added
minitile_inner_nw Added
minitile_inner_se Added
minitile_inner_sw Added
minitile_line_e Added
minitile_line_n Added
minitile_line_s Added
minitile_line_w Added
mono Added
offset Added
offset_checker_a Added
offset_checker_b Added
pavement Added
pavement_checker_a Added
pavement_checker_b Added
pavement_vertical Added
pavement_vertical_checker_a Added
pavement_vertical_checker_b Added
quartertile_overlay Added
quartertile_overlay_180 Added
quartertile_overlay_270 Added
quartertile_overlay_90 Added
threequartertile_overlay Added
threequartertile_overlay_180 Added
threequartertile_overlay_270 Added
threequartertile_overlay_90 Added

Resources/Textures/_White/Decals/bricktile.rsi

State Old New Status
dark_box Added
dark_corner_ne Added
dark_corner_nw Added
dark_corner_se Added
dark_corner_sw Added
dark_end_e Added
dark_end_n Added
dark_end_s Added
dark_end_w Added

Edit: diff updated after 0c5401d

@Gersoon458
Fixiki
a61da08 
Fix clown shoes and sexyclown mask
Fix lino
@RedBurningPhoenix
Copy link
Contributor

Do not Merge before porting [Port] Advanced Prying #31

@github-actions GitHub Actions
Copy link
Contributor

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

@Gersoon458
Copy link
Contributor Author

Всё, ну теперь точно ничего не должно ебать мозги

Remuchi
Remuchi approved these changes Sep 5, 2024
View reviewed changes
Copy link
Collaborator

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

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

Fine.

@Remuchi Remuchi merged commit 08fc563 into WWhiteDreamProject:master Sep 5, 2024
11 of 12 checks passed
riddleridou added a commit that referenced this pull request Sep 5, 2024
@riddleridou
Automatic Changelog Update (#28)
f815317
@Gersoon458 Gersoon458 deleted the MajorTextures branch September 5, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Remuchi Remuchi Remuchi approved these changes

Assignees
No one assigned
Labels
Changes: Sprite Changes: YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Gersoon458 @RedBurningPhoenix @Remuchi