From 15a5cebdcddeafe9840016d99274f8b937a8d2e9 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Mon, 17 Mar 2025 11:39:04 -0700 Subject: [PATCH] Chameleon vests now act like winter coats (#34929) First commit --- Content.Shared/Armor/ArmorComponent.cs | 6 ++++++ Content.Shared/Armor/SharedArmorSystem.cs | 2 +- .../Entities/Clothing/OuterClothing/specific.yml | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Armor/ArmorComponent.cs b/Content.Shared/Armor/ArmorComponent.cs index 8ffbb5a4f8..38f5f2cb1b 100644 --- a/Content.Shared/Armor/ArmorComponent.cs +++ b/Content.Shared/Armor/ArmorComponent.cs @@ -23,6 +23,12 @@ public sealed partial class ArmorComponent : Component /// [DataField] public float PriceMultiplier = 1; + + /// + /// If true, you can examine the armor to see the protection. If false, the verb won't appear. + /// + [DataField] + public bool ShowArmorOnExamine = true; } /// diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs index bea875256f..1ff1bbc073 100644 --- a/Content.Shared/Armor/SharedArmorSystem.cs +++ b/Content.Shared/Armor/SharedArmorSystem.cs @@ -51,7 +51,7 @@ public abstract class SharedArmorSystem : EntitySystem private void OnArmorVerbExamine(EntityUid uid, ArmorComponent component, GetVerbsEvent args) { - if (!args.CanInteract || !args.CanAccess) + if (!args.CanInteract || !args.CanAccess || !component.ShowArmorOnExamine) return; var examineMarkup = GetArmorExamine(component.Modifiers); diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml index c3d9bb1224..aec34e80ca 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml @@ -18,3 +18,12 @@ interfaces: enum.ChameleonUiKey.Key: type: ChameleonBoundUserInterface + - type: TemperatureProtection # Same as a basic winter coat. + heatingCoefficient: 1.1 + coolingCoefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 + showArmorOnExamine: false -- 2.51.2