Pow3r: stage 1 (#4208)

Co-authored-by: 20kdc <asdd2808@gmail.com>
2021-07-04 18:11:52 +02:00
parent ea60a81fdf
commit 103bc19508
212 changed files with 8584 additions and 4426 deletions
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -51,7 +51,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: ApcExtensionCableStack
+      - id: CableApcStack
        amount: 3

 - type: entity
@@ -61,7 +61,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: MVWireStack
+      - id: CableMVStack
        amount: 3

 - type: entity
@@ -71,7 +71,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: HVWireStack
+      - id: CableHVStack
        amount: 3

 - type: entity
@@ -81,9 +81,9 @@
  components:
  - type: StorageFill
    contents:
-      - id: HVWireStack
+      - id: CableHVStack
        amount: 2
-      - id: MVWireStack
+      - id: CableMVStack
        amount: 2
-      - id: ApcExtensionCableStack
+      - id: CableApcStack
        amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -24,7 +24,7 @@
      - id: Crowbar
      - id: WelderExperimental
      - id: Multitool
-      - id: ApcExtensionCableStack
+      - id: CableApcStack

 - type: entity
  id: ClothingBeltSecurityFilled
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -30,12 +30,12 @@
      - id: Screwdriver
      - id: Crowbar
      - id: Wirecutter
-      - id: ApcExtensionCableStack
-      - id: MVWireStack
+      - id: CableApcStack
+      - id: CableMVStack
      - id: ClothingHandsGlovesColorYellow
        prob: 0.05
        orGroup: GlovesOrWires
-      - id: HVWireStack
+      - id: CableHVStack
        orGroup: GlovesOrWires

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -27,11 +27,11 @@
        prob: 0.05
      - id: ClothingHeadHatHardhatRed
        prob: 0.4
-      - id: ApcExtensionCableStack
+      - id: CableApcStack
        prob: 0.3
-      - id: ApcExtensionCableStack
+      - id: CableApcStack
        prob: 0.3
-      - id: ApcExtensionCableStack
+      - id: CableApcStack
        prob: 0.3

 - type: entity
@@ -47,9 +47,9 @@
        prob: 0.05
      - id: APCElectronics
        prob: 0.1
-      - id: MVWireStack
+      - id: CableMVStack
        prob: 0.2
-      - id: ApcExtensionCableStack
+      - id: CableApcStack
        prob: 0.3

 - type: entity
@@ -91,7 +91,7 @@
      - id: OxygenTankFilled
      - id: ClothingShoesBootsMag
        prob: 0.15
-        
+
 - type: entity
  id: LockerRadiationSuitFilled
  parent: LockerRadiationSuit
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -16,7 +16,7 @@

 - type: technology
  name: "cleaning technology"
-  id: MopBucket 
+  id: MopBucket
  description: Start to a shiny clean station
  icon:
    sprite: Objects/Specific/Janitorial/janitorial.rsi
@@ -44,7 +44,7 @@
  unlockedRecipes:
    - Scythe
    - Hatchet
-    - KitchenKnife  
+    - KitchenKnife

 - type: technology
  name: "advanced botany"
@@ -234,8 +234,8 @@
    - BasicResearch
  unlockedRecipes:
    - CableStack
-    - MVWireStack
-    - HVWireStack
+    - CableMVStack
+    - CableHVStack
    - LightBulb
    - LightTube
    - FirelockElectronics
@@ -253,4 +253,4 @@
 #     state: icon
 #   requiredPoints: 999999
 #   requiredTechnologies:
-#     - BasicResearch
+#     - BasicResearch
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -5,7 +5,7 @@
  animationDuration: 1.1
  spriteName: youtool
  startingInventory:
-    ApcExtensionCableStack1: 10
+    CableApcStack1: 10
    Crowbar: 5
    Welder: 3
    Wirecutter: 5
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
@@ -46,7 +46,7 @@
      close_sound: /Audio/Machines/airlock_close.ogg
      deny_sound: /Audio/Machines/airlock_deny.ogg
    - type: WiresVisualizer
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Wires
    BoardName: "Airlock Control"
    LayoutId: Airlock
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml
@@ -54,12 +54,12 @@
    examinable: true
    nodes:
      ame:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: AMEngine
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: PowerSupplier
    supplyRate: 0

--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml
@@ -17,7 +17,7 @@
      visuals:
        - type: ParticleAcceleratorPartVisualizer
          baseState: unlit
-    - type: PowerReceiver
+    - type: ApcPowerReceiver
    - type: ParticleAcceleratorControlBox
    - type: Construction
      graph: particleAcceleratorControlBox
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml
@@ -24,7 +24,7 @@
      examinable: true
      nodes:
        input:
-          !type:AdjacentNode
+          !type:CableDeviceNode
          nodeGroupID: HVPower
    - type: Construction
      graph: particleAcceleratorPowerBox
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml
@@ -36,7 +36,7 @@
    examinable: true
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
  - type: RadiationCollector
    # Note that this doesn't matter too much (see next comment)
@@ -47,8 +47,10 @@
  - type: BatteryDischarger
    # This is JUST a default. It has to be dynamically adjusted to ensure that the battery doesn't discharge "too fast" & run out immediately, while still scaling by input power.
    activeSupplyRate: 100000
-  - type: PowerSupplier
-    supplyRate: 0
  - type: Anchorable
  - type: Rotatable
  - type: Pullable
+  - type: PowerNetworkBattery
+    maxSupply: 1000000000
+    supplyRampTolerance: 1000000000
+
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml
@@ -41,7 +41,7 @@
    examinable: true
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: MVPower
  - type: Damageable
    resistances: metallicResistances
--- a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml
@@ -33,12 +33,11 @@
    examinable: true
    nodes:
      output:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
  - type: PowerSupplier
    supplyRate: 3000
+    supplyRampRate: 500
+    supplyRampTolerance: 500
  - type: Anchorable
  - type: Pullable
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
--- a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml
@@ -29,9 +29,11 @@
    examinable: true
    nodes:
      output:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
  - type: PowerSupplier
+    supplyRampTolerance: 500
+    supplyRampRate: 500
  - type: SolarPanel
    supply: 1500
  - type: SnapGrid
@@ -47,9 +49,6 @@
        acts: ["Breakage"]
  - type: Anchorable
  - type: Pullable
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
  - type: Construction
    graph: solarpanel
    node: solarpanel
--- a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml
@@ -25,7 +25,7 @@
  - type: NodeContainer
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
  - type: PowerConsumer
    drawRate: 50
@@ -64,10 +64,8 @@
  - type: NodeContainer
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
-  - type: PowerConsumer
-  - type: BatteryStorage
  - type: Anchorable

 - type: entity
@@ -93,9 +91,8 @@
  - type: NodeContainer
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
-  - type: PowerSupplier
  - type: BatteryDischarger
  - type: Anchorable

@@ -133,5 +130,5 @@
  - type: Sprite
    sprite: Constructible/Power/power.rsi
    state: wirelessmachine
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Anchorable
--- a/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml
@@ -12,10 +12,6 @@
  - type: Battery
    maxCharge: 10000000
    startingCharge: 10000000
-  - type: BatteryStorage
-    activeDrawRate: 0
-  - type: BatteryDischarger
-    activeSupplyRate: 0

 - type: entity
  parent: BaseSubstation
@@ -24,10 +20,6 @@
  - type: Battery
    maxCharge: 4000000
    startingCharge: 4000000
-  - type: BatteryStorage
-    activeDrawRate: 8000
-  - type: BatteryDischarger
-    activeSupplyRate: 6000

 - type: entity
  parent: BaseApc
@@ -36,5 +28,3 @@
  - type: Battery
    maxCharge: 12000
    startingCharge: 2000
-  - type: BatteryStorage
-    activeDrawRate: 2000
--- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
@@ -5,7 +5,7 @@
  name: arcade
  parent: ComputerBase
  components:
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Sprite
    sprite: Constructible/Power/computers.rsi
    layers:
--- a/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml
@@ -0,0 +1,42 @@
+- type: entity
+  id: CableTerminal
+  name: cable terminal
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      sprite: Constructible/Power/wire_terminal.rsi
+      state: term
+      netsync: false
+      drawdepth: BelowFloor
+    - type: Clickable
+    - type: Physics
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+            bounds: "-0.5, -0.5, 0.5, 0.5"
+          layer:
+            - Underplating
+    - type: InteractionOutline
+    - type: SnapGrid
+    - type: Damageable
+      resistances: metallicResistances
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 100
+          behaviors:
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+    - type: SubFloorHide
+    - type: NodeContainer
+      nodes:
+        # Just define nodes for both MV and HV. One will end up unused in 99% of cases
+        # but it means one cable terminal type.
+        powerHV:
+          !type:CableTerminalNode
+          nodeGroupID: HVPower
+        powerMV:
+          !type:CableTerminalNode
+          nodeGroupID: MVPower
--- a/Resources/Prototypes/Entities/Constructible/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/cables.yml
@@ -1,6 +1,6 @@
 - type: entity
  abstract: true
-  id: WireBase
+  id: CableBase
  placement:
    mode: SnapgridCenter
  components:
@@ -17,8 +17,6 @@
  - type: Sprite
    netsync: false
    drawdepth: BelowFloor
-  - type: IconSmooth
-    mode: CardinalFlags
  - type: Damageable
    resistances: metallicResistances
  - type: Destructible
@@ -30,11 +28,13 @@
      - !type:DoActsBehavior
        acts: ["Destruction"]
  - type: SubFloorHide
+  - type: CableVis
+    node: power

 - type: entity
-  parent: WireBase
-  id: HVWire
-  name: HV Wire
+  parent: CableBase
+  id: CableHV
+  name: HV power cable
  description: An orange high voltage power cable.
  components:
  - type: Sprite
@@ -43,20 +43,17 @@
  - type: Icon
    sprite: Constructible/Power/Wires/hv_cable.rsi
    state: hvcable_4
-  - type: IconSmooth
-    base: hvcable_
-    key: hv_cables
  - type: NodeContainer
    nodes:
      power:
-        !type:AdjacentNode
+        !type:CableNode
        nodeGroupID: HVPower
      wire:
        !type:AdjacentNode
        nodeGroupID: WireNet
-  - type: Wire
-    wireDroppedOnCutPrototype: HVWireStack1
-    wireType: HighVoltage
+  - type: Cable
+    cableDroppedOnCutPrototype: CableHVStack1
+    cableType: HighVoltage
  - type: Destructible
    thresholds:
    - trigger:
@@ -65,16 +62,20 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          HVWireStack1:
+          CableHVStack1:
            min: 1
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: Appearance
+    visuals:
+    - type: CableVisualizer
+      base: hvcable_

 - type: entity
-  parent: WireBase
-  id: MVWire
-  name: MV Wire
+  parent: CableBase
+  id: CableMV
+  name: MV power cable
  description: A medium voltage power cable.
  components:
  - type: Sprite
@@ -85,20 +86,17 @@
    color: Yellow
    sprite: Constructible/Power/Wires/mv_cable.rsi
    state: mvcable_4
-  - type: IconSmooth
-    base: mvcable_
-    key: mv_cables
  - type: NodeContainer
    nodes:
      power:
-        !type:AdjacentNode
+        !type:CableNode
        nodeGroupID: MVPower
      wire:
        !type:AdjacentNode
        nodeGroupID: WireNet
-  - type: Wire
-    wireDroppedOnCutPrototype: MVWireStack1
-    wireType: MediumVoltage
+  - type: Cable
+    cableDroppedOnCutPrototype: CableMVStack1
+    cableType: MediumVoltage
  - type: Destructible
    thresholds:
    - trigger:
@@ -107,16 +105,20 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          MVWireStack1:
+          CableMVStack1:
            min: 1
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: Appearance
+    visuals:
+    - type: CableVisualizer
+      base: mvcable_

 - type: entity
-  parent: WireBase
-  id: ApcExtensionCable
-  name: LV Wire
+  parent: CableBase
+  id: CableApcExtension
+  name: LV power cable
  description: A cable used to connect machines to an APC. #ACPs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future.
  components:
  - type: Sprite
@@ -127,22 +129,19 @@
    color: Green
    sprite: Constructible/Power/Wires/lv_cable.rsi
    state: lvcable_4
-  - type: IconSmooth
-    base: lvcable_
-    key: lv_cables
  - type: NodeContainer
    nodes:
      power:
-        !type:AdjacentNode
+        !type:CableNode
        nodeGroupID: Apc
      wire:
        !type:AdjacentNode
        nodeGroupID: WireNet
  - type: PowerProvider
    voltage: Apc
-  - type: Wire
-    wireDroppedOnCutPrototype: ApcExtensionCableStack1
-    wireType: Apc
+  - type: Cable
+    cableDroppedOnCutPrototype: CableApcStack1
+    cableType: Apc
  - type: Destructible
    thresholds:
    - trigger:
@@ -151,64 +150,12 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          ApcExtensionCableStack1:
+          CableApcStack1:
            min: 1
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-
-#Dummy wires
-
- type: entity
-  abstract: true
-  id: BaseDummyWire
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: SnapGrid
-  - type: Sprite
-    drawdepth: BelowFloor
-  - type: IconSmooth
-    mode: CardinalFlags
-  - type: SubFloorHide
-
- type: entity
-  abstract: true
-  parent: BaseDummyWire
-  id: HVDummyWire
-  name: HV Connector Wire
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/Wires/hv_cable.rsi
-    state: hvcable_0
-  - type: IconSmooth
-    base: hvcable_
-    key: hv_cables
-
- type: entity
-  abstract: true
-  parent: BaseDummyWire
-  id: MVDummyWire
-  name: MV Connector Wire
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/Wires/mv_cable.rsi
-    state: mvcable_0
-    color: Yellow
-  - type: IconSmooth
-    base: mvcable_
-    key: mv_cables
-
- type: entity
-  abstract: true
-  parent: BaseDummyWire
-  id: LVDummyWire
-  name: LV Connector Wire
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/Wires/lv_cable.rsi
-    state: lvcable_0
-    color: Green
-  - type: IconSmooth
-    base: lvcable_
-    key: lv_cables
+  - type: Appearance
+    visuals:
+    - type: CableVisualizer
+      base: lvcable_
--- a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/chargers.yml
@@ -11,7 +11,7 @@
    state: empty
  - type: PowerCellCharger
    transfer_efficiency: 0.85
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Appearance
    visuals:
    - type: PowerChargerVisualizer
@@ -32,7 +32,7 @@
    state: empty
  - type: WeaponCapacitorCharger
    transfer_efficiency: 0.85
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Appearance
    visuals:
    - type: PowerChargerVisualizer
@@ -53,7 +53,7 @@
    state: empty
  - type: WeaponCapacitorCharger
    transfer_efficiency: 0.95
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Appearance
    visuals:
    - type: PowerChargerVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml
@@ -82,7 +82,7 @@
    graph: computer
    node: computer
  - type: Computer
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Sprite
    sprite: Constructible/Power/computers.rsi
    layers:
@@ -158,7 +158,7 @@
      type: ResearchConsoleBoundUserInterface
    - key: enum.ResearchClientUiKey.Key
      type: ResearchClientBoundUserInterface
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
    load: 200
    priority: Low
  - type: Computer
--- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
@@ -30,7 +30,7 @@
    interfaces:
    - key: enum.LatheUiKey.Key
      type: LatheBoundUserInterface
-  - type: PowerReceiver
+  - type: ApcPowerReceiver

 - type: entity
  parent: BaseLathe
@@ -138,8 +138,8 @@
      - SheetRGlass
      - SheetPlastic
      - CableStack
-      - MVWireStack
-      - HVWireStack
+      - CableMVStack
+      - CableHVStack
      - ConveyorAssembly
      - RCD
      - RCDAmmo
--- a/Resources/Prototypes/Entities/Constructible/Power/parts.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/parts.yml
@@ -1,43 +1,3 @@
- type: entity
-  abstract: true
-  id: BaseSmes
-  parent: BaseMachine
-  name: SMES
-  description: A high-capacity superconducting magnetic energy storage (SMES) unit.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Constructible/Power/smes.rsi
-    layers:
-    - state: smes
-    - state: smes-display
-      shader: unshaded
-  - type: Smes
-  - type: Appearance
-    visuals:
-    - type: SmesVisualizer
-  - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: ExaminableBattery
-  - type: NodeContainer
-    examinable: true
-    nodes:
-      power:
-        !type:AdjacentNode
-        nodeGroupID: HVPower
-  - type: PowerConsumer
-  - type: BatteryStorage
-    activeDrawRate: 1500
-  - type: PowerSupplier
-  - type: BatteryDischarger
-    activeSupplyRate: 1000
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
-
 - type: entity
  abstract: true
  id: BaseSubstation
@@ -63,23 +23,20 @@
    examinable: true
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: HVPower
      output:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: MVPower
-  - type: PowerConsumer
-  - type: BatteryStorage
-    activeDrawRate: 1500
-  - type: PowerSupplier
-    voltage: Medium
+  - type: BatteryCharger
+    voltage: High
  - type: BatteryDischarger
-    activeSupplyRate: 1000
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
-    - MVDummyWire
-
+    voltage: Medium
+  - type: PowerNetworkBattery
+    maxSupply: 150000
+    maxChargeRate: 5000
+    supplyRampTolerance: 5000
+    supplyRampRate: 1000
 - type: entity
  abstract: true
  id: BaseApc
@@ -115,15 +72,13 @@
    examinable: true
    nodes:
      input:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: MVPower
      output:
-        !type:AdjacentNode
+        !type:CableDeviceNode
        nodeGroupID: Apc
-  - type: PowerConsumer
+  - type: BatteryCharger
    voltage: Medium
-  - type: BatteryStorage
-    activeDrawRate: 1000
  - type: PowerProvider
    voltage: Apc
  - type: Apc
@@ -135,7 +90,9 @@
  - type: Construction
    graph: apc
    node: apc
-  - type: ClientEntitySpawner
-    prototypes:
-    - MVDummyWire
-    - LVDummyWire
+  - type: PowerNetworkBattery
+    maxSupply: 10000
+    maxChargeRate: 5000
+    supplyRampTolerance: 1000
+    supplyRampRate: 500
+
--- a/Resources/Prototypes/Entities/Constructible/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/smes.yml
@@ -0,0 +1,46 @@
+- type: entity
+  abstract: true
+  id: BaseSmes
+  parent: BaseMachine
+  name: SMES
+  description: A high-capacity superconducting magnetic energy storage (SMES) unit.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      netsync: false
+      sprite: Constructible/Power/smes.rsi
+      layers:
+        - state: smes
+        - state: smes-display
+          shader: unshaded
+    - type: Smes
+    - type: Appearance
+      visuals:
+        - type: SmesVisualizer
+    - type: Battery
+      maxCharge: 1000
+      startingCharge: 1000
+    - type: ExaminableBattery
+    - type: NodeContainer
+      examinable: true
+      nodes:
+        input:
+          !type:CableDeviceNode
+          nodeGroupID: HVPower
+        output:
+          !type:CableTerminalPortNode
+          nodeGroupID: HVPower
+    - type: BatteryCharger
+      voltage: High
+      node: output
+
+    - type: BatteryDischarger
+      voltage: High
+      node: input
+
+    - type: PowerNetworkBattery
+      maxSupply: 150000
+      maxChargeRate: 5000
+      supplyRampTolerance: 5000
+      supplyRampRate: 1000
--- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
@@ -38,7 +38,7 @@
      type: VendingMachineBoundUserInterface
    - key: enum.WiresUiKey.Key
      type: WiresBoundUserInterface
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Wires
    BoardName: "Vending Machine"
    LayoutId: Vending
--- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
@@ -27,7 +27,7 @@
    drawdepth: FloorObjects
  - type: SignalReceiver
    maxTransmitters: 1
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Conveyor
  - type: Appearance
    visuals:
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
@@ -12,4 +12,4 @@
    state: industrial_dispenser
  - type: ReagentDispenser
    pack: ChemDispenserStandardInventory
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml
@@ -21,7 +21,7 @@
        - Opaque
        - MobImpassable
        - SmallImpassable
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: UserInterface
    interfaces:
    - key: enum.ReagentDispenserUiKey.Key
--- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml
@@ -39,7 +39,7 @@
    - state: mw_unlit
      shader: unshaded
      map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Damageable
    resistances: metallicResistances
  - type: Destructible
--- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml
@@ -17,7 +17,7 @@
    - type: ReagentGrinderVisualizer
  - type: Clickable
  - type: InteractionOutline
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: LoopingSound
  - type: Physics
    fixtures:
--- a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml
@@ -21,7 +21,7 @@
        - MobImpassable
  - type: ResearchServer
  - type: TechnologyDatabase
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
    powerLoad: 200
    priority: Low
  - type: Damageable
@@ -77,7 +77,7 @@
  - type: Appearance
    visuals:
    - type: PowerDeviceVisualizer
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
@@ -33,5 +33,5 @@
            max: 1
      - !type:DoActsBehavior
        acts: ["Destruction"]
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: CargoTelepad
--- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
@@ -16,7 +16,7 @@
    sprite: Constructible/Power/mixer.rsi
    state: mixer_loaded
  - type: ChemMaster
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: InteractionOutline
  - type: Anchorable
  - type: Physics
--- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml
@@ -14,7 +14,7 @@
        shader: unshaded
        map: ["enum.GravityGeneratorVisualLayers.Core"]
  - type: SnapGrid
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
    powerLoad: 500
  - type: Physics
    fixtures:
--- a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml
@@ -32,4 +32,4 @@
      state_clean: grinder-o1
      state_bloody: grinder-o1bld
  - type: Recycler
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
--- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
@@ -14,7 +14,7 @@
    drawdepth: WallTops
    sprite: Constructible/Misc/barsign.rsi
    state: empty
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: BarSign
  - type: Destructible
    thresholds:
@@ -37,7 +37,7 @@
    drawdepth: WallTops
    sprite: Constructible/Misc/sylphs.rsi
    state: sylph
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: BarSign

 - type: entity
--- a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
@@ -11,7 +11,7 @@
    offset: "0, 0.8"
    color: "#FF4020"
    mask: /Textures/Effects/LightMasks/emergency_mask.png
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Battery
    maxCharge: 30000
    startingCharge: 0
@@ -20,6 +20,10 @@
    sprite: Constructible/Lighting/emergency_light.rsi
    layers:
    - state: emergency_light_off
+  - type: Appearance
+    visuals:
+    - type: EmergencyLightVisualizer
+
  placement:
    snap:
    - Wallmount
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
@@ -63,7 +63,7 @@
    enabled: false
  - type: PoweredLight
    bulb: Tube
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Appearance
    visuals:
    - type: PoweredLightVisualizer
@@ -135,7 +135,7 @@
      layer: [ Passable ]
  - type: PoweredLight
    bulb: Bulb
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
  - type: Appearance
    visuals:
    - type: PoweredLightVisualizer
--- a/Resources/Prototypes/Entities/Constructible/base_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/base_machine.yml
@@ -29,10 +29,10 @@
        acts: ["Destruction"]
      - !type:PlaySoundBehavior
        sound: /Audio/Effects/metalbreak.ogg
-        
+
 - type: entity
  abstract: true
  parent: BaseMachine
  id: BaseMachinePowered
  components:
-  - type: PowerReceiver
+  - type: ApcPowerReceiver
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -16,26 +16,26 @@
      netsync: false
    - type: Item
      sprite: Objects/Tools/cable-coils.rsi
-    - type: WirePlacer
+    - type: CablePlacer
    - type: Clickable


 - type: entity
-  id: HVWireStack
+  id: CableHVStack
  parent: CableStack
  name: HV cable coil
  suffix: Full
  components:
    - type: Stack
-      stackType: HVCable
+      stackType: CableHV
    - type: Sprite
      state: coilhv-30
    - type: Item
      size: 10
      HeldPrefix: coilhv
-    - type: WirePlacer
-      wirePrototypeID: HVWire
-      blockingWireType: HighVoltage
+    - type: CablePlacer
+      cablePrototypeID: CableHV
+      blockingCableType: HighVoltage
    - type: Appearance
      visuals:
        - type: StackVisualizer
@@ -45,8 +45,8 @@
            - coilhv-30

 - type: entity
-  parent: HVWireStack
-  id: HVWireStack1
+  parent: CableHVStack
+  id: CableHVStack1
  suffix: 1
  components:
    - type: Sprite
@@ -54,12 +54,11 @@
    - type: Item
      size: 3
    - type: Stack
-      stackType: HVWireStack1
      count: 1

 - type: entity
  parent: CableStack
-  id: ApcExtensionCableStack
+  id: CableApcStack
  name: cable coil
  description: Low-Voltage stack of wires for connecting APCs to machines and other purposes.
  suffix: Full
@@ -69,9 +68,9 @@
    - type: Item
      size: 10
      HeldPrefix: coillv
-    - type: WirePlacer
-      wirePrototypeID: ApcExtensionCable
-      blockingWireType: Apc
+    - type: CablePlacer
+      cablePrototypeID: CableApcExtension
+      blockingCableType: Apc
    - type: Appearance
      visuals:
        - type: StackVisualizer
@@ -81,8 +80,8 @@
            - coillv-30

 - type: entity
-  parent: ApcExtensionCableStack
-  id: ApcExtensionCableStack1
+  parent: CableApcStack
+  id: CableApcStack1
  suffix: 1
  components:
    - type: Sprite
@@ -94,20 +93,20 @@

 - type: entity
  parent: CableStack
-  id: MVWireStack
+  id: CableMVStack
  name: MV cable coil
  suffix: Full
  components:
    - type: Stack
-      stackType: MVCable
+      stackType: CableMV
    - type: Sprite
      state: coilmv-30
    - type: Item
      size: 10
      HeldPrefix: coilmv
-    - type: WirePlacer
-      wirePrototypeID: MVWire
-      blockingWireType: MediumVoltage
+    - type: CablePlacer
+      cablePrototypeID: CableMV
+      blockingCableType: MediumVoltage
    - type: Appearance
      visuals:
        - type: StackVisualizer
@@ -117,8 +116,8 @@
            - coilmv-30

 - type: entity
-  parent: MVWireStack
-  id: MVWireStack1
+  parent: CableMVStack
+  id: CableMVStack1
  suffix: 1
  components:
    - type: Sprite
@@ -126,5 +125,4 @@
    - type: Item
      size: 3
    - type: Stack
-      stackType: MVWireStack1
      count: 1
--- a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
@@ -58,7 +58,7 @@
        - to: assembly
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
              amount: 5
          steps:
            - tool: Cutting
--- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
@@ -100,7 +100,7 @@
            - !type:EntityAnchored { }
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
              amount: 5
          steps:
            - tool: Cutting
--- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
@@ -59,7 +59,7 @@
        - to: frame1
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
              amount: 2
          conditions:
            - !type:EntityAnchored
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
@@ -63,7 +63,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Prying
              doAfter: 2
--- a/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml
@@ -34,7 +34,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
@@ -86,7 +86,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
@@ -138,7 +138,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
@@ -189,7 +189,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
@@ -240,7 +240,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
@@ -291,7 +291,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
@@ -342,7 +342,7 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: ApcExtensionCableStack1
+              prototype: CableApcStack1
          steps:
            - tool: Cutting
              doAfter: 0.5
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -38,25 +38,25 @@
  id: CableStack
  name: cable coil
  icon: /Textures/Objects/Tools/cable-coils.rsi/coillv-30.png
-  result: ApcExtensionCableStack1
+  result: CableApcStack1
  completetime: 500
  materials:
    Steel: 100

 - type: latheRecipe
-  id: MVWireStack
+  id: CableMVStack
  name: MV cable coil
  icon: /Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png
-  result: MVWireStack1
+  result: CableMVStack1
  completetime: 500
  materials:
    Steel: 150

 - type: latheRecipe
-  id: HVWireStack
+  id: CableHVStack
  name: HV cable coil
  icon: /Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png
-  result: HVWireStack1
+  result: CableHVStack1
  completetime: 500
  materials:
    Steel: 200
--- a/Resources/Prototypes/Stacks/power_stacks.yml
+++ b/Resources/Prototypes/Stacks/power_stacks.yml
@@ -2,24 +2,13 @@
  id: Cable
  name: cable
  icon: "/Textures/Objects/Tools/cable-coils.rsi/coil-30.png"
-  spawn: ApcExtensionCableStack1
+  spawn: CableApcStack1

 - type: stack
-  id: MVCable
+  id: CableMV
  name: mv cable
+  spawn: CableHVStack1

 - type: stack
-  id: HVCable
+  id: CableHV
  name: hv cable
-
- type: stack
-  id: HVWireStack1
-  name: hv wire
-
- type: stack
-  id: MVWireStack1
-  name: mv wire
-
- type: stack
-  id: ApcExtensionCableStack1
-  name: apc extension cable