-
Notifications
You must be signed in to change notification settings - Fork 439
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
tweak: edit armor for gloves and boots from armory #6254
Merged
BeebBeebBoob
merged 13 commits into
ss220-space:master220
from
FlitchTime:gloves-and-boots-from-armory
Jan 4, 2025
Merged
tweak: edit armor for gloves and boots from armory #6254
BeebBeebBoob
merged 13 commits into
ss220-space:master220
from
FlitchTime:gloves-and-boots-from-armory
Jan 4, 2025
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
…и, новые боты в оружейке
Antoonij
reviewed
Dec 17, 2024
FlitchTime
changed the title
tweak: armor for gloves and boots
tweak: edit armor for gloves and boots from armory
Dec 20, 2024
BeebBeebBoob
previously approved these changes
Dec 30, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
апрув за код
FlitchTime
force-pushed
the
gloves-and-boots-from-armory
branch
from
December 31, 2024 07:50
4dd0d32
to
8e0d1f4
Compare
…tchTime/ParadiseForked into gloves-and-boots-from-armory
@SAADf603, конфликты пофикшены, проверяйте |
@BeebBeebBoob, изменения карты откатил. Оставил только замену предметов по предложке. Пока бригадир понижает градус после нг можно без апрува прокинуть? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Описание
Добавил riot gloves (рескин combat gloves), riot boots и добавил их к риот сету в оружейную
Изменил броню combat gloves, armored gloves и armored shoes
Убрал жучки из оружейки Коробки (перевели в щитспавн, но забыли убрать отсюда)
Добавил дюфели с риот и балистик сетами (заказы сетов в карго и для Церы, т.к. куча вещей в 1 тайле плохо)
Причина создания ПР / Почему это хорошо для игры
Предложка
Жучки
Тесты
Локалка