diff --git a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs index 44d0644524..5e3a1252ff 100644 --- a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs +++ b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs @@ -236,7 +236,7 @@ public sealed partial class CP14StationDemiplaneMapSystem : CP14SharedStationDem new Vector2(specialPos.X, specialPos.Y), false, locationConfig: special.Location, - modifiers: special.Modifiers + modifiers: [..special.Modifiers] ); grid[specialPos] = specialNode; specialPositions.Add(specialPos); diff --git a/Content.Shared/_CP14/Demiplane/Prototypes/CP14SpecialDemiplanePrototype.cs b/Content.Shared/_CP14/Demiplane/Prototypes/CP14SpecialDemiplanePrototype.cs index fb4a4fa702..a36a040d7f 100644 --- a/Content.Shared/_CP14/Demiplane/Prototypes/CP14SpecialDemiplanePrototype.cs +++ b/Content.Shared/_CP14/Demiplane/Prototypes/CP14SpecialDemiplanePrototype.cs @@ -29,5 +29,5 @@ public sealed partial class CP14SpecialDemiplanePrototype : IPrototype /// Modifiers that will be automatically added to the demiplane when it is generated. /// [DataField] - public List>? Modifiers = new(); + public List> Modifiers = new(); } diff --git a/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs b/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs index 374eaff14e..302d17e928 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs @@ -75,12 +75,14 @@ public sealed partial class MaterialResource : CP14WorkbenchCraftRequirement if (mat.Key != Material) continue; + if (requiredCount <= 0) + return; + if (stack is null) { var value = (int)MathF.Min(requiredCount, mat.Value); requiredCount -= value; entManager.DeleteEntity(placedEntity); - continue; } else { diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml index 054aa6e5e6..c363aa95b8 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml @@ -1,7 +1,7 @@ - type: cp14DemiplaneLocation id: T1IceCaves levels: - min: 3 + min: 2 max: 7 icon: sprite: _CP14/Interface/Misc/demiplane_locations.rsi diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml index 906a766042..d0349520fc 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml @@ -1,7 +1,7 @@ - type: cp14DemiplaneLocation id: T1MagmaCaves levels: - min: 7 + min: 4 max: 10 icon: sprite: _CP14/Interface/Misc/demiplane_locations.rsi diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml index afb13626f8..690f774b8e 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml @@ -1,7 +1,7 @@ - type: cp14DemiplaneModifier id: ArtifactRoom levels: - min: 1 + min: 3 max: 10 generationWeight: 2 categories: