tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add verb for smartfridge item insertion (#39807)

Browse Source
This commit is contained in:
Perry Fraser
2025-08-22 16:33:04 -04:00
committed by GitHub
parent 73a5c45c49
commit 8206126fb2
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Shared/SmartFridge/SmartFridgeSystem.cs
View File

@@ -1,15 +1,16 @@
using Content.Shared.Access.Components;
using Content.Shared.Access.Systems;
using Content.Shared.Construction.EntitySystems;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using Content.Shared.Whitelist;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Shared.SmartFridge;
@@ -27,9 +28,10 @@ public sealed class SmartFridgeSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<SmartFridgeComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<SmartFridgeComponent, InteractUsingEvent>(OnInteractUsing, after: [typeof(AnchorableSystem)]);
SubscribeLocalEvent<SmartFridgeComponent, EntRemovedFromContainerMessage>(OnItemRemoved);
SubscribeLocalEvent<SmartFridgeComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerb);
SubscribeLocalEvent<SmartFridgeComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
SubscribeLocalEvent<SmartFridgeComponent, DumpEvent>(OnDump);
@@ -78,7 +80,7 @@ public sealed class SmartFridgeSystem : EntitySystem
private void OnInteractUsing(Entity<SmartFridgeComponent> ent, ref InteractUsingEvent args)
{
if (!_hands.CanDrop(args.User, args.Used))
if (args.Handled || !_hands.CanDrop(args.User, args.Used))
return;
args.Handled = DoInsert(ent, args.User, [args.Used], true);
@@ -136,6 +138,24 @@ public sealed class SmartFridgeSystem : EntitySystem
_popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-out-of-stock"), ent, args.Actor);
}
private void OnGetAltVerb(Entity<SmartFridgeComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
{
var user = args.User;
if (!args.CanInteract
|| args.Using is not { } item
|| !_hands.CanDrop(user, item)
|| !_whitelist.CheckBoth(item, ent.Comp.Blacklist, ent.Comp.Whitelist))
return;
args.Verbs.Add(new AlternativeVerb
{
Act = () => DoInsert(ent, user, [item], true),
Text = Loc.GetString("verb-categories-insert"),
Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/insert.svg.192dpi.png")),
});
}
private void OnGetDumpableVerb(Entity<SmartFridgeComponent> ent, ref GetDumpableVerbEvent args)
{
if (_accessReader.IsAllowed(args.User, ent))