Can no longer place an infinite quantity of items inside a microwave (#23577)

* initial commit

* rewrote code to early return to reduce nesting

* added VV to Capacity field of MicrowaveComponent
This commit is contained in:
SpeltIncorrectyl
2024-01-05 20:03:48 +00:00
committed by GitHub
parent 5c02a4fba4
commit 655b54145a
4 changed files with 12 additions and 0 deletions

View File

@@ -66,6 +66,9 @@ namespace Content.Server.Kitchen.Components
public int CurrentCookTimeButtonIndex;
public Container Storage = default!;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public int Capacity = 10;
}
public sealed class BeingMicrowavedEvent : HandledEntityEventArgs

View File

@@ -31,6 +31,7 @@ using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Player;
using System.Linq;
using Content.Shared.Access.Components;
namespace Content.Server.Kitchen.EntitySystems
{
@@ -260,6 +261,12 @@ namespace Content.Server.Kitchen.EntitySystems
return;
}
if (ent.Comp.Storage.Count >= ent.Comp.Capacity)
{
_popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-full"), ent, args.User);
return;
}
args.Handled = true;
_handsSystem.TryDropIntoContainer(args.User, args.Used, ent.Comp.Storage);
UpdateUserInterfaceState(ent, ent.Comp);

View File

@@ -10,6 +10,7 @@ microwave-component-suicide-others-message = {$victim} is trying to cook their h
microwave-component-suicide-multi-head-message = You cook your heads!
microwave-component-suicide-message = You cook your head!
microwave-component-upgrade-cook-time = cook time
microwave-component-interact-full = It's full.
## Bound UI

View File

@@ -5,6 +5,7 @@
description: It's magic.
components:
- type: Microwave
capacity: 10
- type: Appearance
- type: GenericVisualizer
visuals: