From 36da152d73112ff7e85e111e5f7fa4a6cd02e1df Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 11 Jun 2024 13:48:01 +0300 Subject: [PATCH] Clothing update (#231) * added cotton shirts * pants update * add new cloaks * Update misc_startinggear.yml * glasses update * Update migration.yml * remove yellow hoodie helmet --- .../ru-RU/_CP14/_PROTO/entities/clothing.ftl | 12 +- .../_CP14/Entities/Clothing/Cloak/cloak.yml | 33 +++-- .../_CP14/Entities/Clothing/Head/helmets.yml | 15 -- .../_CP14/Entities/Clothing/Pants/pants.yml | 21 ++- .../_CP14/Entities/Clothing/Shirt/shirt.yml | 65 ++++++++- .../_CP14/Entities/Mobs/Species/base.yml | 12 +- .../Loadouts/Jobs/Mercenary/adventurer.yml | 138 +++++++++++++----- .../_CP14/Loadouts/loadout_groups.yml | 24 +-- .../Roles/Jobs/Fun/misc_startinggear.yml | 7 +- .../Simple/dark_blue.rsi/equipped-CLOAK.png | Bin 0 -> 1012 bytes .../Cloak/Simple/dark_blue.rsi/icon.png | Bin 0 -> 498 bytes .../dark_blue.rsi}/meta.json | 2 +- .../Cloak/Simple/white.rsi/equipped-CLOAK.png | Bin 0 -> 1020 bytes .../Clothing/Cloak/Simple/white.rsi/icon.png | Bin 0 -> 519 bytes .../Simple/white.rsi}/meta.json | 4 +- .../Cloak/furcape.rsi/equipped-CLOAK.png | Bin 479 -> 962 bytes .../_CP14/Clothing/Cloak/furcape.rsi/icon.png | Bin 325 -> 527 bytes .../Cloak/yellowhoodie.rsi/equipped-CLOAK.png | Bin 778 -> 0 bytes .../Clothing/Cloak/yellowhoodie.rsi/icon.png | Bin 388 -> 0 bytes .../alchemy_glasses.rsi/equipped-EYES.png | Bin 348 -> 501 bytes .../flipped-equipped-EYES.png | Bin 360 -> 525 bytes .../Eyes/alchemy_glasses.rsi/icon.png | Bin 266 -> 327 bytes .../Eyes/alchemy_glasses.rsi/meta.json | 2 +- .../Eyes/gold_glasses.rsi/equipped-EYES.png | Bin 293 -> 370 bytes .../flipped-equipped-EYES.png | Bin 297 -> 361 bytes .../Clothing/Eyes/gold_glasses.rsi/icon.png | Bin 245 -> 265 bytes .../Clothing/Eyes/gold_glasses.rsi/meta.json | 2 +- .../Eyes/monocle.rsi/equipped-EYES.png | Bin 232 -> 267 bytes .../_CP14/Clothing/Eyes/monocle.rsi/icon.png | Bin 226 -> 202 bytes .../_CP14/Clothing/Eyes/monocle.rsi/meta.json | 2 +- .../Head/yellowhoodie.rsi/equipped-HELMET.png | Bin 638 -> 0 bytes .../Clothing/Head/yellowhoodie.rsi/icon.png | Bin 231 -> 0 bytes .../Trousers/dark_blue.rsi/equipped-PANTS.png | Bin 0 -> 719 bytes .../Pants/Trousers/dark_blue.rsi/icon.png | Bin 0 -> 373 bytes .../dark_blue.rsi}/meta.json | 2 +- .../Trousers/white.rsi/equipped-PANTS.png | Bin 0 -> 753 bytes .../Pants/Trousers/white.rsi/icon.png | Bin 0 -> 400 bytes .../Pants/Trousers/white.rsi/meta.json | 18 +++ .../Pants/aristocratic.rsi/equipped-PANTS.png | Bin 455 -> 683 bytes .../Pants/harlequin.rsi/equipped-PANTS.png | Bin 824 -> 0 bytes .../Clothing/Pants/harlequin.rsi/icon.png | Bin 395 -> 0 bytes .../Pants/loincloth.rsi/equipped-PANTS.png | Bin 470 -> 795 bytes .../Shirt/Cotton/blue.rsi/equipped-SHIRT.png | Bin 0 -> 852 bytes .../Clothing/Shirt/Cotton/blue.rsi/icon.png | Bin 0 -> 425 bytes .../blue.rsi}/meta.json | 2 +- .../Cotton/dark_blue.rsi/equipped-SHIRT.png | Bin 0 -> 888 bytes .../Shirt/Cotton/dark_blue.rsi/icon.png | Bin 0 -> 435 bytes .../Shirt/Cotton/dark_blue.rsi/meta.json | 18 +++ .../Cotton/purple.rsi/equipped-SHIRT.png | Bin 0 -> 879 bytes .../Clothing/Shirt/Cotton/purple.rsi/icon.png | Bin 0 -> 447 bytes .../Shirt/Cotton/purple.rsi/meta.json | 18 +++ .../Shirt/Cotton/red.rsi/equipped-SHIRT.png | Bin 0 -> 926 bytes .../Clothing/Shirt/Cotton/red.rsi/icon.png | Bin 0 -> 461 bytes .../Clothing/Shirt/Cotton/red.rsi/meta.json | 18 +++ .../Shirt/Cotton/white.rsi/equipped-SHIRT.png | Bin 0 -> 839 bytes .../Clothing/Shirt/Cotton/white.rsi/icon.png | Bin 0 -> 429 bytes .../Clothing/Shirt/Cotton/white.rsi/meta.json | 18 +++ .../Cotton/yellow.rsi/equipped-SHIRT.png | Bin 0 -> 868 bytes .../Clothing/Shirt/Cotton/yellow.rsi/icon.png | Bin 0 -> 449 bytes .../Shirt/Cotton/yellow.rsi/meta.json | 18 +++ .../harlequine_red.rsi/equipped-SHIRT.png | Bin 1093 -> 0 bytes .../Shirt/harlequine_red.rsi/icon.png | Bin 489 -> 0 bytes Resources/migration.yml | 7 +- 63 files changed, 343 insertions(+), 115 deletions(-) create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/icon.png rename Resources/Textures/_CP14/Clothing/Cloak/{yellowhoodie.rsi => Simple/dark_blue.rsi}/meta.json (86%) create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/icon.png rename Resources/Textures/_CP14/Clothing/{Head/yellowhoodie.rsi => Cloak/Simple/white.rsi}/meta.json (75%) delete mode 100644 Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/equipped-CLOAK.png delete mode 100644 Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/equipped-PANTS.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/icon.png rename Resources/Textures/_CP14/Clothing/Pants/{harlequin.rsi => Trousers/dark_blue.rsi}/meta.json (86%) create mode 100644 Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/equipped-PANTS.png delete mode 100644 Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/icon.png rename Resources/Textures/_CP14/Clothing/Shirt/{harlequine_red.rsi => Cotton/blue.rsi}/meta.json (86%) create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/white.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/white.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/white.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/yellow.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/yellow.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/yellow.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/equipped-SHIRT.png delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/icon.png diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl index 297e75d253..3a804445de 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl @@ -7,8 +7,10 @@ ent-CP14ClothingCloakFurcapeBlack = меховая накидка .desc = Брутальная, выделанная из шерсти, накидка на плечи. ent-CP14ClothingCloakFurcapeBlue = { ent-CP14ClothingCloakFurcapeBlack } .desc = { ent-CP14ClothingCloakFurcapeBlack.desc } -ent-CP14ClothingCloakHoodieYellow = желтый короткий плащ с капюшоном - .desc = Защищает ваши плечи и голову от холода и интереса противоположного пола. +ent-CP14ClothingCloakSimpleWhite = белый плащ + .desc = Длинный плащ с высоким воротником. +ent-CP14ClothingCloakSimpleDarkBlue = { ent-CP14ClothingCloakSimpleWhite } + .desc = { ent-CP14ClothingCloakSimpleWhite.desc } # Eyes ent-CP14ClothingEyesMonocle = монокль @@ -23,8 +25,6 @@ ent-CP14ClothingGlovesGirdles = железные наручи .desc = Бронированные боевые наручи из металла. # Helmet -ent-CP14ClothingHeadHoodieYellow = желтый капюшон - .desc = Вы получаете +2 к броскам скрытности от внимания противоположного пола. ent-CP14ClothingHeadMetalHeadband = металлический обруч .desc = Вероятность, что он защитит от попадания в голову, крайне мала. @@ -33,16 +33,12 @@ ent-CP14ClothingMaskSinner = маска грешника .desc = Маска предназначенная для ношения не самыми светлыми личностями. Палачи надевают их на себя и на жертву перед казнью. # Pants -ent-CP14ClothingPantsHarlequinRed = красно-желтые штаны арлекина - .desc = С одной стороны кроваво красные, с другой стороны солнечно желтые. Дуальность жизни и смерти всегда хороший повод для шуток. ent-CP14ClothingPantsAristocratic = штаны аристократа .desc = Они из достаточно дорогой ткани, чтобы вы не хотели в них шляться по пещерам. ent-CP14ClothingPantsLoincloth = набедренная повязка .desc = Свободные, ничего не мешает, да еще и выглядят экстремально брутально # Shirt -ent-CP14ClothingShirtHarlequineRed = красная рубаха арлекина - .desc = На ней не видно пятен крови, которые остаются после неудачных шуток. ent-CP14ClothingShirtSteampunk = укрепленная латунью рубашка .desc = Белая рубашка, укрепленная латунными вставками. diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml index 401e2f5b6c..bdbefd1a58 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml @@ -46,7 +46,7 @@ parent: CP14ClothingCloakBase id: CP14ClothingCloakFurcapeBlack name: furcape - description: Brutal woolen wool cape + description: Brutal woolen wool cape. components: - type: Sprite sprite: _CP14/Clothing/Cloak/furcape2.rsi @@ -57,7 +57,7 @@ parent: CP14ClothingCloakBase id: CP14ClothingCloakFurcapeBlue name: furcape - description: Brutal woolen wool cape + description: Brutal woolen wool cape. components: - type: Sprite sprite: _CP14/Clothing/Cloak/furcape.rsi @@ -66,19 +66,22 @@ - type: entity parent: CP14ClothingCloakBase - id: CP14ClothingCloakHoodieYellow - name: yellow short hooded cape - description: Protects your shoulders and head from the cold and the interest of the opposite sex. + id: CP14ClothingCloakSimpleWhite + name: white cloak + description: Long coat with a high collar. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi + sprite: _CP14/Clothing/Cloak/Simple/white.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi - - type: ToggleableClothing - clothingPrototype: CP14ClothingHeadHoodieYellow - requiredSlot: - - cloak - slot: head - - type: ContainerContainer - containers: - toggleable-clothing: !type:ContainerSlot {} \ No newline at end of file + sprite: _CP14/Clothing/Cloak/Simple/white.rsi + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakSimpleDarkBlue + name: dark cloak + description: Long coat with a high collar. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml index 2095617b3b..05db42f07e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml @@ -14,21 +14,6 @@ size: Small storedRotation: -90 -- type: entity - parent: CP14ClothingHeadBase - id: CP14ClothingHeadHoodieYellow - noSpawn: true - name: yellow hood - description: You gain +2 to stealth rolls against the attention of the opposite sex. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/yellowhoodie.rsi - - type: Clothing - sprite: _CP14/Clothing/Head/yellowhoodie.rsi - - type: Tag - tags: - - HidesHair - - type: entity parent: CP14ClothingHeadBase id: CP14ClothingHeadMetalHeadband diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml index 6ff16d072f..9b17f39f5f 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml @@ -13,14 +13,25 @@ - type: entity parent: CP14ClothingPantsBase - id: CP14ClothingPantsHarlequinRed - name: red-and-yellow harlequin pants - description: Blood red on one side, sunny yellow on the other. The duality of life and death is always a good joke. + id: CP14ClothingPantsTrouserWhite + name: white trouser + description: Wide, loose pants made of plain canvas cloth. components: - type: Sprite - sprite: _CP14/Clothing/Pants/harlequin.rsi + sprite: _CP14/Clothing/Pants/Trousers/white.rsi - type: Clothing - sprite: _CP14/Clothing/Pants/harlequin.rsi + sprite: _CP14/Clothing/Pants/Trousers/white.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsTrouserDarkBlue + name: dark trouser + description: Wide, loose pants made of plain canvas cloth. + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/Trousers/dark_blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/Trousers/dark_blue.rsi - type: entity parent: CP14ClothingPantsBase diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml index 93a5a50a2e..0b8f48dc5e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml @@ -13,14 +13,69 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingShirtHarlequineRed - name: red harlequin shirt - description: It doesn't show the bloodstains that are left behind after bad jokes. + id: CP14ClothingShirtCottonBlue + name: cotton blue shirt + description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite - sprite: _CP14/Clothing/Shirt/harlequine_red.rsi + sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/harlequine_red.rsi + sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonBlueDark + name: cotton dark shirt + description: Pleasant to the touch material, in a comfortable loose shirt shape. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonPurple + name: cotton purple shirt + description: Pleasant to the touch material, in a comfortable loose shirt shape. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonRed + name: cotton red shirt + description: Pleasant to the touch material, in a comfortable loose shirt shape. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Cotton/red.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Cotton/red.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonWhite + name: cotton white shirt + description: Pleasant to the touch material, in a comfortable loose shirt shape. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Cotton/white.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Cotton/white.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonYellow + name: cotton yellow shirt + description: Pleasant to the touch material, in a comfortable loose shirt shape. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi - type: entity parent: CP14ClothingShirtBase diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index fe88f63bf5..b864007ec8 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -25,8 +25,8 @@ sprite: Mobs/Customization/masking_helpers.rsi state: unisex_full visible: false - - map: [ "pants" ] - map: [ "shirt" ] + - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] @@ -315,16 +315,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - #- shader: StencilClear - # sprite: _CP14/Mobs/Species/Human/parts.rsi - # state: l_leg - #- shader: StencilMask - # map: [ "enum.HumanoidVisualLayers.StencilMask" ] - # sprite: Mobs/Customization/masking_helpers.rsi - # state: unisex_full - # visible: false - - map: [ "pants" ] - map: [ "shirt" ] + - map: [ "pants" ] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml index e228d10f71..c70d5d7e08 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml @@ -1,40 +1,53 @@ # Cloak - type: loadout - id: CP14HoodieYellow - equipment: CP14HoodieYellow + id: CP14ClothingCloakBlacksmithArpon + equipment: CP14ClothingCloakBlacksmithArpon - type: startingGear - id: CP14HoodieYellow - equipment: - cloak: CP14ClothingCloakHoodieYellow - -- type: loadout - id: CP14BlacksmithArpon - equipment: CP14BlacksmithArpon - -- type: startingGear - id: CP14BlacksmithArpon + id: CP14ClothingCloakBlacksmithArpon equipment: cloak: CP14ClothingCloakBlacksmithArpon + - type: loadout - id: CP14FurcapeBlack - equipment: CP14FurcapeBlack + id: CP14ClothingCloakFurcapeBlack + equipment: CP14ClothingCloakFurcapeBlack - type: startingGear - id: CP14FurcapeBlack + id: CP14ClothingCloakFurcapeBlack equipment: cloak: CP14ClothingCloakFurcapeBlack + - type: loadout - id: CP14FurcapeBlue - equipment: CP14FurcapeBlue + id: CP14ClothingCloakFurcapeBlue + equipment: CP14ClothingCloakFurcapeBlue - type: startingGear - id: CP14FurcapeBlue + id: CP14ClothingCloakFurcapeBlue equipment: cloak: CP14ClothingCloakFurcapeBlue + +- type: loadout + id: CP14ClothingCloakSimpleWhite + equipment: CP14ClothingCloakSimpleWhite + +- type: startingGear + id: CP14ClothingCloakSimpleWhite + equipment: + cloak: CP14ClothingCloakSimpleWhite + + +- type: loadout + id: CP14ClothingCloakSimpleDarkBlue + equipment: CP14ClothingCloakSimpleDarkBlue + +- type: startingGear + id: CP14ClothingCloakSimpleDarkBlue + equipment: + cloak: CP14ClothingCloakSimpleDarkBlue + # Eyes - type: loadout @@ -91,51 +104,104 @@ # Pants - type: loadout - id: CP14HarlequinRed - equipment: CP14HarlequinRed + id: CP14ClothingPantsTrouserWhite + equipment: CP14ClothingPantsTrouserWhite - type: startingGear - id: CP14HarlequinRed + id: CP14ClothingPantsTrouserWhite equipment: - pants: CP14ClothingPantsHarlequinRed + pants: CP14ClothingPantsTrouserWhite + - type: loadout - id: CP14Aristocratic - equipment: CP14Aristocratic + id: CP14ClothingPantsTrouserDarkBlue + equipment: CP14ClothingPantsTrouserDarkBlue - type: startingGear - id: CP14Aristocratic + id: CP14ClothingPantsTrouserDarkBlue + equipment: + pants: CP14ClothingPantsTrouserDarkBlue + + +- type: loadout + id: CP14ClothingPantsAristocratic + equipment: CP14ClothingPantsAristocratic + +- type: startingGear + id: CP14ClothingPantsAristocratic equipment: pants: CP14ClothingPantsAristocratic + - type: loadout - id: CP14Loincloth - equipment: CP14Loincloth + id: CP14ClothingPantsLoincloth + equipment: CP14ClothingPantsLoincloth - type: startingGear - id: CP14Loincloth + id: CP14ClothingPantsLoincloth equipment: pants: CP14ClothingPantsLoincloth # Shirt - type: loadout - id: CP14ShirtHarlequineRed - equipment: CP14ShirtHarlequineRed + id: CP14ClothingShirtCottonBlue + equipment: CP14ClothingShirtCottonBlue - type: startingGear - id: CP14ShirtHarlequineRed + id: CP14ClothingShirtCottonBlue equipment: - shirt: CP14ClothingShirtHarlequineRed + shirt: CP14ClothingShirtCottonBlue + - type: loadout - id: CP14ShirtSteampunk - equipment: CP14ShirtSteampunk + id: CP14ClothingShirtCottonBlueDark + equipment: CP14ClothingShirtCottonBlueDark - type: startingGear - id: CP14ShirtSteampunk + id: CP14ClothingShirtCottonBlueDark equipment: - shirt: CP14ClothingShirtSteampunk + shirt: CP14ClothingShirtCottonBlueDark + + +- type: loadout + id: CP14ClothingShirtCottonPurple + equipment: CP14ClothingShirtCottonPurple + +- type: startingGear + id: CP14ClothingShirtCottonPurple + equipment: + shirt: CP14ClothingShirtCottonPurple + + +- type: loadout + id: CP14ClothingShirtCottonRed + equipment: CP14ClothingShirtCottonRed + +- type: startingGear + id: CP14ClothingShirtCottonRed + equipment: + shirt: CP14ClothingShirtCottonRed + + +- type: loadout + id: CP14ClothingShirtCottonWhite + equipment: CP14ClothingShirtCottonWhite + +- type: startingGear + id: CP14ClothingShirtCottonWhite + equipment: + shirt: CP14ClothingShirtCottonWhite + + +- type: loadout + id: CP14ClothingShirtCottonYellow + equipment: CP14ClothingShirtCottonYellow + +- type: startingGear + id: CP14ClothingShirtCottonYellow + equipment: + shirt: CP14ClothingShirtCottonYellow # Shoes diff --git a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml index ea86b58ee9..59b0fb27f9 100644 --- a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml @@ -3,10 +3,11 @@ name: cp14-loadout-test-cloak minLimit: 0 loadouts: - - CP14HoodieYellow - - CP14BlacksmithArpon - - CP14FurcapeBlack - - CP14FurcapeBlue + - CP14ClothingCloakSimpleWhite + - CP14ClothingCloakSimpleDarkBlue + - CP14ClothingCloakBlacksmithArpon + - CP14ClothingCloakFurcapeBlack + - CP14ClothingCloakFurcapeBlue - type: loadoutGroup id: CP14TestEyes @@ -41,16 +42,21 @@ id: CP14TestPants name: cp14-loadout-test-pants loadouts: - - CP14HarlequinRed - - CP14Aristocratic - - CP14Loincloth + - CP14ClothingPantsTrouserWhite + - CP14ClothingPantsTrouserDarkBlue + - CP14ClothingPantsAristocratic + - CP14ClothingPantsLoincloth - type: loadoutGroup id: CP14TestShirt name: cp14-loadout-test-shirt loadouts: - - CP14ShirtSteampunk - - CP14ShirtHarlequineRed + - CP14ClothingShirtCottonWhite + - CP14ClothingShirtCottonBlue + - CP14ClothingShirtCottonBlueDark + - CP14ClothingShirtCottonPurple + - CP14ClothingShirtCottonRed + - CP14ClothingShirtCottonYellow - type: loadoutGroup id: CP14TestShoes diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml index 10cc62f25b..690029225d 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml @@ -1,9 +1,10 @@ - type: startingGear id: CP14DeathMatchGear equipment: - shirt: CP14ClothingShirtHarlequineRed - pants: CP14ClothingPantsHarlequinRed - shoes: CP14ClothingShoesBlack + cloak: CP14ClothingCloakFurcapeBlue + shirt: CP14ClothingShirtCottonBlueDark + pants: CP14ClothingPantsLoincloth + shoes: CP14ClothingShoesSandals inhand: - CP14BaseDagger - CP14BaseDagger \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..fec4e0d648113f41e3e6045bc488168b8c6c4864 GIT binary patch literal 1012 zcmVPx&u1Q2eRCt{2nm=pXKp4g!l@bzLq;VSx?cgC}p@ibeP_hMVI(c=r(#fA7A0eNh zQ|XqhnSu-1g29t9t|3!#f}m+goY=8dS!huQ=XK8VpWK~JwnOg+!LlUldGE=4r<3jl zG#ZUYqxo+!<{f}6nOwoA?H`9u*bP_~n&~Xu@ z44?sU()TD~(_BRs2peEEYJ&lgs8>sd)u@FIMg%f~vO(4iZUeTq^IWql-t$D++Rpp0 zUMGk4kqPt}GuMRmg)-o=Q8w!NK+ow&_48?P8xS+sl%6LFdtKIO+P=B6r1ZHAVAE>S zfXD7v-3{n^j@=$BBm*YP^Bq!7Z?YP0kgalRLVsoZYD<73S|hD0hD^8w;mOcX4sm)7p~0WiuLA$#pgxo9|c8$G8pWP+%^a0cXdc73)~ zogDyYkrAv0tDVUed>MV|+u*orjbEpwNEaz9<)Y!a-JwQ?tr+1pfTo|phO>ncvsj^J zH9WVAxS1G=C%Lf+0Nl?c++DzPyMr+*}X i9>2)3X*3$m!txK3vN{^s7B08|0000Px$tVu*cR9J=Wmc32_K@>(0#t=kMmc+z}1;$oM?2Vm?Ev;4>E1$qe@CmGpowl?- z06hVXm4VI1AtV_7goV&xVP>*M2zL=;v!~jf`R3klXJ+pV1Ox>9Goe`rZm0J~`uW{{ znK_QHfhXCkk+MrPn=Jrbw?{O(3V>xLNToA84(rJ+hJ!8uxrZB3>}84Q?KMv-ogo~Fv7X#A ziSAGDxOluI9Elli-|e96k|Zo3T!QC9KBVjt?M4-V;h>9CF0y+b$0--hSGOBglwIPv zkQeU*@gDF7?YkYb1jE56eYZ1KH&+7yE73Io>a_|=DFBpG)N7R={R=a&2z(pR>n&}c zyMcK#lL2oH827$V15UYUHlRi+g;Opr*1*y6si?$Cb-oP%=6}}*kVe0I>wy$eDF%qf z5@VB2(@jG(1Kw$!wBfw%ewIOGp!wkd-xW~b1%7FoEmIM-UV^x8?;jkFbfQUE*7x-L oIS*#KN_nqin!jAj0s{V(FBoFB+k|Bz#sB~S07*qoM6N<$f}f(-r~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/meta.json similarity index 86% rename from Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/meta.json index ae0f0bd806..e19dbe65a9 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "CrystallPunk14, by KBAS5", + "copyright": "CrystallPunk14, by TheShuEd", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..68c7b91148d81d97f42b8ae8dbb547b5624ed229 GIT binary patch literal 1020 zcmVPx&wn;=mRCt{2n!jrrVHn51S2`xdK$gORn2d!EZRn6>DHI9`Ey*8{twWbW2gi(# zHwZ2kLKm0P4oXEKPzWXJ5KIQKqe>tU4+@^>{&q+o^LqZs`@X(+8v1@fJnzo?KF^ou z-h1_Z0E59`Fc|(@ta%5ZO1^NyX#4Hn8|6HtzL+nZuxVoV9oGRRz8YB`?CW?v0BS}E zf1y;auxUbkU_0Ae+D#yRK5;*ETt@$qs5k(`qE7$-@%RzrkJD#5PUq`_uD2RlMr37a z;)~3Y(HC|qUpQfuAOLvXKAw8-@H_GYk(H&v{?^saO!uUy{v>4eg(?8JE&JBh4S?I^ zbJ-$R_x@P9Y!P0!uOu!5uRjSDePIK5I$jU1+Xeu*ZhJ5Y1`l^w^b@p+5lcqWWR2_ZXX@5r%mrcRY0TJ0x&uW zA~Wc?3`z#j066J$knm-$qY9)A$YqOz0g%XKj;&m_ICC&EkP%c3s%8iqkW8h8W>=!; z$&yT^+2-?SL;J`Cdf!-&N$X2hz>#(GTad9v`=<&CE8>Sawy zU&sKytR@Y3{C?fH0bQ@rY>gyH6|u1%8*Izy3mI^6UIj2b1N6hs2kDw4 z#9WLZeToOTi%}Hir7^GDhaI(HM{RTpYs}v?5hU^W5$hDz80qsdg+i%ZVfA{A)$27@ zDpwelU>GKlMlzLV{y0>wr(C+Fa)nW62sKQEbt}ZFvk5E|X(v*4%jKk~pQN65%`Xq3igk?wVk+nhp2P>$ zAQ1#J8xU59SWwzC8KAo(bRIEC8Ng3;sCT!~Yz+;7K~9GFYdcQDYBXEuc)cMLWc8&h zpj56fzEzzc0K=#VUW3=p7fzIBgUXM=aorl9(_aEzq;#Bw<+|;mB**m($RKP0O+WpK z^NkT+*}X9>2)384L!)!txizw?75&B7fEZ0000Px$!AV3xR9J=WmN84iKp2J}tw@I!<5b(AH9Gna)TxW0=+@FjaPWsH_yYtN1rfxh zv_p$x!9@|ZgQ!D62wkK@TRSx+LB%Bwav_SvOKow+prQ z*LNnhIKkjBPt^w5Opc?Yed#=q&H?wPEyJYQdO30&oc~>1Kmsv#*8^FkN-@Cnl=frL-*mqrbpq~V?UZotc`u(q%E0~Y9q?HJMKAE3 zTCMI>M4^{Kx^AzouG=C|CsZ{Cc)Jg}YNg!mnBXsMnUBxE@&S08urYs8q~8Dl002ov JPDHLkV1hr7=v)8* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/meta.json similarity index 75% rename from Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/meta.json index 9cc30d21f2..e19dbe65a9 100644 --- a/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "CrystallPunk14, by KBAS5", + "copyright": "CrystallPunk14, by TheShuEd", "size": { "x": 32, "y": 32 @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-HELMET", + "name": "equipped-CLOAK", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/equipped-CLOAK.png index e0f4b5df7b3c48622515d5f500aeeac200f21bb6..a57695ea54b411d133faae972b9057a8136c7cb2 100644 GIT binary patch delta 951 zcmV;o14#Ve1HuQ88Gi-<0063Kaozv`00DDSM?wIu&K&6g00VqUL_t(|ob8&wYZ_q~ z$G-`oa1JUG@i+=3sC;yHHl<_5H5dd&hsp0pJFJt>;Hg?3?Y7zi&u3rHFzJA`HIthtXR`|m*)>f0Z zCNC?|TjS;nMSo#mAhPdW8m>uj+yPqc7?D^UOUj~a_KBlP4Qs1ObUSTaoSk~=<3^*Y zLGnp3`zB;13PW!pv#}%Sx1qPJcF8B9(bND8ccUBg<6b0ES&`e?L?9SKqp3kwq5y`g ze4jnF%SsfDriMT;gxuEVSbH~U^~o=d-R-m?`6O$?vVRhV_ zp0<|V@#v&zH7F2Zcpe)~4ZTZaqKVs)d=d=3g+MTbKrm#DZI5TPjcjQ*xZ!v{?AeRN z;#gT$@oCqO1^oc?InC-jD5>H`*~8nz9vV&U*4BT>MVLrsMI;u7**C2=$tT@O20f43 zU7Ve|`hWKn9Np^vu#8{t{@_O0!;6fh;N^K$EtGP7W32_?dQ zzsxf648t%C!!QiPFbu;m48t%C^Pk}PTe`hW_J3Tz!A}#TC!_mHQ$N2QKC2|GZ|@3w z`P^%j$W|K!Ku`ea`WN~*{gisGLg!$c};2{01}B~{o(6SKnZ$L^nD7=~dOhG7_nVHn0M Ze*rmG&F(|1?^^%>002ovPDHLkV1oGt$4USI delta 464 zcmX@aexG@QWIZzj1H;_yjcNS%G}f0G|+7 zYqyZ#g#3c4W|x52U)Lx8+p7kY;Yr%}0Z6fz1o;L32LlEvZ)P{35NCl$WHAE+-(e7D zJf6QI1!#$br;B4qg!|ht&%PrHJoR6ge*T}lyXUNs)TOMmGH%LV6Jshgee}#??T-ll zh;8({zUqi$MUS~(bM+HZpP;!3p{uzKPESy{V=U99rB%wKz2x0HrX?OL=D29DR|s-V z{@1vzLO>|&$QYGDFv~LY$}j;m07-<;apA~`{GWid@)0aY{oQ4cg8Gdqf78!yh;P^($S-Y|u!r;dvpHwiG|rYS)Vra&K5!Sm+z-Em zM&$w)9`^?v5`72cg%8}}`o<`cf3QK%pm&Y!yUy5#&|iHY8P>=fZMmS8lcAXKJXc=q zz?c2L@BMO^KVE(8$#DIF*pt@m3a2-65^wpLJj1dpog*U-lyO|$l#(-XvZ>`deP&aE z>8i=yQ=an{SpAwL_=k7(+hn`?UWm2w95L6q!#$!jW}mtl1q@>bPgg&ebxsLQ0G9u` A$p8QV diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/icon.png index 5ddc4302f455173c170f3d98954521d1c6f1bb96..0584398c469877750191dcd3bad1bb9468a3d96e 100644 GIT binary patch delta 512 zcmV+b0{{KR0*?fc8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00GHKL_t(oh3%8iYtvvH z#y@F#Y09cdOJeE}FFlA=0(xpZ4Jzt!)tgZ857D0mj%54c>vlBvXR3tR1u7$1x%D&=2>&z3lwPN>v0 zJ}x)9X}fTB6SP17x{CrKX|jb()4L(!5g}E_Rm$z`R}sV0CT4$?+t% zfKs00&h1+O?0?yZ0K9+Qi_J-$fHhdhbDbzW4&M)=bExxN2WzmN=$|-&reTVO`}f$h z5Aj@w3l}djvWEanC*RNQLile#OY4&+=id-^hD5ah*rBJnuaOD zk delta 309 zcmeBYIm$FavYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#`z$e7j zD=gX2+TFy?(>pZ5+ASnFA-|xi*(D(M*Y%12_NwWa*a8*KSpPu-Nb!^e`33(+00yD^ z=gtAeISV`@iy0XB4ude`@%sD~DL~Olo-U3d7XEMhz4?wP@HlgqGBy6bU*2;le3gmR z*=_e!Ecj*C{c_cR@Jn!qQ^!ZUJ&y~DeOm9{sXFjnrQzLMh7<gn!9QF?zxq&dlnS t%nOvh5Vtbz+Nn#7HZNIY{xfZ@WB8G*{*^zad?(O(44$rjF6*2UngF}MdHnzY diff --git a/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/equipped-CLOAK.png deleted file mode 100644 index 14ec4a54056353957fff87f713c7dc4105d80f54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 778 zcmV+l1NHogP)Px%#7RU!RCt{2nz3%vP!xv$A|^;=MNXt3nQ)~J5S1l^y)+994G+KrWa!Ao;z#Jh zmXWm^4*(gMZkKk*LKIM2$wZb~#kC@Eu-DGx=urefg0_$bL&5}35q%`1psk8wvH9=zO3a<=B70tm7ZXD zbcl`TPZ4!W>MZ?bu9w{coW}(mA01+}+g2Cj6KnkkHsX%(0RS7#t!wYH3t$(zv*;VvYgJP)03aFQczBAk zczKy$Q6L`l=IYN)j*^H6J$UtoF4nC806u*Bj`we00Dvi;;%vlipqtQ_U88TB@CPcM z^eNs(f9@mTc_mX!Jm{GYXK8}%S1z(NK^7graVt}Co>yA9=vjR#hV;vB0ms8rbClh} zlzv}!m!>~O)M=TwunYtBx8KWGy+8U_SoLS`zUwm#!!QiPFbu;m48t%C!!QiUu#?Ul^< zJnwYa${_;aO7Yq>p?v~Tr=|AJ8+ev|U975{{B&L;>Xgh@cZ7eLQ@w${>{_p7-GJHR zvorxYM*v_mP4MwY4KjpU)h>`>pgy10uw5U+aWAzgm&qp3qdJed{r~`GHVPx$K1oDDR9J=Wl(9;~P!xtgMFhbTO6Zm$qorLsGzey>OX~wjpP-|gOCG_+t&iaY zsPh%X4w)p58M2ikX#**NavfqKwWUdloA=w!x#yh!=ib8wg+ihD?;PyYBpgfr&e?Zw zd(EocBpgc`&CW(X@Z7yjRB8~8B_CfsPEU?E&Z0Qs>bzOm#8H_de>{)?LGa0ZxdM_k z6H%Oe=YML=o2ODn4$FvZW*2~#-DlWqGheQV;$%&H*lW|W`v7QWH#btmPM5;5WXtXo z`V**`>2SS~#=y&>!$r-_MZ?)NZCvlT z#k0DyOIi2?hEdOl1)iJVKscK+y3`40Q$l}&rZ?8=45MB&x;p-NAhSO}IF{TN|GnxC iwtYwng+ifFROJiux058xMJ}WO0000NVl zWDh>oCP&*AwRUqhRzV4q?N_QB9UYxbtVH;}>YJE^e96knyrSE*%)R-7Kw7I_|Fj9) zZ(KOIUa=;EvuvWQn-(Pu^+9Ub>n{(e<&l+=5qJJ^iA7pMy=k(6yU>(Hn!fD)$|_aUJIYe?|r^{TWn*VRE*P#Sp9`tNS%G|&0G|-o z|KA?`ITf49kuAo~^L+_JlFZyd=^{0Lk^kFeRM-OI6zYKr#b=#51*CXNg8YL2BLIWY z{d4Dl;+zE@k;M!Qe1}1p@pygyiWH#eN>3NZkO=p;(@ygpR^VY-sAkCd|Ns8hTT?eE zhR%*#l<|Cg{^LM&a#2GnVo@St~>x48@^G9<2f1-GW0B5Ay5m&e?T1k4+7b$B{lznL)^sRbllJ_ zq+OCF6ln-qlA#~G9a=-Gw)m-+n)3YC@8Eszz1zMAATu&-%YVPl@Q|LEJgh@sUafri zs6$_5*cQ)mMTTwBq5oek<&Qkal~E0{mD{W4tztD$O7d2*x|Q3j>d+U@ac6E3Mt?xo zN+PvjqtkC;DYJ~qPK2e*GCKVh=6a{dTFJO_J|2NmB6V9vH3$HVY7nX05-1h>*Pomr zb^F@9yJSe*H-FSLd5$YtD~W^suR#7BI9tW*-RI-;?m*+@%O|6EnyCcaASu3dBA0p?e8;y3Y=jlG1h) zmG==!g#+}ZjO>df3QqaHdH(AA=Ob)xERJVo5^K;Qq<6I41OOaHk@4N2Q9mG1N&=;% zJJ9G3G*SyT8W+b%&!mPXGV_07*qoM6N<$f=>DC Ap#T5? delta 344 zcmeBWdBHS6vYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKQ0) z|8EceoQlol$QEPg`M!i9NoH=Kbdegr$p7s!Dr^C93iUvR;_X$OUx6?j}0Ix>F#|36x}u+3rR zjjB84w+$<~#IJvxFL6+RTh;OXdz7D>`UY`p=w!!;`_Edwg4OV;ZjPnvS>5F~_8gG0 zUUndH$NA^X#s#nMY3y{lIPb%>2f_jl3Jwg742&#?9yfVEJnFQPL&|E2?UQAJ_9lmy zDrLNw@J(RWw*=M@t)^vtm*n>SnXCM^ZLd=W78Gi-<0047(dh`GQ00DDSM?wIu&K&6g0099>L_t(oh3(U^O2beT z#_@kNh)6JlLm=FOO9us^!+im_4!(hikSB0(cku-}=-{AG>a2s1ZrvqA#IcLe66oL% zDHbGf93;-UR0r|=rhDOX&c``iP)aGK{;I@UNvxG+>v*nB>wj}mRsh7I55RSnIn{Cw zkXS2q)AZ>cZ)4j7=(anuOpq0q#{dtvdmQiH^sC1sk@pv=16^J2P?Qy}YiXRe+wMpl z`V?iw-C53Qzc-o9r)++VT5oInlPECs&a>9R;WNW=-nee#2@J=%SCkcT=(E0Mn9Zj| zf#KpLBMQFmt1z#l?^XP EQm$YOv1ECz_A=0|>oQc9`+=M(F|TfMPFl?wm>002ov JPDHLkV1gvZl>Yz# delta 249 zcmX@k)WtMGvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#`z$e7@ z|F;K!PQ_+&WQ(!$sPT(@U&4?iGdEDW=>K*Z6}Eslg?gaE0F_b+AjMM>=PdAuEM{QfI|RavqD2~B4M5RwPZ!4!3;(xgE^-}E;Anj~XIIp||G&?jQOLTG z%Jb{JRh>x6MaHeV2@z@x;w^P=8MB;f+bP0l+XkK5!YQv diff --git a/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/meta.json index dd3a027246..a3741863bb 100644 --- a/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "Created by KBAS5", + "copyright": "Created by KBAS5, Edited by TheShuEd", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png index ca06756107299c82549d2274ad27d12766351904..5a88088f7e408b94252defe3826fb1f50ddf9cd6 100644 GIT binary patch delta 354 zcmV-o0iFJ(0`dZo8Gi-<0063Kaozv`00DDSM?wIu&K&6g00AsXL_t(|obB2nPs2bM z#_^|Y9syz@vj`lb!Q{}``p=kB>+GeQzX_DiS_HDU7en9?6YmX&p2dr8h^+3<@rpHAG3E!GKFln zzP(%Ob+L#-LxgaL%$`2=b#$rGYOd@1rbyO3{JDf~z7Pi?oAauS@~VvL#&l){TCVPX`)z$a z+PQ=_kIOe$fIj}Lz+d$9`vL#}000000Dzr*15^66J?`LiH2?qr07*qoM6N<$f<@4z ADF6Tf delta 277 zcmeyww3KOrWIZzj1H;_yjcNS%G|s0G|-o zKwJ6WSF-<{imiHdEAPzF|J!9uHAH}t_awHi22va)L4LviA%Njt^WI3H7-xY;WHAE+ z-(e7DJf6QI1t{3$>Eaj?;r@1-V?Eaa1s;~kH)j0*zhhZdK(gi~Cw*)7LPefQ-QM4X zIMf(7PWUiy^L#bWb~(>?JTo_SP22pmyUt?rs+E1r{%`h{GqMO+2sk`&U}$7^6sd51 zP{#jZk?ohAfBtM$+9I>!ZK4jxsah zBCYr?i)8M!yPJDotI4d}^xtQ7XO?N8^m4QL=e|ArnOEx(wmdtL)h*4(z8T4;!0}% zONS%G|s0G|-o zKwJ6WSF-<{imiHdEAPzF|J!9uHAH}t_awHi22va)L4LviA%Njt^WI3H7-xY;WHAE+ z-(e7DJf6QI1t{3&>Eaj?;r@1-cRkku1s<1Vlaqh*W17VNI60dyJrivyHD9m&jjFtG zK++?T;%}Fa?DRM(WAx>)my(*(txsq6+Rr&27o2$UqnF19W+o094ut}Rh66tr9?*8m zdfmDulRtQ!=)%_4*lLMIS!+3T^{#wdaJT8Gi-<0047(dh`GQ00DDSM?wIu&K&6g006^DL_t(oh3(Lx3&KDY z2Jr9n`ubQk*bEQ<2E&4Vh;V<8*;_?Lc3BuK$@(?J`oS~Ei7f3L2I2kE$MLxL z-2p-fA;gyq5gQ^NdXEZS>a%Sf03ePu0AOF1L3afgFhuN^0&zgmR0;qVlNk>wqC%I7qzVTd@SMDGH&b%-MkL&Ur76r20{{3-(W`Eoie)2t484@P|li>6Yx yb+E0&_;G!oceDSYpW{4X&J*rtA%qa(?>qrPn^5uRmZ(Dj0000_4Ys|8JM6dUPxA%+XgXRDtsEM47GvDbA80zu^B+z!2lBSEK+1{XAV9Lo8zb-=6d4I-tPgda)+%(wq9DQc6*879<~RW>%iAaI{}~ z%4eom5mQRfWU_IcwZ8JFaOL(bW(7)3(r>mV{bm+sxp;mHYrMGzJBuK%v!uNGf5snr QK%*HvUHx3vIVCg!009+MNdN!< diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json index dd3a027246..7b7c7805e2 100644 --- a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "Created by KBAS5", + "copyright": "Created by TheShuEd", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png index 8e5d9627316fff6300cebe72a712b3150319162d..7aeb34f28e832f005b984acaffa4258a3ffb433c 100644 GIT binary patch delta 226 zcmaFC*v&M-u>Pp0i(^Q|oVU03@*Xk}XiIEQ={a+dk0)`XK=cNNSg)%53G>XPBdoYm zPCAKs{Il%&WH(j%wVn6%pT=wq6V6*}-;4ZN+7}aiGWGqMm}{TkmYNyKu6LdrQN^b^ z{rKB?Hrp>fU3Su_TW7PxWxIqKm*)zsx!oXD_P2ro3Zfa_^ger^yEe`#&|X1o7n782 zV~GAi>)EE;SI7%+|7GZ%=dfz}0>kgxXXPL5m>yuX`xaYM1MG8=`*3-o?q$2L^ zt&O}53IYrck7W2B#=T2>t>pKROH4v&MuSI3{dJoQHZ=>XgcxM!WuGsV@VC3Z=jm^a zje18f^VvUA^ND>SID7W5ovn3jK=Xh=;LM3{v0amwv`X%nECv2;@{ypvh33$5txvXSdOl$!#~dbd9l-KPx%I7vi7RCt{2nlWzjKoEtWf2BnhLUb;+rA&b<6v{L?3I}kJG6e_7QPPkuzg&^R zRpi#ib_gMh12~1VmJJ5&ERGS%`y>nRV(-ijvulet9vsPD9}9D?7AwznoNL>6x-olw zEPOSs+IjZbYY@7$|IfuZ2CCUPP>o;YH!+jXx0~wl)zsO(C~B>fud~m7H4`fP`wR^~ zOxwY}I0Gt!=h`=fH~>0LpcbpSP7|2Jw0py30dSlRLhd9NYrVs4xt;^4J`J3eV-%Z-78P7?%^`-_Hg*#p`pf3Ck6*9z+Dt6NH{EzIOS8D zcF=|>0}jPVe>ARSDrw{|p|Z8ls+0#xtxzh{TLoaYTzfiAP?x0q(HLLxJJe$3=`;cM znUg#%MeAK@tE@}#zT)?05P~6enpi7Eort4-%2Hk1vR(qWq`gUemF)pP=?9eSuuY}y zn;;lA_5|rNbdtx7VN<1Xt?Y=Sum~pijfwZ>OB{uT?W5)|_(2FEgb+dqA%qY@2q8DY YH;nu;(NU@ZZ2$lO07*qoM6N<$f_jl24gdfE diff --git a/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/icon.png deleted file mode 100644 index 9c4e3743d744519ec5bbe6d3dd012e4880ac07c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3q4&NLn2y} z6C_v{Cy4YkF|zeM$*M6p`q#c^?S##fbBa$~`jOD}yS|P!*y8`==F2J8O`S5QB`ZV& zSSv*XoLWR2CavBW)yHFJuVAU-!N)kmwc_WNk^_@pKbI6KD!XOBvu++^TVlPx%iAh93RCt{2+CfX(U>FDRe?>xE-_SN|pjIsNP#DDxhrK9++=_mM9`~XA2wpu} zb{h;l$;81J^f1YmAcUn2X=y0JyF-1mWSuT=+H@N{Kagr#^M82rCOte4KnNj(5JCtc zgb+d=cGTSC@!#LH+x*vKtIE&v{_m{IeAs3TN6kH6FRi1wso<%~@jX;fFSWVj-@#@~ zHeZU!2Y_DxsvwSwV_EX07C<)|aMc0qFo5%UlqgK8YS6WcbOBlNr(uw|+BRcQ)NJ`{ zX+LOoy1cgC0@Er`R1G#`(T}2PU|I#W?H0^VH<#NWul&>tuu&{Wuk3!MKYn;$005>{ z67T0BuY9Rn!1o-K^f~}Q2?n!QRl`QHjFMi5?>SQ8vhv7Jy#sn@Cxyv)2mnzLg7|wf z9-?=4QkeVaCCDpZY6p0(1<$px_3UNhxbHczZ?0udl}R4?QVSsNIRMdvW*P>tZ?5C- z<>qha6G8|fgb+dqA%qY@2qEPEwv=Xqm>F>VyF}kU56jMy>I^+pOng|P*I%@x$C=Nc z%nfENvJeX`fLq;63`^uaAp!uW-`21-`kALxHK2c$`FyFn!vOH&)$6DyXLh<=^yw!% zEnxQ$y3xp7NLsql0Co>&nV8K6#D^l{HKrl8b@mUAxtPQNW?fnL_6w$A0NrTd-P_ZZ zG$_qZmwT=SMb%)`cB1z9?blBj1p{1OoTsisY6rw8F~l%}*aee8TH@0q zX-Pc;M)y-0!el&L*;S8=x5CX%mv0oy@I42U@o=ujKapC1%Zu~E{=qQ^R(r)CKP)Px$FG)l}R9J=WltD|wFcioClM+*w(6vsOm5G;K1{1vtyN!K@eXxCvUHbvNE89iz zG6t!KVzyF8s|fW_Th_zCHxWJL2O;FWyqABHmjDKX!C?4f8q|Qn&27HVx46F}=OYD- zd)N8mEiHr`+wdI=Vf=wzTk!Ni%4tz1DShHDRnR;YpV);OM&(hoec}>GmO{3&tgs5LIJbLP!^#ZXd(ZWN(f9NPyjJ zRlWGyX<2kax-~xq(iOxygyZ=D0G6zao=e!x797tvHvmwHC@IJ3 zc7tFx{k>P9qZM?t!ujP@%^vFzYB{H*I!wUMM^hErdzL^g=Lda427|$1_!oQvJJMIG Tfl0I!00000NkvXXu0mjfcF~}$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/meta.json similarity index 86% rename from Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/meta.json index 98cc8e2fac..270bdd7dcd 100644 --- a/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "CrystallPunk14, by KBAS5", + "copyright": "CrystallPunk14, by TheShuEd", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png new file mode 100644 index 0000000000000000000000000000000000000000..450e0e0b234c7c1640b851358cbeb4c6943cda9a GIT binary patch literal 753 zcmVPx%t4TybRCt{2+CNAeVHgJRCnZQJLWB}72?s|K0#y=7$Pt1BiXa$JaTc0I9fG1b zICktJI0Uj}s4hA?TWDzmQi>=IZID1nj)SYILkAZvD105#@5rB8?n^w4@cx!0cb9wK zymv>2?*#}Ugb+dqA%qY@$nDahC~JMcpsK8M+kNHtvj1P4A_u#ZD$)S+xts`jhw%I< z!>`{%@VQiWc5wrDQU$6d(HeyF0pOroa`5f^hxd{%)PQ(Gg&}!xe*P21FUM_#g(VMU zMaJ&#TcHAa&F78a`BIPhPplr8%NN+>#5iO{h9r65POA7ZJlqyOIWdl0zF^B^U{}87 z1_T3s^Ho-40KoUJhYkRc6}fG{9qh^%dIU7R0l(q}02sOf0FWdPf&oALiWi#R5DFJ% zN517dV0L=SQLAeJU>3pg&$YUS+36`q*O%{rUHO(9007%NdzjBGcXe9R8<@{5V|!;$ zec*eN_WgX_^Kij_<3m#%O+ zGS<)OEIAz+!+z-s#mXhFN23VO&GdCXp$72vIG{POz=svmYgw%1HW5##eHCLxJfUJG zw~6#x)*Osz9g1kJ(F&nQK$1M>qz2Gjl{It&Cr8b3nf2AItJYY|af>CDee{NesS3Eh{qKefWe@xgr$Y555e(`1g+EgA=_>rwBEmv%9srb}v`G z6CaIPUp+)FUtqz2ADZ4kt*!~*0m8*^Y`kW&BAZu%7xPf~Y{25eD;TPx$N=ZaPR9J=Wls`)XVI0Rl#$gSDLmYR?!EuU{2}wsB;vxtJ;tO!N&B<3IxHzPX zzKGVK!9hrfCeh=-x*QtX3WRGYEeXS?h8mvF^6)&rf8XbMe$N9Ei9{m#V;V zHg~ZYs$-+Q7cZ9zwA!7mJ@P97>6En|4buQVn$9qd4Z8?JSK#>pmYD!x?#}_xG@W$H z!ZH(hejrpF1WuqAs2Fhk-*-VLonlz?fH+_*lNFS>2(3^dYUi7MsX<}C0TH@*&4MLmg%?@Fy+w2*{ z?8W(R2n?As90nww0T^S9F~%5Uj4{R-dsHAiRj2(q#(zmUxqsF65!^umfUPY2{2btS z{{zDJpNe)QJL(vo?A7Zo@M~Vg&n;DKb^GmfOzP93oE*hNCBq)ps|0zLBHQmE91pf| z;a^B3i)+lLV^W_KQg+qZ`6U1#>@WbSt3d1r1&o=C)>gW0QeUY z0E%FGU$-|!IDa1UECqn#qV+bDa2gfRH3}D}USXkY{P5KY{FC6c3e@-3MQM zQg&4o4;%doWsEV#7-Nhv#u#IaF{TB=Q-Sc5y6QFl&#b!Ysr>6lb*!}rwg1Ntgr{0< zA7|&6C#elY@le^q#dfpApSv|~vt6xtMzz86U|MY-QGax@!iX-;MEwz3Z69^(0mcc? zcS1NG)_Ku&WYkHacvyD zu5xVsKB6Kgpj?kX<#Yd-@)*ivYt(ZqN1MI?85d*hFBilaCa1>`X8-^I07*qoM6N<$ Eg43fun*aa+ delta 440 zcmZ3@dYpNJWIZzj1H;_yjcNS%G}H0G|+7 zK{hTiR&EgyNhxXN|J!ALU&)qN)Hb#B)HAdPDrs}Sbsb1?l?3?(|AzsFO=on@14TIt zJR*x382Ao@Fyrz36)8XqWjyO$977`9-%h)jcUXbPwezmzkN@)TOh1|A6s*eepKLKv z$m4-ThU)Gw_C+l23uF!oYHVH*^SID<(z)i&(_epS`CRMIVLl@(mUwCQSLGgt9XD$0 zl@um=g&tXZfm^CP&s_UJ%8$#U9@PvX`bO>t z;SHY^@2r*2R4ZWoqnP*2Vqy9Ud)Hm9cK@8FoW0Lp(B%Jy$wugnMU!$s-vf>*$~QQ@ zDkHNQk2Y_ui?}D^CCn|vy!P?ipS;3CIb7RS-?A`X>I=!vclg%(x|nIn+F8rp8u|;C zh;p&4-L~e4lmOcuu1}8+T#!-{SE#=}o7Yg|#v$LbIIR^^12ZD4AFvpf=6|&2Xo~;v do^|hjMy?Cp3Y*zXt$^Xj;OXk;vd$@?2>{}Puf6~P diff --git a/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/equipped-PANTS.png deleted file mode 100644 index 1811517d8b4109c1d43411c55eaffffc0eabd2d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmV-81IPS{P)Px%@<~KNRCt{2+CNAeQ5?YWuUdyQiP91%l_c~CNTQHIJL#Z9*U~t)Qv;iR~#+nEry$*8Mv+)n_l2|Ff&vtpq@7?|G z-Frvg4}=gx2qA`&bE~1=(pkJd}DPv>|qJvS4jKRy{ zTX;e-$fZ=nDT~J^SORmibHe^?@AD@{!~Lvfi^}mjRlYnBx=o=}wL3L32E)Hr065BT zF)}`;d;%(hH@n$bO%abz5FLyH5FLy%8t!K&zl*=SOF5=e0^no>Sl%pru!ox`6jSb8 zRbjtIME9|=nnFt_0Z7fwvXkFM>*=Lbt1HJ;P5_*Y1gERGcsLpUPR<(uFdFVxj;WM@ zo%}9<{TNt|@>>9GthRp+0Ep8E9FyjfRiT_Yx^?jOtAGhIETHPk)V`-*SUj^wQP}6t!}TklgVtym(4wvmshy= zc3Wu;R<)fwwC9`U9dyS|K3?|oQZ(fv|faS5JCtcgb+dqA%qY@i1W4NfBeOT zcP7BVkN0ig8<-yonxSXU0eGBv(R5#~HbjYTOp_`(FRPx$MM*?KR9J=Wl)p;DP!xwhtpVGn8KlxB21})M>QDy}2PY@rL2xXc^c7rm>LgA+ zfK%}elp>{rOOQq!DkLBXL2D&RrPMf-R)faD)8zj@K%?cM+<7)I>Pu1~Y;bFis}q5>8~9%q#VyUS_Z;fQu`fYTid z*-#eQ-_rr8xBBr307#}ZczfmWZw0aA5&OBZuP#0K8mYV0A1ipH~2Qw#oYTR=fgWoPh~Pr{~kI|C0<%C>puQdDh^< z0v_yVfN2>fc(w_^?e$H(0+J~W#|;Sl-=pT)CZ&8PUIBsMkMzJ#(nfivF%+hzt6@!7 pBO9+#Erg9~L3j&FBoc`P;0yaNV3s`3)T;mh002ovPDHLkV1lqis`vl^ diff --git a/Resources/Textures/_CP14/Clothing/Pants/loincloth.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/loincloth.rsi/equipped-PANTS.png index 16f3628bd8786655f46d3a432b216bc4fa887112..2a3434b03782e3acebbe9e69def7ccf59809c238 100644 GIT binary patch delta 783 zcmV+q1MvLT1Dghr8Gi-<0063Kaozv`00DDSM?wIu&K&6g00PxXL_t(|obB38OXE-! z2H-cHnNSEdl#1zOVI4%33$tmVT@^%dVXR=ApjM-X+CuLv z>dpAYI5#1kDVzsFOKy5k?ngr59Doo)2qA^;#GTh-1S~iQm>*A}X!5t36_N4V)7k?>PMj@LG&)r^MBbZDgEr8fN z06@oaq%>pUp!sJf!L85n3Fh(pt_ycK#7L4}w2Kg$0RDW9Bngmyk2lTOi}oaS97h^S zZ^J}g0O1_~0Hgc+Fld@F+&nx)=|3~XTs|MBsk_I=b4g7Zr4j>XH39%|cz75& zZsZ-n(@|H0!7M*Nhw6}!@1vlqxO%D)h?5! z5|0l6X0aG4M;Q4fD9bY3n;VSo?f}fHH|B-MIy*l{I+KAMBX;bUAeUrqP?E7CPe8|U zr1W$;*Oh-wk!7T((^%Chksg6hkB2(v>@U6PT==M2q8qkFX2%lWE#rrW&i*H N00>D%PDHLkV1ijvWrP3# delta 455 zcmbQuc8z(0WIZzj1H;_yjcNS%G}r0G|-o z5N~f|UEQ#-u)eM?T@8(fh6Y_JDF+7!3k3xqb8}+_1yeOOTUAw4b#HzF5#TPR$Kw5tWs3OE)(M%a nJAVFloWWgpSgb}z;TMy%=*gTe~DWM4f#Ur>4 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe5e90999948e36b73c0cd72eae043b48e6eea6 GIT binary patch literal 852 zcmV-a1FQUrP)Px&4oO5oRCt{2nz3u!KorKmXG{$a6ucPIA&{XI6C7^^PwkT3Q>N?%51q2~f5_Cq z(7By5dGFGa!Qjm`B@_<^4~@|xWROBiqU&Ja`4maE?kuOJeZNUMo$h=0?sO8m4`3LE zVHk$_Pob<88|{uLJSk&%ah`fl^W;o~zXFVU-OTNp=+k}^G#e+z&^$R4qV^nOIyBPH zR8fkHg9-}$L23YD>m_L78V6yb4*>Z3C0^;(YXC6T-&pCPI61cvSN(`UqumiyZ$VT` zRzaBPtH7OGzz=}EveH%84D<_Gf>52GxDeG6sNO=O-4QClW#?()M(XET&xA_3@~haaF=sbSRX5=~qb z`U8ai+@!CW^x+4oNwCo`uDkgC^CtopE4(W71CX;4Rnu^<3o*nHE94G4h01Sy^m^IF=P$!B48t%C!!QiP zFbu;m43jg)e{%Id!hg%3;B8_us=Usq@Yu4TP1s)wUD5I2y=}gSL2#$JPI`rp4 zj=bE1KYI63NYjMAWxXrNa{#BTOcLMTzfmR%nk}}_O?HWm-U5jYFTDW*RgPx$V@X6oR9J=WlQC<;KorOSPXay& zKY-vS(xEs697@O%6e0+c*CF1SG_5%+r4;Trg?BIa|K;5UFc=Jm|AOQBEcydJ)+71@ zc0B)R&u417;nWgH-5$P^5d8tCZV%KFI7OmTK!$VM1^{rU9N>69b4O(BZTln%tqI6* z3Sw}h4(hrp!0~*huA9|^xX^#Lfc$zHPT?X8Xw;$VEdg%Sv*&Q3By^`xIRQ2L#e0eR(1P#hagOKoJfS`|;!QLbXu1!0h>vD$}8P3GIH zwtysm2V|%eqE%F0*Ff7;a&vdj*41@c?)^<2*{=!!`11FfkB2|n%V01V41dlCJCK^( Tg{6MO00000NkvXXu0mjfB;vZH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/meta.json similarity index 86% rename from Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/meta.json index e0add1cfdd..8163f4aba3 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "CrystallPunk14, by KBAS5", + "copyright": "CrystallPunk14, by TheShuEd", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..40f4f7bfeb82eb901107e60c372b6e8889690b12 GIT binary patch literal 888 zcmV-;1Bd*HP)Px&GD$>1RCt{2n$1qzKoo^fstN%yQ1ep(i>L@TL}Ed+ii*0cM3&w55&B?#g;eSS zsiMj%MFJ_^qyl*n5IAw1I6q?JF04Bmj1$j{6E?ly2IEZT+&ObSmU1t^Fbu;m4D+9o zQyo|;SHj0}A6FOW6TfqGd=f4!uApA4D$lEnK#Sig6afIu#;<2%4vHTD0Jly<%Y@WH^5Ov` zE>LBRDe=V^wQxKMa>vH=f-e_1Z@IMghm4NnrMA&oB(bFbu;m48t%C!!QiP%mM9Ra^-^KJQ^WP z$P$y*;AxEtFKvdrXw&8hAf+~#gj|P{g-hj1_);cJYMNNK-iT_EDq5v608gs1lmR=1 zqH;YxD@j>M#aWY*ys`muvjPA#FV8^D6M$YCX=oWhDMqE}VbD$N*qAr6rW}hLqbkaWV7*q&`S&-XGE2qK)6ZYS zq#l8JB5VEp@l7;QP*;dfm00U7FlpkKT)eC)r@Lu&TKhGa6bKMCF+Gm^S*J_Ia~&)! zt{`vOGcjKKH5g|Qc<@{YX>GK#;_Bi&_c-pua~KEp5!!!QiPFoJ)LeE`DUd>y6$ O0000Px$ZAnByR9J=Wlg(1lF)?bjyXhj#U<~HRZd#acdFSSyGbeWd4u`|}FEm>nqUi>S>d|zAG+Uj>o_$V| ziWiDCsEsxbnb35DsEsxX#TwF>h&4dPrCb>RP*Lh3fo7{iDoPyyAmz%bOe9KxijU1f zNMP6C*c=4U+UaG2i ze0nCOs>*8HPWbR`@?9=fPZsp>QH|akqPXx zUCwcKeg(jP5trgMHtPkx)-F3wOJb*#`@07s-72BFHyyEGmWEUb0RCQR*?j1E9V5=+ da5$Vl!4Isulla}o)}#Oc002ovPDHLkV1n{oy&eDn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json new file mode 100644 index 0000000000..8163f4aba3 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..fac9624f973523325136cc8b9e97d2970ed93641 GIT binary patch literal 879 zcmV-#1CacQP)Px&DM>^@RCt{2nz3rzP!xuLm)5m0kuV8_7-AA=AQ_yYnoPG&C5wj+**tXaJM<;` z1lclV$PzkrE1nc+GB}WeO&ny5ZG;_65@%3{^xPiHvZE_S9@_IQmVB@E|M%P@349J9 z2!bF8g7BY`3OliERXuk&z{Tb9%-?KpRlK}mqGlh2zOIhGnKsbuwE{hCZ&kdFm30ip zLoNMK6U$cB+gaVj+EM{WrzbNFe0;ly_Kkyjr}3;o;Q9dY{nwAFIq%=R0|0IPCnx#E z$p9B9TUCz?L@}YOPZ~tfSXliRVN8&KeRU4tG1_IT>XAWOJdOJe#l^4BzvEg_^ydbE zq7OVqwb^T_F*9vUd;&nT*HSyPv%0B*6qR}U!1O|+=s%eOBvS7*kjrM2fK@EvL;163 z6-&xsE}KEU(+D&dm09}y7NFxO`Y-1VjvwxEbb5k~m37qYgVgp`#dF*~9Jh}`ei>G= zG+|_Pdk6dMFlD9k6+oV%=+6y+eRlZgAyQGPRLCy_0C*ti zoS5~h(j`dWugTBp7SYk48vue|j0A%g9yI?s;MW_Bhk*NdOdk9`bo4_7fXHPt69&kT znKm#O4`Zi%7=6+N0J!X!jq9MjQ`YXjmwxqHEt(iV+_RKT4r_Pc8{OVbeV@x_BI!pm zOb;W@bEmx^2!bF8f*=TjAP9mW2!fCR+W+M8f@2bm5K)NZNoz87X;49wH!3VT7<|#Z zJg?g!qE#6JCd*M=xNKFuMFqjX5!~CLGo10OU_v!WaCoxPx$c}YY;R9J=Wl(B2VKorKmlr~KWRm6f+s8lcz2RoQa+?iiU}zvBL?n^Y8i(u9-Wf$r#1>k(-*V*M%YEN__c(yV;c)&76}?F`)gYU4 zG}Ry#y}2=GnZ3B;#Y`TJavkeTXsSUPK3<6*Nq8KBhzUsYMI&0O3a`lOXv;z3;#v2zbP2Zrnr8%#o6&GI%Z4IRD(F< z5uEV|*;E>OuEY!hz}x!=%x+sqiV0%5HWXRf&4Af$e-F`o^0TQl03d9Hep4*h#?$jn zBgF_}t31-vK pmHnat04ra^ZQ9P^a5$Vl#U}wnn6BZ0T0H;&002ovPDHLkV1oHw!XW?v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/meta.json new file mode 100644 index 0000000000..8163f4aba3 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/purple.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..5a057d26b06638433bd281960dd767661f34271d GIT binary patch literal 926 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 LNkvXXu0mjfUxW%~ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/icon.png deleted file mode 100644 index 8530cf24a37011f414a5ae6b9c9be452d58b055c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmVPx$qe(f{1UP( zt|$(bS$JVn}3{N fE9~Il@TYhK<|>_B_EvkT00000NkvXXu0mjfJTB8; diff --git a/Resources/migration.yml b/Resources/migration.yml index 0f6faa6160..92a8964978 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -16,12 +16,17 @@ CP14CaveStoneWall: CP14WallStone CP14CaveStoneWallSilverOre: CP14WallStoneSilverOre CP14CaveStoneWallGoldOre: CP14WallStoneGoldOre -# 2024-07-06-2024 +# 2024-06-07 CP14GatherableBloodgrass2: CP14GatherableBloodgrass CP14GatherableBloodgrass3: CP14GatherableBloodgrass CP14GatherableBloodgrass4: CP14GatherableBloodgrass CP14GatherableBloodgrass5: CP14GatherableBloodgrass +# 2024-06-10 +CP14ClothingCloakHoodieYellow: CP14ClothingCloakSimpleWhite +CP14ClothingPantsHarlequinRed: CP14ClothingPantsTrouserDarkBlue +CP14ClothingShirtHarlequineRed: CP14ClothingShirtCottonBlueDark + # <---> CrystallPunk migration zone end