From 34d4e9803a9ccd7b402dd11ac9d1784e4ecc3062 Mon Sep 17 00:00:00 2001
From: Jezithyr <jezithyr@gmail.com>
Date: Sun, 1 Oct 2023 13:33:18 -0700
Subject: [PATCH] Fix for [20593] (#20663)

---
 Content.Shared/Body/Part/BodyPartComponent.cs   | 4 ++--
 Content.Shared/Body/Systems/SharedBodySystem.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
index 4f838d9898..c4e65c06a3 100644
--- 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 602c8f015b..431503c96e 100644
--- 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!;