Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Silence reagent dispensers on spawn. #2862

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public sealed class ReagentDispenserSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly OpenableSystem _openable = default!;
[Dependency] private readonly LabelSystem _label = default!; // Frontier
[Dependency] private readonly SharedContainerSystem _containers = default!; // Frontier

public override void Initialize()
{
Expand Down Expand Up @@ -279,8 +280,10 @@ private void OnMapInit(EntityUid uid, ReagentDispenserComponent component, MapIn
{
for (var i = 0; i < packPrototype.Inventory.Count && i < component.StorageSlots.Count; i++)
{
if (component.StorageSlots[i].ContainerSlot == null)
continue;
var item = Spawn(packPrototype.Inventory[i], Transform(uid).Coordinates);
if (!_itemSlotsSystem.TryInsert(uid, component.StorageSlots[i].ID!, item, null, excludeUserAudio: true))
if (!_containers.Insert(item, component.StorageSlots[i].ContainerSlot!)) // ContainerSystem.Insert is silent.
QueueDel(item);
}
}
Expand Down
Loading