Рефактор мехов, правки в системе медицины

Content.Client/Mech/MechSystem.cs

@@ -2,6 +2,7 @@
 using Content.Shared.Mech.Components;
 using Content.Shared.Mech.EntitySystems;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Mech;
@@ -17,30 +18,49 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<MechComponent, AppearanceChangeEvent>(OnAppearanceChanged);
+        SubscribeLocalEvent<MechComponent, UpdateAppearanceEvent>(OnUpdateAppearanceEvent);
     }
 
     private void OnAppearanceChanged(EntityUid uid, MechComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!args.Sprite.TryGetLayer((int) MechVisualLayers.Base, out var layer))
+        UpdateAppearance(uid, component, args.Sprite);
+    }
+
+    private void OnUpdateAppearanceEvent(EntityUid uid, MechComponent component, ref UpdateAppearanceEvent args)
+    {
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
+            return;
+
+        UpdateAppearance(uid, component, sprite);
+    }
+
+    private void UpdateAppearance(EntityUid uid, MechComponent component, SpriteComponent sprite)
+    {
+        if (!sprite.TryGetLayer((int) MechVisualLayers.Base, out var layer))
             return;
 
         var state = component.BaseState;
         var drawDepth = DrawDepth.Mobs;
-        if (component.BrokenState != null && _appearance.TryGetData<bool>(uid, MechVisuals.Broken, out var broken, args.Component) && broken)
+
+        if (component.BrokenState != null 
+            && _appearance.TryGetData<bool>(uid, MechVisuals.Broken, out var broken) 
+            && broken)
         {
             state = component.BrokenState;
             drawDepth = DrawDepth.SmallMobs;
         }
-        else if (component.OpenState != null && _appearance.TryGetData<bool>(uid, MechVisuals.Open, out var open, args.Component) && open)
+        else if (component.OpenState != null 
+                 && _appearance.TryGetData<bool>(uid, MechVisuals.Open, out var open) 
+                 && open)
         {
             state = component.OpenState;
             drawDepth = DrawDepth.SmallMobs;
         }
 
         layer.SetState(state);
-        args.Sprite.DrawDepth = (int) drawDepth;
+        sprite.DrawDepth = (int) drawDepth;
     }
 }

Content.Server/Chemistry/EntitySystems/HypospraySystem.cs

@@ -11,8 +11,12 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Timing;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Inventory;
+using Content.Shared.Tag;
+using Content.Shared.Popups;
 using Content.Server.Interaction;
 using Content.Server.Body.Components;
