Machine Linking Overhaul (#7160)

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -181,6 +181,10 @@
     qualities:
       - Pulsing
   - type: SignalLinker
+  - type: UserInterface
+    interfaces:
+    - key: enum.SignalLinkerUiKey.Key
+      type: SignalPortSelectorBoundUserInterface
   - type: Tag
     tags:
       - DroneUsable

Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml

@@ -66,11 +66,7 @@
   - type: IconSmooth
     key: walls
     mode: NoSprite
-  - type: SignalReceiver
-    inputs:
-    - name: pressed
-  - type: ToggleDoorOnTrigger
-  - type: TriggerOnSignalReceived
+  - type: DoorSignalControl
   placement:
     mode: SnapgridCenter
 

Resources/Prototypes/Entities/Structures/Machines/recycler.yml

@@ -49,8 +49,3 @@
       state_off: grinder-o0
   - type: Recycler
   - type: Conveyor
-  - type: SignalReceiver
-    inputs:
-      - name: state
-        type: Content.Shared.MachineLinking.TwoWayLeverSignal
-        maxConnections: 1

Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml

@@ -32,14 +32,6 @@
     energy: 0.8
     softness: 1
     offset: "0, -0.5"
-  - type: SignalReceiver
-    inputs:
-      - name: state
-        type: bool
-  - type: UserInterface
-    interfaces:
-      - key: enum.SignalReceiverUiKey.Key
-        type: SignalPortSelectorBoundUserInterface
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -132,7 +124,7 @@
     energy: 2.5
     softness: 0.9
     color: "#EEEEFF"
-        
+
 - type: entity
   id: PoweredlightExterior
   description: "A light fixture. Draws power and produces light when equipped with a light tube."
@@ -155,7 +147,7 @@
     energy: 4.5
     softness: 0.5
     color: "#B4FCF0"
-        
+
 
 - type: entity
   id: PoweredlightSodium

Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml

@@ -13,15 +13,6 @@
     state: on
   - type: SignalSwitch
   - type: Rotatable
-  - type: SignalTransmitter
-    outputs:
-      - name: state
-        type: bool
-      - name: stateChange
-  - type: UserInterface
-    interfaces:
-      - key: enum.SignalTransmitterUiKey.Key
-        type: SignalPortSelectorBoundUserInterface
   placement:
     mode: SnapgridCenter
     snap:
@@ -42,9 +33,6 @@
     state: dead
   - type: SignalButton
   - type: Rotatable
-  - type: SignalTransmitter
-    outputs:
-      - name: pressed
   placement:
     mode: SnapgridCenter
     snap:
@@ -78,3 +66,36 @@
     mode: SnapgridCenter
     snap:
       - Wallmount
+
+- type: entity
+  id: TwoWayLever
+  name: two way lever
+  description: A two way lever.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Sprite
+      netsync: false
+      sprite: Structures/conveyor.rsi
+      state: switch-off
+    - type: TwoWayLever
+    - type: Appearance
+      visuals:
+        - type: TwoWayLeverVisualizer
+          state_forward: switch-fwd
+          state_off: switch-off
+          state_reversed: switch-rev
+    - type: Construction
+      graph: LeverGraph
+      node: lever
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+

Resources/Prototypes/Entities/Structures/conveyor.yml

@@ -16,11 +16,6 @@
     sprite: Structures/conveyor.rsi
     state: conveyor_started_cw
     drawdepth: FloorObjects
-  - type: SignalReceiver
-    inputs:
-      - name: state
-        type: Content.Shared.MachineLinking.TwoWayLeverSignal
-        maxConnections: 1
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: Conveyor
@@ -61,38 +56,3 @@
     graph: ConveyorGraph
     node: item
 
-- type: entity
-  id: TwoWayLever
-  name: two way lever
-  description: A two way lever.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      netsync: false
-      sprite: Structures/conveyor.rsi
-      state: switch-off
-    - type: TwoWayLever
-    - type: SignalTransmitter
-      outputs:
-        - name: state
-          type: Content.Shared.MachineLinking.TwoWayLeverSignal
-    - type: Appearance
-      visuals:
-        - type: TwoWayLeverVisualizer
-          state_forward: switch-fwd
-          state_off: switch-off
-          state_reversed: switch-rev
-    - type: Construction
-      graph: LeverGraph
-      node: lever
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 100
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]

Resources/Prototypes/Entities/Structures/lighting_ground.yml

@@ -33,14 +33,6 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
-  - type: SignalReceiver
-    inputs:
-      - name: state
-        type: bool
-  - type: UserInterface
-    interfaces:
-      - key: enum.SignalReceiverUiKey.Key
-        type: SignalPortSelectorBoundUserInterface
 
 
 - type: entity