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

lavaland #909

Merged
merged 23 commits into from
Dec 31, 2024
Merged

lavaland #909

merged 23 commits into from
Dec 31, 2024

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Dec 23, 2024

Описание PR

добавила лаваленд, консоль шаттлов, крашеры и ещё пару приколов

origin:
DeltaV-Station/Delta-v#2419
DeltaV-Station/Delta-v#2380
DeltaV-Station/Delta-v#2445
DeltaV-Station/Delta-v#2434

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

было в сс13

Медиа

2024-12-23.21-20-22.video-converter.com.mp4
  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Чейнджлог
🆑 Ratyyy

  • add: НТ открыло для посещения лаваленд - гиганскую планетарную планету!

Copy link
Contributor

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

@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации labels Dec 23, 2024
Copy link
Contributor

github-actions bot commented Dec 23, 2024

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

Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi

State Old New Status
goliath Modified
goliath_dead Modified

Resources/Textures/ADT/Clothing/Head/Helmets/mining.rsi

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

Resources/Textures/ADT/Clothing/OuterClothing/Armor/mining.rsi

State Old New Status
equipped-OUTERCLOTHING-unshaded Added
equipped-OUTERCLOTHING-xeno Added
equipped-OUTERCLOTHING Added
icon-unshaded-layer Added
icon-unshaded Added
icon-xeno Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Mobs/Aliens/Lavaland/legion.rsi

State Old New Status
legion Added
legion_skull Added

Resources/Textures/ADT/Objects/Specific/Lavaland/loot.rsi

State Old New Status
asclepius_active Added
blue_cube Added
demon_claws Added
legion_core Added
legion_core_decayed Added
legion_core_stable Added
legion_skull Added
red_cube Added
rune_scimmy Added

Resources/Textures/ADT/Objects/Specific/Salvage/voucher.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Objects/Specific/droppod.rsi

State Old New Status
dropping Added

Resources/Textures/ADT/Objects/Specific/droppod_open.rsi

State Old New Status
droppod_opened Added

Resources/Textures/ADT/Objects/Tools/upgrade.rsi

State Old New Status
base Added
display Added
overlay-1 Added
overlay-2 Added
overlay-3 Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_claws-inhands.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_claws.rsi

State Old New Status
icon-lit Added
icon-uncharged Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_hammer-inhands.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_hammer.rsi

State Old New Status
icon-lit Added
icon-uncharged Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_machete-inhands.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_machete.rsi

State Old New Status
icon-lit Added
icon-uncharged Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_spear-inhands.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Crushers/crusher_spear.rsi

State Old New Status
icon-lit Added
icon-uncharged Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/katana_cursed.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
katana-shard Added

Resources/Textures/ADT/Structures/Storage/Crates/necropolechest.rsi

State Old New Status
crate Added
crate_door Added
crate_icon Added
crate_open Added
welded Added

Edit: diff updated after 2098db2

@Ratyyy Ratyyy changed the title лаваленд и прочее lavaland Dec 23, 2024
@Inconnu1337
Copy link
Contributor

это пиздец

@Schrodinger71
Copy link
Collaborator

афигеть

Copy link
Contributor

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

@KashRas2 KashRas2 merged commit 15a0a80 into master Dec 31, 2024
16 of 17 checks passed
@KashRas2 KashRas2 deleted the lava branch December 31, 2024 08:14
@Roudenn Roudenn mentioned this pull request Jan 3, 2025
7 tasks
Schrodinger71 pushed a commit that referenced this pull request Jan 10, 2025
<!-- Что вы изменили в этом пулл реквесте? -->
добавила лаваленд, консоль шаттлов, крашеры и ещё пару приколов

origin:
DeltaV-Station/Delta-v#2419
DeltaV-Station/Delta-v#2380
DeltaV-Station/Delta-v#2445
DeltaV-Station/Delta-v#2434
<!-- Почему оно было изменено? Ссылайтесь на любые обсуждения или
вопросы здесь. Пожалуйста, обсудите, как это повлияет на игровой баланс.
-->
было в сс13
<!--
Пулл реквесты, которые вносят внутриигровые изменения (добавление
одежды, предметов, новых возможностей и т.д.), должны содержать медиа,
демонстрирующие изменения.
Небольшие исправления/рефакторы не требуют медиа.

Если Вы не уверены в том, что Ваш пулл реквест требует медиа, спросите
мейнтейнера.
-->

https://github.com/user-attachments/assets/1b6f616a-7b10-4d28-9fdb-c9ea2096fb22

- [X] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [X] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
🆑  Ratyyy

- add: НТ открыло для посещения лаваленд - гиганскую планетарную
планету!

---------

Co-authored-by: KashRas2 <[email protected]>
Co-authored-by: PyotrIgn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса S: Untriaged size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants