Merge remote-tracking branch 'origin/master' into weapon-modules

# Conflicts:
#	Resources/Prototypes/Recipes/Lathes/security.yml

Content.Server/_White/Construction/Completions/Surgery.cs

@@ -2,6 +2,7 @@ using Content.Server.Body.Systems;
 using Content.Shared.Body.Organ;
 using Content.Shared.Construction;
 using Content.Shared._White.CheapSurgery;
+using Content.Shared.Changeling;
 
 namespace Content.Server._White.Construction.Completions;
 
@@ -20,7 +21,8 @@ public sealed partial class Surgery : IGraphAction
             return;
         }
 
-        if (entityManager.TryGetComponent<OrganComponent>(surgeryComponent.OrganUid, out var organComponent))
+        if (entityManager.TryGetComponent<OrganComponent>(surgeryComponent.OrganUid, out var organComponent) &&
+            !entityManager.HasComponent<ChangelingComponent>(uid))
             bodySystem.RemoveOrgan(surgeryComponent.OrganUid, organComponent);
 
         entityManager.RemoveComponent<ActiveSurgeryComponent>(uid);

Content.Server/_White/MagGloves/MagneticGlovesSystem.cs

@@ -0,0 +1,116 @@
+using Content.Server.Emp;
+using Content.Server.Power.Components;
+using Content.Shared.Examine;
+using Content.Shared.Inventory.Events;
+using Content.Shared._White.MagGloves;
+using Content.Shared.Popups;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Server._White.MagGloves;
+
+/// <summary>
+/// This handles...
+/// </summary>
+public sealed class MagneticGlovesSystem : EntitySystem
+{
+
+    [Dependency] private readonly SharedContainerSystem _sharedContainer = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<MagneticGlovesComponent, GotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<MagneticGlovesComponent, GotUnequippedEvent>(OnGotUnequipped);
+        SubscribeLocalEvent<MagneticGlovesComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<MagneticGlovesComponent, EmpPulseEvent>(OnEmp);
+    }
+
+    public override void Update(float frameTime)
+    {
+        var query = EntityQueryEnumerator<MagneticGlovesComponent>();
+        while (query.MoveNext(out var uid, out var gloves))
+        {
+            if (_gameTiming.CurTime > gloves.GlovesLastActivation + gloves.GlovesActiveTime && gloves.Enabled)
+            {
+                RaiseLocalEvent(uid, new ToggleMagneticGlovesEvent());
+            }
+
+        }
+    }
+
+    public void OnEmp(EntityUid uid, MagneticGlovesComponent component, EmpPulseEvent args)
+    {
+        if (component.Enabled)
+        {
+            RaiseLocalEvent(uid, new ToggleMagneticGlovesEvent());
+        }
+    }
+
+    public void OnGotUnequipped(EntityUid uid, MagneticGlovesComponent component, GotUnequippedEvent args)
+    {
+        if (args.Slot == "gloves")
+        {
+            ToggleGloves(args.Equipee, component, false, uid);
+        }
+
+        if (component.Enabled)
+        {
+            _popup.PopupEntity(Loc.GetString("maggloves-deactivated"), uid, args.Equipee);
+            RaiseLocalEvent(uid, new ToggleMagneticGlovesEvent());
+        }
+    }
+
+    public void OnGotEquipped(EntityUid uid, MagneticGlovesComponent component, GotEquippedEvent args)
+    {
+        if (args.Slot == "gloves")
+        {
+            ToggleGloves(args.Equipee, component, true, uid);
+        }
+    }
+
+    public void ToggleGloves(EntityUid owner, MagneticGlovesComponent component, bool active, EntityUid uid)
+    {
+        if (!active)
+        {
+            RemComp<KeepItemsOnFallComponent>(owner);
+            if (TryComp<MagneticGlovesAdvancedComponent>(uid, out var adv))
+            {
+                RemComp<PreventDisarmComponent>(owner);
+                RemComp<PreventStrippingFromHandsAndGlovesComponent>(owner);
+            }
+        }
+        else if (component.Enabled)
+        {
+            EnsureComp<KeepItemsOnFallComponent>(owner);
+            if (TryComp<MagneticGlovesAdvancedComponent>(uid, out var adv))
+            {
+                EnsureComp<PreventDisarmComponent>(owner);
+                EnsureComp<PreventStrippingFromHandsAndGlovesComponent>(owner);
+            }
+        }
+    }
+
+    public void OnExamined(EntityUid uid, MagneticGlovesComponent component, ExaminedEvent args)
+    {
+
+        if (!args.IsInDetailsRange)
+            return;
+
+        var message = Loc.GetString("maggloves-ready-in") + " " + component.GlovesReadyAt.Subtract(_gameTiming.CurTime).TotalSeconds.ToString("0");
+
+        if (component.GlovesReadyAt < _gameTiming.CurTime)
+        {
+            message = Loc.GetString("maggloves-ready");
+        }
+
+        if (component.Enabled)
+        {
+            message = Loc.GetString("maggloves-enabled-till") + " " + (component.GlovesLastActivation
+                .Add(component.GlovesActiveTime).Subtract(_gameTiming.CurTime).TotalSeconds.ToString("0"));
+        }
+
+        args.PushMarkup(message);
+    }
+}

Content.Server/_White/Other/CritSystem/CritSystem.cs

@@ -67,7 +67,7 @@ public sealed class CritSystem : EntitySystem
             args.BonusDamage = new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Slash"),
                 damage - args.BaseDamage.GetTotal());
 
-            _popup.PopupEntity($@"Crit! {damage}", args.User, PopupType.MediumCaution);
+            _popup.PopupEntity($"Crit! {damage}", args.User, args.User, PopupType.MediumCaution);
         }
     }