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

Фикс наших ошибок в распределении #356

Merged
merged 10 commits into from
Aug 28, 2024

Conversation

1Stepka1
Copy link
Collaborator

Убрал лишние папки с Entities и/или перемести в правильные папки(устранение дубликатов)
Исправил ошибку в написании Turtleneck.
Перенес действия от прыжковых ботинок в прыжковые ботинки(на подобии с магнитными, визарды черти как распределять action)
Немного рассортировал фантома
Переименование некоторых файлов в правильные названия
Текстуры канистр в папке ADT
Папка Catalog перенесена из Locate/ADT в prototypes
no cl no fun

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

github-actions bot commented Aug 27, 2024

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Structures/Storage/canister.rsi

State Old New Status
can-connector Added
can-o0 Added
can-o1 Added
can-o2 Added
can-o3 Added
can-oa1 Added
can-open Added
locked Added
unlocked Added

Edit: diff updated after e312a69

@Bolper
Copy link
Contributor

Bolper commented Aug 27, 2024

Стёпка красавчик
Люблю тебя

@PyotrIgn PyotrIgn added this pull request to the merge queue Aug 28, 2024
Merged via the queue into AdventureTimeSS14:master with commit 4691d93 Aug 28, 2024
20 checks passed
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# Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants