From ad4db6ba00f405ca48c58c4a4136f8e114b3f9f2 Mon Sep 17 00:00:00 2001 From: xRiriq <94037592+xRiriq@users.noreply.github.com> Date: Tue, 16 Nov 2021 19:05:41 -0500 Subject: [PATCH] hardsuit clothing should be large and not fit in pockets (#5368) Co-authored-by: xRiriq --- Content.Server/Inventory/Components/InventoryComponent.cs | 5 +++-- Resources/Prototypes/Entities/Clothing/Head/base.yml | 2 ++ .../Prototypes/Entities/Clothing/OuterClothing/base.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs index 22b40ba08c..c161e42679 100644 --- a/Content.Server/Inventory/Components/InventoryComponent.cs +++ b/Content.Server/Inventory/Components/InventoryComponent.cs @@ -231,9 +231,10 @@ namespace Content.Server.Inventory.Components reason = controllerReason ?? reason; } - if (!pass && reason == null) + if (!pass) { - reason = Loc.GetString("inventory-component-can-equip-cannot"); + reason = reason ?? Loc.GetString("inventory-component-can-equip-cannot"); + return false; } var canEquip = pass && _slotContainers[slot].CanInsert(item.Owner); diff --git a/Resources/Prototypes/Entities/Clothing/Head/base.yml b/Resources/Prototypes/Entities/Clothing/Head/base.yml index 9944903a2d..683a70ef72 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base.yml @@ -26,6 +26,8 @@ id: ClothingHeadHardsuitBase name: base hardsuit helmet components: + - type: Clothing + size: 15 - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 100 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml index a75ebf5845..8208aa917a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml @@ -18,6 +18,8 @@ - type: PressureProtection highPressureMultiplier: 0.75 lowPressureMultiplier: 100 + - type: Clothing + size: 25 - type: Armor modifiers: coefficients: