Revert "Use old reagent dispenser beaker slot ID (#24209)"
This reverts commit 7a7d0017b5.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -39,6 +39,11 @@ namespace Content.Server.Chemistry.Components
|
||||
[DataField]
|
||||
public EntityWhitelist? StorageWhitelist;
|
||||
|
||||
/// <summary>
|
||||
/// Slot for container to dispense into.
|
||||
/// </summary>
|
||||
public static string BeakerSlotId = "ReagentDispenser-beakerSlot";
|
||||
|
||||
[DataField]
|
||||
public ItemSlot BeakerSlot = new();
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace Content.Shared.Chemistry
|
||||
/// </summary>
|
||||
public sealed class SharedReagentDispenser
|
||||
{
|
||||
public const string OutputSlotName = "beakerSlot";
|
||||
public const string OutputSlotName = "ReagentDispenser-beakerSlot";
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user