Fix some lathe recipes (#5941)

Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs

@@ -19,7 +19,7 @@ namespace Content.Shared.Lathe
 
         public override string Name => "ProtolatheDatabase";
 
-        [DataField("protolatherecipes", customTypeSerializer:typeof(PrototypeIdListSerializer<EntityPrototype>))]
+        [DataField("protolatherecipes", customTypeSerializer:typeof(PrototypeIdListSerializer<LatheRecipePrototype>))]
         private List<string> _recipeIds = new();
 
         /// <summary>

Content.Shared/Research/Prototypes/LatheRecipePrototype.cs

@@ -34,7 +34,7 @@ namespace Content.Shared.Research.Prototypes
         [DataField("completetime")]
         private int _completeTime = 2500;
 
-        [DataField("materials", customTypeSerializer:typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]
+        [DataField("materials", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]
         private Dictionary<string, int> _requiredMaterials = new();
 
         /// <summary>

Content.Shared/Research/Prototypes/TechnologyPrototype.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -49,15 +49,14 @@ namespace Content.Shared.Research.Prototypes
         /// <summary>
         ///     A list of technology IDs required to unlock this technology.
         /// </summary>
-        [ViewVariables]
-        [DataField("requiredTechnologies")]
+        [DataField("requiredTechnologies", customTypeSerializer: typeof(PrototypeIdListSerializer<TechnologyPrototype>))]
         public List<string> RequiredTechnologies { get; } = new();
 
         /// <summary>
         ///     A list of recipe IDs this technology unlocks.
         /// </summary>
         [ViewVariables]
-        [DataField("unlockedRecipes", customTypeSerializer:typeof(PrototypeIdListSerializer<EntityPrototype>))]
+        [DataField("unlockedRecipes", customTypeSerializer:typeof(PrototypeIdListSerializer<LatheRecipePrototype>))]
         public List<string> UnlockedRecipes { get; } = new();
     }
 }

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -144,10 +144,10 @@
   requiredTechnologies:
      - SecurityTechnology
   unlockedRecipes:
-    - CartridgePistolBase
-    - ShellShotgunBase
-    - CartridgeLRifleBase
-    - CartridgeMagnumBase
+    - CartridgePistol
+    - ShellShotgun
+    - CartridgeLRifle
+    - CartridgeMagnum
 
 #- type: technology
 #   name: "ballistic technology"

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -164,10 +164,10 @@
       - Flash
       - Handcuffs
       - Stunbaton
-      - CartridgePistolBase
-      - ShellShotgunBase
-      - CartridgeLRifleBase
-      - CartridgeMagnumBase
+      - CartridgePistol
+      - ShellShotgun
+      - CartridgeLRifle
+      - CartridgeMagnum
       - FirelockElectronics
       - MicroManipulatorStockPart
       - ScanningModuleStockPart

Resources/Prototypes/Recipes/Lathes/botany.yml

@@ -10,7 +10,7 @@
     Plastic: 100
 
 - type: latheRecipe
-  id: Scythe
+  id: HydroponicsToolScythe
   icon:
     sprite: Objects/Tools/Hydroponics/scythe.rsi
     state: icon
@@ -21,7 +21,7 @@
     Plastic: 200
 
 - type: latheRecipe
-  id: Hatchet
+  id: HydroponicsToolHatchet
   icon:
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
     state: icon

Resources/Prototypes/Recipes/Lathes/cargo.yml

@@ -1,5 +1,5 @@
 - type: latheRecipe
-  id: ConveyorAssembly
+  id: ConveyorBeltAssembly
   icon:
     sprite: Structures/conveyor.rsi
     state: conveyor_loose

Resources/Prototypes/Recipes/Lathes/electronics.yml

@@ -96,3 +96,12 @@
   materials:
      Steel: 100
      Glass: 100
+
+- type: latheRecipe
+  id: CrewMonitoringComputerCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: CrewMonitoringComputerCircuitboard
+  completetime: 1000
+  materials:
+     Steel: 100
+     Glass: 100

Resources/Prototypes/Recipes/Lathes/medical.yml

@@ -57,7 +57,7 @@
     Steel: 200
 
 - type: latheRecipe
-  id: BoneSaw
+  id: Saw
   icon: Objects/Specific/Medical/Surgery/saw.rsi/saw.png
   result: Saw
   completetime: 500

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -32,41 +32,41 @@
     Steel: 100
 
 - type: latheRecipe
-  id: CartridgePistolBase
+  id: CartridgePistol
   icon:
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: base
-  result: CartridgePistolBase
+  result: CartridgePistol
   completetime: 500
   materials:
     Steel: 10
 
 - type: latheRecipe
-  id: ShellShotgunBase
+  id: ShellShotgun
   icon:
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
     state: base
-  result: ShellShotgunBase
+  result: ShellShotgun
   completetime: 500
   materials:
     Steel: 20
 
 - type: latheRecipe
-  id: CartridgeMagnumBase
+  id: CartridgeMagnum
   icon:
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: base
-  result: CartridgeMagnumBase
+  result: CartridgeMagnum
   completetime: 500
   materials:
     Steel: 20
 
 - type: latheRecipe
-  id: CartridgeLRifleBase
+  id: CartridgeLRifle
   icon:
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: base
-  result: CartridgeLRifleBase
+  result: CartridgeLRifle
   completetime: 500
   materials:
     Steel: 30

Resources/Prototypes/Recipes/Lathes/sheet.yml

@@ -9,7 +9,7 @@
     Steel: 100
 
 - type: latheRecipe
-  id: GlassStack
+  id: SheetGlass1
   icon:
     sprite: Objects/Materials/Sheets/glass.rsi
     state: glass