From 5da40f0d88e8dde313d85e4fa84ff6166c9e76f1 Mon Sep 17 00:00:00 2001 From: Julian Giebel Date: Wed, 17 May 2023 22:28:30 +0200 Subject: [PATCH] [tweak] Add configuration capability back to multitool (#16289) * Add configuration capability back to multitool * Remove configurator from toolbelts Add configurator to scientist lockers, yellow toolboxes and the YouTool * Remove configurator from electric toolbox --- .../Locale/en-US/devices/network-configurator.ftl | 2 +- Resources/Prototypes/Catalog/Fills/Items/belt.yml | 4 +--- .../Prototypes/Catalog/Fills/Lockers/science.yml | 2 ++ .../Catalog/VendingMachines/Inventories/youtool.yml | 1 + .../Prototypes/Entities/Objects/Tools/tools.yml | 12 ++++++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/devices/network-configurator.ftl b/Resources/Locale/en-US/devices/network-configurator.ftl index 38fad1ba72..dfd5d0106a 100644 --- a/Resources/Locale/en-US/devices/network-configurator.ftl +++ b/Resources/Locale/en-US/devices/network-configurator.ftl @@ -33,7 +33,7 @@ network-configurator-tooltip-set = Sets targets device list network-configurator-tooltip-add = Adds to targets device list network-configurator-tooltip-edit = Edit targets device list network-configurator-tooltip-clear = Clear targets device list -network-configurator-tooltip-copy = Copy targets device list to multitool +network-configurator-tooltip-copy = Copy targets device list to held tool network-configurator-tooltip-show = Show a holographic visualization of targets device list # examine diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 62a0c71e42..05d5cdbdb3 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -11,7 +11,6 @@ - id: Wirecutter - id: Welder - id: Multitool - - id: NetworkConfigurator - type: entity id: ClothingBeltChiefEngineerFilled @@ -25,7 +24,6 @@ - id: WelderExperimental - id: Multitool - id: CableApcStack - - id: NetworkConfigurator - type: entity id: ClothingBeltSecurityFilled @@ -68,7 +66,7 @@ amount: 2 - id: Gauze - id: EmergencyMedipen #You never know what people are going to latejoin into - + - type: entity id: ClothingBeltParamedicFilled parent: ClothingBeltMedical diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml index 881547fc10..4f09061f9a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml @@ -11,3 +11,5 @@ - id: ClothingOuterCoatRnd - id: AnomalyScanner - id: NodeScanner + - id: NetworkConfigurator + prob: 0.5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index e4cd34bf9a..85ffaf4adf 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -8,6 +8,7 @@ Wrench: 5 Screwdriver: 5 trayScanner: 5 + NetworkConfigurator: 3 GasAnalyzer: 5 FlashlightLantern: 5 ClothingHandsGlovesColorYellowBudget: 5 diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index e8ca0136d7..2479261c4d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -196,6 +196,18 @@ - type: Tool qualities: - Pulsing + - type: NetworkConfigurator + - type: ActivatableUI + key: enum.NetworkConfiguratorUiKey.List + inHandsOnly: true + - type: UserInterface + interfaces: + - key: enum.NetworkConfiguratorUiKey.List + type: NetworkConfiguratorBoundUserInterface + - key: enum.NetworkConfiguratorUiKey.Configure + type: NetworkConfiguratorBoundUserInterface + - key: enum.NetworkConfiguratorUiKey.Link + type: NetworkConfiguratorBoundUserInterface - type: Tag tags: - Multitool -- 2.51.2