]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Validate wire layout prototypes and remove invalid WiresComponents (#26682)
authorTayrtahn <tayrtahn@gmail.com>
Wed, 3 Apr 2024 03:13:59 +0000 (23:13 -0400)
committerGitHub <noreply@github.com>
Wed, 3 Apr 2024 03:13:59 +0000 (23:13 -0400)
Validate wire layout prototypes; delete invalid wirescomponents.

29 files changed:
Content.Server/Wires/WiresComponent.cs
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
Resources/Prototypes/Entities/Structures/Machines/research.yml
Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
Resources/Prototypes/Entities/Structures/Power/apc.yml
Resources/Prototypes/Entities/Structures/Power/chargers.yml
Resources/Prototypes/Entities/Structures/Power/smes.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Prototypes/Entities/Structures/hydro_tray.yml

index 526b73a300d0e276b34d03daddf4b0309a8e6d9b..89e1873c00d93c9838d8c70e82d7587fc72dee0a 100644 (file)
@@ -1,4 +1,5 @@
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Wires;
 
@@ -15,7 +16,7 @@ public sealed partial class WiresComponent : Component
     ///     The layout ID of this entity's wires.
     /// </summary>
     [DataField(required: true)]
-    public string LayoutId { get; set; } = default!;
+    public ProtoId<WireLayoutPrototype> LayoutId { get; set; } = default!;
 
     /// <summary>
     ///     The serial number of this board. Randomly generated upon start,
index df5b8d7519caefa1f6cedd6a785a4bc2d882e1c4..9ca99f9982296b3f73bd8f16d4ae566b91b1f8a5 100644 (file)
   - type: BorgChassis
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
-  - type: Wires
-    layoutId: Borg
   - type: NameIdentifier
     group: Silicon
   - type: ContainerContainer
index ad4d2eac8a5190a922d323479735a8b24bf18184..191bb75e50e8662d7dff19069ff6702568219c8e 100644 (file)
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-dawinstrument
-    layoutId: DawInstrument
   - type: Machine
     board: DawInstrumentMachineCircuitboard
   - type: Instrument
index 5a2587ff710e418ba7ea03fbfc8fb8976b14ef62..6e5362d9bbbafeb0026b491f8c32330180c836d7 100644 (file)
@@ -66,9 +66,6 @@
     bodyType: KinematicController
   - type: Clickable
   - type: WiresPanel
-  - type: Wires #we just want the panel
-    boardName: wires-board-name-mech
-    layoutId: Mech
   - type: Fixtures
     fixtures:
       fix1:
index d87c5e700abe2b0f162a9db86144aa8175bf552f..d661009b6dc5a8cef06324df5cea0f6151f87c67 100644 (file)
@@ -71,5 +71,4 @@
       beakerSlot: !type:ContainerSlot
   - type: StaticPrice
     price: 1000
-  - type: Wires
   - type: WiresPanel
index 1583bc451de64b3559809da4f7d2fca10634815f..7bc12ca966e3832226595824f31d162cb91c0aaf 100644 (file)
@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: BoozeDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-booze
-    layoutId: BoozeDispenser
   - type: GuideHelp
     guides:
     - Bartender
index 6c70cf9bcace3e91d4352dfcd5436133dd3967ac..681f0a390c8f4afaa259f16a2ea652c99c6d1ea9 100644 (file)
@@ -31,9 +31,6 @@
         acts: ["Destruction"]
   - type: Machine
     board: ChemDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-chemdispenser
-    layoutId: ChemDispenser
   - type: GuideHelp
     guides:
     - Chemicals
index 323480506fa1b1237f62cdb3b43d90a0af45c065..72468973ee41dcc9848e4be5ca3ffe521a943a10 100644 (file)
@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: SodaDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-soda
-    layoutId: SodaDispenser
   - type: GuideHelp
     guides:
     - Bartender
index 0dd65ab4d07039cb788355baa64e08c6086c7b69..a678ab74438037be7468a2a5c3c7c217715cf99a 100644 (file)
@@ -22,7 +22,7 @@
     - type: RCDDeconstructable
       cost: 4
       delay: 6
-      fx: EffectRCDDeconstruct6  
+      fx: EffectRCDDeconstruct6
     - type: Destructible
       thresholds:
       - trigger:
@@ -87,9 +87,6 @@
     - type: Appearance
     - type: WiresVisuals
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-firelock
-      layoutId: Firelock
     - type: UserInterface
       interfaces:
         - key: enum.WiresUiKey.Key
index e2c210e7e6bed4d0d0f9757cdcb6cf0434f4ea1e..23789730d0c491cb767f638bcf161840b3e52aa6 100644 (file)
@@ -29,8 +29,6 @@
           components:
           - FitsInDispenser
   - type: Machine
-  - type: Wires
-    layoutId: chem
   - type: WiresPanel
   - type: WiresVisuals
   - type: ContainerContainer
index 0064e7a4ae95d5cf3765b6c4c22a2cc9f67d2bab..ab09a03fef7352b03bd370060a25d61b9d3a066e 100644 (file)
@@ -37,9 +37,6 @@
     color: "#fca3c0"
   - type: Appearance
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-vessel
-    layoutId: Vessel
   - type: AmbientSound
     enabled: false
     range: 3
   - type: Appearance
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-ape
-    layoutId: Ape
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:
     fuelCost: 10
     doAfterDelay: 5
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-anomalygenerator
-    layoutId: AnomalyGenerator
   - type: Destructible
     thresholds:
     - trigger:
index 1b183661f51682a0d0e26d59c5f3ecc76aa66b37..b00d6d89862f127ab249b8ec6958ba051ebbd34f 100644 (file)
         Blunt: 10
   - type: Machine
     board: ArtifactCrusherMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-crusher
-    layoutId: Crusher
   - type: WiresPanel
   - type: Sprite
     sprite: Structures/Machines/artifact_crusher.rsi
index d7df219663e6e7852e3bdd5ab5de64d3726c36ce..aee124602140e2a06d3fe3d6665819e60b2c4b24 100644 (file)
@@ -63,9 +63,6 @@
           False: { visible: false }
   # Machine / Construction stuff
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-chemmaster
-    layoutId: chem_master
   - type: Machine
     board: ChemMasterMachineCircuitboard
   - type: ContainerContainer
index 5d9ab0dd7e48b5f94713980393c91adc930e3987..0451b3949098272e589330e38cdf6dccb166b579 100644 (file)
@@ -52,9 +52,6 @@
     materialWhiteList:
     - Biomass
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-cloningpod
-    layoutId: CloningPod
   - type: ApcPowerReceiver
     powerLoad: 200 #Receives most of its power from the console
   - type: Appearance
index 9f09e49059c25254f59ecaddee638b9e2d9617b5..fc417e68d6c35ba979b8e774288d1329d5c3c5bb 100644 (file)
@@ -98,9 +98,6 @@
   - type: Machine
     board: FatExtractorMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-fatextractor
-    layoutId: FatExtractor
   - type: Appearance
   - type: Speech
     speechVerb: Robotic
index 54a32db69f5311ac7de4b8e930f5eea412649729..3244789a028fee7f3c50963fa3d72ecc6f382303 100644 (file)
@@ -52,9 +52,6 @@
       path: /Audio/Items/rped.ogg
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-flatpacker
-    layoutId: Flatpacker
   - type: Appearance
   - type: ActivatableUI
     key: enum.FlatpackCreatorUIKey.Key
index 2eb4f57fab5c154220b37b634597299d8e8fb90b..aebc4b03def0ca718b562261cce5de042d16ba6d 100644 (file)
             min: 1
             max: 1
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-minigravitygenerator
-    layoutId: MiniGravityGenerator
   - type: Machine
     board: MiniGravityGeneratorCircuitboard
   - type: ApcPowerReceiver
index 5a32839a47c8643669a67246b7709c7dfb56873b..c32f2992f9455c924678bdc5e3ba695311cb3c7c 100644 (file)
@@ -33,9 +33,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-autolathe
-    layoutId: Autolathe
   - type: ActivatableUI
     key: enum.LatheUiKey.Key
   - type: ActivatableUIRequiresPower
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: ProtolatheMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-protolathe
-    layoutId: Protolathe
   - type: MaterialStorage
     whitelist:
       tags:
index 028e348fd49beae38c4d19dae0707e026600a985..9a9c5283c09bdd042f991c1e4f0c413bd92cf3e8 100644 (file)
@@ -61,9 +61,6 @@
   - type: Machine
     board: MaterialReclaimerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-reclaimer
-    layoutId: Reclaimer
   - type: MaterialReclaimer
     whitelist:
       components:
index 6f05baee94447fabff2a24bfad1d292eb5494f3c..de19db96b52bfd230784dead44035bd04d1549d2 100644 (file)
@@ -69,9 +69,6 @@
   - type: Machine
     board: MedicalScannerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-medicalscanner
-    layoutId: MedicalScanner
   - type: Appearance
   - type: Climbable
   - type: ApcPowerReceiver
index 7b369f62cc980c0edab13772785e89fe4a2b468a..83525a0510cdbeef6a4f67a09199c854e88c3b8f 100644 (file)
@@ -23,8 +23,6 @@
     priority: Low
   - type: ExtensionCableReceiver
   - type: WiresPanel
-  - type: Wires
-    layoutId: rndserver
   - type: WiresVisuals
   - type: Machine
     board: ResearchAndDevelopmentServerMachineCircuitboard
index e12826a8ce4cf3a3f8c6bb0d1af784bce663c6e4..6cc1fc79814b8c45f2c655cc82e362e58265029a 100644 (file)
@@ -51,9 +51,6 @@
   - type: Machine
     board: TelecomServerCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-telecomserver
-    layoutId: TelecomServer
   - type: Transform
     anchored: true
   - type: Pullable
index 03cce096994ba691f7677367eac6226fbe742fd3..4ee78f1213f6aa9689819fb7b9e7aa5243e832d5 100644 (file)
       inHandsOnly: false
       key: enum.ThermomachineUiKey.Key
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-thermomachine
-      layoutId: Thermomachine
     - type: WiresVisuals
     - type: NodeContainer
       nodes:
   - type: Machine
     board: CondenserMachineCircuitBoard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-condenser
-    layoutId: Condenser
   - type: WiresVisuals
   - type: Destructible
     thresholds:
index 0c8afc87a407eff5d2c251fb2e975a8e89fb6d6d..dbaacd6abc2ed9848f564f2b75564d344a9fe8e5 100644 (file)
@@ -42,9 +42,6 @@
 
     # Construction, interaction
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-generator
-      layoutId: Generator
     - type: UserInterface
       interfaces:
         - key: enum.GeneratorComponentUiKey.Key
             damage: 75
           behaviors:
             - !type:SolutionExplosionBehavior
-              solution: tank
\ No newline at end of file
+              solution: tank
index 7efa53e2542abde70b98f8965ee26144bbba104b..4df502791f3125a39a0c6b83c560408c71caf3bc 100644 (file)
@@ -97,9 +97,6 @@
     supplyRampRate: 500
   - type: WallMount
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-apc
-    layoutId: APC
   - type: WiresVisuals
   - type: Damageable
     damageContainer: Inorganic
index 388cc3c9874873aa120857a0e5752d04065979a5..582a5b0dee4f55a7ccad446ac9a5b4aaa99cd2a2 100644 (file)
@@ -83,9 +83,6 @@
       visible: false
   - type: Machine
     board: CellRechargerCircuitboard
-  - type: Wires
-    boardName: wires-board-name-recharger
-    layoutId: Recharger
   - type: WiresPanel
   - type: GenericVisualizer
     visuals:
     - machine_parts
     - machine_board
     - entity_storage
-  - type: Wires
-    layoutId: borgcharger
   - type: WiresPanel
   - type: WiresVisuals
   - type: Machine
index c2170a127adf586ddd25c53d0dbc2d6b6d8443ef..1e3559e5a95a472123f46107df4fd73276d14529 100644 (file)
@@ -67,9 +67,6 @@
       color: "#c9c042"
       castShadows: false
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-smes
-      layoutId: SMES
     - type: Machine
       board: SMESMachineCircuitboard
     - type: StationInfiniteBatteryTarget
index 94de12be1859e073e12d8cfb6a503243ac77b014..4bd0bec5ea05d20fea4f6998b33757cf6b9fd64a 100644 (file)
@@ -92,9 +92,6 @@
     intensitySlope: 2
     totalIntensity: 200
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-substation
-    layoutId: Substation
   - type: Machine
     board: SubstationMachineCircuitboard
   - type: StationInfiniteBatteryTarget
index 1ab1fd5b2fdb8eb5add97bed58c35ed8951887a6..8ea7172d8b419e944f08627bdb7293583bbe191e 100644 (file)
@@ -81,9 +81,6 @@
   - type: Machine
     board: HydroponicsTrayMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-hydroponicstray
-    layoutId: HydroponicsTray
   - type: AmbientSound
     volume: -9
     range: 5