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

Upstream1902 #1123

Merged
merged 269 commits into from
Feb 23, 2025
Merged

Upstream1902 #1123

merged 269 commits into from
Feb 23, 2025

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Feb 19, 2025

Описание PR


Warning

       // Raise a specific event for projectiles.
       if (TryComp(embeddable, out ProjectileComponent? projectile))
       {
           var ev = new ProjectileEmbedEvent(projectile.Shooter, projectile.Weapon, args.Target);  // ADT fix
           RaiseLocalEvent(embeddable, ref ev);
       }

Content.Shared\Projectiles\SharedProjectileSystem.cs

  • Проверить

Warning

Content.Server\Doors\Systems\AirlockSystem.cs

  • поддержка системы корвакса?

Warning

           if (minSize is not null && (proto.Size.X < minSize.Value.X || proto.Size.Y < minSize.Value.Y))
               continue;

           if (maxSize is not null && (proto.Size.X > maxSize.Value.X || proto.Size.Y > maxSize.Value.Y))
               continue;

Content.Server\Procedural\DungeonSystem.Rooms.cs
тут новые проверки от оффоф выбраны, старые от крысы закоменченные убраны

  • НУЖна проверка

Warning


Warning

ADT/Clothing/Head/Hardsuits/paramedic_hardsuithead.rsi # ADT tweak респрайт от празата
ClothingHeadHardsuitBase было от корвакса в parent

  • Проверить

Warning

Resources\Prototypes\Entities\Clothing\Head\hardsuit-helmets.yml
принял от визов
id: ClothingHeadHelmetHardsuitCap
стр 325

  • Проверить(вроде решено)

ClothingHeadSuitWithLightBase
ClothingHeadHardsuitWithLightBase

для себя


Требования

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

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

Чейнджлог
🆑 Шрёдька

  • tweak: Подтянуты коммиты Визардов, 19.02.2025.

ElectroJr and others added 30 commits January 18, 2025 16:50
* Create a Armor CoeffientQuery

- add Armor Coefficent Query Event for InventoryRelay system

* CR - cleanup, comments and fix typos

* CR - Remove Whitespace

* typos

* on't

---------

Co-authored-by: ScarKy0 <[email protected]>
* Test Vulture server config

* skreee

* weh

* color!

* comment

* Update Resources/ConfigPresets/WizardsDen/vulture.toml

Co-authored-by: Hannah Giovanna Dawson <[email protected]>

* Update Resources/ConfigPresets/WizardsDen/vulture.toml

Co-authored-by: Hannah Giovanna Dawson <[email protected]>

---------

Co-authored-by: Hannah Giovanna Dawson <[email protected]>
* Upped cyborgs from 2 to 5, updated armory stock, did some button QOL, gave warden a enforcer.

* Fixed a few more buttons
…imation fix (#34421)

* flashbang resprite

* emp grenade resprite

* smoke grenade resprite

* tear gas resprite

* stinger grenade resprite

* adds missing animations for projectile grenades
* Initial commit

* Updated sprites

* Updated base.png and base_shadow.png

* Updated meta file
Increased vendomat Wirecutter stock from 1 to 2. Increased vendomat Screwdriver stock from 0 to 2.
@jungarikjan
Copy link
Contributor

давай тестик завершись

…tBlue, убран BaseRestrictedContraband из parent:
@Schrodinger71
Copy link
Collaborator Author

т-т

@Schrodinger71 Schrodinger71 merged commit 33750cd into master Feb 23, 2025
9 of 10 checks passed
@Schrodinger71 Schrodinger71 deleted the upstream1902 branch February 23, 2025 10:55
@Schrodinger71
Copy link
Collaborator Author

Ладно мелочь уже на проде дочиним

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса S: Untriaged size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.