From 06071a5d8a90211a98d88a3a7ebdba11ea107f79 Mon Sep 17 00:00:00 2001 From: godisdeadLOL <169250097+godisdeadLOL@users.noreply.github.com> Date: Sat, 14 Dec 2024 02:00:45 +0300 Subject: [PATCH] Secret stash wrench anchoring fix (#31779) * secret stash wrench fix * fix * cleanup --------- Co-authored-by: YourUsername Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../EntitySystems/SecretStashSystem.cs | 23 +++++++++---------- .../Structures/Furniture/potted_plants.yml | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs index af9b768e98..f13303d733 100644 --- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs @@ -1,20 +1,19 @@ -using Content.Shared.Popups; -using Content.Shared.Storage.Components; +using Content.Shared.Construction.EntitySystems; using Content.Shared.Destructible; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; -using Content.Shared.Item; -using Robust.Shared.Containers; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction; -using Content.Shared.Tools.Systems; -using Content.Shared.Examine; +using Content.Shared.Item; +using Content.Shared.Materials; +using Content.Shared.Popups; +using Content.Shared.Storage.Components; +using Content.Shared.Tools.EntitySystems; +using Content.Shared.Verbs; +using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; -using Content.Shared.Verbs; -using Content.Shared.IdentityManagement; -using Content.Shared.Tools.EntitySystems; -using Content.Shared.Whitelist; -using Content.Shared.Materials; +using Robust.Shared.Containers; using Robust.Shared.Map; namespace Content.Shared.Storage.EntitySystems; @@ -38,7 +37,7 @@ public sealed class SecretStashSystem : EntitySystem SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnDestroyed); SubscribeLocalEvent(OnReclaimed); - SubscribeLocalEvent(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem) }); + SubscribeLocalEvent(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem), typeof(AnchorableSystem) }); SubscribeLocalEvent(OnInteractHand); SubscribeLocalEvent>(OnGetVerb); } diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 9e6d6580b3..e47e8df41c 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -30,7 +30,6 @@ - type: SecretStash tryInsertItemSound: /Audio/Effects/plant_rustle.ogg tryRemoveItemSound: /Audio/Effects/plant_rustle.ogg - hasVerbs: false secretStashName: secret-stash-plant - type: ContainerContainer containers: