diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 56f4c6eb0c..afebd54fce 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -100,9 +100,8 @@ - id: CP14ClothingCloakRitualAttireLeather - id: CP14ClothingHeadBeretMercenary - id: CP14ClothingPantsMercenaryTrousers - - id: CP14ClothingPantsSouthernMagician - id: CP14ClothingShirtMercenary - - id: CP14ClothingShirtYellowWizard + - id: CP14ClothingYellowWizardDress - !type:GroupSelector children: - id: CP14DyeYellow diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml deleted file mode 100644 index 5f38f8120d..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - parent: ClothingBeltBase - id: CP14ClothingBeltBrown - name: brown belt - description: A simple brown belt. It will help the shirt not to flutter in the wind. - categories: [ ForkFiltered ] - components: - - type: Sprite - sprite: _CP14/Clothing/Belt/brown.rsi - state: icon - - type: Clothing - slots: - - belt - equipSound: - path: /Audio/Effects/rustle1.ogg - quickEquip: false - breakOnMove: false - equipDelay: 0.45 - unequipDelay: 0.45 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general_dress.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general_dress.yml deleted file mode 100644 index 27cd9ebaf5..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general_dress.yml +++ /dev/null @@ -1,89 +0,0 @@ -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressBlack - name: black dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/black.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/black.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressBlue - name: blue dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/blue.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/blue.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressBrown - name: brown dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/brown.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/brown.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressGreen - name: green dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/green.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/green.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressGreenBelt - name: green belt dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/green_belt.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/green_belt.rsi - -- type: entity - parent: CP14ClothingPantsDressGreenBelt - id: CP14ClothingPantsDressGreenBelt2 - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/green_belt2.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/green_belt2.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressRed - name: red dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/red.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/red.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsDressYellow - name: yellow dress - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/yellow.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/yellow.rsi - -- type: entity - parent: CP14ClothingPantsBase - id: CP14ClothingPantsSouthernMagician - name: southern magician's dress - description: A traditional southern mage skirt, rather loose. - components: - - type: Sprite - sprite: _CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi - - type: Clothing - sprite: _CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 8edf93eea4..c5e37bcfae 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -4,9 +4,19 @@ name: cotton black shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/black.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/black.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtBlackDress + name: cotton black dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -14,9 +24,9 @@ name: cotton blue shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/blue.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/blue.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi - type: entity parent: CP14ClothingShirtBase @@ -24,9 +34,19 @@ name: cotton blue collar shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/blue_collar.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/blue_collar.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingBlueCollarDress + name: cotton blue collar dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -35,9 +55,9 @@ description: A mercenary's colourful shirt. components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/mercenary.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/mercenary.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi - type: entity parent: CP14ClothingShirtBase @@ -45,9 +65,19 @@ name: cotton blue open shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/open_blue.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/open_blue.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingBlueOpenDress + name: cotton blue open dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -55,9 +85,19 @@ name: cotton red open shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/open_red.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/open_red.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingRedOpenDress + name: cotton red open dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -65,9 +105,19 @@ name: cotton yellow open shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/open_yellow.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/open_yellow.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingYellowOpenDress + name: cotton yellow open dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -75,9 +125,9 @@ name: cotton purple shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/purple.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/purple.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi - type: entity parent: CP14ClothingShirtBase @@ -85,9 +135,19 @@ name: cotton red shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/red.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/red.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingCottonRedDress + name: cotton red dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -95,9 +155,39 @@ name: cotton white shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingCottonWhiteDress + name: cotton white dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonWhiteCollar + name: cotton white collar shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingCottonWhiteCollarDress + name: cotton white collar dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi - type: entity parent: CP14ClothingShirtBase @@ -105,9 +195,9 @@ name: cotton yellow shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/yellow.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/yellow.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi - type: entity parent: CP14ClothingShirtBase @@ -115,17 +205,47 @@ name: cotton yellow collar shirt components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingShirtYellowWizard - name: yellow wizard shirt + id: CP14ClothingCottonYellowCollarDress + name: cotton yellow collar dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingYellowWizardDress + name: yellow wizard robe description: A loose magician's shirt, comfortable and nice looking. components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothinGreenBeltDress + name: green skirt with belt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothinGreenBeltDress2 + name: green skirt with belt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index d365cd01cd..770a36caa0 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -78,4 +78,15 @@ - type: CP14SpellStorageAccessWearing - type: CP14SpellStorage spells: - - CP14ActionSpellMagicalAcceleration \ No newline at end of file + - CP14ActionSpellMagicalAcceleration + +- type: entity + parent: CP14ClothingShoesBase + id: CP14LongLeatherBoots + name: long leather boots + description: the perfect tool for kicking left and right + components: + - type: Sprite + sprite: _CP14/Clothing/Shoes/long_leather_boots.rsi + - type: Clothing + sprite: _CP14/Clothing/Shoes/long_leather_boots.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index e496d90e0d..937ad24dc5 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -28,9 +28,9 @@ visible: false - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "pants" ] - map: [ "shoes" ] - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] @@ -352,9 +352,9 @@ visible: false - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "pants" ] - map: [ "shoes" ] - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index a50f2a4f0e..e73db860fd 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml @@ -26,9 +26,9 @@ visible: false - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "pants" ] - map: [ "shoes" ] - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # Bark Before clothing @@ -138,9 +138,9 @@ visible: false - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "pants" ] - map: [ "shoes" ] - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # Bark Before clothing diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml index 8db122887a..ecd1a4a3ff 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml @@ -20,9 +20,9 @@ - map: [ "enum.HumanoidVisualLayers.LLeg" ] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "pants" ] - map: [ "shoes" ] - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index 4c0ff5adfb..6a82e5dcce 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -22,9 +22,9 @@ - map: [ "enum.HumanoidVisualLayers.LLeg" ] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "pants" ] - map: [ "shoes" ] - map: [ "shirt" ] - - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 738398ba00..71d5479e42 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -69,22 +69,22 @@ - type: loadout id: CP14ClothingOuterClothingBrownVest1 equipment: - cloak: CP14ClothingOuterClothingBrownVest1 + outerClothing: CP14ClothingOuterClothingBrownVest1 - type: loadout id: CP14ClothingOuterClothingBrownVest2 equipment: - cloak: CP14ClothingOuterClothingBrownVest2 + outerClothing: CP14ClothingOuterClothingBrownVest2 - type: loadout id: CP14ClothingOuterClothingBrownVest3 equipment: - cloak: CP14ClothingOuterClothingBrownVest3 + outerClothing: CP14ClothingOuterClothingBrownVest3 - type: loadout id: CP14ClothingOuterClothingRedVest equipment: - cloak: CP14ClothingOuterClothingRedVest + outerClothing: CP14ClothingOuterClothingRedVest # Eyes @@ -220,13 +220,7 @@ - CP14ClothingPantsLoincloth - CP14ClothingPantsGreen - CP14ClothingPantsBrown - # Dress - - CP14ClothingPantsDressBlack - - CP14ClothingPantsDressBlue - - CP14ClothingPantsDressBrown - - CP14ClothingPantsDressGreen - - CP14ClothingPantsDressGreenBelt - - CP14ClothingPantsDressRed + - type: loadout id: CP14ClothingPantsTrouserWhite @@ -258,41 +252,6 @@ equipment: pants: CP14ClothingPantsBrown -- type: loadout - id: CP14ClothingPantsDressBlack - equipment: - pants: CP14ClothingPantsDressBlack - -- type: loadout - id: CP14ClothingPantsDressBlue - equipment: - pants: CP14ClothingPantsDressBlue - -- type: loadout - id: CP14ClothingPantsDressBrown - equipment: - pants: CP14ClothingPantsDressBrown - -- type: loadout - id: CP14ClothingPantsDressGreen - equipment: - pants: CP14ClothingPantsDressGreen - -- type: loadout - id: CP14ClothingPantsDressGreenBelt - equipment: - pants: CP14ClothingPantsDressGreenBelt - -- type: loadout - id: CP14ClothingPantsDressRed - equipment: - pants: CP14ClothingPantsDressRed - -- type: loadout - id: CP14ClothingPantsDressYellow - equipment: - pants: CP14ClothingPantsDressYellow - # Shirt - type: loadoutGroup @@ -300,22 +259,40 @@ name: cp14-loadout-general-shirt loadouts: - CP14ClothingShirtCottonBlack + - CP14ClothingShirtBlackDress - CP14ClothingShirtCottonBlue - CP14ClothingShirtCottonBlueCollar + - CP14ClothingBlueCollarDress - CP14ClothingShirtBlueOpen + - CP14ClothingBlueOpenDress - CP14ClothingShirtRedOpen + - CP14ClothingRedOpenDress - CP14ClothingShirtYellowOpen + - CP14ClothingYellowOpenDress - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed + - CP14ClothingCottonRedDress - CP14ClothingShirtCottonWhite + - CP14ClothingCottonWhiteDress + - CP14ClothingShirtCottonWhiteCollar + - CP14ClothingCottonWhiteCollarDress + - CP14ClothinGreenBeltDress + - CP14ClothinGreenBeltDress2 - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar + - CP14ClothingCottonYellowCollarDress + - type: loadout id: CP14ClothingShirtCottonBlack equipment: shirt: CP14ClothingShirtCottonBlack +- type: loadout + id: CP14ClothingShirtBlackDress + equipment: + shirt: CP14ClothingShirtBlackDress + - type: loadout id: CP14ClothingShirtCottonBlue equipment: @@ -326,21 +303,41 @@ equipment: shirt: CP14ClothingShirtCottonBlueCollar +- type: loadout + id: CP14ClothingBlueCollarDress + equipment: + shirt: CP14ClothingBlueCollarDress + - type: loadout id: CP14ClothingShirtBlueOpen equipment: shirt: CP14ClothingShirtBlueOpen +- type: loadout + id: CP14ClothingBlueOpenDress + equipment: + shirt: CP14ClothingBlueOpenDress + - type: loadout id: CP14ClothingShirtRedOpen equipment: shirt: CP14ClothingShirtRedOpen +- type: loadout + id: CP14ClothingRedOpenDress + equipment: + shirt: CP14ClothingRedOpenDress + - type: loadout id: CP14ClothingShirtYellowOpen equipment: shirt: CP14ClothingShirtYellowOpen +- type: loadout + id: CP14ClothingYellowOpenDress + equipment: + shirt: CP14ClothingYellowOpenDress + - type: loadout id: CP14ClothingShirtCottonPurple equipment: @@ -351,11 +348,41 @@ equipment: shirt: CP14ClothingShirtCottonRed +- type: loadout + id: CP14ClothingCottonRedDress + equipment: + shirt: CP14ClothingCottonRedDress + - type: loadout id: CP14ClothingShirtCottonWhite equipment: shirt: CP14ClothingShirtCottonWhite +- type: loadout + id: CP14ClothingCottonWhiteDress + equipment: + shirt: CP14ClothingCottonWhiteDress + +- type: loadout + id: CP14ClothingShirtCottonWhiteCollar + equipment: + shirt: CP14ClothingShirtCottonWhiteCollar + +- type: loadout + id: CP14ClothingCottonWhiteCollarDress + equipment: + shirt: CP14ClothingCottonWhiteCollarDress + +- type: loadout + id: CP14ClothinGreenBeltDress + equipment: + shirt: CP14ClothinGreenBeltDress + +- type: loadout + id: CP14ClothinGreenBeltDress2 + equipment: + shirt: CP14ClothinGreenBeltDress2 + - type: loadout id: CP14ClothingShirtCottonYellow equipment: @@ -366,6 +393,11 @@ equipment: shirt: CP14ClothingShirtCottonYellowCollar +- type: loadout + id: CP14ClothingCottonYellowCollarDress + equipment: + shirt: CP14ClothingCottonYellowCollarDress + # Shoes - type: loadoutGroup @@ -375,6 +407,7 @@ - CP14ShoesBlack - CP14ShoesAristocraticBlack - CP14ShoesSandals + - CP14LongLeatherBoots - type: loadout id: CP14ShoesBlack @@ -391,6 +424,11 @@ equipment: shoes: CP14ClothingShoesSandals +- type: loadout + id: CP14LongLeatherBoots + equipment: + shoes: CP14LongLeatherBoots + # Back - type: loadoutGroup @@ -433,7 +471,6 @@ - CP14FluteInstrument - CP14LyraInstrument - CP14ClothingBeltQuiver - - CP14ClothingBeltBrown - type: loadout id: CP14ManaOperationGlove @@ -521,15 +558,8 @@ - type: loadout id: CP14ClothingBeltQuiver - storage: - back: - - CP14ClothingBeltQuiver - -- type: loadout - id: CP14ClothingBeltBrown - storage: - back: - - CP14ClothingBeltBrown + equipment: + belt2: CP14ClothingBeltQuiver # Keys diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index fa1d2aa48c..8456a2201b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -92,6 +92,22 @@ knowledge: ClothingSewing result: CP14ClothingShirtCottonYellow +- type: CP14Recipe + id: CP14ClothingShirtBlackDress + tag: CP14RecipeSewing + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14String + - !type:ProtoIdResource + protoId: CP14DyeBlack + - !type:StackResource + stack: CP14Cloth + count: 3 + - !type:KnowledgeRequired + knowledge: ClothingSewing + result: CP14ClothingShirtBlackDress + - type: CP14Recipe id: CP14ClothingPantsTrouserWhite tag: CP14RecipeSewing @@ -122,38 +138,6 @@ knowledge: ClothingSewing result: CP14ClothingPantsTrouserDarkBlue -- type: CP14Recipe - id: CP14ClothingPantsDressBlack - tag: CP14RecipeSewing - craftTime: 2 - requirements: - - !type:ProtoIdResource - protoId: CP14String - - !type:ProtoIdResource - protoId: CP14DyeBlack - - !type:StackResource - stack: CP14Cloth - count: 2 - - !type:KnowledgeRequired - knowledge: ClothingSewing - result: CP14ClothingPantsDressBlack - -- type: CP14Recipe - id: CP14ClothingPantsSouthernMagician - tag: CP14RecipeSewing - craftTime: 2 - requirements: - - !type:ProtoIdResource - protoId: CP14String - - !type:ProtoIdResource - protoId: CP14DyeYellow - - !type:StackResource - stack: CP14Cloth - count: 2 - - !type:KnowledgeRequired - knowledge: ClothingSewing - result: CP14ClothingPantsSouthernMagician - - type: CP14Recipe id: CP14ClothingHeadBeretRed tag: CP14RecipeSewing @@ -298,7 +282,7 @@ result: CP14ClothingShirtMercenary - type: CP14Recipe - id: CP14ClothingShirtYellowWizard + id: CP14ClothingYellowWizardDress tag: CP14RecipeSewing craftTime: 2 requirements: @@ -315,7 +299,7 @@ count: 3 - !type:KnowledgeRequired knowledge: AdvancedClothingSewing - result: CP14ClothingShirtYellowWizard + result: CP14ClothingYellowWizardDress - type: CP14Recipe id: CP14ClothingHeadBeretMercenary diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png deleted file mode 100644 index 37ca353eda..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png deleted file mode 100644 index 37ca353eda..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png deleted file mode 100644 index 03fee9ce71..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json deleted file mode 100644 index 447f75bbd6..0000000000 --- a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT1", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/equipped-PANTS.png deleted file mode 100644 index 990b04ed57..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/icon.png deleted file mode 100644 index 1950887919..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/meta.json deleted file mode 100644 index 5041180993..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/black.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/equipped-PANTS.png deleted file mode 100644 index 9daded4f91..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/icon.png deleted file mode 100644 index 4bd088b093..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/blue.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/equipped-PANTS.png deleted file mode 100644 index c98e19154f..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/icon.png deleted file mode 100644 index ea46fa92ba..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/brown.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/equipped-PANTS.png deleted file mode 100644 index 805a656bb3..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/icon.png deleted file mode 100644 index b3ce4d99cb..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/green.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/equipped-PANTS.png deleted file mode 100644 index 637da4cf78..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/icon.png deleted file mode 100644 index 7eaec44a5e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/equipped-PANTS.png deleted file mode 100644 index 2cbab39d91..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/icon.png deleted file mode 100644 index 0b58ef4393..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/green_belt2.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/equipped-PANTS.png deleted file mode 100644 index 8ccc947f87..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/icon.png deleted file mode 100644 index 052ac5fb00..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/red.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/equipped-PANTS.png deleted file mode 100644 index 1224ba3462..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/icon.png deleted file mode 100644 index 8308853cd7..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/meta.json deleted file mode 100644 index 2cad48eb1e..0000000000 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-PANTS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/equipped-PANTS.png deleted file mode 100644 index b5e1e57bbc..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/equipped-PANTS.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/icon.png deleted file mode 100644 index 4e8240f894..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..f0a54c8788 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/icon.png new file mode 100644 index 0000000000..8baffb0d0c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/meta.json similarity index 80% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/meta.json index be228e48bf..dc322b5986 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/black_dress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", + "copyright": "Created by TheShuEd, interpreted by creamy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..f952058ae5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/icon.png new file mode 100644 index 0000000000..d30244b03a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/meta.json similarity index 78% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/meta.json index be228e48bf..f2e8b1700c 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_dress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..93d0ec5491 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/icon.png new file mode 100644 index 0000000000..3d78376125 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/meta.json similarity index 78% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/meta.json index be228e48bf..f2e8b1700c 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/blue_open_dress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..227b5711c3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/icon.png new file mode 100644 index 0000000000..181518251d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..8f4add5f71 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/icon.png new file mode 100644 index 0000000000..37a1a3f4ed Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/green_belt_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..6317e8ae2c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/icon.png new file mode 100644 index 0000000000..14f3c2f446 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_red_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..79b2c9c4fc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/icon.png new file mode 100644 index 0000000000..930dd2be7e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/open_yellow_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..642fa3416c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/icon.png new file mode 100644 index 0000000000..96b0f337e3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/red_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..726fc455ba Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/icon.png new file mode 100644 index 0000000000..71bdaf8cc6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_brown_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..5baccb1a4a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/icon.png new file mode 100644 index 0000000000..03d2f44818 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/white_collar_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..68754bf9dc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/icon.png new file mode 100644 index 0000000000..9fac83b940 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/meta.json new file mode 100644 index 0000000000..f2e8b1700c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_collar_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord), interpreted by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..0c756d79f5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/icon.png new file mode 100644 index 0000000000..d9f8703d8e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/meta.json similarity index 81% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/meta.json index be228e48bf..77cde2acdd 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by omsoyk (Discord)", + "copyright": "Created by Prazat, interpreted by creamy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/black.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/black.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/black.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/black.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/black.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue_collar.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue_collar.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue_collar.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue_collar.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue_collar.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/blue_collar.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/mercenary.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_blue.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_blue.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_blue.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_red.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_red.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_red.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_yellow.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_yellow.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_yellow.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_yellow.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_yellow.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/open_yellow.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/purple.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/purple.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/purple.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/purple.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/purple.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/purple.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/red.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/red.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/red.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_collar.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_collar.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/equipped-SHIRT.png deleted file mode 100644 index 4c159f7371..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/icon.png deleted file mode 100644 index 6f57e043be..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_belt.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/equipped-SHIRT.png deleted file mode 100644 index d7d6c392a3..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/icon.png deleted file mode 100644 index c8a363afdc..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/equipped-SHIRT.png deleted file mode 100644 index dfdda54e6f..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/icon.png deleted file mode 100644 index 30862b015e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/equipped-SHIRT.png deleted file mode 100644 index c5f3f9ae7a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/icon.png deleted file mode 100644 index af7e2a06ac..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/equipped-FEET.png b/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/equipped-FEET.png new file mode 100644 index 0000000000..aa7d49a8a2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/icon.png new file mode 100644 index 0000000000..4b6194ea51 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/meta.json similarity index 63% rename from Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/meta.json index c393d18ee5..6e672c2dad 100644 --- a/Resources/Textures/_CP14/Clothing/Pants/Dress/yellow_magician_dress.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shoes/long_leather_boots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by Prazat", + "license": "All right reserved", + "copyright": "Created by creamy", "size": { "x": 32, "y": 32 @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-PANTS", + "name": "equipped-FEET", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png index 7c783e2909..6db8439b74 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png index 6b0baa576c..f746b28745 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png index 09b2f4caf9..44374639e1 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png index 7c783e2909..6db8439b74 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png differ