juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes machine parts stackable, removes unused field in stack prototypes (#28434)

Browse Source 
* Makes machine parts stacks, removes unused field in stack prototypes

* forgor

* Fix tests

* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely

* detail

* a
This commit is contained in:
AJCM-git
2024-06-01 13:49:28 -04:00
committed by GitHub
parent a29b6a6894
commit 09256cfaa5
22 changed files with 88 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Construction/MachinePartSystem.cs
View File

@@ -87,9 +87,9 @@ namespace Content.Shared.Construction
foreach (var (stackId, amount) in comp.MaterialIdRequirements)
{
var stackProto = _prototype.Index<StackPrototype>(stackId);
var defaultProto = _prototype.Index(stackProto.Spawn);
if (_prototype.TryIndex(stackProto.Spawn, out var defaultProto) &&
defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
if (defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
{
foreach (var (mat, matAmount) in physComp.MaterialComposition)
{