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

Marble floor #1589

Closed
wants to merge 0 commits into from
Closed

Conversation

TTTomaTTT
Copy link

@TTTomaTTT TTTomaTTT commented Aug 14, 2024

Описание PR

Мраморная плитка и связанные с ней декали
Медиа

image
image

Проверки

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

Изменения

🆑 TTTomaTTT

  • add: Добавлена мраморная плитка и декали из неё

@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Aug 14, 2024
Copy link

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

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

github-actions bot commented Aug 14, 2024

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

Resources/Textures/SS220/Decals/marble.rsi

State Old New Status
black_corner_ne Added
black_corner_nw Added
black_corner_se Added
black_corner_sw Added
black_diagonal_left Added
black_diagonal_right Added
black_inner_ne Added
black_inner_nw Added
black_inner_se Added
black_inner_sw Added
black_line_e Added
black_line_n Added
black_line_s Added
black_line_w Added
bw_corner_ne Added
bw_corner_nw Added
bw_corner_se Added
bw_corner_sw Added
wb_corner_ne Added
wb_corner_nw Added
wb_corner_se Added
wb_corner_sw Added
white_corner_ne Added
white_corner_nw Added
white_corner_se Added
white_corner_sw Added
white_diagonal_left Added
white_diagonal_right 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/Objects/Tiles/marble.rsi

State Old New Status
blackmarble Added
bordermarble-inhand-left Added
bordermarble-inhand-right Added
bordermarblebw Added
bordermarblewb Added
cornermarble-inhand-left Added
cornermarble-inhand-right Added
cornermarblene Added
cornermarblenw Added
cornermarblese Added
cornermarblesw Added
diagonalmarble-inhand-left Added
diagonalmarble-inhand-right Added
diagonalmarblebw Added
diagonalmarblewb Added
innermarble-inhand-left Added
innermarble-inhand-right Added
innermarblene Added
innermarblenw Added
innermarblese Added
innermarblesw Added
marbleblack-inhand-left Added
marbleblack-inhand-right Added
marblewhite-inhand-left Added
marblewhite-inhand-right Added
verticalmarble-inhand-left Added
verticalmarble-inhand-right Added
verticalmarblebw Added
verticalmarblewb Added
whitemarble Added

Edit: diff updated after f57ec339c82ab19f239e206682662750993127e5

@TTTomaTTT TTTomaTTT closed this Aug 14, 2024
@TTTomaTTT TTTomaTTT deleted the MarbleFloor branch August 14, 2024 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Merge Conflict Some content has conflicts.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant