Fix to make all scrubbers vents and sensors show the correct address prefix

Author: Omegalucky

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml

@@ -6,6 +6,9 @@
   placement:
     mode: AlignAtmosPipeLayers
   components:
+  # Starlight-edit: moved off AirSensorBase
+  - type: DeviceNetwork
+    prefix: device-address-prefix-sensor
   - type: Sprite
     sprite: _Carpmosia/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi # Carpmosia-edit - 5 pipe layers
     drawdepth: BelowFloor

Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml

@@ -6,7 +6,9 @@
     deviceNetId: AtmosDevices
     receiveFrequencyId: AtmosMonitor
     transmitFrequencyId: AtmosMonitor
-    prefix: device-address-prefix-sensor
+    # Starlight-edit: prefix moved to the sensors themselves - vents and scrubbers
+    # inherit this base for its monitoring, and a variant listing it as an earlier
+    # parent used to inherit the sensor address with it
     sendBroadcastAttemptEvent: true
     examinableAddress: true
   - type: WiredNetworkConnection
@@ -55,6 +57,9 @@
   placement:
     mode: SnapgridCenter
   components:
+  # Starlight-edit: moved off AirSensorBase
+  - type: DeviceNetwork
+    prefix: device-address-prefix-sensor
   - type: Transform
     anchored: true
   - type: Damageable

Resources/Prototypes/_Starlight/Entities/Structures/Specific/Atmospherics/chamber.yml

@@ -44,10 +44,11 @@
 
 # Gas Vent
 
-# Carries nothing but the layer map, so the vanilla alt sprite is the only one in
-# the alts' parent lists and the placement ghost draws it at the right offset.
+# Inherits the thresholds so no variant has to list the sensor base as a second
+# parent. Declares no sprite, so the vanilla alt sprite reaches the placement ghost.
 - type: entity
   abstract: true
+  parent: AirSensorChamberBase
   id: GasVentPumpChamberBase
   components:
   - type: AtmosPipeLayers
@@ -59,32 +60,32 @@
       Quinary: GasVentPumpChamberAlt4
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentPumpChamberBase, GasVentPump]
+  parent: [GasVentPumpChamberBase, GasVentPump]
   id: GasVentPumpChamber
   placement:
     mode: AlignAtmosPipeLayers
   description: An air vent set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentPumpChamberBase, GasVentPumpAlt1]
+  parent: [GasVentPumpChamberBase, GasVentPumpAlt1]
   id: GasVentPumpChamberAlt1
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentPumpChamberBase, GasVentPumpAlt2]
+  parent: [GasVentPumpChamberBase, GasVentPumpAlt2]
   id: GasVentPumpChamberAlt2
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentPumpChamberBase, GasVentPumpAlt3]
+  parent: [GasVentPumpChamberBase, GasVentPumpAlt3]
   id: GasVentPumpChamberAlt3
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentPumpChamberBase, GasVentPumpAlt4]
+  parent: [GasVentPumpChamberBase, GasVentPumpAlt4]
   id: GasVentPumpChamberAlt4
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in chambers. It only alarms on extreme pressure.
@@ -93,6 +94,7 @@
 
 - type: entity
   abstract: true
+  parent: AirSensorChamberBase
   id: GasVentScrubberChamberBase
   components:
   # Scrubbers default to enabled and nothing switches them off at map init, so a
@@ -108,32 +110,32 @@
       Quinary: GasVentScrubberChamberAlt4
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentScrubberChamberBase, GasVentScrubber]
+  parent: [GasVentScrubberChamberBase, GasVentScrubber]
   id: GasVentScrubberChamber
   placement:
     mode: AlignAtmosPipeLayers
   description: An air scrubber set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentScrubberChamberBase, GasVentScrubberAlt1]
+  parent: [GasVentScrubberChamberBase, GasVentScrubberAlt1]
   id: GasVentScrubberChamberAlt1
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentScrubberChamberBase, GasVentScrubberAlt2]
+  parent: [GasVentScrubberChamberBase, GasVentScrubberAlt2]
   id: GasVentScrubberChamberAlt2
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentScrubberChamberBase, GasVentScrubberAlt3]
+  parent: [GasVentScrubberChamberBase, GasVentScrubberAlt3]
   id: GasVentScrubberChamberAlt3
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in chambers. It only alarms on extreme pressure.
 
 - type: entity
