diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs index f834a726e5..7977ce8939 100644 --- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs @@ -99,11 +99,8 @@ namespace Content.Server.GameObjects.Components.Research } internal bool Produce(LatheRecipePrototype recipe) - { if(!Powered) - { - return false; - } - if (Producing || !CanProduce(recipe) || !Owner.TryGetComponent(out MaterialStorageComponent? storage)) return false; + { + if (Producing || !Powered || !CanProduce(recipe) || !Owner.TryGetComponent(out MaterialStorageComponent? storage)) return false; UserInterface?.SendMessage(new LatheFullQueueMessage(GetIdQueue())); @@ -181,15 +178,21 @@ namespace Content.Server.GameObjects.Components.Research State = LatheState.Inserting; switch (material.MaterialTypes.Values.First().Name) { - case "Steel": + case "steel": SetAppearance(LatheVisualState.InsertingMetal); break; - case "Glass": + case "glass": SetAppearance(LatheVisualState.InsertingGlass); break; - case "Gold": + case "gold": SetAppearance(LatheVisualState.InsertingGold); break; + case "plastic": + SetAppearance(LatheVisualState.InsertingPlastic); + break; + case "plasma": + SetAppearance(LatheVisualState.InsertingPlasma); + break; } Owner.SpawnTimer(InsertionTime, () => diff --git a/Resources/Prototypes/Reagents/materials.yml b/Resources/Prototypes/Reagents/materials.yml index 4787489a8e..12b410d9fe 100644 --- a/Resources/Prototypes/Reagents/materials.yml +++ b/Resources/Prototypes/Reagents/materials.yml @@ -1,4 +1,4 @@ -- type: material +- type: material id: steel name: steel color: gray @@ -31,7 +31,7 @@ - type: material id: gold name: gold - icon: Objects/Materials/goldbar_single.png + icon: Objects/Materials/materials.rsi/goldbar_10.png density: 10000 electricResistivity: 8.0e-9 thermalConductivity: 30