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] Clothing cleanup (take 2)(reopened) #2386

Open
wants to merge 83 commits into
base: master
Choose a base branch
from

Conversation

lexaSvarshik
Copy link

@lexaSvarshik lexaSvarshik commented Dec 22, 2024

Описание PR

Продолжение работы по мертвому пру #1771
Не драфт чтобы чеки крутились

BORN TO SHITCODE
MAINTS IS A FUCK
鬼神 Robust Em All 1984
I am mcdonalds wifi coder
410,757,864,530 TEST FAILS
eXLs_Bфва2LMsQ

chell4592 and others added 30 commits September 6, 2024 15:47
# 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 24, 2024
Copy link

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

@lexaSvarshik

This comment was marked as resolved.

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

изображение
livrah-ss13

@UrPrice
Copy link
Collaborator

UrPrice commented Dec 24, 2024

Вот так открываешь, и думаешь, что человек апстрим хуярил

@lexaSvarshik
Copy link
Author

Локаль в .ftl перенесу отдельным ПРом

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Merge Conflict Some content has conflicts.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants