diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml index 2fc38991df..1edeeac536 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml @@ -16,16 +16,16 @@ - map: [ "mannequin" ] sprite: _CP14/Structures/Furniture/mannequin.rsi state: mannequin - - map: [ "shirt" ] - map: [ "pants" ] - - map: [ "gloves" ] - map: [ "shoes" ] + - map: [ "shirt" ] + - map: [ "gloves" ] + - map: [ "outerClothing" ] - map: [ "cloak" ] - map: [ "eyes" ] - map: [ "belt1" ] - map: [ "belt2" ] - map: [ "neck" ] - - map: [ "back" ] - map: [ "mask" ] - map: [ "head" ] - type: Rotatable @@ -78,6 +78,10 @@ showEnts: False occludes: False ent: null + outerClothing: !type:ContainerSlot + showEnts: False + occludes: False + ent: null cloak: !type:ContainerSlot showEnts: False occludes: False @@ -98,10 +102,6 @@ showEnts: False occludes: False ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null mask: !type:ContainerSlot showEnts: False occludes: False diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml index d69e679cf8..8e108bac5d 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml @@ -6,9 +6,15 @@ - name: neck slotTexture: neck slotFlags: NECK - uiWindowPos: 0,2 + uiWindowPos: 0,0 strippingWindowPos: 1,2 displayName: Neck + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 2,3 + strippingWindowPos: 2,1 + displayName: Mask - name: eyes slotTexture: eyes slotFlags: EYES @@ -47,18 +53,18 @@ uiWindowPos: 2,0 strippingWindowPos: 0,2 displayName: Gloves + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + uiWindowPos: 2,1 + strippingWindowPos: 2,3 + displayName: Armor - name: cloak slotTexture: cloak slotFlags: CLOAK - uiWindowPos: 2,2 + uiWindowPos: 2,3 strippingWindowPos: 2,2 displayName: Cloak - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 2,3 - strippingWindowPos: 2,1 - displayName: Mask # Main hotbar - name: belt1 slotTexture: belt @@ -77,13 +83,6 @@ dependsOn: pants displayName: Keys stripHidden: true - - name: back - slotTexture: back - slotFlags: BACK - slotGroup: SecondHotbar - uiWindowPos: 0,0 - strippingWindowPos: 0,5 - displayName: Back # Right hand # Left hand - name: belt2