Use old reagent dispenser beaker slot ID (#24209)

Change the slot ID back to what it was to keep old map saves with an item in the slot loading correctly. This also fixes the "You can't put this in the dispenser!" message not appearing when inserting an item without FitsInDispenserComponent because the whitelisted slot name wasn't changed.
Citadel-Station-13 · Jan 18, 2024 · 7a7d001 · 7a7d001
1 parent a32f0da
commit 7a7d001
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
@@ -25,7 +25,7 @@ public async Task InsertEjectBuiTest()
         await Interact();
 
         // Eject beaker via BUI.
-        var ev = new ItemSlotButtonPressedEvent(ReagentDispenserComponent.BeakerSlotId);
+        var ev = new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName);
         await SendBui(ReagentDispenserUiKey.Key, ev);
 
         // Beaker is back in the player's hands

diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
@@ -39,11 +39,6 @@ public sealed partial class ReagentDispenserComponent : Component
         [DataField]
         public EntityWhitelist? StorageWhitelist;
 
-        /// <summary>
-        /// Slot for container to dispense into.
-        /// </summary>
-        public static string BeakerSlotId = "ReagentDispenser-beakerSlot";
-
         [DataField]
         public ItemSlot BeakerSlot = new();
 

diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
@@ -202,7 +202,7 @@ private void OnMapInit(EntityUid uid, ReagentDispenserComponent component, MapIn
                 _itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]);
             }
 
-            _itemSlotsSystem.AddItemSlot(uid, ReagentDispenserComponent.BeakerSlotId, component.BeakerSlot);
+            _itemSlotsSystem.AddItemSlot(uid, SharedReagentDispenser.OutputSlotName, component.BeakerSlot);
         }
     }
 }
diff --git a/Content.Shared/Chemistry/SharedReagentDispenser.cs b/Content.Shared/Chemistry/SharedReagentDispenser.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Chemistry
     /// </summary>
     public sealed class SharedReagentDispenser
     {
-        public const string OutputSlotName = "ReagentDispenser-beakerSlot";
+        public const string OutputSlotName = "beakerSlot";
     }
 
     [Serializable, NetSerializable]

diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -68,7 +68,7 @@
     containers:
       machine_board: !type:Container
       machine_parts: !type:Container
-      ReagentDispenser-beakerSlot: !type:ContainerSlot
+      beakerSlot: !type:ContainerSlot
   - type: StaticPrice
     price: 1000
   - type: Wires