forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 154
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
lexaSvarshik
wants to merge
83
commits into
SerbiaStrong-220:master
Choose a base branch
from
lexaSvarshik:clothing_cleanup1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[WiP] Clothing cleanup (take 2)(reopened) #2386
lexaSvarshik
wants to merge
83
commits into
SerbiaStrong-220:master
from
lexaSvarshik:clothing_cleanup1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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
убраны оффовские скидки
This reverts commit 4b1e7bd.
no .ftl ? :c
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This comment was marked as resolved.
This comment was marked as resolved.
ne neiming a pizdez sorry
твари
Вот так открываешь, и думаешь, что человек апстрим хуярил |
Локаль в .ftl перенесу отдельным ПРом |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Продолжение работы по мертвому пру #1771
Не драфт чтобы чеки крутились
BORN TO SHITCODE
MAINTS IS A FUCK
鬼神 Robust Em All 1984
I am mcdonalds wifi coder
410,757,864,530 TEST FAILS