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

заказ Костегрыза #781

Merged
merged 2 commits into from
Nov 13, 2024
Merged

заказ Костегрыза #781

merged 2 commits into from
Nov 13, 2024

Conversation

PyotrIgn
Copy link
Contributor

Описание PR

Заказы от Костегрыза и мелкие фиксы предыдущего QoL-патча

Почему / Баланс

Для маппинга

Ссылка на публикацию в Discord

Чейнджлог

🆑

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

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Nov 13, 2024
Copy link
Contributor

github-actions bot commented Nov 13, 2024

RSI Diff Bot; head commit 5aeb354 merging into 7b428ff
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Decals/concretetrim.rsi

State Old New Status
whiteconcrete_box Added

Resources/Textures/ADT/Decals/markings.rsi

State Old New Status
arrows_whitescale Added
bot_left_whitescale Added
bot_right_whitescale Added
bot_whitescale Added
caution_whitescale Added
delivery_whitescale Added
loading_area_whitescale Added
standclear_whitescale Added
warn_box_whitescale Added
warn_corner_flipped_whitescale Added
warn_corner_small_whitescale_ne Added
warn_corner_small_whitescale_nw Added
warn_corner_small_whitescale_se Added
warn_corner_small_whitescale_sw Added
warn_corner_whitescale Added
warn_corner_whitescale_ne Added
warn_corner_whitescale_nw Added
warn_corner_whitescale_se Added
warn_corner_whitescale_sw Added
warn_end_whitescale Added
warn_end_whitescale_e Added
warn_end_whitescale_n Added
warn_end_whitescale_s Added
warn_end_whitescale_w Added
warn_full_whitescale Added
warn_line_whitescale_e Added
warn_line_whitescale_n Added
warn_line_whitescale_s Added
warn_line_whitescale_w Added
warningline_whitescale Added
warninglinecorner_flipped_whitescale Added

Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi

State Old New Status
6pack1 Added
6pack2 Added
6pack3 Added
6pack4 Added
6pack5 Added
6pack6 Added
plastic-thingy Added

Edit: diff updated after 5aeb354

Copy link
Contributor

@Filokini Filokini left a comment

Choose a reason for hiding this comment

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

Посмотрел, ну вроде в целом всё нормально, если всё работает то кайф.
Там еще одна лицензия другая, но если так надо, то норм.

@PyotrIgn PyotrIgn merged commit bf88b78 into master Nov 13, 2024
18 checks passed
@PyotrIgn PyotrIgn deleted the kostegryz_request branch November 13, 2024 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants