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

Tiles Resprite and New Tiles #2541

Merged
merged 35 commits into from
Feb 11, 2025
Merged

Tiles Resprite and New Tiles #2541

merged 35 commits into from
Feb 11, 2025

Conversation

UrPrice
Copy link
Collaborator

@UrPrice UrPrice commented Feb 9, 2025 •
edited
Loading

Описание PR

Новый тайлы. Обновление спрайтов прежних тайлов.
Было переработано более ста тайлов.

Медиа
tilesshowroom

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
🆑 Kit0vras, UrPrice

  • add: Добавлено 103 новых тайла, что также доступны для крафта!
  • tweak: Изменены спрайты большинства тайлов!

@github-actions github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" labels Feb 9, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 9, 2025 •
edited
Loading

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

Resources/Textures/SS220/Decals/borderfloor.rsi

State Old New Status
borderfloor_dark_corner_end_ne Modified
borderfloor_dark_corner_end_nw Modified
borderfloor_dark_corner_end_se Modified
borderfloor_dark_corner_end_sw Modified
borderfloor_dark_corner_ne Modified
borderfloor_dark_corner_nw Modified
borderfloor_dark_corner_se Modified
borderfloor_dark_corner_sw Modified
borderfloor_dark_e Modified
borderfloor_dark_inner_ne Modified
borderfloor_dark_inner_nw Modified
borderfloor_dark_inner_se Modified
borderfloor_dark_inner_sw Modified
borderfloor_dark_n Modified
borderfloor_dark_s Modified
borderfloor_dark_w Modified
borderfloor_light_corner_end_ne Modified
borderfloor_light_corner_end_nw Modified
borderfloor_light_corner_end_se Modified
borderfloor_light_corner_end_sw Modified
borderfloor_light_corner_ne Modified
borderfloor_light_corner_nw Modified
borderfloor_light_corner_se Modified
borderfloor_light_corner_sw Modified
borderfloor_light_e Modified
borderfloor_light_inner_ne Modified
borderfloor_light_inner_nw Modified
borderfloor_light_inner_se Modified
borderfloor_light_inner_sw Modified
borderfloor_light_n Modified
borderfloor_light_s Modified
borderfloor_light_w Modified
borderfloor_normal_corner_end_ne Modified
borderfloor_normal_corner_end_nw Modified
borderfloor_normal_corner_end_se Modified
borderfloor_normal_corner_end_sw Modified
borderfloor_normal_corner_ne Modified
borderfloor_normal_corner_nw Modified
borderfloor_normal_corner_se Modified
borderfloor_normal_corner_sw Modified
borderfloor_normal_e Modified
borderfloor_normal_inner_ne Modified
borderfloor_normal_inner_nw Modified
borderfloor_normal_inner_se Modified
borderfloor_normal_inner_sw Modified
borderfloor_normal_n Modified
borderfloor_normal_s Modified
borderfloor_normal_w Modified
borderfloor_overlay_corner_end_ne Modified
borderfloor_overlay_corner_end_nw Modified
borderfloor_overlay_corner_end_se Modified
borderfloor_overlay_corner_end_sw Modified
borderfloor_overlay_corner_ne Modified
borderfloor_overlay_corner_nw Modified
borderfloor_overlay_corner_se Modified
borderfloor_overlay_corner_sw Modified
borderfloor_overlay_e Modified
borderfloor_overlay_inner_ne Modified
borderfloor_overlay_inner_nw Modified
borderfloor_overlay_inner_se Modified
borderfloor_overlay_inner_sw Modified
borderfloor_overlay_n Modified
borderfloor_overlay_s Modified
borderfloor_overlay_w Modified

Resources/Textures/SS220/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/SS220/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
dark_inner_ne Added
dark_inner_nw Added
dark_inner_se Added
dark_inner_sw Added
dark_line_e Added
dark_line_n Added
dark_line_s Added
dark_line_w Added
steel_box Added
steel_corner_ne Added
steel_corner_nw Added
steel_corner_se Added
steel_corner_sw Added
steel_end_e Added
steel_end_n Added
steel_end_s Added
steel_end_w Added
steel_inner_ne Added
steel_inner_nw Added
steel_inner_se Added
steel_inner_sw Added
steel_line_e Added
steel_line_n Added
steel_line_s Added
steel_line_w Added
white_box Added
white_corner_ne Added
white_corner_nw Added
white_corner_se Added
white_corner_sw Added
white_end_e Added
white_end_n Added
white_end_s Added
white_end_w Added
white_inner_ne Added
white_inner_nw Added
white_inner_se Added
white_inner_sw Added
white_line_e Added
white_line_n Added
white_line_s Added
white_line_w Added

Resources/Textures/SS220/Decals/concretetrim.rsi

State Old New Status
concrete_box Added
concrete_corner_ne Added
concrete_corner_nw Added
concrete_corner_se Added
concrete_corner_sw Added
concrete_end_e Added
concrete_end_n Added
concrete_end_s Added
concrete_end_w Added
concrete_inner_ne Added
concrete_inner_nw Added
concrete_inner_se Added
concrete_inner_sw Added
concrete_line_e Added
concrete_line_n Added
concrete_line_s Added
concrete_line_w Added
grayconcrete_box Added
grayconcrete_corner_ne Added
grayconcrete_corner_nw Added
grayconcrete_corner_se Added
grayconcrete_corner_sw Added
grayconcrete_end_e Added
grayconcrete_end_n Added
grayconcrete_end_s Added
grayconcrete_end_w Added
grayconcrete_inner_ne Added
grayconcrete_inner_nw Added
grayconcrete_inner_se Added
grayconcrete_inner_sw Added
grayconcrete_line_e Added
grayconcrete_line_n Added
grayconcrete_line_s Added
grayconcrete_line_w Added
oldconcrete_box Added
oldconcrete_corner_ne Added
oldconcrete_corner_nw Added
oldconcrete_corner_se Added
oldconcrete_corner_sw Added
oldconcrete_end_e Added
oldconcrete_end_n Added
oldconcrete_end_s Added
oldconcrete_end_w Added
oldconcrete_inner_ne Added
oldconcrete_inner_nw Added
oldconcrete_inner_se Added
oldconcrete_inner_sw Added
oldconcrete_line_e Added
oldconcrete_line_n Added
oldconcrete_line_s Added
oldconcrete_line_w Added

Resources/Textures/SS220/Decals/dirty.rsi

State Old New Status
Distortion Added
Distortion_2 Added
Distortion_3 Added
Distortion_4 Added

Resources/Textures/SS220/Decals/minitile.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
dark_inner_ne Added
dark_inner_nw Added
dark_inner_se Added
dark_inner_sw Added
dark_line_e Added
dark_line_n Added
dark_line_s Added
dark_line_w Added
steel_box Added
steel_corner_ne Added
steel_corner_nw Added
steel_corner_se Added
steel_corner_sw Added
steel_end_e Added
steel_end_n Added
steel_end_s Added
steel_end_w Added
steel_inner_ne Added
steel_inner_nw Added
steel_inner_se Added
steel_inner_sw Added
steel_line_e Added
steel_line_n Added
steel_line_s Added
steel_line_w Added

Edit: diff updated after 3d27e0a

UrPrice added 16 commits February 9, 2025 19:06
@UrPrice
attrFix
b2673b8
@UrPrice
sourceFix
74133e2
@UrPrice
fix?
eb4c803
@UrPrice
🦋
4b375ad
@UrPrice
👩
971b501
@UrPrice
🧇
5de763f
@UrPrice
🍶
c6ba17b
@UrPrice
(⌐■_■)
60bec2f
@UrPrice
(￣o￣) . z Z
b1f0a61
@UrPrice
d=====(￣▽￣*)b
c1de9b2
@UrPrice
~~~///(^v^)\\\~~~
6fbab21
@UrPrice
Жил-был задумчивый колорадский жук. После своего рождения он постоянн…
0aeac6f 
…о донимал всех вопросами: "Почему небо синее?", "Почему листья картошки зелёные?", "Куда можно попасть, если копать бесконечно вниз?" Остальные жуки, его родители и друзья, соседи и знакомые потешались над ним, ибо колорадским жукам неведомо любопытство и они живут только лишь, чтоб набить брюхо. Поэтому задумчивый жук постоянно ходил и думал, задавая вопросы самому себе и отвечая на них же. Шло время, и с возрастом его вопросы становились всё более серьёзные. В один день задумчивый жук проснулся и подумал: "Зачем есть жуки? В чём смысл быть жуком?" Он долго обдумывал свой вопрос, но так и не смог дойти до ответа самостоятельно, поэтому решил просить помощи у знакомых. Сначала он пошёл к своей матери:
@UrPrice
- В чём смысл жизни? - спросил он.
7a70c46 
- В том, чтобы есть картошку, - ответила мать.
@UrPrice
Такой ответ не устроил задумчивого жука. Тогда он пошёл к отцу.
d4d4eae 
- В чём, по-твоему, смысл жизни жука?
@UrPrice
- Неужели все жуки, - думал он по пути, - всерьёз считают, что смысл …
43c5b2a 
…жизни в поедании картошки? Им действительно не хочется задуматься о своём предназначении? Это неправильно.
@UrPrice
Наконец, задумчивый жук дошёл до куста своего друга. Его друг жил с д…
cad99b7 
…едушкой, и целыми днями они оба только и делали, что ели картошку.
@UrPrice
Copy link
Collaborator Author

UrPrice commented Feb 10, 2025

@stalengd я прошёл все чеки, но проблема не исправилась. Молюсь на тебя.

@Burenov
Copy link

Burenov commented Feb 11, 2025

Молюсь 🦋🎷

@Kit0vras
Copy link

image

UrPrice and others added 2 commits February 11, 2025 21:37
@UrPrice
- Привет, мой друг! - сказал задумчивый жук.
f1b2d52 
- Привет, задумчивый жук! Ты опять пришёл задавать глупые вопросы?
@UrPrice
Merge branch 'SerbiaStrong-220:master' into newTiles
b857e38
@UrPrice UrPrice mentioned this pull request Feb 11, 2025
Merged
5 tasks
stalengd
stalengd requested changes Feb 11, 2025
View reviewed changes
Copy link
Collaborator

@stalengd stalengd left a comment

Choose a reason for hiding this comment

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

Переделывай

@UrPrice
Copy link
Collaborator Author

UrPrice commented Feb 11, 2025

@Kit0vras переделывай

@UrPrice UrPrice requested a review from stalengd February 11, 2025 22:36
stalengd
stalengd requested changes Feb 11, 2025
View reviewed changes
@UrPrice UrPrice requested a review from stalengd February 11, 2025 22:57
@stalengd stalengd merged commit e553f12 into SerbiaStrong-220:master Feb 11, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stalengd stalengd stalengd approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png"
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@UrPrice @Burenov @Kit0vras @stalengd