Merge branch 'master' into EntitiesSort

AdventureTimeSS14 · May 20, 2024 · a16f5d3 · a16f5d3
2 parents 17d7d56 + d398b17
commit a16f5d3
Show file tree

Hide file tree

Showing 54 changed files with 441,831 additions and 34,650 deletions.
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.203
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.203
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.203
       - name: Install dependencies
         run: dotnet restore
       - name: Build

diff --git a/ADT_STATION b/ADT_STATION
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -46,7 +46,7 @@ protected override void DeactivateInternal()
 
     private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive || args.InContainer || args.HasStealthComponent)
             return;
 
         var healthIcons = DecideHealthIcons(entity);

diff --git a/Content.Client/Overlays/ShowHungerIconsSystem.cs b/Content.Client/Overlays/ShowHungerIconsSystem.cs
@@ -19,7 +19,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent hungerComponent, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive || args.InContainer || args.HasStealthComponent)
             return;
 
         var hungerIcons = DecideHungerIcon(uid, hungerComponent);

diff --git a/Content.Client/Overlays/ShowSecurityIconsSystem.cs b/Content.Client/Overlays/ShowSecurityIconsSystem.cs
@@ -27,7 +27,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent @event)
     {
-        if (!IsActive || @event.InContainer)
+        if (!IsActive || @event.InContainer || @event.HasStealthComponent)
         {
             return;
         }

diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs
@@ -19,7 +19,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent thirstComponent, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive || args.InContainer || args.HasStealthComponent)
             return;
 
         var thirstIcons = DecideThirstIcon(uid, thirstComponent);

diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
@@ -31,6 +31,7 @@ private void OnGetStatusIcon(EntityUid uid, SSDIndicatorComponent component, ref
         if (component.IsSSD &&
             _cfg.GetCVar(CCVars.ICShowSSDIndicator) &&
             !args.InContainer &&
+            !args.HasStealthComponent &&
             !_mobState.IsDead(uid) &&
             !HasComp<ActiveNPCComponent>(uid) &&
             TryComp<MindContainerComponent>(uid, out var mindContainer) &&

diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
+using Content.Shared.Stealth.Components;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 
@@ -13,6 +14,7 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
 {
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
 
     private bool _globalEnabled;
     private bool _localEnabled;
@@ -55,7 +57,8 @@ public List<StatusIconData> GetStatusIcons(EntityUid uid, MetaDataComponent? met
             return list;
 
         var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0;
-        var ev = new GetStatusIconsEvent(list, inContainer);
+        var hasStealthComponent = _entManager.HasComponent<StealthComponent>(uid);
+        var ev = new GetStatusIconsEvent(list, inContainer, hasStealthComponent);
         RaiseLocalEvent(uid, ref ev);
         return ev.StatusIcons;
     }

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -72,6 +72,8 @@ public sealed class PostMapInitTest
             "ADTMarathon",
             "ADTAtlas",
             "ADTDelta",
+            "ADTTrain",
+            "ADTAvrite",
             // Corvax-Start
             "CorvaxAvrite",
             // Corvax-End

diff --git a/Content.Server/ADT/SecretTrans/blank.txt b/Content.Server/ADT/SecretTrans/blank.txt
@@ -0,0 +1 @@
+Гооол
diff --git a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs
@@ -24,7 +24,7 @@ public sealed partial class StatusIconComponent : Component
 /// </summary>
 /// <param name="StatusIcons"></param>
 [ByRefEvent]
-public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer);
+public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer, bool HasStealthComponent);
 
 /// <summary>
 /// Event raised on the Client-side to determine whether to display a status icon on an entity.

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1902</NoWarn>
+  </PropertyGroup>
+</Project>
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1766,8 +1766,22 @@ Entries:
   id: 55747 
   time: '2024-05-07T23:25:00.0000000+00:00' 
 
+- author: username228
+  changes:
+  - {message: "Лучшие ксенобиологи NanoTrasen смогли вернуть к жизни один из вымерших инопланетных видов - Слизнекошек с Дождливой планеты! Теперь у работников корпорации появляется уникальнейшая возможность лицезреть этих очаровательных созданий в живую, а так же завести себе как питомца!", type: Add} 
+  id: 55748 #костыль отображения в Обновлениях
+  time: '2024-05-10T20:25:00.0000000+00:00' 
+
 - author: JustKekc
   changes:
   - {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add}
-  id: 55748 
+  id: 55749
   time: '2024-05-10T20:25:00.0000000+00:00' 
+
+- author: Петр Игнатьевич
+  changes:
+  - {message: "Куличи в Гетмор Шоколаде - закончились.", type: Remove}
+  - {message: "Добавлена наши модификации карт Аврит, Ориджин и Трейн.", type: Add}
+  - {message: "Частично пофикшена видимость невидимок визорами.", type: Fix}
+  id: 55750 #костыль отображения в Обновлениях
+  time: '2024-05-13T08:20:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Device/holoprojectors.ftl b/Resources/Locale/ru-RU/ADT/Objects/Device/holoprojectors.ftl
@@ -17,3 +17,7 @@ ent-ADTHolosignShipForcefieldNT = Корабельный щит
 ent-ADTHolosignShipForcefieldGorlax = Корабельный щит
     .desc = Сдерживающие поле, останавливающее снаряды, но пропускающее лучи энергооружия
     .suffix = { "Горлакс" }
+
+ent-ADTSyndiHolosignForcefield = Голобарьер
+    .desc = Сдерживающие поле
+    .suffix = { "Синдикат" }