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

[SHIPBATTLE] Прототипы для корабельных боев #965

Merged
merged 12 commits into from
Jan 27, 2025

Conversation

PyotrIgn
Copy link
Contributor

@PyotrIgn PyotrIgn commented Jan 8, 2025

Описание PR

Добавил мелкие вещи, нужные для корабельных боев

Стойку и тележку для снарядов
Вендомат для выдачи снарядов
Символика фракций
Мехи для фракций
Самолеты для фракций и модули для них
Ховербайки для фракций (взяты у frontier-station-14)

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

Дополнение режима полезными мелочами

Прогресс

  • Стойку и тележку для снарядов
  • Вендомат для выдачи снарядов
  • Символика фракций
  • Мехи для фракций
  • Самолеты для фракций и модули для них
  • Ховербайки для фракций

Чейнджлог
🆑 Петр

  • add: Добавлены ховербайки для корабельных боев (взяты у frontier-station-14, спасибо им)
  • add: Добавлены мехи OneStar для корабельных боев
  • add: Добавлены "космические истребители" для корабельных боев
  • add: Добавлены флаги и знаки для корабельных боев
  • add: Добавлен специальный вендомат для выдачи снарядов
  • add: Добавлены стойки и тележки для снарядов

@github-actions github-actions bot added S: Untriaged size/L Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации Changes: No C# labels Jan 8, 2025
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Decals/floorsign.rsi

State Old New Status
kmt1 Added
kmt10 Added
kmt11 Added
kmt12 Added
kmt13 Added
kmt14 Added
kmt15 Added
kmt16 Added
kmt2 Added
kmt3 Added
kmt4 Added
kmt5 Added
kmt6 Added
kmt7 Added
kmt8 Added
kmt9 Added
tsf1 Added
tsf10 Added
tsf11 Added
tsf12 Added
tsf13 Added
tsf14 Added
tsf15 Added
tsf16 Added
tsf2 Added
tsf3 Added
tsf4 Added
tsf5 Added
tsf6 Added
tsf7 Added
tsf8 Added
tsf9 Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Specific/Mech/onestar.rsi

State Old New Status
onestar_kmt-broken Added
onestar_kmt-open Added
onestar_kmt Added
onestar_tsf-broken Added
onestar_tsf-open Added
onestar_tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Specific/Mech/sabre.rsi

State Old New Status
sabre_kmt-broken Added
sabre_kmt-open Added
sabre_kmt Added
sabre_tsf-broken Added
sabre_tsf-open Added
sabre_tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Vehicles/hoverbike.rsi

State Old New Status
bag Added
engine Added
hull_kmt Added
hull_tsf Added
lights Added
vehicle Added
vehicle_kmt Added
vehicle_tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Structures/Decoration/banner.rsi

State Old New Status
kmt Added
tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Structures/Decoration/flag.rsi

State Old New Status
kmt Added
tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Structures/Decoration/signs.rsi

State Old New Status
kmt Added
tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Structures/Machines/VendingMachines/shelldispenser.rsi

State Old New Status
broken Added
deny-unshaded Added
eject-unshaded Added
normal-unshaded Added
off Added
panel Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Structures/Storage/shellrack.rsi

State Old New Status
base-0 Added
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
icon Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Structures/Storage/shellrackmovable.rsi

State Old New Status
icon Added
rack-0 Added
rack-1 Added
rack-2 Added
rack-3 Added
rack-4 Added
rack-5 Added

Edit: diff updated after fda17c8

@PyotrIgn PyotrIgn changed the title Штуки для корабельных боёв [SHIPBATTLE] Прототипы для корабельных боев Jan 15, 2025
@github-actions github-actions bot added size/XL and removed size/L labels Jan 17, 2025
Copy link
Contributor

@Filokini Filokini left a comment

Choose a reason for hiding this comment

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

Навверное так

@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Jan 27, 2025
@PyotrIgn PyotrIgn requested a review from Filokini January 27, 2025 20:00
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Jan 27, 2025
Copy link
Contributor

@Filokini Filokini left a comment

Choose a reason for hiding this comment

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

крутой чел

@PyotrIgn PyotrIgn merged commit 4f62232 into master Jan 27, 2025
19 checks passed
@PyotrIgn PyotrIgn deleted the stuff_for_shipbattle branch January 27, 2025 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: No C# Changes: Sprites Изменение спрайтов S: Untriaged size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants