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

tweak: edit armor for gloves and boots from armory #6254

Merged

Conversation

FlitchTime
Copy link
Contributor

@FlitchTime FlitchTime commented Dec 15, 2024

Описание

Добавил riot gloves (рескин combat gloves), riot boots и добавил их к риот сету в оружейную
Изменил броню combat gloves, armored gloves и armored shoes
Убрал жучки из оружейки Коробки (перевели в щитспавн, но забыли убрать отсюда)
Добавил дюфели с риот и балистик сетами (заказы сетов в карго и для Церы, т.к. куча вещей в 1 тайле плохо)

Причина создания ПР / Почему это хорошо для игры

Предложка
Жучки

image
image

Тесты

Локалка

@FlitchTime FlitchTime requested a review from a team as a code owner December 15, 2024 23:12
@github-actions github-actions bot added MAP Affects map DMI Affects DMI files labels Dec 15, 2024
@FlitchTime FlitchTime changed the title tweak: armor for gloves and boots tweak: edit armor for gloves and boots from armory Dec 20, 2024
BeebBeebBoob
BeebBeebBoob previously approved these changes Dec 30, 2024
Copy link
Member

@BeebBeebBoob BeebBeebBoob left a comment

Choose a reason for hiding this comment

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

апрув за код

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Dec 30, 2024
@FlitchTime FlitchTime closed this Dec 31, 2024
@FlitchTime FlitchTime force-pushed the gloves-and-boots-from-armory branch from 4dd0d32 to 8e0d1f4 Compare December 31, 2024 07:50
@FlitchTime FlitchTime reopened this Dec 31, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Dec 31, 2024
@FlitchTime
Copy link
Contributor Author

@SAADf603, конфликты пофикшены, проверяйте

@FlitchTime
Copy link
Contributor Author

@BeebBeebBoob, изменения карты откатил. Оставил только замену предметов по предложке. Пока бригадир понижает градус после нг можно без апрува прокинуть?

@BeebBeebBoob BeebBeebBoob merged commit e0a7853 into ss220-space:master220 Jan 4, 2025
12 checks passed
@FlitchTime FlitchTime deleted the gloves-and-boots-from-armory branch January 5, 2025 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DMI Affects DMI files MAP Affects map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants