Convert almost all IActivate instances that open UIs to ActivatableUI (#7028)

* Chem master * Drone support for handhelds * Vending machines, scanners * Cloners, R&D computers * make research a little less sussy * Unfuck wires * PA control computer * Unfuck merge * Clean up git gore for good * Disposals * Microwaves * paper * Magic mirror * More vendors for drones * Solar computer whitelist * EFR review updates
2022-03-12 13:26:06 -05:00
parent 865c9630bd
commit 926e36d81d
48 changed files with 305 additions and 584 deletions
--- a/Resources/Locale/en-US/components/base-computer-ui-component.ftl
+++ b/Resources/Locale/en-US/components/base-computer-ui-component.ftl
@@ -1 +1 @@
-base-computer-ui-component-not-powered = The computer is not powered.
+base-computer-ui-component-not-powered = {CAPITALIZE(THE($machine))} is not powered.
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -10,6 +10,8 @@
    layers:
    - state: paper
  - type: Paper
+  - type: ActivatableUI
+    key: enum.PaperUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.PaperUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -9,6 +9,8 @@
    state: icon
    netsync: false
  - type: GasAnalyzer
+  - type: ActivatableUI
+    key: enum.GasAnalyzerUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.GasAnalyzerUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -6,6 +6,8 @@
  - type: Sprite
    sprite: Objects/Tanks/generic.rsi
    state: icon
+  - type: ActivatableUI
+    key: enum.SharedGasTankUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.SharedGasTankUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -26,6 +26,9 @@
        - SmallImpassable
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
+  - type: ActivatableUI
+    key: enum.ReagentDispenserUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.ReagentDispenserUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -41,6 +41,9 @@
  - type: SpaceVillainArcade
  - type: Wires
    BoardName: "Arcade"
+  - type: ActivatableUI
+    key: enum.SpaceVillainArcadeUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
      - key: enum.SpaceVillainArcadeUiKey.Key
@@ -57,6 +60,9 @@
  parent: ArcadeBase
  components:
  - type: BlockGameArcade
+  - type: ActivatableUI
+    key: enum.BlockGameUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
      - key: enum.BlockGameUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -93,7 +93,7 @@
    color: "#1f8c28"
  - type: Computer
    board: MedicalRecordsComputerCircuitboard
-    
+
 - type: entity
  parent: ComputerBase
  id: ComputerCriminalRecords
@@ -156,6 +156,9 @@
  - type: ResearchClient
  - type: ResearchConsole
  - type: TechnologyDatabase
+  - type: ActivatableUI
+    key: enum.ResearchConsoleUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.ResearchConsoleUiKey.Key
@@ -226,6 +229,9 @@
  description: That's a body scanner.
  components:
  - type: BodyScanner
+  - type: ActivatableUI
+    key: enum.BodyScannerUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.BodyScannerUiKey.Key
@@ -295,6 +301,10 @@
    radius: 1.5
    energy: 1.6
    color: "#e6e227"
+  - type: Tag
+    tags:
+      - DroneUsable
+

 - type: entity
  parent: ComputerBase
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -45,6 +45,9 @@
        node: machineFrame
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: ActivatableUI
+    key: enum.ChemMasterUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.ChemMasterUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -54,6 +54,8 @@
          enum.CloningPodStatus.NoMind: pod_e
          enum.CloningPodStatus.Gore: pod_g
          enum.CloningPodStatus.Idle: pod_0
+  - type: ActivatableUI
+    key: enum.CloningPodUIKey.Key #Ejecting doesn't require power so I didn't give it that component
  - type: UserInterface
    interfaces:
      - key: enum.CloningPodUIKey.Key
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -70,6 +70,9 @@
    visuals:
    - type: AutolatheVisualizer
    - type: WiresVisualizer
+  - type: ActivatableUI
+    key: enum.LatheUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.LatheUiKey.Key
@@ -182,6 +185,9 @@
      - KitchenKnife
      - ButchCleaver
      - FlashlightLantern
+  - type: ActivatableUI
+    key: enum.LatheUiKey.Key #Yes only having 1 of them here doesn't break anything
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.LatheUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -49,6 +49,9 @@
  - type: Appearance
    visuals:
    - type: MedicalScannerVisualizer
+  - type: ActivatableUI
+    key: enum.MedicalScannerUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.MedicalScannerUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -14,6 +14,8 @@
  - type: Appearance
    visuals:
    - type: MicrowaveVisualizer
+  - type: ActivatableUI
+    key: enum.MicrowaveUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.MicrowaveUiKey.Key
@@ -48,4 +50,4 @@
      - !type:DoActsBehavior
        acts: ["Breakage"]
  - type: ApcPowerReceiver
-    powerLoad: 400
+    powerLoad: 400
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -37,6 +37,9 @@
      behaviors:
      - !type:DoActsBehavior
        acts: ["Breakage"]
+  - type: ActivatableUI
+    key: enum.VendingMachineUiKey.Key
+  - type: ActivatableUIRequiresPower
  - type: UserInterface
    interfaces:
    - key: enum.VendingMachineUiKey.Key
@@ -188,6 +191,9 @@
  - type: Advertise
    pack: ClothesMateAds
  - type: Speech
+  - type: Tag
+    tags:
+      - DroneUsable
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/clothing.rsi
    layers:
@@ -657,6 +663,9 @@
    radius: 1.5
    energy: 1.6
    color: "#c73434"
+  - type: Tag
+    tags:
+      - DroneUsable

 - type: entity
  parent: VendingMachine
@@ -754,6 +763,9 @@
    radius: 1.5
    energy: 1.6
    color: "#d4ab33"
+  - type: Tag
+    tags:
+      - DroneUsable

 - type: entity
  parent: VendingMachine
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -114,6 +114,8 @@
    - type: DisposalVisualizer
      state_free: conpipe-tagger
      state_anchored: pipe-tagger
+  - type: ActivatableUI
+    key: enum.DisposalTaggerUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.DisposalTaggerUiKey.Key
@@ -178,6 +180,8 @@
      state_anchored: pipe-j1s
  - type: Flippable
    mirrorEntity: DisposalRouterFlipped
+  - type: ActivatableUI
+    key: enum.DisposalRouterUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.DisposalRouterUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
@@ -23,6 +23,9 @@
    - type: Construction
      graph: ParticleAcceleratorControlBox
      node: completed
+    - type: ActivatableUI
+      key: enum.ParticleAcceleratorControlBoxUiKey.Key
+    - type: ActivatableUIRequiresPower
    - type: UserInterface
      interfaces:
        - key: enum.ParticleAcceleratorControlBoxUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -46,6 +46,8 @@
  - type: Anchorable
  - type: Pullable
  - type: AMEController
+  - type: ActivatableUI
+    key: enum.AMEControllerUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.AMEControllerUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
@@ -12,6 +12,8 @@
  - type: Transform
    anchored: true
  - type: MagicMirror
+  - type: ActivatableUI
+    key: enum.MagicMirrorUiKey.Key
  - type: UserInterface
    interfaces:
    - key: enum.MagicMirrorUiKey.Key