Block interactions with subfloor entities (#6732)

Content.Shared/SubFloor/SharedSubFloorHideSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
@@ -26,7 +27,7 @@ namespace Content.Shared.SubFloor
             SubscribeLocalEvent<SubFloorHideComponent, ComponentStartup>(OnSubFloorStarted);
             SubscribeLocalEvent<SubFloorHideComponent, ComponentShutdown>(OnSubFloorTerminating);
             SubscribeLocalEvent<SubFloorHideComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
-            SubscribeLocalEvent<SubFloorHideComponent, InteractUsingEvent>(OnInteractionAttempt);
+            SubscribeLocalEvent<SubFloorHideComponent, GettingInteractedWithAttemptEvent>(OnInteractionAttempt);
         }
 
         public override void Shutdown()
@@ -37,10 +38,11 @@ namespace Content.Shared.SubFloor
             _mapManager.TileChanged -= MapManagerOnTileChanged;
         }
 
-        private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, InteractUsingEvent args)
+        private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, GettingInteractedWithAttemptEvent args)
         {
-            // TODO make this use an interact attempt event or something. Handling an InteractUsing is not going to work in general.
+            // No interactions with entities hidden under floor tiles.
-            args.Handled = component.IsUnderCover;
+            if (component.BlockInteractions && component.IsUnderCover)
+                args.Cancel();
         }
 
         private void OnSubFloorStarted(EntityUid uid, SubFloorHideComponent component, ComponentStartup _)

Content.Shared/SubFloor/SubFloorHideComponent.cs

@@ -20,6 +20,15 @@ namespace Content.Shared.SubFloor
         [ViewVariables]
         public bool IsUnderCover { get; set; } = false;
 
+        /// <summary>
+        ///     Whether interactions with this entity should be blocked while it is under floor tiles.
+        /// </summary>
+        /// <remarks>
+        ///     Useful for entities like vents, which are only partially hidden.
+        /// </remarks>
+        [DataField("blockInteractions")]
+        public bool BlockInteractions { get; set; } = true;
+
         /// <summary>
         ///     When revealed using some scanning tool, what transparency should be used to draw this item?
         /// </summary>

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -6,6 +6,8 @@
     mode: SnapgridCenter
   components:
   - type: AtmosDevice
+  - type: SubFloorHide
+    blockInteractions: false
   - type: NodeContainer
     nodes:
       inlet:

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml

@@ -6,6 +6,8 @@
     mode: SnapgridCenter
   components:
     - type: AtmosDevice
+    - type: SubFloorHide
+      blockInteractions: false
     - type: NodeContainer
       nodes:
         inlet:

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -6,6 +6,8 @@
     mode: SnapgridCenter
   components:
     - type: AtmosDevice
+    - type: SubFloorHide
+      blockInteractions: false
     - type: NodeContainer
       nodes:
         pipe: