diff --git a/Content.Shared/Storage/EntitySystems/BinSystem.cs b/Content.Shared/Storage/EntitySystems/BinSystem.cs index afb1e52881..17c3eb4288 100644 --- a/Content.Shared/Storage/EntitySystems/BinSystem.cs +++ b/Content.Shared/Storage/EntitySystems/BinSystem.cs @@ -4,12 +4,11 @@ using Content.Shared.Database; using Content.Shared.Examine; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; +using Content.Shared.Item; using Content.Shared.Storage.Components; using Content.Shared.Verbs; using Robust.Shared.Containers; -using Robust.Shared.Map; using Robust.Shared.Network; -using Robust.Shared.Timing; namespace Content.Shared.Storage.EntitySystems; @@ -18,7 +17,6 @@ namespace Content.Shared.Storage.EntitySystems; /// public sealed class BinSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly INetManager _net = default!; [Dependency] private readonly ISharedAdminLogManager _admin = default!; [Dependency] private readonly SharedContainerSystem _container = default!; @@ -32,7 +30,7 @@ public sealed class BinSystem : EntitySystem SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnEntRemoved); - SubscribeLocalEvent(OnInteractHand); + SubscribeLocalEvent(OnInteractHand, before: new[] { typeof(SharedItemSystem) }); SubscribeLocalEvent(OnAfterInteractUsing); SubscribeLocalEvent>(OnAltInteractHand); SubscribeLocalEvent(OnExamined); @@ -73,7 +71,7 @@ public sealed class BinSystem : EntitySystem private void OnInteractHand(EntityUid uid, BinComponent component, InteractHandEvent args) { - if (args.Handled || !_timing.IsFirstTimePredicted) + if (args.Handled) return; EntityUid? toGrab = component.Items.LastOrDefault(); @@ -111,9 +109,6 @@ public sealed class BinSystem : EntitySystem if (handled || !canReach) return; - if (!_timing.IsFirstTimePredicted) - return; - if (!TryInsertIntoBin(target, itemInHand, component)) return; diff --git a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml index 843b402a6c..fe275e3be3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml @@ -55,9 +55,11 @@ shape: !type:PhysShapeAabb bounds: "-0.10,-0.10,0.10,0.10" - density: 3 + density: 20 mask: - - TabletopMachineMask + - TabletopMachineMask + restitution: 0.3 + friction: 0.2 - type: InteractionOutline - type: ItemMapper sprite: Objects/Misc/candy_bowl.rsi