-  parent: [AirSensorChamberBase, GasVentScrubberChamberBase, GasVentScrubberAlt4]
+  parent: [GasVentScrubberChamberBase, GasVentScrubberAlt4]
   id: GasVentScrubberChamberAlt4
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in chambers. It only alarms on extreme pressure.

Resources/Prototypes/_Starlight/Entities/Structures/Specific/Atmospherics/sauna.yml

@@ -42,10 +42,11 @@
 
 # Gas Vent
 
-# Carries nothing but the layer map, so the vanilla alt sprite is the only one in
-# the alts' parent lists and the placement ghost draws it at the right offset.
+# Inherits the thresholds so no variant has to list the sensor base as a second
+# parent. Declares no sprite, so the vanilla alt sprite reaches the placement ghost.
 - type: entity
   abstract: true
+  parent: AirSensorSaunaBase
   id: GasVentPumpSaunaBase
   components:
   - type: AtmosPipeLayers
@@ -57,32 +58,32 @@
       Quinary: GasVentPumpSaunaAlt4
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentPumpSaunaBase, GasVentPump]
+  parent: [GasVentPumpSaunaBase, GasVentPump]
   id: GasVentPumpSauna
   placement:
     mode: AlignAtmosPipeLayers
   description: An air vent set up for use in saunas. It ignores humidity, and heat until it turns harmful.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentPumpSaunaBase, GasVentPumpAlt1]
+  parent: [GasVentPumpSaunaBase, GasVentPumpAlt1]
   id: GasVentPumpSaunaAlt1
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in saunas. It ignores humidity, and heat until it turns harmful.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentPumpSaunaBase, GasVentPumpAlt2]
+  parent: [GasVentPumpSaunaBase, GasVentPumpAlt2]
   id: GasVentPumpSaunaAlt2
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in saunas. It ignores humidity, and heat until it turns harmful.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentPumpSaunaBase, GasVentPumpAlt3]
+  parent: [GasVentPumpSaunaBase, GasVentPumpAlt3]
   id: GasVentPumpSaunaAlt3
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in saunas. It ignores humidity, and heat until it turns harmful.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentPumpSaunaBase, GasVentPumpAlt4]
+  parent: [GasVentPumpSaunaBase, GasVentPumpAlt4]
   id: GasVentPumpSaunaAlt4
   categories: [ HideSpawnMenu ]
   description: An air vent set up for use in saunas. It ignores humidity, and heat until it turns harmful.
@@ -94,6 +95,7 @@
 # inherit it without the primary's sprite.
 - type: entity
   abstract: true
+  parent: AirSensorSaunaBase
   id: GasVentScrubberSaunaBase
   components:
   - type: AtmosPipeLayers
@@ -124,32 +126,32 @@
     - ZXA
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentScrubberSaunaBase, GasVentScrubber]
+  parent: [GasVentScrubberSaunaBase, GasVentScrubber]
   id: GasVentScrubberSauna
   placement:
     mode: AlignAtmosPipeLayers
   description: An air scrubber set up for use in saunas. It leaves water vapour where it is.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentScrubberSaunaBase, GasVentScrubberAlt1]
+  parent: [GasVentScrubberSaunaBase, GasVentScrubberAlt1]
   id: GasVentScrubberSaunaAlt1
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in saunas. It leaves water vapour where it is.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentScrubberSaunaBase, GasVentScrubberAlt2]
+  parent: [GasVentScrubberSaunaBase, GasVentScrubberAlt2]
   id: GasVentScrubberSaunaAlt2
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in saunas. It leaves water vapour where it is.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentScrubberSaunaBase, GasVentScrubberAlt3]
+  parent: [GasVentScrubberSaunaBase, GasVentScrubberAlt3]
   id: GasVentScrubberSaunaAlt3
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in saunas. It leaves water vapour where it is.
 
 - type: entity
-  parent: [AirSensorSaunaBase, GasVentScrubberSaunaBase, GasVentScrubberAlt4]
+  parent: [GasVentScrubberSaunaBase, GasVentScrubberAlt4]
   id: GasVentScrubberSaunaAlt4
   categories: [ HideSpawnMenu ]
   description: An air scrubber set up for use in saunas. It leaves water vapour where it is.