Computer Boards Fixup

Content.IntegrationTests/Tests/MachineBoardTest.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction.Components;
@@ -57,7 +57,7 @@ await server.WaitAssertion(() =>
                 Assert.Multiple(() =>
                 {
                     Assert.That(protoMan.TryIndex<EntityPrototype>(mId, out var mProto),
-                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype."); // Frontier
+                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype.");
                     Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp, compFact),
                         $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent");
                     Assert.That(mComp.Board, Is.EqualTo(p.ID),
@@ -93,6 +93,11 @@ await server.WaitAssertion(() =>
                     continue;
                 var cId = cbc.Prototype;
 
+                // Frontier: we accept null as board prototypes, but this will fail the assertions.
+                if (cId == "Null")
+                    continue;
+                // End Frontier
+
                 Assert.Multiple(() =>
                 {
                     Assert.That(cId, Is.Not.Null, $"Computer board \"{p.ID}\" does not have a corresponding computer.");

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -444,19 +444,6 @@
     - type: ComputerTabletopBoard # Frontier
       prototype: ComputerTabletopIFFSyndicate # Frontier
 
-- type: entity
-  parent: BaseComputerCircuitboard
-  id: ShipyardComputerCircuitboard
-  name: shipyard computer board
-  description: A computer printed circuit board for a shipyard computer.
-  components:
-    - type: Sprite
-      state: cpu_supply
-    - type: ComputerBoard
-      prototype: ComputerShipyard
-    - type: ComputerTabletopBoard # Frontier
-      prototype: ComputerTabletopShipyard # Frontier
-
 - type: entity
   parent: BaseComputerCircuitboard
   id: ComputerMassMediaCircuitboard

Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -23,4 +23,17 @@
   # - type: ComputerBoard
     # prototype: ComputerAdvancedRadar
   # - type: ComputerTabletopBoard # Frontier
-    # prototype: ComputerTabletopAdvancedRadar # Frontier
+    # prototype: ComputerTabletopAdvancedRadar # Frontier
+
+# - type: entity
+  # parent: BaseComputerCircuitboard
+  # id: ShipyardComputerCircuitboard
+  # name: shipyard computer board
+  # description: A computer printed circuit board for a shipyard computer.
+  # components:
+    # - type: Sprite
+      # state: cpu_supply
+    # - type: ComputerBoard
+      # prototype: ComputerShipyard
+    # - type: ComputerTabletopBoard # Frontier
+      # prototype: ComputerTabletopShipyard # Frontier