+using Content.Server.Popups;
 using Robust.Shared.GameStates;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -22,6 +26,8 @@ namespace Content.Server.Chemistry.EntitySystems;
 
 public sealed class HypospraySystem : SharedHypospraySystem
 {
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
 
@@ -84,6 +90,23 @@ public bool TryDoInject(Entity<HyposprayComponent> entity, EntityUid target, Ent
         }
 
         string? msgFormat = null;
+
+        if (!component.PierceArmor && _inventorySystem.TryGetSlotEntity(target, "outerClothing", out var suit))
+        {
+            if (TryComp<TagComponent>(suit, out var tag) && tag.Tags.Contains("Hardsuit"))
+            {
+                if (target == null) return false;
+                var taget = (EntityUid) target;
+
+                _popup.PopupEntity(Loc.GetString("hypospay-component-failure-hardsuit"), target, user, PopupType.MediumCaution);
+                return false;
+            }
+        }
+        else if (!component.PierceArmor && TryComp<TagComponent>(target, out var tag) && tag.Tags.Contains("NoInjectable"))
+        {
+            _popup.PopupEntity(Loc.GetString("hypospay-component-failure-hardsuit"), target, user, PopupType.MediumCaution);
+            return false;
+        }
 
         if (target == user)
             msgFormat = "hypospray-component-inject-self-message";

Content.Server/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Server.Popups;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -11,13 +12,18 @@
 using Content.Shared.Forensics;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Inventory;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Stacks;
+using Content.Shared.Tag;
+using Content.Shared.Popups;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
 public sealed class InjectorSystem : SharedInjectorSystem
 {
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
     [Dependency] private readonly BloodstreamSystem _blood = default!;
     [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
 
@@ -31,6 +37,20 @@ public override void Initialize()
 
     private bool TryUseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
     {
+        if (_inventorySystem.TryGetSlotEntity(target, "outerClothing", out var suit))
+        {
+            if (TryComp<TagComponent>(suit, out var tag) && tag.Tags.Contains("Hardsuit"))
+            {
+                _popup.PopupEntity(Loc.GetString("injector-component-failure-hardsuit"), target, user, PopupType.MediumCaution);
+                return false;
+            }
+        }
+        else if (TryComp<TagComponent>(target, out var tag) && tag.Tags.Contains("NoInjectable"))
+        {
+            _popup.PopupEntity(Loc.GetString("injector-component-failure-hardsuit"), target, user, PopupType.MediumCaution);
+            return false;
+        }
+
         // Handle injecting/drawing for solutions
         if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
         {

Content.Server/Mech/Systems/MechSystem.cs

@@ -11,6 +11,9 @@
 using Content.Shared.Mech;
 using Content.Shared.Mech.Components;
 using Content.Shared.Mech.EntitySystems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
 using Content.Shared.Tools.Components;
@@ -20,7 +23,11 @@
 using Content.Shared.Tools.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
 using Content.Shared.Tag;
+using Robust.Server.Audio;
+using Robust.Shared.Audio;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -32,6 +39,8 @@ namespace Content.Server.Mech.Systems;
 /// <inheritdoc/>
 public sealed partial class MechSystem : SharedMechSystem
 {
+    [Dependency] private readonly AudioSystem _audioSystem = default!;
+    [Dependency] private readonly NpcFactionSystem _factionSystem = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
@@ -44,6 +53,7 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -240,14 +250,11 @@ private void OnMechEntry(EntityUid uid, MechComponent component, MechEntryEvent
             return;
         }
 
-        if (!TryComp<HandsComponent>(args.Args.User, out var handsComponent))
-            return;
-
-        foreach (var hand in _hands.EnumerateHands(args.Args.User, handsComponent))
-        {
-            _hands.DoDrop(args.Args.User, hand, true, handsComponent);
-        }
+        if (TryComp<HandsComponent>(args.Args.User, out var handsComponent))
+            foreach (var hand in _hands.EnumerateHands(args.Args.User, handsComponent))
+                _hands.DoDrop(args.Args.User, hand, true, handsComponent);
 
+        _factionSystem.Up(args.Args.User, uid);
         TryInsert(uid, args.Args.User, component);
         _actionBlocker.UpdateCanMove(uid);
 
@@ -259,24 +266,48 @@ private void OnMechExit(EntityUid uid, MechComponent component, MechExitEvent ar
         if (args.Cancelled || args.Handled)
             return;
 
+        RemComp<NpcFactionMemberComponent>(component.Owner);
         TryEject(uid, component);
 
         args.Handled = true;
     }
 
     private void OnDamageChanged(EntityUid uid, MechComponent component, DamageChangedEvent args)
     {
-        var integrity = component.MaxIntegrity - args.Damageable.TotalDamage;
-        SetIntegrity(uid, integrity, component);
-
+        /*
+        if (TryComp<DamageableComponent>(uid, out var damage))
+        {
+            PlayCritSound(uid, component, damage);
+        }
+        */
         if (args.DamageIncreased &&
             args.DamageDelta != null &&
             component.PilotSlot.ContainedEntity != null)
         {
-            var damage = args.DamageDelta * component.MechToPilotDamageMultiplier;
-            _damageable.TryChangeDamage(component.PilotSlot.ContainedEntity, damage);
+            var damagetoplayer = args.DamageDelta * component.MechToPilotDamageMultiplier;
+            _damageable.TryChangeDamage(component.PilotSlot.ContainedEntity, damagetoplayer);
         }
     }
+
+    private void PlayCritSound(EntityUid uid, MechComponent component, DamageableComponent damage )
+    {
+        var total = damage.TotalDamage;
+        if (_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold))
+        {
+            var damagePercentage = (total / critThreshold) * 100;
+            if (component.PilotSlot.ContainedEntity != null)
+            {
+                if (damagePercentage >= 95)
+                    _audioSystem.PlayPvs(_audioSystem.GetSound(component.Alert5), component.PilotSlot.ContainedEntity.Value);
+                else if (damagePercentage >= 75)
+                    _audioSystem.PlayPvs(_audioSystem.GetSound(component.Alert25), component.PilotSlot.ContainedEntity.Value);
+                else if (damagePercentage >= 50)
+                    _audioSystem.PlayPvs(_audioSystem.GetSound(component.Alert50), component.PilotSlot.ContainedEntity.Value);
+                Dirty(uid ,component);
+            }
+        }
+    }
+
 
     private void ToggleMechUi(EntityUid uid, MechComponent? component = null, EntityUid? user = null)
     {

Content.Server/Medical/HealingSystem.cs

@@ -127,7 +127,7 @@ private bool HasDamage(DamageableComponent component, HealingComponent healing)
         var healingDict = healing.Damage.DamageDict;
         foreach (var type in healingDict)
         {
-            if (damageableDict[type.Key].Value > 0)
+            if (damageableDict.TryGetValue(type.Key, out var damageValue) && damageValue.Value > 0) //Sunrise-edit: fix server crashes
             {
                 return true;
             }

Content.Server/_Sunrise/Execution/ExecutionSystem.cs

@@ -21,6 +21,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Containers;
 
 namespace Content.Server._Sunrise.Execution;
 
@@ -29,6 +30,7 @@ namespace Content.Server._Sunrise.Execution;
 /// </summary>
 public sealed class ExecutionSystem : EntitySystem
 {
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
@@ -168,6 +170,15 @@ private bool CanExecuteWithGun(EntityUid weapon, EntityUid victim, EntityUid use
         // We must be able to actually fire the gun
         if (!TryComp<GunComponent>(weapon, out var gun) && _gunSystem.CanShoot(gun!))
             return false;
+
+        if (_containerSystem.TryGetContainer(weapon, "gun_chamber", out var chamberContainer))
+        {
+            foreach (var contained in chamberContainer.ContainedEntities)
+            {
+                if (TryComp<CartridgeAmmoComponent>(contained, out var cartridge) && cartridge.Spent)
+                    return false;
+            }
+        }
 
         return true;
     }