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

New craftable weapon: Emitter Cannon #232

Merged
merged 6 commits into from
Aug 25, 2023

Conversation

Tenteratus
Copy link

@Tenteratus Tenteratus commented Aug 24, 2023

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

Добавлено новое создаваемое оружие - Эмиттер-пушка! Может быть использована как в качестве оружия, так и в качестве ручного эмиттера. Имеет заряд на 5 выстрелов и очень медленную скорость зарядки. Урон 25 Heat.

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

Медиа

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

Чейнджлог

Чтобы шаблон Чейнджлога отображался, уберите его из блока комментариев.
🆑 Tenteratus, MilenVolf

  • add: Добавлено новое создаваемое оружие - Эмиттер-пушка

@github-actions
Copy link

github-actions bot commented Aug 24, 2023

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

Resources/Textures/Objects/Weapons/Guns/Battery/emitter_cannon.rsi

State Old New Status
icon Added
idle Added
inhand-left-0 Added
inhand-left-1 Added
inhand-left-2 Added
inhand-left-3 Added
inhand-left Added
inhand-right-0 Added
inhand-right-1 Added
inhand-right-2 Added
inhand-right-3 Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added

Edit: diff updated after c5fce9e

@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",

Choose a reason for hiding this comment

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

Где копирайт то?

@MilenVolf MilenVolf changed the title New craftable weapon: Emitter gun New craftable weapon: Emitter Cannon Aug 25, 2023
@MilenVolf MilenVolf merged commit 6d37f35 into Workbench-Team:arumoon-server Aug 25, 2023
17 checks passed
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.

3 participants