Fix door electronics configurator usage (#26888)

* allow usage of network configurator for door electronics

* add checks for "allowed" items

diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs
index e3a11af4295c43ae32c81e1156e7aa885c37ecf0..5f2314df90b596c5d58b337d211d7bccb2914e6c 100644 (file)
--- a/Content.Server/UserInterface/ActivatableUISystem.cs
+++ b/Content.Server/UserInterface/ActivatableUISystem.cs
@@ -93,6 +93,9 @@ public sealed partial class ActivatableUISystem : EntitySystem
         if (component.InHandsOnly)
             return;
 
+        if (component.AllowedItems != null)
+            return;
+
         args.Handled = InteractUI(args.User, uid, component);
     }
 
@@ -104,6 +107,9 @@ public sealed partial class ActivatableUISystem : EntitySystem
         if (component.RightClickOnly)
             return;
 
+        if (component.AllowedItems != null)
+            return;
+
         args.Handled = InteractUI(args.User, uid, component);
     }
 

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index 16713a6692f51d5f47109d9a000d808b6eca2813..670b556e359889ae76c596c9fcb0a9295e797dd1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -18,7 +18,7 @@
       key: enum.DoorElectronicsConfigurationUiKey.Key
       allowedItems:
         tags:
-        - Multitool
+        - DoorElectronicsConfigurator
     - type: UserInterface
       interfaces:
       - key: enum.DoorElectronicsConfigurationUiKey.Key

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 2b11c211e8ebc585ee44f5abe5a8b26acb340d59..b3103816eb9c3413e121a1818c4866a4062caf51 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -225,6 +225,7 @@
   - type: Tag
     tags:
       - Multitool
+      - DoorElectronicsConfigurator
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -266,6 +267,9 @@
     - type: ActivatableUI
       key: enum.NetworkConfiguratorUiKey.List
       inHandsOnly: true
+    - type: Tag
+      tags:
+        - DoorElectronicsConfigurator
     - type: UserInterface
       interfaces:
         - key: enum.NetworkConfiguratorUiKey.List
@@ -343,13 +347,13 @@
   description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
   components:
   - type: RCD
-    availablePrototypes:   
+    availablePrototypes:
     - WallSolid
     - FloorSteel
     - Plating
     - Catwalk
     - Grille
-    - Window    
+    - Window
     - WindowDirectional
     - WindowReinforcedDirectional
     - ReinforcedWindow
@@ -398,7 +402,7 @@
   - type: LimitedCharges
     charges: 0
   - type: RCD
-    availablePrototypes:   
+    availablePrototypes:
     - WallSolid
     - FloorSteel
     - Plating

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 961912d6092bf97b54c50a13d994a5b8ec344cf5..021427014c3917422bf9765c1004e0115ab002c1 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -523,6 +523,9 @@
 - type: Tag
   id: DoorElectronics
 
+- type: Tag
+  id: DoorElectronicsConfigurator
+
 - type: Tag
   id: DrinkBottle
 
@@ -1177,7 +1180,7 @@
 
 - type: Tag
   id: SuitEVA
-  
+
 - type: Tag
   id: Sunglasses