Revert "обновление субмодуля"

AdventureTimeSS14 · May 14, 2024 · 712d3b6 · 712d3b6
1 parent 4b564ec
commit 712d3b6
Show file tree

Hide file tree

Showing 20 changed files with 34,431 additions and 441,529 deletions.
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 || args.HasStealthComponent)
+        if (!IsActive || args.InContainer)
             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 || args.HasStealthComponent)
+        if (!IsActive || args.InContainer)
             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 || @event.HasStealthComponent)
+        if (!IsActive || @event.InContainer)
         {
             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 || args.HasStealthComponent)
+        if (!IsActive || args.InContainer)
             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,7 +31,6 @@ 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,7 +1,6 @@
 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;
 
@@ -14,7 +13,6 @@ 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;
@@ -57,8 +55,7 @@ public List<StatusIconData> GetStatusIcons(EntityUid uid, MetaDataComponent? met
             return list;
 
         var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0;
-        var hasStealthComponent = _entManager.HasComponent<StealthComponent>(uid);
-        var ev = new GetStatusIconsEvent(list, inContainer, hasStealthComponent);
+        var ev = new GetStatusIconsEvent(list, inContainer);
         RaiseLocalEvent(uid, ref ev);
         return ev.StatusIcons;
     }

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -72,8 +72,6 @@ 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
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, bool HasStealthComponent);
+public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer);
 
 /// <summary>
 /// Event raised on the Client-side to determine whether to display a status icon on an entity.

diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1771,11 +1771,3 @@ Entries:
   - {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add}
   id: 55748 
   time: '2024-05-10T20:25:00.0000000+00:00' 
-
-- author: Петр Игнатьевич
-  changes:
-  - {message: "Куличи в Гетмор Шоколаде - закончились.", type: Remove}
-  - {message: "Добавлена наши модификации карт Аврит, Ориджин и Трейн.", type: Add}
-  - {message: "Частично пофикшена видимость невидимок визорами.", type: Fix}
-  id: 55749 #костыль отображения в Обновлениях
-  time: '2024-05-13T08:20:00.0000000+00:00'
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ public override void Initialize() @@
         private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent @event)
         {
-            if (!IsActive || @event.InContainer || @event.HasStealthComponent)
+            if (!IsActive || @event.InContainer)
             {
                 return;
             }
@@ Expand Down @@