From c678e96fbc205616e3d4f4e9b3788ab144fef303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:47:40 +0300 Subject: [PATCH] New vests (#862) * Sprites&Meta * Add_Vests * Belt * Loadouts&Fixes * Rem_RedVest_FromGuildmaster --- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 2 + .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 33 +++++---- .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 2 + .../_CP14/Catalog/Fills/dresser.yml | 6 +- .../_CP14/Entities/Clothing/Belt/brown.yml | 19 +++++ .../Clothing/OuterClothing/Roles/general.yml | 65 +++++++++++++++++ .../Clothing/OuterClothing/Roles/merchant.yml | 14 +--- .../Entities/Clothing/OuterClothing/base.yml | 23 +++++- .../Entities/Clothing/Shirt/Roles/general.yml | 48 ------------ .../Clothing/Shirt/Roles/guildmaster.yml | 18 ----- .../_CP14/Loadouts/Jobs/general.yml | 69 ++++++++++-------- .../_CP14/Loadouts/Jobs/guildmaster.yml | 26 ++++--- .../_CP14/Loadouts/Jobs/merchant.yml | 6 -- .../_CP14/Loadouts/role_loadouts.yml | 10 ++- .../Belt/brown.rsi/equipped-BELT1.png | Bin 0 -> 445 bytes .../Belt/brown.rsi/equipped-BELT2.png | Bin 0 -> 445 bytes .../_CP14/Clothing/Belt/brown.rsi/icon.png | Bin 0 -> 255 bytes .../_CP14/Clothing/Belt/brown.rsi/meta.json | 22 ++++++ .../brown.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 740 bytes .../Roles/General/brown.rsi/icon-open.png | Bin 0 -> 275 bytes .../Roles/General/brown.rsi/icon.png | Bin 0 -> 283 bytes .../brown.rsi}/meta.json | 9 +-- .../brown.rsi/open-equipped-OUTERCLOTHING.png | Bin 0 -> 718 bytes .../brown_2.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 932 bytes .../Roles/General/brown_2.rsi/icon.png | Bin 0 -> 366 bytes .../Roles/General/brown_2.rsi}/meta.json | 2 +- .../brown_3.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 871 bytes .../Roles/General/brown_3.rsi/icon.png | Bin 0 -> 378 bytes .../Roles/General/brown_3.rsi}/meta.json | 2 +- .../green.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 733 bytes .../Roles/General/green.rsi/icon-open.png | Bin 0 -> 248 bytes .../Roles/General/green.rsi/icon.png | Bin 0 -> 253 bytes .../Roles/General/green.rsi/meta.json | 25 +++++++ .../green.rsi/open-equipped-OUTERCLOTHING.png | Bin 0 -> 726 bytes .../red.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 882 bytes .../Roles/General/red.rsi/icon-open.png | Bin 0 -> 306 bytes .../Roles/General/red.rsi/icon.png | Bin 0 -> 344 bytes .../Roles/General/red.rsi/meta.json | 25 +++++++ .../red.rsi/open-equipped-OUTERCLOTHING.png | Bin 0 -> 851 bytes .../icon-open.png} | Bin .../Merchant/vest_merchant.rsi/meta.json | 15 ++++ .../open-equipped-OUTERCLOTHING.png} | Bin .../open-inhand-left.png} | Bin .../open-inhand-right.png} | Bin .../General/white.rsi/equipped-SHIRT.png | Bin 864 -> 883 bytes .../Shirt/Roles/General/white.rsi/icon.png | Bin 419 -> 427 bytes .../guildmaster_vest.rsi/equipped-SHIRT.png | Bin 1173 -> 0 bytes .../Mercenary/guildmaster_vest.rsi/icon.png | Bin 532 -> 0 bytes .../guildmaster_vest2.rsi/equipped-SHIRT.png | Bin 1159 -> 0 bytes .../Mercenary/guildmaster_vest2.rsi/icon.png | Bin 541 -> 0 bytes Resources/migration.yml | 2 +- 51 files changed, 289 insertions(+), 154 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml create mode 100644 Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon-open.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon.png rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Merchant/vest_merchant_open.rsi => General/brown.rsi}/meta.json (63%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/open-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/icon.png rename Resources/Textures/_CP14/Clothing/{Shirt/Roles/Mercenary/guildmaster_vest.rsi => OuterClothing/Roles/General/brown_2.rsi}/meta.json (85%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/icon.png rename Resources/Textures/_CP14/Clothing/{Shirt/Roles/Mercenary/guildmaster_vest2.rsi => OuterClothing/Roles/General/brown_3.rsi}/meta.json (85%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon-open.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/open-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon-open.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/open-equipped-OUTERCLOTHING.png rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/{vest_merchant_open.rsi/icon.png => vest_merchant.rsi/icon-open.png} (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/{vest_merchant_open.rsi/equipped-OUTERCLOTHING.png => vest_merchant.rsi/open-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/{vest_merchant_open.rsi/inhand-left.png => vest_merchant.rsi/open-inhand-left.png} (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/{vest_merchant_open.rsi/inhand-right.png => vest_merchant.rsi/open-inhand-right.png} (100%) delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/equipped-SHIRT.png delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/equipped-SHIRT.png delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/icon.png diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index eea7e84348..a91bd27996 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -1,5 +1,6 @@ # General +cp14-loadout-general-outer = Outer Clothes cp14-loadout-general-cloak = Cloak cp14-loadout-general-eyes = Goggles cp14-loadout-general-gloves = Gloves @@ -52,6 +53,7 @@ cp14-loadout-merchant-shoes = Merchant's shoes # Guildmaster +cp14-loadout-guildmaster-outer = Guildmaster outer clothes cp14-loadout-guildmaster-cloak = Guildmaster cloak cp14-loadout-guildmaster-shirt = Guildmaster shirt cp14-loadout-guildmaster-pants = Guildmaster pants diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 70f305bb4e..9a356a675e 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -656,6 +656,24 @@ ent-CP14ClothingRingFlashLight = проводящее кольцо вспышк .desc = Стандартное манапроводящее кольцо, позволяющее вызвать яркую ослепляющую вспышку света. .suffix = Вспышка света +ent-CP14ClothingBeltBrown = коричневый пояс + .desc = Простой коричневый пояс. Он поможет рубашке не развеваться на ветру. + +ent-CP14ClothingOuterClothingGreenVest = зелёная жилетка + .desc = Стильный зеленый жилет с золотыми пуговицами. + +ent-CP14ClothingOuterClothingRedVest = красная жилетка + .desc = Стильный красный жилет с золотыми крапинками. + +ent-CP14ClothingOuterClothingBrownVest1 = коричневый жилет + .desc = Простой, приличный кожаный жилет. Довольно стильно. + +ent-CP14ClothingOuterClothingBrownVest2 = коричневый жилет с застежками + .desc = Тот же простой коричневый кожаный жилет, но с застежками. + +ent-CP14ClothingOuterClothingBrownVest3 = лёгкий кожаный жилет + .desc = Два кожаных лоскута, соединенных ремнем снизу. + ent-CP14ClothingShirtBase = рубашка .desc = Приятный на ощупь материал, удобная свободная форма рубашки. @@ -692,21 +710,6 @@ ent-CP14ClothingShirtCottonRed = холщовая красная рубашка ent-CP14ClothingShirtCottonWhite = холщовая белая рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingShirtCottonWhiteBelt = холщовая опоясанная белая рубашка - .desc = { ent-CP14ClothingShirtBase.desc } - -ent-CP14ClothingShirtCottonWhiteBrownVest = холщовая опоясанная бело-коричневая рубашка - .desc = { ent-CP14ClothingShirtBase.desc } - -ent-CP14ClothingShirtCottonWhiteBrownVest2 = { ent-CP14ClothingShirtCottonWhiteBrownVest } - .desc = { ent-CP14ClothingShirtCottonWhiteBrownVest.desc } - -ent-CP14ClothingShirtCottonWhiteBrownVest3 = { ent-CP14ClothingShirtCottonWhiteBrownVest } - .desc = { ent-CP14ClothingShirtCottonWhiteBrownVest.desc } - -ent-CP14ClothingShirtCottonWhiteCollar = холщовая белая рубашка с воротником - .desc = { ent-CP14ClothingShirtBase.desc } - ent-CP14ClothingShirtCottonYellow = холщовая желтая рубашка .desc = { ent-CP14ClothingShirtBase.desc } diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 0475f24f65..7d32157e9c 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -1,5 +1,6 @@ # General +cp14-loadout-general-outer = Верхняя одежда cp14-loadout-general-cloak = Накидка cp14-loadout-general-eyes = Очки cp14-loadout-general-gloves = Перчатки @@ -52,6 +53,7 @@ cp14-loadout-merchant-shoes = Ботинки торговца # Guildmaster +cp14-loadout-guildmaster-outer = Верхняя одежда гильдмастера cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml index 8fb8e2e27d..c3ed555fcb 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -105,7 +105,7 @@ contents: - id: CP14ClothingCloakGuildmasterCape prob: 1 - - id: CP14ClothingShirtGuildmasterVest - prob: 0.6 - - id: CP14ClothingShirtGuildmasterVest2 + - id: CP14ClothingShirtCottonWhite + prob: 1 + - id: CP14ClothingOuterClothingGreenVest prob: 0.6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml new file mode 100644 index 0000000000..5f38f8120d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml @@ -0,0 +1,19 @@ +- 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/OuterClothing/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml new file mode 100644 index 0000000000..650f73f59d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml @@ -0,0 +1,65 @@ +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterFoldableBase + id: CP14ClothingOuterClothingGreenVest + name: green vest + description: Stylish green vest with gold buttons. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/green.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/green.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterFoldableBase + id: CP14ClothingOuterClothingRedVest + name: red vest + description: Stylish red vest with gold flecks. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/red.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/red.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterFoldableBase + id: CP14ClothingOuterClothingBrownVest1 + name: brown vest + description: A simple, decent leather vest. It's kind of stylish. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingBrownVest2 + name: brown vest with clasps + description: The same plain brown leather vest, but with clasps. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingBrownVest3 + name: lightweight leather vest + description: Two flaps of leather connected by a belt from below. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml index f14b540a84..16ed29837e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml @@ -1,7 +1,7 @@ - type: entity parent: - ClothingSlotBase - - CP14ClothingOuterClothingBase + - CP14ClothingOuterFoldableBase id: CP14ClothingOuterClothingMerchantWaistCoat name: "merchant's waistcoat" description: Stylish waistcoat made of expensive leather. A special uniform for merchants that makes customers feel like beggars. @@ -9,14 +9,4 @@ - type: Sprite sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi - type: Clothing - sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi - -- type: entity - parent: CP14ClothingOuterClothingMerchantWaistCoat - id: CP14ClothingOuterClothingMerchantWaistCoatOpen - name: "open merchant's waistcoat" - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi \ No newline at end of file + sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml index fd809b400e..8b3e10b4fe 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml @@ -10,4 +10,25 @@ slots: - outerClothing - type: Sprite - state: icon \ No newline at end of file + state: icon + +- type: entity + abstract: true + parent: [ CP14ClothingOuterClothingBase, BaseFoldable ] + id: CP14ClothingOuterFoldableBase + components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: Sprite + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon-open + map: ["foldedLayer"] + visible: false \ 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 880b45ad9d..8edf93eea4 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -99,54 +99,6 @@ - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteBelt - name: cotton white belt shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_belt.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_belt.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteBrownVest - name: cotton white brown vest shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi - -- type: entity - parent: CP14ClothingShirtCottonWhiteBrownVest - id: CP14ClothingShirtCottonWhiteBrownVest2 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi - -- type: entity - parent: CP14ClothingShirtCottonWhiteBrownVest - id: CP14ClothingShirtCottonWhiteBrownVest3 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteCollar - name: cotton white collar shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi - - type: entity parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonYellow diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml deleted file mode 100644 index 81c2e9893c..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtGuildmasterVest - name: cotton white green vest shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi - -- type: entity - parent: CP14ClothingShirtGuildmasterVest - id: CP14ClothingShirtGuildmasterVest2 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 0064419f12..738398ba00 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -54,6 +54,38 @@ equipment: cloak: CP14ClothingCloakFurCoat +# OuterClothing + +- type: loadoutGroup + id: CP14GeneralOuterClothing + name: cp14-loadout-general-outer + minLimit: 0 + loadouts: + - CP14ClothingOuterClothingBrownVest1 + - CP14ClothingOuterClothingBrownVest2 + - CP14ClothingOuterClothingBrownVest3 + - CP14ClothingOuterClothingRedVest + +- type: loadout + id: CP14ClothingOuterClothingBrownVest1 + equipment: + cloak: CP14ClothingOuterClothingBrownVest1 + +- type: loadout + id: CP14ClothingOuterClothingBrownVest2 + equipment: + cloak: CP14ClothingOuterClothingBrownVest2 + +- type: loadout + id: CP14ClothingOuterClothingBrownVest3 + equipment: + cloak: CP14ClothingOuterClothingBrownVest3 + +- type: loadout + id: CP14ClothingOuterClothingRedVest + equipment: + cloak: CP14ClothingOuterClothingRedVest + # Eyes - type: loadoutGroup @@ -276,11 +308,6 @@ - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed - CP14ClothingShirtCottonWhite - - CP14ClothingShirtCottonWhiteBelt - - CP14ClothingShirtCottonWhiteBrownVest - - CP14ClothingShirtCottonWhiteBrownVest2 - - CP14ClothingShirtCottonWhiteBrownVest3 - - CP14ClothingShirtCottonWhiteCollar - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar @@ -329,31 +356,6 @@ equipment: shirt: CP14ClothingShirtCottonWhite -- type: loadout - id: CP14ClothingShirtCottonWhiteBelt - equipment: - shirt: CP14ClothingShirtCottonWhiteBelt - -- type: loadout - id: CP14ClothingShirtCottonWhiteBrownVest - equipment: - shirt: CP14ClothingShirtCottonWhiteBrownVest - -- type: loadout - id: CP14ClothingShirtCottonWhiteBrownVest2 - equipment: - shirt: CP14ClothingShirtCottonWhiteBrownVest2 - -- type: loadout - id: CP14ClothingShirtCottonWhiteBrownVest3 - equipment: - shirt: CP14ClothingShirtCottonWhiteBrownVest3 - -- type: loadout - id: CP14ClothingShirtCottonWhiteCollar - equipment: - shirt: CP14ClothingShirtCottonWhiteCollar - - type: loadout id: CP14ClothingShirtCottonYellow equipment: @@ -431,6 +433,7 @@ - CP14FluteInstrument - CP14LyraInstrument - CP14ClothingBeltQuiver + - CP14ClothingBeltBrown - type: loadout id: CP14ManaOperationGlove @@ -522,6 +525,12 @@ back: - CP14ClothingBeltQuiver +- type: loadout + id: CP14ClothingBeltBrown + storage: + back: + - CP14ClothingBeltBrown + # Keys - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index 366dbe30d2..ac48c3bc94 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -14,24 +14,26 @@ equipment: cloak: CP14ClothingCloakGuildmasterCape +# OuterClothing + +- type: loadoutGroup + id: CP14GuildmasterOuterClothing + name: cp14-loadout-guildmaster-outer + loadouts: + - CP14ClothingOuterClothingGreenVest + +- type: loadout + id: CP14ClothingOuterClothingGreenVest + equipment: + cloak: CP14ClothingOuterClothingGreenVest + # Shirt - type: loadoutGroup id: CP14GuildmasterShirt name: cp14-loadout-guildmaster-shirt loadouts: - - CP14ClothingShirtGuildmasterVest - - CP14ClothingShirtGuildmasterVest2 - -- type: loadout - id: CP14ClothingShirtGuildmasterVest - equipment: - shirt: CP14ClothingShirtGuildmasterVest - -- type: loadout - id: CP14ClothingShirtGuildmasterVest2 - equipment: - shirt: CP14ClothingShirtGuildmasterVest2 + - CP14ClothingShirtCottonWhite # Pants diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml index 693d70c591..2c1b521921 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml @@ -21,18 +21,12 @@ minLimit: 0 loadouts: - CP14ClothingOuterClothingMerchantWaistCoat - - CP14ClothingOuterClothingMerchantWaistCoatOpen - type: loadout id: CP14ClothingOuterClothingMerchantWaistCoat equipment: outerClothing: CP14ClothingOuterClothingMerchantWaistCoat -- type: loadout - id: CP14ClothingOuterClothingMerchantWaistCoatOpen - equipment: - outerClothing: CP14ClothingOuterClothingMerchantWaistCoatOpen - # Shirt - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 2c10afde7a..b8818a9cd7 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -3,6 +3,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GeneralMask - CP14GeneralCloak @@ -19,6 +20,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GeneralGloves - CP14GeneralShirt @@ -34,6 +36,7 @@ groups: - CP14GeneralSpells - CP14AlchemistHead # + - CP14GeneralOuterClothing - CP14AlchemistEyes # - CP14AlchemistCloak # - CP14GeneralGloves @@ -48,6 +51,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GeneralCloak - CP14GeneralGloves @@ -62,6 +66,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14BlacksmithCloak - CP14GeneralGloves @@ -76,6 +81,7 @@ groups: - CP14GeneralSpells - CP14GuardHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GuardCommanderCloak # - CP14GeneralGloves @@ -91,6 +97,7 @@ groups: - CP14GeneralSpells - CP14GuardHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GuardCloak # - CP14GeneralGloves @@ -106,9 +113,9 @@ groups: - CP14GeneralSpells - CP14CommandantHead + - CP14MerchantOuterClothing - CP14GeneralEyes - CP14CommandantCloak - - CP14MerchantOuterClothing - CP14MerchantShirt - CP14MerchantPants - CP14MerchantShoes @@ -119,6 +126,7 @@ id: JobCP14Guildmaster groups: - CP14GeneralSpells + - CP14GuildmasterOuterClothing - CP14GeneralEyes - CP14GuildmasterCloak - CP14GuildmasterShirt diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png new file mode 100644 index 0000000000000000000000000000000000000000..37ca353edaf998eaa20131cfcd6285414cb2f9fb GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z%ROBjLn`LH zy=Cux*g=BrgZiRqcTEm04@KGCRvLdrG-Y+pHSMsRm0(@Q-Bi5NIn&Pd!ojV{+^zwR z0>|_Co-6PkG28O~>7=mQx?oTJ%6rwn+b38zbU?sAX>X$)X}3@9%u<^tyd|d8Oeadd z{Q1Vmev8+I#$0&ox_-NVUO{wS{EYkZy)MNyn6ZcOl9KowQP?$-_37Z zl)cU>-o)a?w+FlDt(wAR{GRuiaE!@%U5Ed|<`ebLikUMo)Laj?j@GjJ_bt- zM@sf|YHY&1J@c8=uPUugKI~%HkaIR+?xr47h7-#=GCz*qnP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..37ca353edaf998eaa20131cfcd6285414cb2f9fb GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z%ROBjLn`LH zy=Cux*g=BrgZiRqcTEm04@KGCRvLdrG-Y+pHSMsRm0(@Q-Bi5NIn&Pd!ojV{+^zwR z0>|_Co-6PkG28O~>7=mQx?oTJ%6rwn+b38zbU?sAX>X$)X}3@9%u<^tyd|d8Oeadd z{Q1Vmev8+I#$0&ox_-NVUO{wS{EYkZy)MNyn6ZcOl9KowQP?$-_37Z zl)cU>-o)a?w+FlDt(wAR{GRuiaE!@%U5Ed|<`ebLikUMo)Laj?j@GjJ_bt- zM@sf|YHY&1J@c8=uPUugKI~%HkaIR+?xr47h7-#=GCz*qnP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..03fee9ce7144dfdc28a6757ff5474b5b09687e28 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J3U<-Ln2z= zUb5wDG7w?^P~V#ub710xDHDYYcsjbnAFw&CFn_=mD^)EOCL|^<6n<0U)sp61ll~(+ z_QYRW`u6t=_5%{hJ%48|V2j92IKQ=ezP_KA$nnGPr8Sn8Tz=I4ww!NzqQY}!@$-+b zSlco@DSYLn*_=H;=ekMK){oD2?TVbtC4K5yrr?Q58at+`3Of0J=G8ou)x0h*W<_V+ zoWPaS{s?-SGcZiead&FoO{`qkHgo?!5F^>bP0l+XkK D&r4_G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json new file mode 100644 index 0000000000..447f75bbd6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "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/OuterClothing/Roles/General/brown.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..61822391fcf1123fe7f17a83f97d2b126e97eea3 GIT binary patch literal 740 zcmVPx%o=HSORCt{2n!jt?KorNns#|9=*rj+hff)G@$kL%;3dx^flOZ8nra-2ILa~R4 zK#8Y9r*6g>O!Zd?I&{e&5ECz20vfD<7XQFp2lvE9l^wmatkU*<7M-NyzVE$zItjf4 z7=~dOhGCfJX_}^3=e{m>uMfM|$Nu)t%JKKNcZA*Rlg55Y>0GW9V7C?mjiZC#jC8sk zU_jC*QOf7A%0b&|lgE5P>Fl||lk*?W_l58;qoViIAnNef*2mZ^Sa$t6NEx8gG)-}1 zouO%(0AT2jL&2ZUQL7eXovl@ixVwKOk4Xx^Fc`z>c0~R7+-S5epE&JwJ7O4&$p)+< zI{Tx^44xaHRxQGF1C%QT0E^7?+yJA=jI2S<0M8BJbUQ+}RU@**pUzQ^oa;bZ10>Q} zIpbM6A9YktLMflq8jl=+Ws%mMfuy`S{1Uchz~%Ao{xQ^7`z1ju161*>cyBD;IHi0p zbXFeK*_Zv2LR!7;ULT(>F2w7tR{$1^lG^@oeQiX)57I>HFT1a!pULYhO_F@+QG)Q- z1ptT-!X`71VHk#C7=~dOhG7_nVHoD0f%I2cZh(;Wz{A#O0|4IE-=%I?5@dP)#ySgY zl>qQw%n zyOAw2DyMt9LfwiJb)JfL287qFwumzz&5T%94N60MtpLb6VJV+Oxl(}V2Bhatho)%? zspU`SVNFu)lgT3x$EHiCp=>_p$5-#CPIXR)(@mZ4mmZX?j=KJ99k*9ef(Q49YZ?7w zNf-&vO-QS;O%9_Op9-)((-I?|!{*k$f?%v_n2fCaU8?*w<(3t{jRjf3}Eo XM>w@^ocC}q&|?gqu6{1-oD!M<9b0Vw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c7767e827e6108116b51feaee9426a5254593521 GIT binary patch literal 283 zcmV+$0p$LPP)Px#)k#D_R9J=WlRXZCKoEr=#)5_t5}IvDXeg<;2xs98dkq_-2k`_J5@{$g0h4X` z3BhV9R7_^E&}6=9vokyI%}f?x7>4;L(lDIX#NV-@BzwX^?2GBR+rPwOUre5GsQR!d z$!Qo)g=!b$fn(#4=cJmX2|SA>k&D2wO-s-X6skoMx%2sSzClkUiClb|&JtVdgQ`@s ziKPx%h)G02RCt{2n!jq}KoG`9=fj=BhQp9X1Y+a|aC60hIY=JCB1J-8Ado6)4!N+J z162oCT_==6oSs5(#Wi_=gt$=?aFGPmI0<2|aMoGN@}F7D&IP_77_-u{-^}c+R%nL^ z0000004&C~EV1Z*6oeE7VWGNm%)RZMx%zwCJA$kIk<+)Qu2T3~7{u}=p3BMSn-Y+T(vg7=6zU5}Ytm}(lWq^upS>oJ1A=|Qu zhz#9vINUuxQ?pUcb+*~4(&hC%drVdU`st8j-xKYlQ={YbCY+9aPxRB_ME@uVr=4^l}lRVX$2rV+iH82l%L0^gP&7+^8fPsejFIJ-!f@zogZ zIJI(V?5zA(XJ7VP3sDeKYs(bs3r`e;WLuVKZJF$s5MBLQKOKGc_BBsrUFpB9zK$JQ z`*)rZn{fVr(FXtk00000000000DyN3>#MLVkdOx<2hIq*h?tE;8`Vg*3`938n`Q8z2pJ~}msHvd^#+9D5T)zfN@E!u~p9j9lgXM(n6iR0at zR*?dS96Vi}u&A>W|eNRMgSEx4V z^6u&bil(ptY_dY6NG<(`;Nd=9+$4sq3(BhzSQk>OpAPBbCNWld?y!oaq)^_&@U1gI zHwao8kQM8v!Px&UP(kjRCt{2+A(MvQ5XmC|CwAAK}|#gE{E1ihLRzep@oJLsAC`mgbZ;DB}1VE zf(XS9kwTC_C}b+#>>voG(6L<#DRgMakSQ2Ra0!USBnMW#n%BYJMN*CTo|-oB{Xh^s z-}k-mo_FH=073{Mgb;GGkXKRQ6wn8Ix}NJ|~MvA`|yV0W>E*HZs)lINs%G z=JVxxqwTSsUhjsx0Id_womGr8aZ@1%p;%B+EU3nFQCtPMfQ&u$s?xzxI{;u@aUiEz zaRFI45wr12QZr_`-axtDFit>8vJ1uMx&}DW{N8`d*8!UgISp`6&*PrggM+P2STNXY zfD;UMgTpgCOTL!+ zaqn-9r;9`vkxgf?5sP*Fp%qW1xZ`sdpqqXcfH$^Ce69kRNoG(5_@CkvLI@#*5JCtc zgb+f=oyGO9u-*fp?*}X;-beuO@X6yrqugy)E_sJKmSWuBys{nv@{R^E4?+av; zub93mqVLylf7uoKo1NG5ryO=9Y13bM<4m z8(rF5Q0A85UWoQ(Jnkl`>&cV=jD1KWUvI!N;3g>muvE|Sd2176BSXz@5nGSr_447p zqkYLzJqG}USJ!TB1%y}E05prSceH;icOJv_i{X@ilC8v(Y>-Wot@Jo6@g$q_PYyg@ zS7Bd(g}e&OrZYXa#hIbU33(M3_67cZ0SF<45JCtcchYZ>^Hcdih)+KN0000Px$C`m*?R9J=WlR-+uKp2I;w4F{Vq_!ax+=PM_51<$50R#`wrDq6&xReSG^QqZ#2ri zbLjgi!1evK@Z3sK;mmkul4t&3z`v;JhyffaI6Bx*!$jdo0YIl-#gT$AQM%)bH!#n} zdOI`j)T@h(SUkYIVelB!_3U5!r3Hu(+&q6|>wdclK-aSglq5ow8=!@vC*kt;jnBpk zfs(v$?ciGVl8vfXkcJX zvIg!FavK;}lX3#U&mZqesJuSW7s+=67suK8*~zI^0E59`Fc_B37oT}p2iVOTXaE2J M07*qoM6N<$f{uBeh5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/meta.json similarity index 85% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/meta.json index be228e48bf..efcfaa38fc 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SHIRT", + "name": "equipped-OUTERCLOTHING", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..59ba4362c20926c7ec751bc74a83dc1607d9133a GIT binary patch literal 871 zcmV-t1DO1YP)Px&AxT6*RCt{2+D%IvK^O<{|7fDC5KyaPs0L+Ya_}Tx6qMj0A0USWDG_hES}2Cn z5)WAfv8O^##U4sLgytjkBq;PEy%lO3C~2uQNGz_Dyi~S_Fp`(m&183D3(pS%$tIcS z$+I(?VP^nB2qAKRbT!5M-BhXOd>|_emjH;004!&s+&L|uL=hj6;pOtA+NUl(2L47 z3V9VVWv69m8WAc$Oxa;MwWOOsPAzqmfT)~W5;|@~r~te1xF)+KG+*qBt z8;zzqO2o)$G}Tso(RPLZ1uiPrSehHd;hPsX!ItL6@afAh(WW|L6n`|D0@mAaPpAi6 z!ijS>h~r!Z#Q`rK1&8r?(}&`K7w2pcmvCa09f>q)D7?M~09a*5E%Eu|I9IVPeuMhS zNb^H)5@N@MNF;tcgoePBXA&d*P87>kJl)&7x!~=_D1yb()VQm%YK-tuQ+R8Nm zh~yx=JkEs^Nmjp9-mTl@yccHE8GOrs$APk`74j+q8(S=#NV0GuDRcrlE&xy~f|>7k ziWi&jOE8m%sR97NS(UYHnCK?6C&6?9>N))LRyKF1tg@}0Rn2!m%L?%D$G(<~Sz1qB zRu@@#g9OJHK4;xBt}uwy(F6Q>ePUT+w@Jo&Q24lS*^m<|fZl5FgyewRSw<)lVp-*b z?bm{5Pfp7cRU2@@rzM6CqebB x-iPqd%ce6}nel5YGyZ$~`z3@BLI@%MyT9cAUh4kiT2KH0002ovPDHLkV1gT$k4pdm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e3b0ccd860f1b715f387480c94f498c2cbf4ebd6 GIT binary patch literal 378 zcmV-=0fqjFP)Px$G)Y83R9J=Wld)>UFc5}+HFfL+47RsI;>DtVfG!yVnfeHYQplP$okXB?3IX9q z=-Q>w=jhl6DAbFWLI_TYm&75cQ$kZU(1V&R`WAuir2jvi4lo!Dh9ko$$rop#8YRiW zGg1ik`jL_DJfS25z{CBWqU`^xfyi|ba}QF8JuxYSin)i#b*eQmFE@Ll-`Ah6hZ~IE|jm< z7$ph2>R*!#oKlk8VGDt6?ZmeGTT|_@MG^;yE$H;R@awf-$I!3W(CKx_1`Gy+!EkiG Y065NHuQEe$j{pDw07*qoM6N<$f;Whwwg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/meta.json similarity index 85% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/meta.json index be228e48bf..efcfaa38fc 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SHIRT", + "name": "equipped-OUTERCLOTHING", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7f271034211efbf526a3ae64ebbad093199d3e54 GIT binary patch literal 733 zcmV<30wVp1P)Px%mq|oHRCt{2n!j$^P!z^LSD>oR29-!8U~8ETPteg1fE1x3mJAu`!a#S1OsUiX zH4{QYNIZa-Na@h25-^mZZZp|UW2++VLaT~Mw}W+^8$&49#wM!HPh#-(pYNW}=i12U z00co01VIqQze$&hEX@8e47z=!OGP&5_5TSsJ8aPH zEB<3zdMA+iQU+`TG5CBT12vai8myX20?0^T|AFiY`lPqi>AS|GK+PqwyQ6qNH~3&k z8Swkp9{`KN@@>9?@eNSBJ99&ob^L=&DX@1-=PGN4^=D5l}y!^pXkE^+u#A!S(GKgFRyyTXT%9IqVq=tS@!KI{&h6-L(ig=Kz??aS<-+xIm6$j(8^0I>rk zU&x@T)oz_1rvV}@y~D)H@N_s@J1(ixm{@r^JU(JAxRqhQ5plsQ)BdWE%#8?K9d6ef zN>i&TqVsA+i@aPcYM6$DrdCtJl;lE{#{qXK@Lqwi*IE}fd&=}lkL3&UEiryV8E|-f z<|{Ln2z= zPEzD!G8AyNXYmVQcWlc4&U7PgA=^>a4+Z=|mzS_V&}lf#z}BuT$s)ON$+Ek;oF{F5 z&c6Tu2t$(s$N!crp3+Kx!&AB$>6yvl&F^c! zIp%e|n`K?UI77njISdSss&1WH&27;A^EsdY^StK)ItLExd@^plz1jAR(wuPBUkq0z vf_fF->bS};n5%kj5&u_J7DoY=h57d;y)?}>lh4=*bUlNotDnm{r-UW|fq`E` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..abdf188379a7dba6692b10b50c6fd7da92cafa61 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dW+zLn2y} z6C_v{Cy4YkEo5ow?fn<5)X%$N!lD_IyXPJ>IQ6-HYPyZ`u9(~3TK~t}|8rRNcZns# zO{1bOiOfDrvJ9rAs(Q{@#rNaiTlKKh2{kip&dMABf)9W0%I{dZI(VsM!bd*gZ}u?29WX1ph literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json new file mode 100644 index 0000000000..1452f4b3d7 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon-open" + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..62adb31bc13eff5c38aa0ae0bc051d0da4b314cb GIT binary patch literal 726 zcmV;{0xA88P)Px%kV!;ARCt{2+P`nwKoke?uPd0cK_!X=Y%R0lFX-q$04YL6EEyP?80gNx#LxjL z6GB2rOqo0sDIK~33ya%KhO~H~8|px%>tNYA9DexDKa$~nB!(E<@80v}kbDmygb+dq zA(y4gC3fli$#5J=?8$I^_WqZ?KP4eEkW(7Hu6s_Ub}f2qUokuSfK7&D#d}UiADn$S zrwA9ouds^1CtoOLpyrcDlU4Ic02$%?zY)DaUyhDe`qc3#sQDz`T`BIzPF{|10f6Vp zo=QIGdf>g@G%PGud;I?M4*-x&C6G7Y> zV@u5d0Qm6UUWb1CJbd_JE`GeXpT0ahb}aE@=ba;604H&$5OK<;5^nNAXP)q{z-Gsg zP1%Vr)=!1l?4D*qShL{ZJ~bd+E&;&78o>Vz03Vg_LNSD9K)=~iOvA$6bdAdGBLLv@ zw_muMu3;J$`ps6P)4_?q*)eQ(42#tsi`5>R9g~hPbb+5$J*qXp&lqH43(bJ2lM6D2 z*Dy9h2qA*Fi{ucHqbzcaj@&3)%3v^B=>yfk`U)`8uq;4MU4oJI-nu8_!sklq~aH(N?ut1Eov z)v6YGlLQ~bG%U2Wx)NkdPPzb&LNNnr{3~V=>k-0*VxYH?i%nCGr%+~Y-e-jMK?y%y z!;1HCf5X(O7D~L({sk(xkC8V>0QRqs)0{yFA%qY@2qCim15$M%%o$Jpi2wiq07*qo IM6N<$g6s-PJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2edffae73561bf941698811143d0667f909b064c GIT binary patch literal 882 zcmV-&1C9KNP)Px&EJ;K`RCt{2n$JrcK@`Wo3AI|yDcggPY!AhMAZSes#iDr0tstUca~Aht#H}C& zPeLz}VzJaeAP5T~X9F%srH}>#xknLnBX~(KibMschjrJ@njf9bX0hdcAcV}!&iB2y zGqYje0|)82XZLMx1i`8`)B{9Cp{}!0Q2?|G_xygI!Rm4rQ_9!_19AzOO(|ngm$TdkI3X$u z5W2d}PgE2f&&3shLY1$--SfbHeW42EwF(Z;E&u=n{Q(U02LR~pt?a7@R{((fZD2*{ z>eiRPhZv3nFazQQ?f?{5b`e<}HMc=7A+yNpD2gk)0O0E3XXW{aZx7n)IbLsEGq?f} z^y|ZmE4z>~F>K8(=_mi4^G1KCFynQ*Lm7A-YC2xFJZmwX&)2&rd zGfy0N9}oec<_xg@27poDPc99vkj-qa`Hrsrch25Zxw*p8wI4H^YY(2!ZerIzJiEZ* z*+pCWTo)Lp^48oEd-?R%Y`2Pc>I|^j&`95jwxc^%@A1}Y#~+hEK@bE%5ClOG1VIo4 zK@h}03-?=L>l<0|MHm3^`rTXiEaKqT4?PK@os`Ws-nYYCiII`s5bI+*tdH%mNLXdZ z^Agie%57(Xosdo`&`!!Yo|jl8teSR>^fs?zvEwK)Vh{1QRyMO(9`{L^n3*Z|VkNY4o|m@Mxh2ipx&XJe+X}$OtjyGftX@3jF;XT5 zbs>w5S!cyj2HffKdXzMV+vI1K*Nc=onjy|5WEK?#l;l^g%;$IoOvb0NcX{e7RDtv4 zJ_gr^T`}ly7+fF5d2%0xDzJBX>L@F0z_kJz3FWm42GP2R$_)&Sysae8X%JkiY4P$f zbW^MC{c8O280rCx3erxq7z{CECG1^#qe&11K@bE%5dRr}0EDb+WEd7C@&Et;07*qo IM6N<$f;lOb8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon-open.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..aefe9ca7810fa7548187895ca067edaff8148b16 GIT binary patch literal 306 zcmV-20nPr2P)Px#>`6pHR9J=WlsgK-KoCHm0b^sOrP$;sc6N3a-XLWv8&4qE3ZB45uoMw;0l_|j zG-9chg&)XTZNLx8Bm|pzu&^+*JC7L{P!vV^GZjg4&}fPx$5=lfsR9J=Wlrd`pF%*D51IArPx6nV}PdK-mOHmNFF1@i(aB*@JI_lD`6b{PG zbr9|k2<}>L>!@=*A?Z-=I8jQY937f(3FN)J_whmk4u`|>$5d>R@9RyIqym86bex}k zxqC1GN@^arA67N3lHcQ7Gr4{vlPIF3CWw5lyeF%g$CZ9ywKg=WwUe<%wZ>{~Y|7aS z%m*_%VH+j&!M>83PS|EXn3XHA_`EEBu>hRDhI7Y%mcVit(;9gwso83clA6}YV>yh= z7pM!7O9YV*KoI$P^DJJP0KjIy1IS07t=WF50=?^+ipAzP{jRNp!{Kl^{yAS6Y+zzCCbWkD0000Px&4M{{nRCt{2n!igMVHn51Ck+vG%5@Nu>*PNmT2rA|6qjrT5e1uBxWP!SgA`o5 zNW@~PAlsYcW@!7j?5<)A3r34_d^nZ$DplkU{Aud@RQ31m&Z#x8^YPW^H?dL z(f0rBCzkzsvg?7LUfsZaxN~iv`zKr4*${Tq`%U+D)BAx357ZT5Pl9z>!8a+UO9FQ~ z2%KJb-2_h%1VIo4K@bE%5ClOG1o7X&eJX4}k(FM>003{^z4gx{4u1Wp7eS1RYU3X7 z=`dGaU}_-B2H61{WCv_Crm^!CnHd*V$7AZC$z@d-7ge0E$ZRyGHT;?y;OkQ1Qb22< zqcM$ro7=V~nc30!B6QLX_;x0kM}!WLW#c*;=8 zFfj)Io1~nuY?NAB;@l>|x0a4xJ`DY|<$1qaFCOFlfYm`7H0el`SxPv%?Tt->AP9mW d2!i;>_zNwCO!H-^Uf=)#002ovPDHLkV1g@Si^2c^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/icon-open.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/icon-open.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json index 8155cf3eb1..168f3b112b 100644 --- a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json @@ -21,6 +21,21 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "icon-open" + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png index 10cd0c51e040410ba2a909427bebdfb2762be155..04f7514f133b27e8be035db4754cd75cc3d23718 100644 GIT binary patch delta 847 zcmV-V1F-zy2J;4xF@G&dL_t(|ob8%1NE=ZY$NwqCOob4*cS44O5L|Ku9JF9RY9^$T1U5yYc9Gb5$0&Dq%T95Z!HY9Z|# zjKN?Go)FR|88=erzF%zB;a2-25e|hIPV>>MvjDh=o^;s(F`+vL>3xa&+bIeSn|KtjA9ec!( zT#`|u*_r$OFeqtxZhfsRy|-NrK7A-+IQhxn=a(+Fb}JLx{-&X?wF?a6^G=$}Q!@#D z?YkxS<*0bxoSoRdKW+U)4nMTLOk?sdMV}xDf*=TjAP9mW2!bF8;=e`vP3qouH8Art z003*DoPPm;cOTzR*ex|~{#*k9?0O>r1{ERQ!iaWd$jr~+>$fie27LmOhngmylhdQa z@YT5NP5AZmL^}xDm7#)>4J)(JrU>cKa|c4|%vt5IJTCny7+LLttWtSAifn_a)vm(= zq`_DijA^j6wjNI2b!^mX*D>F8P!7OBbw5~`e}5Aj^Lb~aPCrdNAx7$h3-fQZ8Z)$4 z05B*;%S70;8)2Qk?e&tF)1vM5LOod$H}f-No2SO16@cL-R=>MP+v`odBSeL+;Ane2 z)bH+NSA!G3r04zy+lbcO8xF0-0vs)7nX#r-AYF44L|<`K@bE%5ClOe Z^AGmE2$3)&xEBBb002ovPDHLkV1f__o2>u< delta 828 zcmV-C1H=6D2H*yeF@G9KL_t(|ob8%1Xxl&(hJTk5PXS|)6!1_8lq@xd3`rqP3vsiQ zPMtb*Y^F@!lO@US$&)>L=-_lJUYZt~W@tMYg0uud!Gpnf0%6ExE$SfdI6JPQlN>jN z_bs;1(*5t=-Mtff4$Y3rYPo_DXRw_<_Gxw;je==mv$~6JyA>9#75Hq3&FZccE|`{1ms$vY!!%)-COppNCxBG? z590o8)*IpW&VL39rX{@!L|zs%E(Q+(w$qnJZ0~F!Ydnb42PS7et$wTn1S8IHcJ9jW zDysJZ;OyMJaZOfc>8o2Hi+-#Fm><9}P1sH!TSuok<_GZE5F^guaW0pe@H+DYY#p8E zY^M*yG{O8J`6xB@fyfE!)=Q&*>k4ok`$k7%Nvf#PnSc2KT*po{$bYS`6{SxO>*34i zkKwZ+iq?v37r)QWT^t4GV(Gr zs}@BFgYMc9LT9yHk?C<^Pszw@Cu9?)$5mF#6#zh|a{UT9mzrP$)BIJ6uvy~KJ~*BE%?xmScFVZ<2*-Wa{B>xp*VZICz!?$!2lVri+7 zR*lAsrex%0QuO4o9uB-;($=JXXq^K0IRl%vFe6iegdnQk>SwMAN&@o(eE%BFbjiqP z?lmt}5LD@1U4!{Ss;96t930njLT`Hi69hpJ1VIo4k(fVJBoz}bD4e1I0000^p3nxbau+fUyJOW^?^*(<1_i21KkJxBsQued~m27c@K!!2x z;k2ZZElar|3VbDNt*Ho?wbn$T+~>E4(~=Bh93fE2_B;ddHP>vRbR>r?<>JVAYU&h5 zM delta 379 zcmV->0fhdm1ET|wF@If2L_t(oh3%9-Yr;Sn#($QAYbfL*I0%JqN;e(E4q87-r%vwe zV!LN@@-z4eY8SVTl57DXL&3X1$l5IFP?E+tn3$!7`%RaZ=icYJKRM87G@Ady(q1G> zdy&-D6ls(-?{zyE!eZxa`3$~}G;OoVb?=r)NgUVbVfI+6_kT%I-rN)dfRFdLgAi@A z$zU=CAW*7Oh>J2QQ#{upP>R81O51GG>vl5pKq)-esnYIrfTg`iM&mw)u(DMFSqLCA z2XI`UNJ$J~F&g(Nb013WK%^w=jhBt{q~>XTz44ATX9tjBj41?;>oc6M8ZwLt<(^1M z0;Mp7m6;pDLUe{P!}+S=xIU&3$S|%K0DjKB*eE@cJUeH55WMVtDD|tPygu8>{oM_r z+;e5MvU>Wx-grE{%qsP~tRgNF%6*;bK*b$^-*+Kzer2^PJwCMpq#=s6bIdgwjYjh) Z_y&-bvvOe|duRXv002ovPDHLkV1oD8w5I?7 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/equipped-SHIRT.png deleted file mode 100644 index 44b838f09aa0b2116a7d4a38ebd3a6451f25bace..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1173 zcmV;G1Zw+Px(Pf0{URCt{2nn7qIRT#(rX*C-QOT&a_B(W~!kb*SLHVdm|EiP+4bmL)J=%Qsy zFUAe5D8*x};@TWM4IYw%sfS?ELt0O1?V$*+1!Y6CwiARVu+YYYPO=Hv%Tl^so`=~P zCpJmvP1B(AewUE<9^e1_zW3$LkoN%$27|$1Fc^&1#DoYLo*XBw)(lUMlb8@`x#lGL zwhO+d_K%xy#&debJ%i_vIPb&+#>xHfel-1a&G6(nNd%mDcz6ymAwmK(w~wqbilPqy z(NwbTI{=889Yj+}0DxzZPXE{hC}LJSkL)Ia+hIX?VV+#Q`JO7UvM^8Lzb_-3CvbUr zcm~n7Bxv_4B>WI@aXYV^?Pqmw_#gdttMkagp6Lf2&qo(GNev&DTi_}-pwHTZ0C-;jRG1Sr%>64vhKWT8BHR&FxoQVDK{ z1=+l;wRSg$T1jeX$0%BT1?{eDtASR(Wdfw?0s8EAh?yN+y0c^gfcRDw(?cA_J`Tca z=ke~BpJIB5Lwu_W0JwB#$s}fW&}X+psvhWeM6bRUZQu&D`o~s4E+eXjUg$XkKu$s; z;KbMmA0iQOs=+JsQuP42jCicL9vbQQ_H?VkYm;C^pX!u;X>^42^;_X~STH@r;r-Yj z_&V?k;#*Z@i~A_&Yxwh*U)%QhYo^azp9k>w&*0JHr;ut-4C(7S0~CUnZ=js7AzR$9 z8&`r4UcNzNjv7T@syzW92d)j?h(7gh#e@j?{D%ef^;^}ka=wPouHQsEUw%5JZ^+?B zkC#pa|8LP}Fc=I5gTY`h7z_r3!C){LjQ=du|D?{%3WVp(0058AYXX4R-gv#uZt3H< zpVt8ZVtSJR@{Q0ZU(8U&M77vl5-7H183{T zs?wfXde`51n_Ao`idHsHP?h%T=6nNZsTwn=D*yl$fFALa00000NkvXXu0mjf%NsB) diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/icon.png deleted file mode 100644 index 8ff47b9ae91ba46dbcb82691ffe4a64c322d33fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmV+v0_**WP)Px$&PhZ;R9J=Wls{+_Q5?rVaWK*8h}<3IEE$9hl4P?YB~WU0(Mh3D5Hei}DuOr$ z6blYcnbN^b0k?2YQcCDl2M4z#6q=Bsy%KmAIBqOi&LP}E{6p_mL5KH&n5Sb~IO8s6_VQ1k zGw#x{ElR~atwuBaYXKs2%`h3dA%$E9OHVKKSbCa5F2m3b(F{{6M4|~q)b}R5dvJ~V zu7jngDHZcrdYbyKGq3MWWaQ2d&}uZp%GxrTVG?+PlOqxD-M)KoVFfrj5(J(=GfXOL z%Za9tXaa#J*gqHn#J?e8>Ur__0rn3@1fKY%j&uOw&(IBn{@|FEZ6^iL?)g;9S=L|G z&chimoy5w4ApX$t=1tQ?3=WEKEufwQ#auB%U3B)sasH6-C*hl z3@2v`^~k)ox*;P6NKOFeH{Px(K}keGRCt{2nqNp;R~*MbDZ_OSx@hA~>nt5X=LW_=?A%5tmb81&*HRyB`yeP3 z`{X)s5A&sy(Lmuor7!Vi59(9O9!7nz3but+Ljq}hs7)6t+Pb8vhB~MO=G{YfFEZ>a)w9MyJe6@|I!DK1{`rN()ji`RRZo1UUpQE*h-#iA>dR#ycl97m0#)m2fp zt&#}{ssXLt*M?njl1-<8{8JyBzf*AE*!&&lrl$bNrc>AzC+)trJ$Hre`kD1Ckz|gS zZ}M)}Rc%pMwFN*VnIp5F71p;@0oinld-oG$*0bEYJ5F8I78g2>0Wj3(p{{C+TX)CF ztY^7*KVc+mztHu~=z#-9LI7d?k_kwy<)~E@;tNZhxe>AfoNyckprNrIyW-?oVg+;i znHwQnd|`=NMIp78v+RgfeKY33bwu@dt$@Tryr`jPi50Tx6b+5_MIBEp#CH|9f?0p< z&-a1+)7OJHCqch1qAxT`w{&_neI!2b`-~6&I!7e=GtZYdj6V2yGP>uHe<$kOztTQA z`GHYwdN+9a<_N2qO`a~lW#z$dLi$3pK=#2 z?_1H=Uy96>t6!GG#ip0T2>#!qFOf(j5{X12kw_#Gi9{liNF@JRgukSY46B;6rf@aZ z?e*Bc?D%@$oU+2B*@wiVv4XF|skIzG{5U8Slkm!r{`=;o0i)gJ_VB6a^F#eC{UjFF zlJS^v{{7f(Z*-d5K4f{?b-3#yQqL-l=86{mdAkp!D}|Xw9L~@er8bKNd@Tp5&9>i zj0~&Vi&yi8uU2gd4T3uvjwExO_tlg6<#!QtWszCW($MH3G+S8mqVvB_Sz|yk{G+jg zcY}lC=A{ArqviGYVhB%z+cED7>AKu^;O_xlm-}oZ!>TdLKc0*pw4_8Lkw_#GiA3^$ ZPx$*GWV{R9J=Wlrd-%VHk#=bg)kCrRKh?ZJ|)wL1-0f$x=cgilB6=G!&sjP;n3k ztzhR4qEN^n8A|Hl&<;X6RxpiVof1ev@3t$!UV?qv)9jg`DBH6Z;HR1$Kp{Ei+8wpE>S(Xq9VXv}d{qGjr4Q>z&NZO{0sn&onUtN%-18i%3{Q7om{PF}skY z$LM8tAxR;hLl+?u)`G+xFOW&4o3VHlO$^+s13)34W39Mx;NDtsgF-$BfLnFY#2^-r z`r3l84Y*Z@t!qJqIl8}HqEvpt$4_4=l|5<=mk+OY0%Znz1&N7y9w#4A zDtkO#eNWx_O!n;;N@b6S*KUxQm=6*M1l$1pcp3eACjdQ0Z+mW9l|Vn>i3M5`hi4}# fS11$;#eczfF%+U@dvv8300000NkvXXu0mjf%C7aq diff --git a/Resources/migration.yml b/Resources/migration.yml index ab91c270b8..65a3b10613 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -243,7 +243,7 @@ CP14Nail10: CP14Nail20 #2025-07-02 CP14SpawnPointBanker: CP14SpawnPointMerchant CP14ClothingOuterClothingBankerWaistCoat: CP14ClothingOuterClothingMerchantWaistCoat -CP14ClothingOuterClothingBankerWaistCoatOpen: CP14ClothingOuterClothingMerchantWaistCoatOpen +CP14ClothingOuterClothingBankerWaistCoatOpen: null CP14ClothingShirtBanker: CP14ClothingShirtMerchant CP14KeyRingBanker: CP14KeyRingMerchant CP14WoodenCabinetBanker: CP14WoodenCabinetMerchant