From bb6251d26e776b58bdaa027f5bbf7641c4a7b149 Mon Sep 17 00:00:00 2001 From: dinowattz Date: Thu, 28 Mar 2024 10:11:44 -0300 Subject: [PATCH 1/2] Fix formatting --- Content.Shared/Clothing/EntitySystems/ClothingSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index f189db005bc..ce8a58886cf 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -164,7 +164,7 @@ private void OnEquipDoAfter(Entity ent, ref ClothingEquipDoAf { if (args.Handled || args.Cancelled || args.Target is not { } target) return; - args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp, predicted: true, checkDoafter: false); + args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp, predicted: true, checkDoafter: false); } private void OnUnequipDoAfter(Entity ent, ref ClothingUnequipDoAfterEvent args) From d78033e752703f59cdb1ba66caeb662474cfed29 Mon Sep 17 00:00:00 2001 From: dinowattz Date: Thu, 28 Mar 2024 13:49:04 -0300 Subject: [PATCH 2/2] Make so pocket items don't affect character visual layers --- Content.Shared/Clothing/EntitySystems/ClothingSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index ce8a58886cf..2654708c4c8 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -91,7 +91,7 @@ private void QuickEquip( private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, string tag) { - InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee); + InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee, SlotFlags.All & ~SlotFlags.POCKET); bool shouldLayerShow = true; while (enumerator.NextItem(out EntityUid item))