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

[WiP] Cleanup clothing (reopened) (i fucked up) #2377

Closed

Conversation

lexaSvarshik
Copy link

Описание PR

Переоткрываю мертвый ПР #1771 спустя три месяца, понемногу доделаю, что осталось

Не драфт чтобы чеки крутились

# Conflicts:
#	Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml
#	Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/ArmorBobmer.yml
#	Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/SRTCoat.yml
@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Dec 22, 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: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Merge Conflict Some content has conflicts. and removed Merge Conflict Some content has conflicts. labels Dec 22, 2024
Copy link

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

@github-actions github-actions bot removed the Merge Conflict Some content has conflicts. label Dec 22, 2024
RobustToolbox Outdated
Copy link
Author

Choose a reason for hiding this comment

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

блять как откатить хуйню

@lexaSvarshik
Copy link
Author

da blyat
изображение
022f6f5c69f20b74a89ee34c6550a80f

@github-actions github-actions bot added Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: UI Изменение затронуло файлы ".xaml" Changes: Localization Изменение затронуло файлы ".ftl" Changes: C# Изменение затронуло файлы ".cs" labels Dec 22, 2024
@lexaSvarshik
Copy link
Author

poshel nahui ya livayu s katki

@lexaSvarshik lexaSvarshik changed the title [WiP] Cleanup clothing (reopened) [WiP] Cleanup clothing (reopened) (i fucked up) Dec 22, 2024
@lexaSvarshik lexaSvarshik deleted the cleanup_clothing branch December 22, 2024 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Изменение затронуло файлы ".cs" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: UI Изменение затронуло файлы ".xaml"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants