diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs index e3a11af429..5f2314df90 100644 --- 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 16713a6692..670b556e35 100644 --- 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 2b11c211e8..b3103816eb 100644 --- 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 961912d609..021427014c 100644 --- 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