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

diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 45f927389ef0cad28de6564cc1587ae383367fd2..631ce6a45016f1ce7f85d0b6f10f1c928d6b4203 100644 (file)
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -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

diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 9c3d0239661e3d0e8a8f953510d4b7fc221d3a06..fb9ea290421ea64b09ecb46a27c8e186afc6f052 100644 (file)
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -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);

diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
index 74bbd553d98098c8db93d5bf6bcc0e45b46ae123..f6be847874a3eefb05ecb9c519a62d23376831c1 100644 (file)
--- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
@@ -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
 

diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 586b4b0af00f3fd58ffb54c5d7fadf7f440e6535..16e43494a672a7f7f63d21e242d371fbd318850e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -5,6 +5,7 @@
   description: It's magic.
   components:
   - type: Microwave
+    capacity: 10
   - type: Appearance
   - type: GenericVisualizer
     visuals: