Fix cryopod interactions (#15045)

diff --git a/Content.Client/Medical/Cryogenics/CryoPodComponent.cs b/Content.Client/Medical/Cryogenics/CryoPodComponent.cs
index 79a5d8a5e3f0097a0e14c8ed5bfc694c5e9739dd..e07d69ea713e57a1299eedafecc833dacf4dc6aa 100644 (file)
--- a/Content.Client/Medical/Cryogenics/CryoPodComponent.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodComponent.cs
@@ -3,5 +3,5 @@ using Content.Shared.Medical.Cryogenics;
 
 namespace Content.Client.Medical.Cryogenics;
 
-[RegisterComponent]
+[RegisterComponent, ComponentReference(typeof(SharedCryoPodComponent))]
 public sealed class CryoPodComponent : SharedCryoPodComponent { }

diff --git a/Content.Server/Medical/Components/CryoPodComponent.cs b/Content.Server/Medical/Components/CryoPodComponent.cs
index 6ede61b0e46e5f71cdff12d7e52ef03c2cdb84be..362576e10c368ba9597f6c895b9e9e3ecd3573b2 100644 (file)
--- a/Content.Server/Medical/Components/CryoPodComponent.cs
+++ b/Content.Server/Medical/Components/CryoPodComponent.cs
@@ -4,7 +4,7 @@ using Content.Shared.Medical.Cryogenics;
 
 namespace Content.Server.Medical.Components;
 
-[RegisterComponent]
+[RegisterComponent, ComponentReference(typeof(SharedCryoPodComponent))]
 public sealed class CryoPodComponent: SharedCryoPodComponent
 {
     /// <summary>

diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index a778322caf940a1515cfdce119eeb8fdda553656..886922986bc55d1415706f1ffd58ba8b0268e01d 100644 (file)
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -53,7 +53,6 @@ public sealed partial class CryoPodSystem: SharedCryoPodSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryoPodComponent, CanDropTargetEvent>(OnCryoPodCanDropOn);
         SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
         SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);

diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index 5aadbbaeb8e0725e0f8c2752110b76d4c91d7f3e..204f37ae92b0f9f187de30eeadec26b61a215727 100644 (file)
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -26,12 +26,16 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
     {
         base.Initialize();
 
+        SubscribeLocalEvent<SharedCryoPodComponent, CanDropTargetEvent>(OnCryoPodCanDropOn);
         InitializeInsideCryoPod();
     }
 
-    protected void OnCryoPodCanDropOn(EntityUid uid, SharedCryoPodComponent component, ref CanDropTargetEvent args)
+    private void OnCryoPodCanDropOn(EntityUid uid, SharedCryoPodComponent component, ref CanDropTargetEvent args)
     {
-        args.CanDrop = args.CanDrop && HasComp<BodyComponent>(args.Dragged);
+        if (args.Handled)
+            return;
+
+        args.CanDrop = HasComp<BodyComponent>(args.Dragged);
         args.Handled = true;
     }