Fix for [20593] (#20663)

diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
index 4f838d989838645ba8458f253bffde5113e140c0..c4e65c06a3f842bb4bb9a8c1578b3dbf5bc2403f 100644 (file)
--- a/Content.Shared/Body/Part/BodyPartComponent.cs
+++ b/Content.Shared/Body/Part/BodyPartComponent.cs
@@ -56,7 +56,7 @@ public sealed partial class BodyPartComponent : Component
 
             foreach (var slotId in Children.Keys)
             {
-                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, slotId));
+                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.PartSlotContainerIdPrefix+slotId));
             }
 
             return temp;
@@ -73,7 +73,7 @@ public sealed partial class BodyPartComponent : Component
 
             foreach (var slotId in Organs.Keys)
             {
-                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, slotId));
+                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.OrganSlotContainerIdPrefix+slotId));
             }
 
             return temp;

diff --git a/Content.Shared/Body/Systems/SharedBodySystem.cs b/Content.Shared/Body/Systems/SharedBodySystem.cs
index 602c8f015b6bd3f25e5e2110daa6caaaf71aed6a..431503c96e2d263941219d668ae9ccaa6e12caae 100644 (file)
--- a/Content.Shared/Body/Systems/SharedBodySystem.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.cs
@@ -15,17 +15,17 @@ public abstract partial class SharedBodySystem : EntitySystem
     /// <summary>
     /// Container ID prefix for any body parts.
     /// </summary>
-    protected const string PartSlotContainerIdPrefix = "body_part_slot_";
+    public const string PartSlotContainerIdPrefix = "body_part_slot_";
 
     /// <summary>
     /// Container ID for the ContainerSlot on the body entity itself.
     /// </summary>
-    protected const string BodyRootContainerId = "body_root_part";
+    public const string BodyRootContainerId = "body_root_part";
 
     /// <summary>
     /// Container ID prefix for any body organs.
     /// </summary>
-    protected const string OrganSlotContainerIdPrefix = "body_organ_slot_";
+    public const string OrganSlotContainerIdPrefix = "body_organ_slot_";
 
     [Dependency] protected readonly IPrototypeManager Prototypes = default!;
     [Dependency] protected readonly DamageableSystem Damageable = default!;