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.

Sign up for GitHub

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

Jump to bottom

friendly_fire #874

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

friendly_fire #874

wants to merge 4 commits into from

Conversation

Inconnu1337
Copy link
Contributor

@Inconnu1337 Inconnu1337 commented Dec 4, 2024 •
edited
Loading

Описание PR

фрндли фаер от торнадо

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

Ссылка на публикацию в Discord

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

Медиа

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

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

Чейнджлог

  • add: Добавлен имплант "Friendly Fire" в аплинк ЯО за 15 ТК

@github-actions github-actions bot added the Changes: Sprites Изменение спрайтов label Dec 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2024 •
edited
Loading

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

Resources/Textures/ADT/Interface/Actions/friendly_fire.rsi

State Old New Status
off Added
on Added

Edit: diff updated after 59010dd

@Unlumy
Copy link
Contributor

Unlumy commented Dec 5, 2024

Это же корабликам петра?

@Inconnu1337
Copy link
Contributor Author

da

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added Merge Conflict Changes: Localization Изменение локализации labels Dec 14, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CrimeMoot CrimeMoot CrimeMoot left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Inconnu1337 @Unlumy @CrimeMoot @PyotrIgn