From 44c98978930be003f784a549831cd4618caa7000 Mon Sep 17 00:00:00 2001 From: creamybag Date: Thu, 13 Mar 2025 15:30:18 +0300 Subject: [PATCH] dress (#1022) --- .../Clothing/Pants/Roles/merchant.yml | 12 ++++++++++- .../Clothing/Shirt/Roles/merchant.yml | 11 ++++++++++ .../_CP14/Loadouts/Jobs/merchant.yml | 20 +++++++++++++++++- .../equipped-PANTS.png | Bin 0 -> 658 bytes .../Pants/merchants_pantaloons.rsi/icon.png | Bin 0 -> 288 bytes .../Pants/merchants_pantaloons.rsi/meta.json | 19 +++++++++++++++++ .../merchants_dress.rsi/equipped-SHIRT.png | Bin 0 -> 1932 bytes .../Merchant/merchants_dress.rsi/icon.png | Bin 0 -> 691 bytes .../Merchant/merchants_dress.rsi/meta.json | 18 ++++++++++++++++ 9 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/equipped-PANTS.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/merchants_pantaloons.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchants_dress.rsi/meta.json 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 0000000000000000000000000000000000000000..fcff542933e1d564a9c1452a82ff2a85c2d27c3b GIT binary patch literal 658 zcmV;D0&V??P)Px%Oi4sRRCt{2nn6p$FcioC6TgHo@w}ClmV6G64ivp^UOg#-CqcGvpt}ki=ur^7 zdX=y-nLCdO`xwuIrgmMKN!!d!-|yIl{9j)FNz=Xp48t%C!!QiPFbu;m43mlw0$Zc0*0qd=A+ zguq_CN&5%8@Pm*5U^wVU`hE}s0K94$07%M4Nw;t91o%Oy1OVV`(BIeM_wMg>d(|f~ zNO;xqoPM&MF4_qg4*HRBeD-^{-8mNw2YnPd`v4%NoYM!e;6MP8z6sh^Q8omCv(rV3 zwb~s5fcv{*?Vr>by^a9@Z{z1k=jiZ+0KltNQe#_&QRCzWBc)8eW(ynoMh?(nl?f;! zhK;Pj=wj=!SQOfupe{Dg0ZG!9fGN2Wuq=S0&jGf`wFF$Zw+@*T@Y4(nA=V;6xg4-8 z2~tX{PXyJsO^pRynNe5b_%;500vLv2){^+)=wI&SE)LrI>#*x+zYVVP%g-vw{5ou! z5Etza6u1Oj9pFzC{!LKvSC$CF{Bd#>M$)jo_KS{z4?-r5(=scBz~$97siLGwX*vt4 zKIsP`F3yjw)giTce0rhDbVifuj2@p}Xx;R36-Fl083EsAX;rzki7Lmd{}m?F8SQLu zS#@1RJmYE>R9XBtXtg_$8`L#ZR~R{9IOs3T`q^otq;}?2tw*Kz`7c0+{2+|t>UAHC s`ZBgoe8x?GMzDp8F)<9oFbv~9A6jlP%iOH1?EnA(07*qoM6N<$g15IW9{>OV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e5b7f9b2d9042ba5163b4fb0b62c99e75a78f1fd GIT binary patch literal 288 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 Z!!P4290aV;iqil9002ovPDHLkV1o5BHYfl9 literal 0 HcmV?d00001 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 + } + ] +}