diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveMenu.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveMenu.cs index d2160d1c4d..b2f62fbcc5 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveMenu.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveMenu.cs @@ -137,10 +137,11 @@ namespace Content.Client.GameObjects.Components.Kitchen { Text = (index <= 0 ? 1 : index).ToString(), TextAlign = Label.AlignMode.Center, + ToggleMode = true, Group = CookTimeButtonGroup, }; CookTimeButtonVbox.AddChild(newButton); - newButton.OnPressed += args => + newButton.OnToggled += args => { OnCookTimeSelected?.Invoke(args); _cookTimeInfoLabel.Text = $"{Loc.GetString("COOK TIME")}: {VisualCookTime}"; diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs index d5e4aa8191..4bec6bfd6a 100644 --- a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs @@ -224,6 +224,8 @@ namespace Content.Server.GameObjects.Components.Kitchen if (!itemEntity.TryGetComponent(typeof(FoodComponent), out var food)) { + + _notifyManager.PopupMessage(Owner, eventArgs.User, "That won't work!"); return false; } diff --git a/Resources/Prototypes/Entities/kitchen.yml b/Resources/Prototypes/Entities/kitchen.yml index f517051c87..27ba6c723d 100644 --- a/Resources/Prototypes/Entities/kitchen.yml +++ b/Resources/Prototypes/Entities/kitchen.yml @@ -2,7 +2,11 @@ id: KitchenMicrowave name: Microwave description: It's magic. + placement: + mode: SnapgridCenter components: + - type: SnapGrid + offset: Center - type: Microwave - type: Clickable - type: InteractionOutline @@ -17,8 +21,6 @@ interfaces: - key: enum.MicrowaveUiKey.Key type: MicrowaveBoundUserInterface - - - type: Collidable shapes: - !type:PhysShapeAabb