tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix infinite lathe printing bug (#12343)

Browse Source
This commit is contained in:
Nemanja
2022-11-01 19:05:00 -04:00
committed by GitHub
parent 9d8f19a442
commit 6fd083af0b
6 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Shared.Research.Prototypes
public sealed class LatheRecipePrototype : IPrototype
{
[ViewVariables]
[IdDataFieldAttribute]
[IdDataField]
public string ID { get; } = default!;
[DataField("name")]
@@ -42,7 +42,6 @@ namespace Content.Shared.Research.Prototypes
{
if (_name.Trim().Length != 0) return _name;
var protoMan = IoCManager.Resolve<IPrototypeManager>();
if (protoMan == null) return _description;
protoMan.TryIndex(_result, out EntityPrototype? prototype);
if (prototype?.Name != null)
_name = prototype.Name;
@@ -60,7 +59,6 @@ namespace Content.Shared.Research.Prototypes
{
if (_description.Trim().Length != 0) return _description;
var protoMan = IoCManager.Resolve<IPrototypeManager>();
if (protoMan == null) return _description;
protoMan.TryIndex(_result, out EntityPrototype? prototype);
if (prototype?.Description != null)
_description = prototype.Description;
@@ -98,5 +96,8 @@ namespace Content.Shared.Research.Prototypes
/// </summary>
[ViewVariables]
public TimeSpan CompleteTime => _completeTime;
[DataField("applyMaterialDiscount")]
public bool ApplyMaterialDiscount = true;
}
}