diff --git a/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs b/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs index 16b3530b09..77e1b23bda 100644 --- a/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs +++ b/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs @@ -50,9 +50,9 @@ namespace Content.Server.White.Other.ExamineSystem RaiseLocalEvent(uid, ev); if (ev.Cancelled) { - if (_idCard.TryFindIdCard(uid, out var id) && !string.IsNullOrWhiteSpace(id.FullName)) + if (_idCard.TryFindIdCard(uid, out var id) && !string.IsNullOrWhiteSpace(id.Comp.FullName)) { - name = id.FullName; + name = id.Comp.FullName; } else { diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index d4e12be0da..dad6521ccf 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -28,6 +28,7 @@ - id: ClothingNeckTieRed - id: ClothingUniformJumpsuitLawyerBlack - id: ClothingShoesBootsLaceup + - id: ClothingHandsGlovesCombat # WD edit - type: entity id: BriefcaseSyndieLobbyingBundleFilled diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index 8d7dde5928..b824fa29c5 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -9,7 +9,7 @@ - type: Sprite state: icon - type: Item - size: Normal + size: Small - type: Food requiresSpecialDigestion: true - type: SolutionContainerManager diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml index f1d4e9fd29..a8b5dcd132 100644 --- a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml +++ b/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: Tiny + size: Small - type: Clothing slots: [underwearb] - type: Tag diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml index 40ad9207ef..1952b169d9 100644 --- a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml +++ b/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: Tiny + size: Small - type: Clothing slots: [socks] - type: Tag diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml index 9449e991dd..c0b24cd78a 100644 --- a/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml +++ b/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: Tiny + size: Small - type: Clothing slots: [underweart] - type: Tag