From 2a7c84a8dd3108299c344be39e4b509bbe35756c Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Thu, 30 Dec 2021 03:19:49 +1300 Subject: [PATCH] Fix some lathe recipes (#5941) --- .../Lathe/SharedProtolatheDatabaseComponent.cs | 2 +- .../Research/Prototypes/LatheRecipePrototype.cs | 2 +- .../Research/Prototypes/TechnologyPrototype.cs | 7 +++---- .../Prototypes/Catalog/Research/technologies.yml | 8 ++++---- .../Entities/Structures/Machines/lathe.yml | 8 ++++---- Resources/Prototypes/Recipes/Lathes/botany.yml | 4 ++-- Resources/Prototypes/Recipes/Lathes/cargo.yml | 2 +- .../Prototypes/Recipes/Lathes/electronics.yml | 9 +++++++++ Resources/Prototypes/Recipes/Lathes/medical.yml | 2 +- Resources/Prototypes/Recipes/Lathes/security.yml | 16 ++++++++-------- Resources/Prototypes/Recipes/Lathes/sheet.yml | 2 +- 11 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs index bdbff3dd8b..55e1b73435 100644 --- a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs +++ b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs @@ -19,7 +19,7 @@ namespace Content.Shared.Lathe public override string Name => "ProtolatheDatabase"; - [DataField("protolatherecipes", customTypeSerializer:typeof(PrototypeIdListSerializer))] + [DataField("protolatherecipes", customTypeSerializer:typeof(PrototypeIdListSerializer))] private List _recipeIds = new(); /// diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs index b5a31be4a0..6ec7652072 100644 --- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs +++ b/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))] + [DataField("materials", customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] private Dictionary _requiredMaterials = new(); /// diff --git a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs index c38ca17d41..a7b029af03 100644 --- a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs +++ b/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 /// /// A list of technology IDs required to unlock this technology. /// - [ViewVariables] - [DataField("requiredTechnologies")] + [DataField("requiredTechnologies", customTypeSerializer: typeof(PrototypeIdListSerializer))] public List RequiredTechnologies { get; } = new(); /// /// A list of recipe IDs this technology unlocks. /// [ViewVariables] - [DataField("unlockedRecipes", customTypeSerializer:typeof(PrototypeIdListSerializer))] + [DataField("unlockedRecipes", customTypeSerializer:typeof(PrototypeIdListSerializer))] public List UnlockedRecipes { get; } = new(); } } diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index ed93e5dfdd..17b4176533 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/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" diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b05d2b1a5a..0567503b19 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/botany.yml b/Resources/Prototypes/Recipes/Lathes/botany.yml index 14109a8143..a14894d889 100644 --- a/Resources/Prototypes/Recipes/Lathes/botany.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml index b312b807c2..7fa47731df 100644 --- a/Resources/Prototypes/Recipes/Lathes/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml @@ -1,5 +1,5 @@ - type: latheRecipe - id: ConveyorAssembly + id: ConveyorBeltAssembly icon: sprite: Structures/conveyor.rsi state: conveyor_loose diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index edbc481d2a..255c169b78 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 24d6431f47..baf29dbaff 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 3935a7ac3a..2e73b37d0c 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index 4c7b06cdca..5670e0f6c1 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/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