Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Use old reagent dispenser beaker slot ID (#24209)"

Browse Source 
This reverts commit 7a7d0017b5.
This commit is contained in:
Aviu00
2024-01-27 08:05:07 +03:00
parent 5363a3e6cc
commit 388424e2f3
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
View File

@@ -25,7 +25,7 @@ public sealed class DispenserTest : InteractionTest
await Interact(); await Interact();
// Eject beaker via BUI. // Eject beaker via BUI.
var ev = new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName); var ev = new ItemSlotButtonPressedEvent(ReagentDispenserComponent.BeakerSlotId);
await SendBui(ReagentDispenserUiKey.Key, ev); await SendBui(ReagentDispenserUiKey.Key, ev);
// Beaker is back in the player's hands // Beaker is back in the player's hands

5
Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
View File

@@ -39,6 +39,11 @@ namespace Content.Server.Chemistry.Components
[DataField] [DataField]
public EntityWhitelist? StorageWhitelist; public EntityWhitelist? StorageWhitelist;
/// <summary>
/// Slot for container to dispense into.
/// </summary>
public static string BeakerSlotId = "ReagentDispenser-beakerSlot";
[DataField] [DataField]
public ItemSlot BeakerSlot = new(); public ItemSlot BeakerSlot = new();

2
Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
View File

@@ -202,7 +202,7 @@ namespace Content.Server.Chemistry.EntitySystems
_itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]); _itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]);
} }
_itemSlotsSystem.AddItemSlot(uid, SharedReagentDispenser.OutputSlotName, component.BeakerSlot); _itemSlotsSystem.AddItemSlot(uid, ReagentDispenserComponent.BeakerSlotId, component.BeakerSlot);
} }
} }
} }

2
Content.Shared/Chemistry/SharedReagentDispenser.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Shared.Chemistry
/// </summary> /// </summary>
public sealed class SharedReagentDispenser public sealed class SharedReagentDispenser
{ {
public const string OutputSlotName = "beakerSlot"; public const string OutputSlotName = "ReagentDispenser-beakerSlot";
} }
[Serializable, NetSerializable] [Serializable, NetSerializable]

2
Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
View File

@@ -68,7 +68,7 @@
containers: containers:
machine_board: !type:Container machine_board: !type:Container
machine_parts: !type:Container machine_parts: !type:Container
beakerSlot: !type:ContainerSlot ReagentDispenser-beakerSlot: !type:ContainerSlot
- type: StaticPrice - type: StaticPrice
price: 1000 price: 1000
- type: Wires - type: Wires