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

Centcom intern #230

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Centcom intern #230

merged 2 commits into from
Aug 24, 2023

Conversation

Elst28
Copy link

@Elst28 Elst28 commented Aug 24, 2023

О запросе слияния

Добавила интернов ЦК с ТГ

Почему / Баланс

Очень подходят для того чтобы их щитспавнить, например вместо ОБР при малой опасности, или когда ЦК на приколе

Техническая информация

Медиа

Screenshot_1
Screenshot_2
Screenshot_3

  • Я добавила скриншоты/видео к этому запросу слияния, демонстрирующие его изменения в игре, или этот запрос слияния не требует демонстрации в игре

Критические изменения

Чейнджлог

@github-actions
Copy link

github-actions bot commented Aug 24, 2023

RSI Diff Bot; head commit 6a9eb9b merging into b83b0d8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Head/Hats/centcomcap.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added

Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Melee/baton.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 6a9eb9b

@AruMoon AruMoon merged commit 5a0fe0d into Workbench-Team:arumoon-server Aug 24, 2023
17 checks passed
@Elst28 Elst28 deleted the CentInt branch May 21, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants