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

vox-raiders #286

Merged
merged 23 commits into from
Feb 24, 2025
Merged

Conversation

FireNameFN
Copy link
Collaborator

@FireNameFN FireNameFN commented Feb 23, 2025

Описание PR

Новый игровой режим. Пока что тестовый. Могут включить только админы.

Ссылка на ветку

https://discord.com/channels/919301044784226385/1312504315847512197

Авторы

fntech (Код, прототипы)
r.t.r. (Спрайты, прототипы)
iam_atoaster (Карта)
justusername (Карта)
vldaad (Карта)

Список изменений

🆑

  • add: Добавлен новый игровой режим: Воксы-налётчики.

@github-actions github-actions bot added S: Untriaged S: Needs Review ПРу необходим ревью size/M Changes: Sprites Changes: Localization Изменяет локализацию and removed size/M labels Feb 23, 2025
Copy link

github-actions bot commented Feb 23, 2025

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

Resources/Textures/_CorvaxNext/Clothing/Head/Hardsuits/vox.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vox Added
on-equipped-HELMET-vox Added

Resources/Textures/_CorvaxNext/Clothing/Mask/vox.rsi

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

Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Hardsuits/vox.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/spike.rsi

State Old New Status
Puh Added
base Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/_CorvaxNext/Objects/Weapons/Melee/e_spike.rsi

State Old New Status
e_sword Added
e_sword_blade Added
icon Added
inhand-left-blade Added
inhand-left Added
inhand-right-blade Added
inhand-right Added

Edit: diff updated after e35d0e3

@github-actions github-actions bot added the S: Merge Conflict У ПРа есть мердж конфликт label Feb 23, 2025
Copy link

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

@github-actions github-actions bot added size/M and removed S: Merge Conflict У ПРа есть мердж конфликт labels Feb 23, 2025
Copy link

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

@github-actions github-actions bot added the S: Merge Conflict У ПРа есть мердж конфликт label Feb 23, 2025
@github-actions github-actions bot removed the S: Merge Conflict У ПРа есть мердж конфликт label Feb 23, 2025
@Bloodcanis
Copy link

Одобрительный meow

@github-actions github-actions bot added size/XL Changes: Map Изменяет карты and removed size/M labels Feb 24, 2025
@Tornado-Technology Tornado-Technology merged commit f6b9ef1 into space-syndicate:master Feb 24, 2025
12 checks passed
@Tornado-Technology
Copy link
Collaborator

xd

@ksen0morph ksen0morph changed the title Воксы-налётчики vox-raiders Mar 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes: Localization Изменяет локализацию Changes: Map Изменяет карты Changes: Sprites S: Needs Review ПРу необходим ревью S: Untriaged size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants