Secret stash wrench anchoring fix (#31779)

* secret stash wrench fix

* fix

* cleanup

---------

Co-authored-by: YourUsername <you@example.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
index af9b768e98be0e7ffec6164b71d62a745323e252..f13303d733868242fd7d37db01eb3dc42cb10ddd 100644 (file)
--- 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.Interaction;
-using Content.Shared.Tools.Systems;
-using Content.Shared.Examine;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Content.Shared.Verbs;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+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 Content.Shared.Materials;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
 
 namespace Content.Shared.Storage.EntitySystems;
@@ -38,7 +37,7 @@ public sealed class SecretStashSystem : EntitySystem
         SubscribeLocalEvent<SecretStashComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
         SubscribeLocalEvent<SecretStashComponent, GotReclaimedEvent>(OnReclaimed);
-        SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem) });
+        SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem), typeof(AnchorableSystem) });
         SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<SecretStashComponent, GetVerbsEvent<InteractionVerb>>(OnGetVerb);
     }

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index 9e6d6580b31694865aaea7d07810e74f5dabe03a..e47e8df41c64dbae6a492c173a3c64338ab99e5b 100644 (file)
--- 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: