From 6c7933cd7f39ab7a4b9aaf307a58c107b2cd1a1d Mon Sep 17 00:00:00 2001 From: Link <131011403+LinkF2kkk@users.noreply.github.com> Date: Thu, 13 Mar 2025 17:19:04 +0300 Subject: [PATCH] Fixing TagResource (Meat Pies) and coffins (#1024) * Update coffin.yml * PierogI --- Content.Shared/_CP14/Workbench/Requirements/TagResource.cs | 3 +++ .../_CP14/Entities/Structures/Storage/Crates/coffin.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs b/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs index f1fdec48ad..1383388e09 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs @@ -52,6 +52,9 @@ public sealed partial class TagResource : CP14WorkbenchCraftRequirement if (!tagSystem.HasTag(placedEntity, Tag)) continue; + if (requiredCount <= 0) + break; + requiredCount--; entManager.DeleteEntity(placedEntity); } diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml index b154783ce8..8bf7d1b01f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml @@ -13,7 +13,7 @@ - state: closed map: ["enum.StorageVisualLayers.Door"] - state: paper - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: _CP14/Structures/Storage/Crates/coffin.rsi state: base @@ -31,7 +31,7 @@ collection: WoodDestroy - !type:SpawnEntitiesBehavior spawn: - MaterialWoodPlank1: + CP14WoodenPlanks1: min: 1 max: 4 - !type:DoActsBehavior