From 388424e2f38f42fd7990ef1dfcb9ce0bcbd043af Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Sat, 27 Jan 2024 08:05:07 +0300 Subject: [PATCH] Revert "Use old reagent dispenser beaker slot ID (#24209)" This reverts commit 7a7d0017b504dec4b1d390b941af9791d9677287. --- Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs | 2 +- .../Chemistry/Components/ReagentDispenserComponent.cs | 5 +++++ .../Chemistry/EntitySystems/ReagentDispenserSystem.cs | 2 +- Content.Shared/Chemistry/SharedReagentDispenser.cs | 2 +- .../Structures/Dispensers/base_structuredispensers.yml | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs index a5449308be..98bb7da6b7 100644 --- a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs @@ -25,7 +25,7 @@ public sealed class DispenserTest : InteractionTest await Interact(); // Eject beaker via BUI. - var ev = new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName); + var ev = new ItemSlotButtonPressedEvent(ReagentDispenserComponent.BeakerSlotId); 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 index eb1839ef2e..4cf0d2e29e 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -39,6 +39,11 @@ namespace Content.Server.Chemistry.Components [DataField] public EntityWhitelist? StorageWhitelist; + /// + /// Slot for container to dispense into. + /// + 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 index d5ec310f87..109d5f351a 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -202,7 +202,7 @@ namespace Content.Server.Chemistry.EntitySystems _itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]); } - _itemSlotsSystem.AddItemSlot(uid, SharedReagentDispenser.OutputSlotName, component.BeakerSlot); + _itemSlotsSystem.AddItemSlot(uid, ReagentDispenserComponent.BeakerSlotId, component.BeakerSlot); } } } diff --git a/Content.Shared/Chemistry/SharedReagentDispenser.cs b/Content.Shared/Chemistry/SharedReagentDispenser.cs index 22cb87dcdb..be71bf8a77 100644 --- a/Content.Shared/Chemistry/SharedReagentDispenser.cs +++ b/Content.Shared/Chemistry/SharedReagentDispenser.cs @@ -8,7 +8,7 @@ namespace Content.Shared.Chemistry /// public sealed class SharedReagentDispenser { - public const string OutputSlotName = "beakerSlot"; + public const string OutputSlotName = "ReagentDispenser-beakerSlot"; } [Serializable, NetSerializable] diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml index d87c5e700a..eedac58ff2 100644 --- 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 - beakerSlot: !type:ContainerSlot + ReagentDispenser-beakerSlot: !type:ContainerSlot - type: StaticPrice price: 1000 - type: Wires