Сезонные обновления [НЕ ДЛЯ МЕРДЖА]

Content.Server/ADT/PickupHumans/PickupHumansSystem.cs

@@ -9,6 +9,9 @@
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Climbing.Events;
+using Content.Shared.ADT.Spike;
+using Robust.Shared.Random;
+using Content.Shared.Buckle.Components;
 
 namespace Content.Server.ADT.PickupHumans;
 
@@ -17,6 +20,7 @@ public sealed partial class PickupHumansSystem : SharedPickupHumansSystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -133,4 +137,39 @@ private void OnStandAttempt(EntityUid uid, TakenHumansComponent component, Stand
         args.Cancel();
     }
     #endregion
+
+    // SpikeSystem: метод, позволяющий снять человека на крюке с некоторой вероятностью в SpikeComponent
+    public override bool ShouldAllowPickup(EntityUid user, EntityUid target, PickupHumansComponent component)
+    {
+        if (SharedSpikeSystem.IsEntityImpaled(user, EntityManager))
+            return false;
+
+        if (SharedSpikeSystem.IsEntityImpaled(target, EntityManager))
+        {
+            if (!TryComp<BuckleComponent>(target, out var buckle) || !buckle.Buckled || buckle.BuckledTo == null)
+            {
+                return false;
+            }
+
+            if (!TryComp<SpikeComponent>(buckle.BuckledTo.Value, out var spikeComp))
+            {
+                return false;
+            }
+
+            if (!_random.Prob(spikeComp.PickupChance))
+            {
+                _popup.PopupEntity(Loc.GetString("spike-pickup-failed"), user, user);
+                _popup.PopupEntity(Loc.GetString("spike-pickup-failed-target"), target, target);
+                return false;
+            }
+            else
+            {
+                _popup.PopupEntity(Loc.GetString("spike-pickup-success"), user, user);
+                _popup.PopupEntity(Loc.GetString("spike-pickup-success-target"), target, target);
+                return true;
+            }
+        }
+
+        return true;
+    }
 }

Content.Server/ADT/Shadekin/ShadekinSystem.cs

@@ -27,6 +27,8 @@
 using Content.Server.Cuffs;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Mech.Components;
+using Content.Shared.Buckle.Components;
+using Content.Shared.ADT.Spike;
 using Content.Shared.Bed.Cryostorage;
 using Content.Shared.ADT.Components.PickupHumans;
 using Content.Shared.Construction.Components;
@@ -111,7 +113,7 @@ public override void Update(float frameTime)
                 comp.MinPowerAccumulator = Math.Clamp(comp.MinPowerAccumulator - 1f, 0f, comp.MinPowerRoof);
             }
 
-            if ((comp.MinPowerAccumulator >= comp.MinPowerRoof) && !comp.Blackeye)
+            if (comp.MinPowerAccumulator >= comp.MinPowerRoof && !comp.Blackeye)
                 BlackEye(uid);
 
             if (!HasComp<TakenHumansComponent>(uid) && comp.MaxedPowerAccumulator >= comp.MaxedPowerRoof)
@@ -120,7 +122,7 @@ public override void Update(float frameTime)
             if (TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
             {
                 var eye = humanoid.EyeColor;
-                if ((eye.R * 255f <= 30f && eye.G * 255f <= 30f && eye.B * 255f <= 30f) && !(comp.Blackeye))
+                if (eye.R * 255f <= 30f && eye.G * 255f <= 30f && eye.B * 255f <= 30f && !comp.Blackeye)
                 {
                     comp.Blackeye = true;
                     comp.PowerLevelGainEnabled = false;
@@ -156,6 +158,10 @@ private void OnTeleport(EntityUid uid, ShadekinComponent comp, ShadekinTeleportA
         if (args.Handled)
             return;
 
+        // SpikeSystem: Чтобы сумеречники не имели возможности слезть с крюка
+        if (TryComp<BuckleComponent>(uid, out var buckle) && buckle.BuckledTo != null && HasComp<SpikeComponent>(buckle.BuckledTo.Value))
+            return;
+
         if (HasComp<MechPilotComponent>(uid))
             return;
 
@@ -204,6 +210,13 @@ public void TeleportRandomly(EntityUid uid, ShadekinComponent? comp)
         if (!Resolve(uid, ref comp))
             return;
 
+        // SpikeSystem: Чтобы сумеречники не имели возможности слезть с крюка
+        if (TryComp<BuckleComponent>(uid, out var buckle) && buckle.BuckledTo != null && HasComp<SpikeComponent>(buckle.BuckledTo.Value))
+        {
+            comp.MaxedPowerAccumulator = 0f;
+            return;
+        }
+
         var coordsValid = false;
         var coords = Transform(uid).Coordinates;
 
@@ -248,6 +261,10 @@ public void TeleportRandomly(EntityUid uid, ShadekinComponent? comp)
 
     public void TeleportRandomlyNoComp(EntityUid uid, float range = 5f)
     {
+        // SpikeSystem: Чтобы сумеречники не имели возможности слезть с крюка
+        if (TryComp<BuckleComponent>(uid, out var buckle) && buckle.BuckledTo != null && HasComp<SpikeComponent>(buckle.BuckledTo.Value))
+            return;
+
         var coordsValid = false;
         var coords = Transform(uid).Coordinates;