diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml index cb263fee64..9ce6201725 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml @@ -7,4 +7,14 @@ - type: Sprite sprite: _CP14/Clothing/Pants/aristocratic.rsi - type: Clothing - sprite: _CP14/Clothing/Pants/aristocratic.rsi \ No newline at end of file + sprite: _CP14/Clothing/Pants/aristocratic.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsMerchantsPantaloons + name: merchant's pantaloons + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/merchants_pantaloons.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/merchants_pantaloons.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml index f152f25189..dbf67b8a7e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml @@ -8,3 +8,14 @@ sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtMerchantDress + name: merchant's dress + description: An elegant dress for equally elegant individuals. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml index 2c1b521921..49217715ac 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml @@ -34,12 +34,18 @@ name: cp14-loadout-merchant-shirt loadouts: - CP14ClothingShirtMerchant + - CP14ClothingShirtMerchantDress - type: loadout id: CP14ClothingShirtMerchant equipment: shirt: CP14ClothingShirtMerchant +- type: loadout + id: CP14ClothingShirtMerchantDress + equipment: + shirt: CP14ClothingShirtMerchantDress + # Pants - type: loadoutGroup @@ -47,6 +53,12 @@ name: cp14-loadout-merchant-pants loadouts: - CP14ClothingPantsAristocratic + - CP14ClothingPantsMerchantsPantaloons + +- type: loadout + id: CP14ClothingPantsMerchantsPantaloons + equipment: + pants: CP14ClothingPantsMerchantsPantaloons # Shoes @@ -54,4 +66,10 @@ id: CP14MerchantShoes name: cp14-loadout-merchant-shoes loadouts: - - CP14ShoesAristocraticBlack \ No newline at end of file + - CP14ShoesAristocraticBlack + - CP14ClothingShoesSandals + +- type: loadout + id: CP14ClothingShoesSandals + equipment: + shoes: CP14ClothingShoesSandals \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/equipped-PANTS.png new file mode 100644 index 0000000000..fcff542933 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/icon.png new file mode 100644 index 0000000000..e5b7f9b2d9 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/meta.json new file mode 100644 index 0000000000..ea78f7d2ac --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-PANTS", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..21ffceeadf Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/icon.png new file mode 100644 index 0000000000..904f2c05dc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/meta.json new file mode 100644 index 0000000000..7b10adb18c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +}