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

Новые пушки для Мехов #817

Merged
merged 6 commits into from
Dec 9, 2024
Merged

Новые пушки для Мехов #817

merged 6 commits into from
Dec 9, 2024

Conversation

KaiserMaus
Copy link
Contributor

@KaiserMaus KaiserMaus commented Dec 9, 2024 •
edited by VigersRay
Loading

Кратное описание

Две новые пушки для мехов

По какой причине

Посетила идея, сделал

Медиа(Видео/Скриншоты)

Loader.2024.12.09.-.17.47.08.135.DVR.online-video-cutter.com.mp4

Проверки

  • Я не требую помощи для завершения PR
  • Перед выкладыванием/запросом о рассмотрении PR, Я проверил работоспособность изменений.
  • Я добавил скриншоты/видео изменений, или данный PR не меняет внутриигровые механики

Changelog
🆑 KaiserMaus

  • add: Добавлена экипировка меха - Авто-пушка.
  • add: Добавлена экипировка меха - Duster.

@github-actions GitHub Actions
Copy link
Contributor

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

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

Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi

State Old New Status
mecha_antimatrifle Added
mecha_autocannon Added

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi

State Old New Status
grenade Added

Edit: diff updated after abce7a9

@github-actions github-actions bot added size/L and removed size/M labels Dec 9, 2024
@KaiserMaus KaiserMaus marked this pull request as ready for review December 9, 2024 18:09
@KaiserMaus KaiserMaus requested a review from VigersRay as a code owner December 9, 2024 18:09
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 9, 2024

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

@VigersRay VigersRay merged commit e556a5e into space-sunrise:master Dec 9, 2024
10 of 12 checks passed
@KaiserMaus KaiserMaus deleted the Mech-AutoCannon branch December 9, 2024 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VigersRay VigersRay Awaiting requested review from VigersRay VigersRay is a code owner

Assignees
No one assigned
Labels
S: Merge Conflict size/L Изменения: Спрайты Нет C# Статус: Несортированный Статус: Требует Рассмотрения
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KaiserMaus @VigersRay