YAML Code quality and name fixing (#3850)

* Table debug * Ports everything from old PR
2021-04-16 05:28:08 +00:00
parent 9bac345d3f
commit f4f068333e
40 changed files with 665 additions and 658 deletions
--- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
@@ -21,7 +21,7 @@
 - type: entity
  id: TableFrame
  parent: TableBase
-  name: "table frame"
+  name: table frame
  description: Pieces of metal that make the frame of a table.
  components:
  - type: Sprite
@@ -52,7 +52,7 @@
 - type: entity
  id: Table
  parent: TableBase
-  name: "table"
+  name: table
  description: A square piece of metal standing on four metal legs.
  components:
  - type: Sprite
@@ -83,8 +83,8 @@
 - type: entity
  id: TableBar
  parent: TableBase
-  name: "bar table"
-  description: "Fancy table. Perfect for serving drinks."
+  name: bar table
+  description: Fancy table. Perfect for serving drinks.
  components:
  - type: Sprite
    sprite: Constructible/Structures/Tables/bar.rsi
@@ -115,8 +115,8 @@
 - type: entity
  id: TableMetal
  parent: TableBase
-  name: "metal table"
-  description: "Just a metal table."
+  name: metal table
+  description: Just a metal table.
  components:
  - type: Sprite
    sprite: Constructible/Structures/Tables/metal.rsi
@@ -141,8 +141,8 @@
 - type: entity
  id: TableReinforced
  parent: TableBase
-  name: "reinforced table"
-  description: "A square piece of metal standing on four metal legs. Extra robust."
+  name: reinforced table
+  description: A square piece of metal standing on four metal legs. Extra robust.
  components:
  - type: Sprite
    sprite: Constructible/Structures/Tables/reinforced.rsi
@@ -170,8 +170,8 @@
 - type: entity
  id: TableGlass
  parent: TableBase
-  name: "glass table"
-  description: "A square piece of glass, standing on four metal legs."
+  name: glass table
+  description: A square piece of glass, standing on four metal legs.
  components:
  - type: Sprite
    sprite: Constructible/Structures/Tables/glass.rsi
@@ -199,8 +199,8 @@
 - type: entity
  id: TableReinforcedGlass
  parent: TableBase
-  name: "reinforced glass table"
-  description: "A square piece of glass, standing on four metal legs. Extra robust."
+  name: reinforced glass table
+  description: A square piece of glass, standing on four metal legs. Extra robust.
  components:
  - type: Sprite
    sprite: Constructible/Structures/Tables/r_glass.rsi
@@ -231,7 +231,7 @@
 - type: entity
  id: TableWood
  parent: TableBase
-  name: "wood table"
+  name: wood table
  description: Do not apply fire to this. Rumour says it burns easily.
  components:
  - type: Sprite
@@ -260,7 +260,7 @@
 - type: entity
  id: TableCarpet
  parent: TableBase
-  name: "gambling table"
+  name: gambling table
  description: Play em' cowboy.
  components:
  - type: Sprite
@@ -292,7 +292,7 @@
 - type: entity
  id: TableStone
  parent: TableBase
-  name: "stone table"
+  name: stone table
  description: Literally the sturdiest thing you have ever seen.
  components:
  - type: Sprite
@@ -313,8 +313,9 @@
 - type: entity
  id: TableDebug
  parent: TableBase
-  name: "debug table"
+  name: table
  description: PUT ON THEM CODERSOCKS!!
+  suffix: DEBUG
  components:
  - type: Sprite
    sprite: Constructible/Structures/Tables/debug.rsi
--- a/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
@@ -1,6 +1,8 @@
 - type: entity
  abstract: true
  id: GasCanisterBase
+  name: gas canister
+  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
  parent: BaseConstructibleDynamic
  components:
  - type: InteractionOutline
@@ -38,8 +40,6 @@
 - type: entity
  parent: GasCanisterBase
  id: GasCanister
-  name: Gas Canister
-  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
  components:
  - type: Sprite
    netsync: false
@@ -77,10 +77,9 @@
 - type: entity
  parent: GasCanister
  id: StorageCanister
-  name: Storage Canister
+  name: storage canister
  components:
    - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
      state: yellow # Classic toxins canister
    - type: GasCanister
      gasMixture:
@@ -114,10 +113,9 @@
 - type: entity
  parent: GasCanister
  id: AirCanister
-  name: Air Canister
+  name: air canister
  components:
  - type: Sprite
-    sprite: Constructible/Atmos/canister.rsi
    state: grey
  - type: GasCanister
    gasMixture:
@@ -145,10 +143,9 @@
 - type: entity
  parent: GasCanister
  id: OxygenCanister
-  name: Oxygen Canister
+  name: oxygen canister
  components:
  - type: Sprite
-    sprite: Constructible/Atmos/canister.rsi
    state: blue
  - type: GasCanister
    gasMixture:
@@ -175,10 +172,9 @@
 - type: entity
  parent: GasCanister
  id: NitrogenCanister
-  name: Nitrogen Canister
+  name: nitrogen canister
  components:
    - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
      state: red
    - type: GasCanister
      gasMixture:
@@ -206,10 +202,9 @@
 - type: entity
  parent: GasCanister
  id: CarbonDioxideCanister
-  name: Carbon Dioxide Canister
+  name: carbon dioxide canister
  components:
    - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
      state: black
    - type: GasCanister
      gasMixture:
@@ -238,10 +233,9 @@
 - type: entity
  parent: GasCanister
  id: PlasmaCanister
-  name: Plasma Canister
+  name: plasma canister
  components:
    - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
      state: orange
    - type: GasCanister
      gasMixture:
@@ -271,10 +265,9 @@
 - type: entity
  parent: GasCanister
  id: TritiumCanister
-  name: Tritium Canister
+  name: tritium canister
  components:
    - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
      state: green
    - type: GasCanister
      gasMixture:
@@ -305,10 +298,9 @@
 - type: entity
  parent: GasCanister
  id: WaterVaporCanister
-  name: Water Vapor Canister
+  name: water vapor canister
  components:
    - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
      state: water_vapor
    - type: GasCanister
      gasMixture:
--- a/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
@@ -35,7 +35,7 @@
 - type: entity
  parent: GasFilterBase
  id: GasFilter
-  name: Gas Filter
+  name: gas filter
  description: It filters gases.
  components:
  - type: NodeContainer
--- a/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: Heater
-  name: Heater
+  name: heater
  description: Heats gas.
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
@@ -1,7 +1,7 @@
 - type: entity
  abstract: true
  id: PipeBase
-  name: Pipe
+  name: pipe
  description: Holds gas.
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
@@ -35,7 +35,8 @@
 - type: entity
  parent: PumpBase
  id: DebugPressurePump
-  name: Debug Pressure Pump
+  name: pressure pump
+  suffix: DEBUG
  components:
  - type: NodeContainer
    nodes:
--- a/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
@@ -35,8 +35,8 @@
 - type: entity
  parent: ScrubberBase
  id: Scrubber
-  name: Scrubber
-  description: "Scrubs unwanted gasses out of the air."
+  name: scrubber
+  description: Scrubs unwanted gasses out of the air.
  components:
  - type: NodeContainer
    nodes:
--- a/Resources/Prototypes/Entities/Constructible/Piping/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/vents.yml
@@ -35,8 +35,8 @@
 - type: entity
  parent: VentBase
  id: Vent
-  name: Vent
-  description: "A vent that releases gas."
+  name: vent
+  description: A vent that releases gas.
  components:
  - type: NodeContainer
    nodes:
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: AMEController
-  name: AME Controller
-  description: "It's a controller for the antimatter engine."
+  name: AME controller
+  description: It's a controller for the antimatter engine.
  placement:
    mode: SnapgridCenter
  components:
@@ -66,10 +66,10 @@
    supplyRate: 0

 - type: entity
-  id: AMEControllerUnanchored
-  parent: AMEController
-  suffix: Unanchored
  abstract: true
+  parent: AMEController
+  id: AMEControllerUnanchored
+  suffix: Unanchored
  components:
  - type: Physics
    bodyType: Dynamic
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/base.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/control_box.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/control_box.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/emitter.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/emitter.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/end_cap.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/end_cap.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/fuel_chamber.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/fuel_chamber.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/particles.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/power_box.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/power_box.yml
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: RadiationCollector
-  name: Radiation Collector
+  name: radiation collector
  description: A machine that collects Radiation and turns it into power.
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: containment field generator
-  description: "A machine that generates a containment field when powered by an emitter.\nKeeps the Singularity docile."
  id: ContainmentFieldGenerator
+  name: containment field generator
+  description: A machine that generates a containment field when powered by an emitter.\nKeeps the Singularity docile.
  placement:
    mode: SnapgridCenter
  components:
@@ -42,9 +42,9 @@
    softness: 32.0

 - type: entity
-  name: Containment Field
-  description: "A containment field that repels gravitational singularities."
  id: ContainmentField
+  name: containment field
+  description: A containment field that repels gravitational singularities.
  placement:
    mode: SnapgridCenter
  components:
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
@@ -1,5 +1,7 @@
- type: entity
+- type: entity
  id: Emitter
+  name: emitter
+  description: A heavy duty industrial laser. Shoots non-stop when turned on.
  placement:
    mode: SnapgridCenter
  components:
@@ -67,4 +69,3 @@
    - type: EmitterVisualizer
  - type: AccessReader
    access: [[ "Engineering" ]]
-
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml
@@ -1,7 +1,7 @@
 - type: entity
+  id: SingularityGenerator
  name: gravitational singularity generator
  description: An Odd Device which produces a Gravitational Singularity when set up.
-  id: SingularityGenerator
  placement:
    mode: SnapgridCenter
  components:
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/singularity.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: "Gravitational Singularity"
-  description: "A mesmerizing swirl of darkness that sucks in everything.\nIf it's moving towards you, run."
  id: Singularity
+  name: gravitational singularity
+  description: A mesmerizing swirl of darkness that sucks in everything.\nIf it's moving towards you, run.
  components:
  - type: Clickable
  - type: Physics
--- a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml
@@ -0,0 +1,45 @@
+- type: entity
+  abstract: true
+  id: BaseGenerator
+  description: A high efficiency thermoelectric generator.
+  name: generator
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.4, 0.3, 0.4"
+      mass: 25
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    sprite: Constructible/Power/power.rsi
+    state: generator
+  - type: NodeContainer
+    examinable: true
+    nodes:
+      output:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
+  - type: PowerSupplier
+    supplyRate: 3000
+  - 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
@@ -0,0 +1,141 @@
+- type: entity
+  id: SolarPanel
+  name: solar panel
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 100
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: Sprite
+    sprite: Constructible/Power/solar_panel.rsi
+    state: normal
+  - type: NodeContainer
+    examinable: true
+    nodes:
+      output:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
+  - type: PowerSupplier
+  - type: SolarPanel
+    supply: 1500
+  - type: SnapGrid
+    offset: Center
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+  - type: Anchorable
+  - type: Pullable
+  - type: ClientEntitySpawner
+    prototypes:
+    - HVDummyWire
+  - type: Construction
+    graph: solarpanel
+    node: solarpanel
+
+- type: entity
+  id: SolarAssembly
+  name: solar assembly
+  description: A solar assembly. Anchor to a wire to start building a solar panel.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 75
+      mask:
+      - VaultImpassable
+      layer:
+      - VaultImpassable
+  - type: Sprite
+    sprite: Constructible/Power/solar_panel.rsi
+    state: solar_assembly
+  - type: SnapGrid
+    offset: Center
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+  - type: Anchorable
+  - type: Pullable
+  - type: Construction
+    graph: solarpanel
+    node: solarassembly
+
+- type: entity
+  id: SolarTracker
+  name: solar tracker
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 100
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: Sprite
+    sprite: Constructible/Power/solar_panel.rsi
+    state: solar_tracker
+  - type: SnapGrid
+    offset: Center
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+  - type: Anchorable
+  - type: Pullable
+  - type: Construction
+    graph: solarpanel
+    node: solartracker
--- a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml
@@ -1,11 +1,12 @@
 - type: entity
  id: DebugGenerator
  parent: BaseGenerator
-  name: Debug Generator
+  suffix: DEBUG

 - type: entity
  id: DebugConsumer
-  name: Debug Consumer
+  name: consumer
+  suffix: DEBUG
  placement:
    mode: SnapgridCenter
  components:
@@ -43,7 +44,8 @@

 - type: entity
  id: DebugBatteryStorage
-  name: Debug Battery Storage
+  name: battery storage
+  suffix: DEBUG
  placement:
    mode: SnapgridCenter
  components:
@@ -72,7 +74,8 @@

 - type: entity
  id: DebugBatteryDischarger
-  name: Debug Battery Discharger
+  name: battery discharger
+  suffix: DEBUG
  placement:
    mode: SnapgridCenter
  components:
@@ -102,21 +105,22 @@
 - type: entity
  id: DebugSmes
  parent: BaseSmes
-  name: Debug Smes
+  suffix: DEBUG

 - type: entity
  id: DebugSubstation
  parent: BaseSubstation
-  name: Debug Substation
+  suffix: DEBUG

 - type: entity
  id: DebugApc
  parent: BaseApc
-  name: Debug Apc
+  suffix: DEBUG

 - type: entity
  id: DebugPowerReceiver
-  name: Debug Power Receiver
+  name: power receiver
+  suffix: DEBUG
  placement:
    mode: SnapgridCenter
  components:
--- a/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml
@@ -1,17 +1,13 @@
 - type: entity
-  id: SalternGenerator
-  description: A high efficiency thermoelectric generator.
  parent: BaseGenerator
-  name: Generator
+  id: SalternGenerator
  components:
  - type: PowerSupplier
    supplyRate: 30000

 - type: entity
-  id: SalternSmes
-  description: A high-capacity superconducting magnetic energy storage (SMES) unit.
  parent: BaseSmes
-  name: Smes
+  id: SalternSmes
  components:
  - type: Battery
    maxCharge: 10000000
@@ -22,10 +18,8 @@
    activeSupplyRate: 0

 - type: entity
-  id: SalternSubstation
-  description: Reduces the voltage of electricity put into it.
  parent: BaseSubstation
-  name: Substation
+  id: SalternSubstation
  components:
  - type: Battery
    maxCharge: 4000000
@@ -36,10 +30,8 @@
    activeSupplyRate: 6000

 - type: entity
-  id: SalternApc
-  description: A control terminal for the area's electrical systems.
  parent: BaseApc
-  name: Apc
+  id: SalternApc
  components:
  - type: Battery
    maxCharge: 12000
--- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml
@@ -2,50 +2,50 @@
  id: ComputerFrame
  parent: BaseConstructibleDynamic
  name: computer frame
-  description: "A computer under construction. It needs a circuit board."
+  description: A computer under construction. It needs a circuit board.
  components:
-    - type: Physics
-      bodyType: Static
-      fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.25,0.5,0.25"
-        mass: 25
-        mask:
-          - MobImpassable
-        layer:
-          - Opaque
-          - MobImpassable
-          - SmallImpassable
-          - VaultImpassable
-    - type: InteractionOutline
-    - type: Rotatable
-    - type: Construction
-      graph: computer
-      node: frameUnsecured
-    - type: Sprite
-      sprite: "Constructible/Misc/stock_parts.rsi"
-      state: "0"
-    - type: Damageable
-      resistances: metallicResistances
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 100
-        behaviors:
-        - !type:PlaySoundCollectionBehavior
-          soundCollection: GlassBreak
-        - !type:ChangeConstructionNodeBehavior
-          node: monitorBroken
-        - !type:DoActsBehavior
-          acts: ["Destruction"]
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
+      mass: 25
+      mask:
+        - MobImpassable
+      layer:
+        - Opaque
+        - MobImpassable
+        - SmallImpassable
+        - VaultImpassable
+  - type: InteractionOutline
+  - type: Rotatable
+  - type: Construction
+    graph: computer
+    node: frameUnsecured
+  - type: Sprite
+    sprite: "Constructible/Misc/stock_parts.rsi"
+    state: "0"
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundCollectionBehavior
+        soundCollection: GlassBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: monitorBroken
+      - !type:DoActsBehavior
+        acts: ["Destruction"]

 - type: entity
-  id: ComputerBroken
  parent: ComputerFrame
+  id: ComputerBroken
  name: broken computer
-  description: "This computer has seen better days."
+  description: This computer has seen better days.
  components:
  - type: Construction
    graph: computer
@@ -70,10 +70,10 @@
        acts: [ "Destruction" ]

 - type: entity
-  id: ComputerBase
-  parent: ComputerFrame
-  name: computer
  abstract: true
+  parent: ComputerFrame
+  id: ComputerBase
+  name: computer
  placement:
    mode: SnapgridCenter
  components:
@@ -102,10 +102,10 @@
      screen: generic

 - type: entity
-  id: ComputerAlert
  parent: ComputerBase
+  id: ComputerAlert
  name: alerts computer
-  description: "Used to access the station's automated alert system."
+  description: Used to access the station's automated alert system.
  components:
  - type: Appearance
    visuals:
@@ -114,10 +114,10 @@
      screen: "alert-2"

 - type: entity
-  id: ComputerPowerMonitoring
  parent: ComputerBase
+  id: ComputerPowerMonitoring
  name: power monitoring computer
-  description: "It monitors power levels across the station."
+  description: It monitors power levels across the station.
  components:
  - type: Appearance
    visuals:
@@ -126,10 +126,10 @@
      screen: power_monitor

 - type: entity
-  id: ComputerMedicalRecords
  parent: ComputerBase
+  id: ComputerMedicalRecords
  name: medical records computer
-  description: "This can be used to check medical records."
+  description: This can be used to check medical records.
  components:
  - type: Appearance
    visuals:
@@ -138,10 +138,10 @@
      screen: medcomp

 - type: entity
-  id: ComputerResearchAndDevelopment
  parent: ComputerBase
+  id: ComputerResearchAndDevelopment
  name: R&D computer
-  description: "A computer used to interface with R&D tools."
+  description: A computer used to interface with R&D tools.
  components:
  - type: Appearance
    visuals:
@@ -164,10 +164,10 @@
    board: ResearchComputerCircuitboard

 - type: entity
-  id: ComputerId
  parent: ComputerBase
+  id: ComputerId
  name: ID card computer
-  description: "Terminal for programming Nanotrasen employee ID cards to access parts of the station."
+  description: Terminal for programming Nanotrasen employee ID cards to access parts of the station.
  components:
  - type: AccessReader
    access: [["HeadOfPersonnel"]]
@@ -185,10 +185,10 @@
    board: IDComputerCircuitboard

 - type: entity
-  id: computerBodyScanner
  parent: ComputerBase
+  id: computerBodyScanner
  name: body scanner computer
-  description: "That's a body scanner."
+  description: That's a body scanner.
  components:
  - type: BodyScanner
  - type: UserInterface
@@ -204,10 +204,10 @@
    board: BodyScannerComputerCircuitboard

 - type: entity
-  id: ComputerComms
  parent: ComputerBase
+  id: ComputerComms
  name: communications computer
-  description: "This can be used for various important functions. Still under developement."
+  description: This can be used for various important functions. Still under developement.
  components:
  - type: Appearance
    visuals:
@@ -223,10 +223,10 @@
    board: CommsComputerCircuitboard

 - type: entity
-  id: ComputerSolarControl
  parent: ComputerBase
-  name: Solar Control Computer
-  description: "A controller for solar panel arrays."
+  id: ComputerSolarControl
+  name: solar control computer
+  description: A controller for solar panel arrays.
  components:
  - type: Appearance
    visuals:
--- a/Resources/Prototypes/Entities/Constructible/Power/parts.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/parts.yml
@@ -0,0 +1,181 @@
+- type: entity
+  abstract: true
+  id: BaseSmes
+  name: SMES
+  description: A high-capacity superconducting magnetic energy storage (SMES) unit.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 25
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: SnapGrid
+    offset: Center
+  - 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: NodeContainer
+    examinable: true
+    nodes:
+      power:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
+  - type: PowerConsumer
+  - type: BatteryStorage
+    activeDrawRate: 1500
+  - type: PowerSupplier
+  - type: BatteryDischarger
+    activeSupplyRate: 1000
+  - type: Anchorable
+  - type: Pullable
+  - type: ClientEntitySpawner
+    prototypes:
+    - HVDummyWire
+
+- type: entity
+  abstract: true
+  id: BaseSubstation
+  name: substation
+  description: Reduces the voltage of electricity put into it.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 25
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    sprite: Constructible/Power/substation.rsi
+    layers:
+    - state: substation
+    - state: screen
+      shader: unshaded
+    - state: full
+      shader: unshaded
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: NodeContainer
+    examinable: true
+    nodes:
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
+      output:
+        !type:AdjacentNode
+        nodeGroupID: MVPower
+  - type: PowerConsumer
+  - type: BatteryStorage
+    activeDrawRate: 1500
+  - type: PowerSupplier
+    voltage: Medium
+  - type: BatteryDischarger
+    activeSupplyRate: 1000
+  - type: Anchorable
+  - type: Pullable
+  - type: ClientEntitySpawner
+    prototypes:
+    - HVDummyWire
+    - MVDummyWire
+
+- type: entity
+  abstract: true
+  id: BaseApc
+  name: APC
+  description: A control terminal for the area's electrical systems.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: AccessReader
+    access: [["Engineering"]]
+  - type: InteractionOutline
+  - type: Physics
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.25, -0.25, 0.25, 0.3"
+        layer: [ Passable ]
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    drawdepth: WallMountedItems
+    netsync: false
+    sprite: "Constructible/Power/apc.rsi"
+    state: apc0
+  - type: Appearance
+    visuals:
+    - type: ApcVisualizer
+  - type: Battery
+    maxCharge: 10000
+    startingCharge: 10000
+  - type: NodeContainer
+    examinable: true
+    nodes:
+      input:
+        !type:AdjacentNode
+        nodeGroupID: MVPower
+      output:
+        !type:AdjacentNode
+        nodeGroupID: Apc
+  - type: PowerConsumer
+    voltage: Medium
+  - type: BatteryStorage
+    activeDrawRate: 1000
+  - type: PowerProvider
+    voltage: Apc
+  - type: Apc
+    voltage: Apc
+  - type: UserInterface
+    interfaces:
+    - key: enum.ApcUiKey.Key
+      type: ApcBoundUserInterface
+  - type: Construction
+    graph: apc
+    node: apc
+  - type: ClientEntitySpawner
+    prototypes:
+    - MVDummyWire
+    - LVDummyWire
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -1,367 +0,0 @@
- type: entity
-  id: BaseGenerator
-  description: "A high efficiency thermoelectric generator."
-  name: Base Generator
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.4, 0.3, 0.4"
-      mass: 25
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    sprite: Constructible/Power/power.rsi
-    state: generator
-  - type: NodeContainer
-    examinable: true
-    nodes:
-      output:
-        !type:AdjacentNode
-        nodeGroupID: HVPower
-  - type: PowerSupplier
-    supplyRate: 3000
-  - type: Anchorable
-  - type: Pullable
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
-
- type: entity
-  id: BaseSmes
-  description: "A high-capacity superconducting magnetic energy storage (SMES) unit."
-  name: Base Smes
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: SnapGrid
-    offset: Center
-  - 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: NodeContainer
-    examinable: true
-    nodes:
-      power:
-        !type:AdjacentNode
-        nodeGroupID: HVPower
-  - type: PowerConsumer
-  - type: BatteryStorage
-    activeDrawRate: 1500
-  - type: PowerSupplier
-  - type: BatteryDischarger
-    activeSupplyRate: 1000
-  - type: Anchorable
-  - type: Pullable
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
-
- type: entity
-  id: BaseSubstation
-  description: "Reduces the voltage of electricity put into it."
-  name: Base Substation
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    sprite: Constructible/Power/substation.rsi
-    layers:
-    - state: substation
-    - state: screen
-      shader: unshaded
-    - state: full
-      shader: unshaded
-  - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: NodeContainer
-    examinable: true
-    nodes:
-      input:
-        !type:AdjacentNode
-        nodeGroupID: HVPower
-      output:
-        !type:AdjacentNode
-        nodeGroupID: MVPower
-  - type: PowerConsumer
-  - type: BatteryStorage
-    activeDrawRate: 1500
-  - type: PowerSupplier
-    voltage: Medium
-  - type: BatteryDischarger
-    activeSupplyRate: 1000
-  - type: Anchorable
-  - type: Pullable
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
-    - MVDummyWire
-
- type: entity
-  id: BaseApc
-  description: "A control terminal for the area's electrical systems."
-  name: Base Apc
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: InteractionOutline
-  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25, -0.25, 0.25, 0.3"
-        layer: [ Passable ]
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    drawdepth: WallMountedItems
-    netsync: false
-    sprite: "Constructible/Power/apc.rsi"
-    state: apc0
-  - type: Appearance
-    visuals:
-    - type: ApcVisualizer
-  - type: Battery
-    maxCharge: 10000
-    startingCharge: 10000
-  - type: NodeContainer
-    examinable: true
-    nodes:
-      input:
-        !type:AdjacentNode
-        nodeGroupID: MVPower
-      output:
-        !type:AdjacentNode
-        nodeGroupID: Apc
-  - type: PowerConsumer
-    voltage: Medium
-  - type: BatteryStorage
-    activeDrawRate: 1000
-  - type: PowerProvider
-    voltage: Apc
-  - type: Apc
-    voltage: Apc
-  - type: UserInterface
-    interfaces:
-    - key: enum.ApcUiKey.Key
-      type: ApcBoundUserInterface
-  - type: Construction
-    graph: apc
-    node: apc
-  - type: ClientEntitySpawner
-    prototypes:
-    - MVDummyWire
-    - LVDummyWire
-
- type: entity
-  id: SolarPanel
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 100
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: Sprite
-    sprite: Constructible/Power/solar_panel.rsi
-    state: normal
-  - type: NodeContainer
-    examinable: true
-    nodes:
-      output:
-        !type:AdjacentNode
-        nodeGroupID: HVPower
-  - type: PowerSupplier
-  - type: SolarPanel
-    supply: 1500
-  - type: SnapGrid
-    offset: Center
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Breakage"]
-  - type: Anchorable
-  - type: Pullable
-  - type: ClientEntitySpawner
-    prototypes:
-    - HVDummyWire
-  - type: Construction
-    graph: solarpanel
-    node: solarpanel
-
- type: entity
-  id: SolarAssembly
-  name: solar assembly
-  description: "A solar assembly. Anchor to a wire to start building a solar panel."
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 75
-      mask:
-      - VaultImpassable
-      layer:
-      - VaultImpassable
-  - type: Sprite
-    sprite: Constructible/Power/solar_panel.rsi
-    state: solar_assembly
-  - type: SnapGrid
-    offset: Center
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Breakage"]
-  - type: Anchorable
-  - type: Pullable
-  - type: Construction
-    graph: solarpanel
-    node: solarassembly
-
- type: entity
-  id: SolarTracker
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 100
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: Sprite
-    sprite: Constructible/Power/solar_panel.rsi
-    state: solar_tracker
-  - type: SnapGrid
-    offset: Center
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Breakage"]
-  - type: Anchorable
-  - type: Pullable
-  - type: Construction
-    graph: solarpanel
-    node: solartracker
--- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml
@@ -35,7 +35,7 @@
  parent: WireBase
  id: HVWire
  name: HV Wire
-  description: "An orange high voltage power cable."
+  description: An orange high voltage power cable.
  components:
  - type: Sprite
    sprite: Constructible/Power/Wires/hv_cable.rsi
@@ -75,7 +75,7 @@
  parent: WireBase
  id: MVWire
  name: MV Wire
-  description: "A medium voltage power cable."
+  description: A medium voltage power cable.
  components:
  - type: Sprite
    color: Yellow
@@ -116,8 +116,8 @@
 - type: entity
  parent: WireBase
  id: ApcExtensionCable
-  name: Apc Extension 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.
+  name: LV Wire
+  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
    color: Green
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: CloningPod
-  name: Cloning Pod
+  name: cloning pod
  description: A Cloning Pod. 50% reliable.
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
@@ -1,7 +1,7 @@
 - type: entity
  parent: BaseSign
  id: PlaqueAtmos
-  name: Atmos Plaque
+  name: atmos plaque
  components:
  - type: Physics
    fixtures:
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -1,7 +1,8 @@
 # TODO: Add descriptions (10)
+
 - type: entity
-  id: BaseComputerCircuitboard
  parent: BaseItem
+  id: BaseComputerCircuitboard
  name: circuit board
  abstract: true
  components:
@@ -11,80 +12,80 @@
      state: id_mod

 - type: entity
-  id: SupplyComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: supply computer circuit board
+  id: SupplyComputerCircuitboard
+  name: supply board
  components:
    - type: ComputerBoard
      prototype: ComputerSupplyOrdering

 - type: entity
-  id: SupplyRequestComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: supply request computer circuit board
+  id: SupplyRequestComputerCircuitboard
+  name: supply request board
  components:
    - type: ComputerBoard
      prototype: ComputerSupplyRequest

 - type: entity
-  id: ResearchComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: R&D computer circuit board
+  id: ResearchComputerCircuitboard
+  name: R&D computer board
  components:
    - type: ComputerBoard
      prototype: ComputerResearchAndDevelopment

 - type: entity
-  id: IDComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: ID card terminal circuit board
+  id: IDComputerCircuitboard
+  name: ID card terminal board
  components:
    - type: ComputerBoard
      prototype: ComputerId

 - type: entity
-  id: BodyScannerComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: body scanner computer circuit board
+  id: BodyScannerComputerCircuitboard
+  name: body scanner computer board
  components:
    - type: ComputerBoard
      prototype: computerBodyScanner

 - type: entity
-  id: CommsComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: communications computer circuit board
+  id: CommsComputerCircuitboard
+  name: communications computer board
  components:
    - type: ComputerBoard
      prototype: ComputerComms

 - type: entity
-  id: SolarControlComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: solar control computer circuit board
+  id: SolarControlComputerCircuitboard
+  name: solar control board
  components:
    - type: ComputerBoard
      prototype: ComputerSolarControl

 - type: entity
-  id: SpaceVillainArcadeComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: space villain arcade computer circuit board
+  id: SpaceVillainArcadeComputerCircuitboard
+  name: space villain arcade board
  components:
    - type: ComputerBoard
      prototype: SpaceVillainArcade

 - type: entity
-  id: BlockGameArcadeComputerCircuitboard
  parent: BaseComputerCircuitboard
-  name: block game arcade computer circuit board
+  id: BlockGameArcadeComputerCircuitboard
+  name: block game arcade board
  components:
    - type: ComputerBoard
      prototype: BlockGameArcade

 - type: entity
-  id: ParticleAcceleratorComputerCircuitboard
  parent: BaseComputerCircuitboard
+  id: ParticleAcceleratorComputerCircuitboard
  name: PA control box
  suffix: Circuit Board
  components:
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: BaseItem
+  id: SolarTrackerElectronics
+  name: solar tracker electronics
+  description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door.
+  components:
+    - type: Sprite
+      sprite: Constructible/Misc/module.rsi
+      state: generic
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: PDA
+  abstract: true
  parent: BaseItem
  id: BasePDA
-  abstract: true
+  name: PDA
  description: Personal Data Assistant.
  components:
  - type: Appearance
@@ -31,18 +31,18 @@
  - type: LoopingSound

 - type: entity
-  name: Assistant PDA
  parent: BasePDA
  id: AssistantPDA
+  name: assistant PDA
  description: Why isn't it gray?
  components:
  - type: PDA
    idCard: AssistantIDCard

 - type: entity
-  name: Chef PDA
  parent: BasePDA
  id: ChefPDA
+  name: chef PDA
  description: Covered in grease and flour.
  components:
  - type: PDA
@@ -55,9 +55,9 @@
    state: pda-cook

 - type: entity
-  name: Botanist PDA
  parent: BasePDA
  id: BotanistPDA
+  name: botanist PDA
  description: Has an earthy scent.
  components:
  - type: PDA
@@ -70,10 +70,10 @@
    state: pda-hydro

 - type: entity
-  name: Clown PDA
  parent: BasePDA
  id: ClownPDA
-  description: "Looks can be deceiving. Warning: extra slippery"
+  name: clown PDA
+  description: Looks can be deceiving.
  components:
  - type: PDA
    idCard: ClownIDCard
@@ -105,9 +105,9 @@
      - SmallImpassable

 - type: entity
-  name: Mime PDA
  parent: BasePDA
  id: MimePDA
+  name: mime PDA
  description: Suprisingly not on mute.
  components:
  - type: PDA
@@ -150,9 +150,9 @@
 #      state: pda-qm

 - type: entity
-  name: Cargo PDA
  parent: BasePDA
  id: CargoPDA
+  name: cargo PDA
  description: PDA for the guys that order the pizzas.
  components:
  - type: PDA
@@ -165,9 +165,9 @@
    state: pda-cargo

 - type: entity
-  name: Bartender PDA
  parent: BasePDA
  id: BartenderPDA
+  name: bartender PDA
  description: Smells like beer.
  components:
  - type: PDA
@@ -181,9 +181,9 @@


 - type: entity
-  name: Janitor PDA
  parent: BasePDA
  id: JanitorPDA
+  name: janitor PDA
  description: Smells like bleach.
  components:
  - type: PDA
@@ -196,9 +196,9 @@
    state: pda-janitor

 - type: entity
-  name: Captain PDA
  parent: BasePDA
  id: CaptainPDA
+  name: captain PDA
  description: Surprisingly no different from your PDA.
  components:
  - type: PDA
@@ -212,9 +212,9 @@


 - type: entity
-  name: Head of Personnel PDA
  parent: BasePDA
  id: HoPPDA
+  name: head of personnel PDA
  description: Looks like it's been chewed on.
  components:
  - type: PDA
@@ -228,9 +228,9 @@


 - type: entity
-  name: Chief Engineer PDA
  parent: BasePDA
  id: CEPDA
+  name: chief engineer PDA
  description: Looks like it's barely been used.
  components:
  - type: PDA
@@ -244,9 +244,9 @@


 - type: entity
-  name: Engineer PDA
  parent: BasePDA
  id: EngineerPDA
+  name: engineer PDA
  description: Rugged and well-worn.
  components:
  - type: PDA
@@ -260,9 +260,9 @@


 - type: entity
-  name: Chief Medical Officer PDA
  parent: BasePDA
  id: CMOPDA
+  name: chief medical officer PDA
  description: Extraordinarily shiny and sterile.
  components:
  - type: PDA
@@ -276,9 +276,9 @@


 - type: entity
-  name: Medical PDA
  parent: BasePDA
  id: MedicalPDA
+  name: medical PDA
  description: Shiny and sterile.
  components:
  - type: PDA
@@ -291,9 +291,9 @@
    state: pda-medical

 - type: entity
-  name: Research Director PDA
  parent: BasePDA
  id: RnDPDA
+  name: research director PDA
  description: It appears surprisingly ordinary.
  components:
  - type: PDA
@@ -306,9 +306,9 @@
    state: pda-rd

 - type: entity
-  name: Science PDA
  parent: BasePDA
  id: SciencePDA
+  name: science PDA
  description: It's covered with an unknown gooey substance.
  components:
  - type: PDA
@@ -321,9 +321,9 @@
    state: pda-science

 - type: entity
-  name: Head of Security PDA
  parent: BasePDA
  id: HoSPDA
+  name: head of security PDA
  description: Whosoever bears this PDA is the law.
  components:
  - type: PDA
@@ -336,9 +336,9 @@
    state: pda-hos

 - type: entity
-  name: Warden PDA
  parent: BasePDA
  id: WardenPDA
+  name: warden PDA
  description: The OS appears to have been jailbroken.
  components:
    - type: PDA
@@ -351,9 +351,9 @@
      state: pda-warden

 - type: entity
-  name: Security PDA
  parent: BasePDA
  id: SecurityPDA
+  name: security PDA
  description: Red to hide the stains of assistant blood.
  components:
  - type: PDA
@@ -366,9 +366,9 @@
    state: pda-security

 - type: entity
-  name: Centcom PDA
  parent: AssistantPDA
  id: CentcomPDA
+  name: centcom PDA
  description: Colored the numbing grey of bureaucracy.
  components:
  - type: PDA
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: AMEJar
-  name: Antimatter Fuel Jar
  parent: BaseItem
+  id: AMEJar
+  name: AME fuel jar
  description: A hermetically sealed jar containing antimatter for use in an antimatter reactor.
  components:
  - type: Item
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: AMEPart
-  name: Antimatter Engine Part
  parent: BaseItem
-  description: "A flatpack used for constructing an antimatter engine reactor.\nUse a multitool to unpack it."
+  id: AMEPart
+  name: AME part
+  description: A flatpack used for constructing an antimatter engine reactor.\nUse a multitool to unpack it.
  components:
  - type: Item
    size: 5
--- a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
@@ -1,17 +1,10 @@
 - type: entity
-  id: SolarAssemblyPart
  parent: BaseItem
+  id: SolarAssemblyPart
+  name: solar assembly part
  components:
  - type: Item
    size: 10
  - type: Sprite
    sprite: Objects/Power/solar_parts.rsi
    state: solar_assembly_parts
-    
- type: entity
-  id: SolarTrackerElectronics
-  parent: BaseItem
-  components:
-    - type: Sprite
-      sprite: Constructible/Misc/module.rsi
-      state: generic
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -1,122 +1,134 @@
 - type: entity
-  parent: BaseItem
  abstract: true
+  parent: BaseItem
  id: GasTankBase
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/generic.rsi
-      state: icon
-    - type: UserInterface
-      interfaces:
-        - key: enum.SharedGasTankUiKey.Key
-          type: GasTankBoundUserInterface
-    - type: Clothing
-      sprite: Objects/Tanks/generic.rsi
-      QuickEquip: false
-    - type: GasTank
-    - type: ItemActions
-      actions:
-        - actionType: ToggleInternals
+  - type: Sprite
+    sprite: Objects/Tanks/generic.rsi
+    state: icon
+  - type: UserInterface
+    interfaces:
+    - key: enum.SharedGasTankUiKey.Key
+      type: GasTankBoundUserInterface
+  - type: Clothing
+    sprite: Objects/Tanks/generic.rsi
+    QuickEquip: false
+  - type: GasTank
+  - type: ItemActions
+    actions:
+    - actionType: ToggleInternals

 - type: entity
+  parent: GasTankBase
  id: OxygenTank
-  parent: GasTankBase
-  suffix: ent-gas-tank-suffix-empty
+  name: oxygen tank
+  description: A tank of oxygen.
+#  suffix: ent-gas-tank-suffix-empty
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/oxygen.rsi
-    - type: GasTank
-      outputPressure: 21.27825
-      air:
-        volume: 70
-        temperature: 293.15
-    - type: Clothing
-      sprite: Objects/Tanks/oxygen.rsi
-      Slots:
-        - Back
+  - type: Sprite
+    sprite: Objects/Tanks/oxygen.rsi
+  - type: GasTank
+    outputPressure: 21.27825
+    air:
+      volume: 70
+      temperature: 293.15
+  - type: Clothing
+    sprite: Objects/Tanks/oxygen.rsi
+    Slots:
+    - Back

 - type: entity
+  parent: OxygenTank
  id: YellowOxygenTank
-  parent: OxygenTank
-  suffix: ent-gas-tank-suffix-empty
+  name: oxygen tank
+  description: A tank of oxygen. This one is in yellow.
+#  suffix: ent-gas-tank-suffix-empty
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/yellow.rsi
-    - type: Clothing
-      sprite: Objects/Tanks/yellow.rsi
-      Slots:
-        - Back
+  - type: Sprite
+    sprite: Objects/Tanks/yellow.rsi
+  - type: Clothing
+    sprite: Objects/Tanks/yellow.rsi
+    Slots:
+    - Back

 - type: entity
+  parent: OxygenTank
  id: RedOxygenTank
-  parent: OxygenTank
-  suffix: ent-gas-tank-suffix-empty
+  name: oxygen tank
+  description: A tank of oxygen. This one is in red.
+#  suffix: ent-gas-tank-suffix-empty
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/red.rsi
-    - type: Clothing
-      sprite: Objects/Tanks/red.rsi
-      Slots:
-        - Back
+  - type: Sprite
+    sprite: Objects/Tanks/red.rsi
+  - type: Clothing
+    sprite: Objects/Tanks/red.rsi
+    Slots:
+    - Back

 - type: entity
+  parent: OxygenTank
  id: EmergencyOxygenTank
-  parent: OxygenTank
-  suffix: ent-gas-tank-suffix-empty
+  name: extended-capacity emergency oxygen tank
+  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
+#  suffix: ent-gas-tank-suffix-empty
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/emergency.rsi
-    - type: GasTank
-      outputPressure: 21.27825
-      air:
-        volume: 2
-        temperature: 293.15
-    - type: Clothing
-      sprite: Objects/Tanks/emergency.rsi
-      Slots:
-        - Pocket
-        - Belt
+  - type: Sprite
+    sprite: Objects/Tanks/emergency.rsi
+  - type: GasTank
+    outputPressure: 21.27825
+    air:
+      volume: 2
+      temperature: 293.15
+  - type: Clothing
+    sprite: Objects/Tanks/emergency.rsi
+    Slots:
+    - Pocket
+    - Belt

 - type: entity
-  id: ExtendedEmergencyOxygenTank
  parent: EmergencyOxygenTank
-  suffix: ent-gas-tank-suffix-empty
+  id: ExtendedEmergencyOxygenTank
+  name: double emergency oxygen tank
+  description: Used for emergencies. Contains little oxygen, so try to conserve it until you actually need it.
+#  suffix: ent-gas-tank-suffix-empty
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/emergency_yellow.rsi
-    - type: GasTank
-      outputPressure: 21.27825
-      air:
-        volume: 6
-        temperature: 293.15
-    - type: Clothing
-      sprite: Objects/Tanks/emergency_yellow.rsi
-      Slots:
-        - Pocket
-        - Belt
+  - type: Sprite
+    sprite: Objects/Tanks/emergency_yellow.rsi
+  - type: GasTank
+    outputPressure: 21.27825
+    air:
+      volume: 6
+      temperature: 293.15
+  - type: Clothing
+    sprite: Objects/Tanks/emergency_yellow.rsi
+    Slots:
+    - Pocket
+    - Belt

 - type: entity
-  id: DoubleEmergencyOxygenTank
  parent: ExtendedEmergencyOxygenTank
-  suffix: ent-gas-tank-suffix-empty
+  id: DoubleEmergencyOxygenTank
+#  suffix: ent-gas-tank-suffix-empty
  components:
-    - type: Sprite
-      sprite: Objects/Tanks/emergency_double.rsi
-    - type: GasTank
-      outputPressure: 21.27825
-      air:
-        volume: 10
-        temperature: 293.15
-    - type: Clothing
-      sprite: Objects/Tanks/emergency_double.rsi
-      Slots:
-        - Pocket
-        - Belt
+  - type: Sprite
+    sprite: Objects/Tanks/emergency_double.rsi
+  - type: GasTank
+    outputPressure: 21.27825
+    air:
+      volume: 10
+      temperature: 293.15
+  - type: Clothing
+    sprite: Objects/Tanks/emergency_double.rsi
+    Slots:
+    - Pocket
+    - Belt

 - type: entity
-  id: AirTank
  parent: GasTankBase
-  suffix: ent-gas-tank-suffix-empty
+  id: AirTank
+  name: air tank
+  description: Mixed anyone?
+#  suffix: ent-gas-tank-suffix-empty
  components:
    - type: Sprite
      sprite: Objects/Tanks/generic.rsi
@@ -131,9 +143,11 @@
        - Back

 - type: entity
-  id: PlasmaTank
  parent: GasTankBase
-  suffix: ent-gas-tank-suffix-empty
+  id: PlasmaTank
+  name: plasma tank
+  description: Contains dangerous plasma. Do not inhale. Extremely flammable.
+#  suffix: ent-gas-tank-suffix-empty
  components:
    - type: Sprite
      sprite: Objects/Tanks/plasma.rsi
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/clusterbang.yml
@@ -1,7 +1,7 @@
 - type: entity
  parent: BaseItem
  id: ClusterBang
-  name: ClusterBang
+  name: clusterbang
  description: Can be used only with flashbangs. Explodes several times.
  components:
  - type: Sprite
@@ -23,4 +23,3 @@
    state: base-3
  - type: ClusterFlash
    fillPrototype: GrenadeFlashBang
-