Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 20-11-19-sandboxing

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-22 00:21:03 +01:00
parent 20fb55d8e9 749cd11d33
commit f72e1948da
138 changed files with 1445 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Shared.GameObjects.Components.Body.Part
public IReadOnlyList<string> MechanismIds => _mechanismIds;
[ViewVariables]
private HashSet<IMechanism> _mechanisms = new HashSet<IMechanism>();
private readonly HashSet<IMechanism> _mechanisms = new HashSet<IMechanism>();
[ViewVariables]
public IBody? Body

2
Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Shared.GameObjects.Components.Research
public override string Name => "LatheDatabase";
public override uint? NetID => ContentNetIDs.LATHE_DATABASE;
private List<LatheRecipePrototype> _recipes = new List<LatheRecipePrototype>();
private readonly List<LatheRecipePrototype> _recipes = new List<LatheRecipePrototype>();
/// <summary>
/// Removes all recipes from the database if it's not static.

2
Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Shared.GameObjects.Components.Research
public override string Name => "ProtolatheDatabase";
public sealed override uint? NetID => ContentNetIDs.PROTOLATHE_DATABASE;
private List<LatheRecipePrototype> _protolatheRecipes = new List<LatheRecipePrototype>();
private readonly List<LatheRecipePrototype> _protolatheRecipes = new List<LatheRecipePrototype>();
/// <summary>
/// A full list of recipes this protolathe can print.

4
Content.Shared/GameObjects/Components/SharedStackComponent.cs
View File

@@ -125,6 +125,7 @@ namespace Content.Shared.GameObjects.Components
{
Metal,
Glass,
ReinforcedGlass,
Plasteel,
Cable,
Wood,
@@ -139,6 +140,7 @@ namespace Content.Shared.GameObjects.Components
FloorTileCarpet,
FloorTileWhite,
FloorTileDark,
FloorTileWood
FloorTileWood,
MetalRod
}
}