From b0d1d31ccce54a7cf48568b2bc4fdc6f771b0a9b Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 4 Dec 2020 11:37:55 +0100 Subject: [PATCH] Makes protolathe use machine parts --- .../Components/Chemistry/GlassBeakerComponent.cs | 10 ++++++++++ .../Entities/Constructible/Power/lathe.yml | 7 +++++++ .../Objects/Misc/machine_circuitboards.yml | 16 ++++++++++++++++ .../Entities/Objects/Specific/chemistry.yml | 2 ++ 4 files changed, 35 insertions(+) create mode 100644 Content.Server/GameObjects/Components/Chemistry/GlassBeakerComponent.cs diff --git a/Content.Server/GameObjects/Components/Chemistry/GlassBeakerComponent.cs b/Content.Server/GameObjects/Components/Chemistry/GlassBeakerComponent.cs new file mode 100644 index 0000000000..ca8921560e --- /dev/null +++ b/Content.Server/GameObjects/Components/Chemistry/GlassBeakerComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameObjects; + +namespace Content.Server.GameObjects.Components.Chemistry +{ + [RegisterComponent] + public class GlassBeakerComponent : Component + { + public override string Name => "GlassBeaker"; + } +} diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 81137dffb9..16c48e451f 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -101,6 +101,13 @@ - state: protolathe_panel map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - type: ResearchClient + - type: Construction + graph: machine + node: machine + - type: BreakableConstruction + node: machineFrame + - type: Machine + board: ProtolatheMachineCircuitboard - type: Wires BoardName: "Protolathe" LayoutId: Protolathe diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_circuitboards.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_circuitboards.yml index 714d20054c..1a651e6bf2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/machine_circuitboards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/machine_circuitboards.yml @@ -21,3 +21,19 @@ Manipulator: 1 materialRequirements: Glass: 1 + +- type: entity + id: ProtolatheMachineCircuitboard + parent: BaseMachineCircuitboard + name: Protolathe (Machine Board) + components: + - type: MachineBoard + prototype: Protolathe + requirements: + MatterBin: 2 + Manipulator: 2 + componentRequirements: + GlassBeaker: + Amount: 2 + DefaultPrototype: Beaker + ExamineName: Glass Beaker diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 103637a663..45e43067c9 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -17,6 +17,7 @@ - type: Pourable transferAmount: 5.0 - type: Spillable + - type: GlassBeaker - type: entity name: large beaker @@ -37,6 +38,7 @@ - type: Pourable transferAmount: 5.0 - type: Spillable + - type: GlassBeaker - type: entity name: dropper