From 7cdfaafb6b99769c3dd7125fcd32f2ae9d65abdc Mon Sep 17 00:00:00 2001 From: paige404 <59348003+paige404@users.noreply.github.com> Date: Mon, 16 Jun 2025 04:30:21 -0400 Subject: [PATCH] Innkeeper tweaks: modular mops, wearable buckets, and more (#1387) * Clarify the naming of the farming sacks. Make mops breakable. Add modular mophead craftable at a workbench. Add lucens mophead. Make all mops and other tools not meant for swinging at things break faster. Tweaked damage numbers on certain tools. Add lucens bucket. Make all buckets wearable as shitty helmets. Add recipes to (slowly) craft ropes from the inventory. * Revert all changes to the CP14BaseMop, as it doesn't need to be touched. Use migration to replace it instead. * Remove the old mop * Correct sprites based on feedback from omsoyk. Dewhimsy the lucens mop and bucket--mop head looks more logical, bucket's rope color is plain rope. Correct certain mop sprites facing the wrong way. * Bring mops up to speed with the belt changes * Make lucens bucket just a norma bucket, in blue * Fix the errors by removing unnecessary fields from the craft recipes, updating the crate loot to use the new preset mop * One more attempt to fix linting errors * Final(?) bugsquash. Remove unnecessary name field * Add clumsy tranlated localization * Revise bucket helmet sprite to sit higher on the head at a jaunty angle * Update old guidebook mop references * Minor shading mistake: :skull: * Move rope craft recipes to the workbench * Remove construction component from rope --------- Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com> --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 14 +++- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 2 +- .../Objects/ModularTools/Blade/mop.yml | 38 ++++++++++ .../Objects/Specific/Farming/sack.yml | 10 ++- .../_CP14/Entities/Objects/Tools/bucket.yml | 36 ++++++++++ .../_CP14/Entities/Objects/Tools/rope.yml | 1 - .../Objects/Weapons/Melee/Tools/janitor.yml | 37 ---------- .../Objects/Weapons/ModularPresets/mop.yml | 14 ++++ .../_CP14/ModularCraft/Blade/hoe.yml | 2 + .../_CP14/ModularCraft/Blade/mop.yml | 67 ++++++++++++++++++ .../_CP14/ModularCraft/Blade/shovel.yml | 4 +- .../Recipes/Workbench/Workbench/misc.yml | 56 +++++++++++++-- .../Guidebook_EN/JobsTabs/Innkeepers.xml | 18 ++--- .../Guidebook_RU/JobsTabs/Innkeepers.xml | 18 ++--- .../Mop/lucens_mop.rsi/equipped-BELT.png | Bin 0 -> 363 bytes .../Mop/lucens_mop.rsi/equipped-BELT2.png | Bin 0 -> 346 bytes .../Mop/lucens_mop.rsi/equipped-NECK.png | Bin 0 -> 281 bytes .../Blade/Mop/lucens_mop.rsi/icon.png | Bin 0 -> 333 bytes .../Blade/Mop/lucens_mop.rsi/inhand-left.png | Bin 0 -> 477 bytes .../Blade/Mop/lucens_mop.rsi/inhand-right.png | Bin 0 -> 449 bytes .../Blade/Mop/lucens_mop.rsi/meta.json | 42 +++++++++++ .../lucens_mop.rsi/wielded-inhand-left.png | Bin 0 -> 515 bytes .../lucens_mop.rsi/wielded-inhand-right.png | Bin 0 -> 506 bytes .../Blade/Mop/mop.rsi/equipped-BELT.png | Bin 0 -> 373 bytes .../Blade/Mop/mop.rsi/equipped-BELT2.png | Bin 0 -> 370 bytes .../Blade/Mop/mop.rsi/equipped-NECK.png | Bin 0 -> 345 bytes .../ModularTools/Blade/Mop/mop.rsi/icon.png | Bin 0 -> 352 bytes .../Blade/Mop/mop.rsi/inhand-left.png | Bin 0 -> 595 bytes .../Blade/Mop/mop.rsi/inhand-right.png | Bin 0 -> 642 bytes .../ModularTools/Blade/Mop/mop.rsi/meta.json | 42 +++++++++++ .../Blade/Mop/mop.rsi/wielded-inhand-left.png | Bin 0 -> 565 bytes .../Mop/mop.rsi/wielded-inhand-right.png | Bin 0 -> 542 bytes .../lucens_bucket.rsi/equipped-HELMET.png | Bin 0 -> 1371 bytes .../Tools/lucens_bucket.rsi/fill-1.png | Bin 0 -> 189 bytes .../Tools/lucens_bucket.rsi/fill-2.png | Bin 0 -> 198 bytes .../Tools/lucens_bucket.rsi/fill-3.png | Bin 0 -> 224 bytes .../Objects/Tools/lucens_bucket.rsi/icon.png | Bin 0 -> 741 bytes .../Tools/lucens_bucket.rsi/inhand-left.png | Bin 0 -> 795 bytes .../Tools/lucens_bucket.rsi/inhand-right.png | Bin 0 -> 797 bytes .../Objects/Tools/lucens_bucket.rsi/meta.json | 35 +++++++++ .../Objects/Tools/mop.rsi/equipped-NECK.png | Bin 0 -> 519 bytes .../_CP14/Objects/Tools/mop.rsi/meta.json | 6 +- .../wooden_bucket.rsi/equipped-HELMET.png | Bin 850 -> 1379 bytes .../Tools/wooden_bucket.rsi/fill-1.png | Bin 138 -> 189 bytes .../Tools/wooden_bucket.rsi/fill-2.png | Bin 145 -> 198 bytes .../Tools/wooden_bucket.rsi/fill-3.png | Bin 163 -> 224 bytes .../Objects/Tools/wooden_bucket.rsi/icon.png | Bin 701 -> 741 bytes .../Tools/wooden_bucket.rsi/inhand-left.png | Bin 600 -> 765 bytes .../Tools/wooden_bucket.rsi/inhand-right.png | Bin 676 -> 832 bytes .../Objects/Tools/wooden_bucket.rsi/meta.json | 6 +- Resources/migration.yml | 7 +- 51 files changed, 380 insertions(+), 75 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-1.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-2.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-3.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Tools/mop.rsi/equipped-NECK.png diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 9d37a62118..fecb2caa09 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2866,6 +2866,15 @@ ent-CP14ModularBladeCopperMace = медный шар булавы ent-CP14ModularBladeMithrilMace = мифриловый шар булавы .desc = { ent-CP14ModularBladeMaceBase.desc } +ent-CP14ModularBladeMopBase = насадка для швабры + .desc = Насадка для швабры без рукояти. Прикрепите ее к рукояти, чтобы сделать швабру. + +ent-CP14ModularBladeWoodMop = насадка для швабры + .desc = { ent-CP14ModularBladeMopBase.desc } + +ent-CP14ModularBladeLucensMop = люценовая насадка для швабры + .desc = { ent-CP14ModularBladeMopBase.desc } + ent-CP14ModularBladePickaxeBase = головка кирки .desc = Массивная острая головка кирки без рукояти. Кузнец может использовать это, чтобы сделать инструмент. @@ -3277,6 +3286,9 @@ ent-CP14RitualChalk = ритуальный мелок ent-CP14Bucket = ведро .desc = Старое скучное ведро +ent-CP14Bucket = люценовая ведро + .desc = Скучное старое ведро, но оно синее. + ent-CP14BaseDemiplaneKey = ключ координат демиплана .desc = Временный сгусток энергии, соединяющий реальный мир и демипланетный. Используйте его, пока он не рассеялся. @@ -4629,7 +4641,7 @@ ent-CP14MagicHealingStaff = посох исцеления ent-CP14BaseShield = щит .desc = Деревянный щит, способный выдержать несколько ударов. -ent-CP14BaseMop = деревянная швабра +ent-CP14ModularWoodMop = деревянная швабра .desc = Швабра для мытья полов от различных неприятных жидкостей ent-CP14BaseWrench = гаечный ключ diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 59feb47008..e674e02856 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -53,7 +53,7 @@ - id: CP14Lighter - id: CP14ModularIronShovel - id: CP14KeyFile - - id: CP14BaseMop + - id: CP14ModularWoodMop - id: CP14LockCopper - id: CP14ModularCopperPickaxe - id: CP14ModularIronSickle diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml new file mode 100644 index 0000000000..38dbf4c7c4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml @@ -0,0 +1,38 @@ +- type: entity + parent: BaseItem + id: CP14ModularBladeMopBase + categories: [ ForkFiltered ] + abstract: true + description: A mop head without a hilt. Attach it to a hilt to make a mop. + components: + - type: Item + storedRotation: 45 + shape: + - 0,0,0,0 + storedOffset: 0, 5 + +- type: entity + parent: CP14ModularBladeMopBase + id: CP14ModularBladeWoodMop + name: wooden mop head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeWoodMop + +- type: entity + parent: CP14ModularBladeMopBase + id: CP14ModularBladeLucensMop + name: lucens mop head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeLucensMop diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml index d23f630903..be5b465b1a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml @@ -1,8 +1,8 @@ - type: entity - name: sack + name: produce sack id: CP14SackFarming parent: BaseStorageItem - description: A bag for various fruits, vegetables, plants and anything else that grows in the bed. + description: A bag for various fruits, vegetables, plants and anything else that grows in the garden. categories: [ ForkFiltered ] components: - type: Sprite @@ -63,8 +63,6 @@ - type: entity id: CP14SackFarmingWheat - name: seed sack - description: Sack for various plant seeds. parent: CP14SackFarming suffix: Wheat components: @@ -82,7 +80,8 @@ - type: entity id: CP14SackFarmingSeed parent: CP14SackFarming - suffix: Seed + name: seed sack + description: A sack for various plant seeds. components: - type: Sprite sprite: _CP14/Objects/Storage/sack.rsi @@ -137,4 +136,3 @@ - id: CP14SeedCotton amount: 1 prob: 0.4 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml index 1e137799f4..b177209a37 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml @@ -17,6 +17,25 @@ visible: false - type: Item size: Ginormous + - type: Clothing + sprite: _CP14/Objects/Tools/wooden_bucket.rsi + clothingVisuals: + head: + - state: equipped-HELMET + equipDelay: 0.25 + unequipDelay: 0.25 + quickEquip: false + breakOnMove: false + slots: + - head + - type: Armor + modifiers: + coefficients: + Blunt: 0.98 + Slash: 0.96 + - type: ClothingSpeedModifier + walkModifier: 0.96 + sprintModifier: 0.80 - type: SolutionContainerManager solutions: bucket: @@ -62,3 +81,20 @@ tags: - Bucket +- type: entity + parent: CP14Bucket + id: CP14BucketLucens + name: lucens bucket + description: It's a boring old bucket, made less boring by being blue. + components: + - type: Sprite + sprite: _CP14/Objects/Tools/lucens_bucket.rsi + - type: Clothing + sprite: _CP14/Objects/Tools/lucens_bucket.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.94 + Slash: 0.93 + - type: ClothingSpeedModifier + walkModifier: 0.98 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml index 6c37509d7f..767ab408a1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml @@ -33,4 +33,3 @@ Blunt: 0 - type: UseDelay delay: 3 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml deleted file mode 100644 index c2924dec9a..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml +++ /dev/null @@ -1,37 +0,0 @@ -- type: entity - id: CP14BaseMop - parent: - - BaseItem - - CP14BaseWeaponDestructible - name: wooden mop - description: Mop for cleaning floors from various unpleasant liquids - components: - - type: Item - size: Normal - storedRotation: 0 - shape: - - 0,0,0,2 - sprite: _CP14/Objects/Tools/mop.rsi - - type: Sprite - sprite: _CP14/Objects/Tools/mop.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: 10 - damage: - types: - Blunt: 7 - soundHit: - collection: MetalThud - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 3 - - type: Spillable - solution: absorbed - - type: Absorbent - - type: SolutionContainerManager - solutions: - absorbed: - maxVol: 50 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml new file mode 100644 index 0000000000..6f41083150 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml @@ -0,0 +1,14 @@ +- type: entity + id: CP14ModularWoodMop + parent: CP14ModularGripWoodenLong + name: wooden mop + description: A mop for cleaning floors of various unpleasant liquids. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeWoodMop diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml index 5665e58ce9..2f28e2769d 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml @@ -36,6 +36,8 @@ bonusDamage: types: Piercing: 3 + - !type:EditDamageableModifier # Improvised weapon + multiplier: 1.2 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml new file mode 100644 index 0000000000..cb14574735 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml @@ -0,0 +1,67 @@ +# Concept: the mop +# Cleans puddles +# Standard attack speed +# Reasonable blunt damage (mop-fu real) +# Fragile; not a real weapon, should not take the place of one long-term +- type: modularPart + id: BaseBladeMop + modifiers: + - !type:AddComponents + override: true + components: + - type: Spillable + solution: absorbed + - type: Absorbent + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 50 + - !type:EditMeleeWeapon + bonusDamage: + types: + Blunt: 5 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Blunt: 5 + - !type:EditDamageableModifier # Improvised weapon + multiplier: 1.2 + - !type:EditItem + newSize: Normal + adjustShape: 0, 1 + storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde # Remember, Ed asked for this + - BladeInlay # Ed didn't ask for this, but it's REALLY funny + +- type: modularPart + id: BladeWoodMop + slots: + - Blade + rsiPath: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeMop + - BaseBladeIron # TODO wood weapons are planned, revisit this when they're done + - !type:EditDamageableModifier + multiplier: 2 # For now, we treat it as weaker iron + +- type: modularPart + id: BladeLucensMop + slots: + - Blade + rsiPath: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeMop + - BaseBladeMithril # TODO wood weapons might mean lucens weapons? + - !type:AddComponents + override: true + components: + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 100 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml index 9b1aa71c42..f5b5c167f6 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml @@ -17,13 +17,15 @@ angleMultiplier: 1.2 bonusDamage: types: - Slash: 2 + Slash: 3 Blunt: 3 - !type:EditIncreaseDamageOnWield bonusDamage: types: Slash: 1 Blunt: 3 + - !type:EditDamageableModifier # Improvised weapon + multiplier: 1.2 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index 44e46aed1d..dd765998a5 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -12,6 +12,20 @@ count: 1 result: CP14Bucket +- type: CP14Recipe + id: CP14BucketLucens + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14LucensWoodenPlanks + count: 3 + - !type:ProtoIdResource + protoId: CP14Rope + count: 1 + result: CP14BucketLucens + - type: CP14Recipe id: CP14WoodenBeerMug tag: CP14RecipeWorkbench @@ -43,17 +57,32 @@ result: CP14Plate - type: CP14Recipe - id: CP14BaseMop + id: CP14ModularBladeWoodMop tag: CP14RecipeWorkbench - craftTime: 3 + category: Tools + craftTime: 2 requirements: - !type:StackGroupResource group: WoodenPlanks - count: 2 + count: 1 - !type:StackResource stack: CP14Cloth count: 1 - result: CP14BaseMop + result: CP14ModularBladeWoodMop + +- type: CP14Recipe + id: CP14ModularBladeLucensMop + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14LucensWoodenPlanks + count: 1 + - !type:StackResource + stack: CP14Cloth + count: 1 + result: CP14ModularBladeLucensMop - type: CP14Recipe id: CP14Lighter @@ -275,3 +304,22 @@ count: 2 result: CP14OpenSign +- type: CP14Recipe + id: CP14RopeFromGrass + tag: CP14RecipeWorkbench + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14FloraMaterial + count: 4 + result: CP14Rope + +- type: CP14Recipe + id: CP14RopeFromCloth + tag: CP14RecipeWorkbench + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14Cloth + count: 2 + result: CP14Rope diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml index f821ba9ef1..4e97c985ab 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml @@ -9,11 +9,11 @@ To begin farming, locate the supply table in the garden. Usually, a crate will contain a variety of seeds, while a table will hold farming tools like a bucket and hoe. Grab a seed variety and use it on the ground to plant it. Wait a while, then use any sharp tool (such as a sickle or dagger) to harvest the fully grown crop. To keep your crops alive for an extended period, be sure to water them frequently. Keeping plants healthy is easier with the spell **“Plant Growth”** from the Vivification tree, which restores a plant’s water, nutrients, and health. - + - + If all your seedbeds are full and demand is still high, you can use a hoe to till additional soil. Consider making a seed bag if you plan to expand your farm. Along with growing food crops, cotton can also be grown. Cotton can be used to weave fabrics and clothing for the people, providing an additional source of income for the inn. To do this, gather some cotton, find a few wood planks, and create a tailoring workbench. @@ -21,11 +21,11 @@ - + ## The Cellar The cellar is extremely popular among patrons. Several barrels can be found here that dispense alcohol. Grab a mug, ensure you are drawing from a keg, and profit. For this very reason though, patrons may try to break into the cellar via the caves it is built in. Checking in on the cellar often can keep all your highly valued booze safe. In the event that some ruffian breaks your barrels, the alcohol can be mopped up and put into a new barrel. Customers will certainly enjoy your new "cocktail". - + A typical cellar also contains a few tables and torches, as well as a barrel of water. Tables usually hold spare mugs. Be careful not to serve too much alcohol at once... unless your esteemed customer is a dwarf. ## The Kitchen @@ -39,9 +39,9 @@ - - - Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. + + + Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. @@ -53,7 +53,7 @@ - + ## Customers In the kitchen, there is a small ordering window for customers. It is strongly recommended that you create a small menu using paper and a fountain pen, listing the dishes you offer and their prices. Prices are set by the innkeeper, but customers will appreciate affordable options. @@ -61,7 +61,7 @@ In the event your delightful cooking or your generous portions of ale makes a customer vomit, a mop can be found near the stairs to the cellar. Dip the mop inside one of your water barrels and wipe up the mess. Be careful to avoid serving water from your mopping barrel - customers generally don't enjoy the taste of vomit. - + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml index f821ba9ef1..4e97c985ab 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml @@ -9,11 +9,11 @@ To begin farming, locate the supply table in the garden. Usually, a crate will contain a variety of seeds, while a table will hold farming tools like a bucket and hoe. Grab a seed variety and use it on the ground to plant it. Wait a while, then use any sharp tool (such as a sickle or dagger) to harvest the fully grown crop. To keep your crops alive for an extended period, be sure to water them frequently. Keeping plants healthy is easier with the spell **“Plant Growth”** from the Vivification tree, which restores a plant’s water, nutrients, and health. - + - + If all your seedbeds are full and demand is still high, you can use a hoe to till additional soil. Consider making a seed bag if you plan to expand your farm. Along with growing food crops, cotton can also be grown. Cotton can be used to weave fabrics and clothing for the people, providing an additional source of income for the inn. To do this, gather some cotton, find a few wood planks, and create a tailoring workbench. @@ -21,11 +21,11 @@ - + ## The Cellar The cellar is extremely popular among patrons. Several barrels can be found here that dispense alcohol. Grab a mug, ensure you are drawing from a keg, and profit. For this very reason though, patrons may try to break into the cellar via the caves it is built in. Checking in on the cellar often can keep all your highly valued booze safe. In the event that some ruffian breaks your barrels, the alcohol can be mopped up and put into a new barrel. Customers will certainly enjoy your new "cocktail". - + A typical cellar also contains a few tables and torches, as well as a barrel of water. Tables usually hold spare mugs. Be careful not to serve too much alcohol at once... unless your esteemed customer is a dwarf. ## The Kitchen @@ -39,9 +39,9 @@ - - - Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. + + + Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. @@ -53,7 +53,7 @@ - + ## Customers In the kitchen, there is a small ordering window for customers. It is strongly recommended that you create a small menu using paper and a fountain pen, listing the dishes you offer and their prices. Prices are set by the innkeeper, but customers will appreciate affordable options. @@ -61,7 +61,7 @@ In the event your delightful cooking or your generous portions of ale makes a customer vomit, a mop can be found near the stairs to the cellar. Dip the mop inside one of your water barrels and wipe up the mess. Be careful to avoid serving water from your mopping barrel - customers generally don't enjoy the taste of vomit. - + diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..2c1e091f6a197008c125f772365f53672813f43d GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nl1 zPZ!6KinzD8_VXPK5IO!a`lFQE_kJ^g(aN6A%+w9mKCY^ zy3D$h{d)fU*mniz_uB41e`~P_HzSLH0|N$eN+n@t%iekAh0E=KO|d()cx$|m&$_3J zmMwZ6bf`U1;o#L&GDySe9LtUGh&O*0;TW?_|}C$H%h2y6uVU3$D)JR{iS1tz-GAoDS9s6HT-? zGj2+Wdr5V{X5`*Qey34 QVCXS;y85}Sb4q9e0P=&1e*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..6f103240675639da5e571976ee440763227a43e7 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nkR zPZ!6KinzD8?70pZh#dbI{*mRKpI@F;6&L&YhnY6*&AT7GSke4nY~cb{(^m^h*7aU+ zwOaBtQ0ga}SKFR_D)J}32`4HvFfegoAyip^9WG4Te>`{kl$^ky`MhUk-_PE;=WJxp z&MtipU*Cr3s*}QQ8Sp5d-B$O_Do6aD4YPf#r72dUkc<}*6I`|0i0cT@Jxc_z2oT;k-*9p$@bXE`kLQkm_#!I8(hE`9eis}N?Pb+fas9Q~;6 y(JXOaeFCe|rkm?B-#GHK2skh>vIzXhZ{+`D=3F8Z%W4Y@ECx?kKbLh*2~7YYF?(+S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..8de9a5f179614c3f22e985e01b5ae5d00a6d29b0 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0px|jw z7srr_xVKjfxeghKusz_(W6giCq&xhB*u9I|9C`B&UE=1@dht%AvRUD%s3CP=r3GtE3=lw{%?J+_uPu1<-P6itUSBA@c-w-MgQH7Qz|jpqjmVdQqPrq kS!War;5K1lJX8C?nAsF<(Uii*4fGa+r>mdKI;Vst01-=I8~^|S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e352f3351c76fa205e25502ed728c81f86ed736b GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1HK} zi(^QHdvbyV>taO%DJCFs$+=;o7~_X;SGWE*C~iHv<-@ImF23vyI`=k~p8S7(eY{c5 z-Rc>Q6P_yUj?^e*IN>xQb!nOC9cFgI{1da+|TIF z{;IAOUt9wOHyvH@fR%B=QU&g#A|?_K_NiV>int(9a-eth@BfFJB+?AeEMM|VEV|}F zDT9V2j6Z^%bbup6Bak;1Ss)BjEUj4 XRHLtam;Mr9P%wD9`njxgN@xNAA;W@W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a5baa40ea336a5388c4632cbdbadc66281ed2a9c GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s7{ zPZ!6KinzD8?7f&BMUH}>eKzGb`A zPfqT{LgRdOt8JIW}8qf#_vBu`Z!t3)jeqOv;X`nV` z@!79y%?@tdsFhV+^=9Aw`0!;ve${-mm*>8&>Qu%cx_R^V_xI+#yL>izyKZo9JR12v+U-K%hCL0bXJdV0{2BR01_s7r zPZ!6KinzD8_IfcpiX8pe-RpY6@6rq{%`IELsy6XIdi{eXtZ|CdtOv|2EZnO43Uv+N z!nBvqFqp*qCZ%v^`Cs;FA~RFI|4CDeo@4sBm4S&vp#hcn(9i1j__LS0Jg3_9@U1)f zK5dB4*DtfM*&N%v_>ji=@4s)^+0WZ9V8-yPz;5@(>&KVM&Ykm(O|kX*lXYSITRCQT ziXM9OZkrTO-|Fs{rJ}W}8tvP*+?%>Ok2PoQt9=R?pSljK_sS^#4OsH`zE+K_(-CXu zSx4MX*Ij?}>h$a7zc*|@8uqYN$g*aM?&+;cXikH08zRGPpRUilAY2n}yVSd3-?u5Q z+&VF?-^HuVc$#)u$Yv#WFWY%A;k)h9rqy2hs}@MJoNs@^v99Wr-l6BIYgeyYclyJ- zDlgr`Tb@hXR|f8Q6U%@9_et*SE4lRjes3)OA6Ma5emM58=FZCxn*2BR01_s8h zo-U3d6>)E8+4>!J5NH)|adB<+;d1C=ab2+ZsSt-1-$7Oj262Z+TqP41EIlE(qQS&t zVuMmdNJvQceJ*d!GkShDix1Y_epgYq?@W)or1f!UCKU&Cq{LFj-~abV;uHIO^0j9e z-YK$I3c71eS(hOZb$Z*Kluy%4rar%{z+Sm_F%!eVFTZE&ovymLBj~$Oz!iooCmA{& z>MyTkTX0$O!_58HUNKI%Zgqx%_fq`j!nHgNd#=5#VasUbD>HaJe4C!^~0w>A`g;I7gyPpgq?QeVQA79mzk#6G4()B?zw4)|DIjib=I}o z`SJPex~~^^d=Bwo`aj!Y%^#QhOkx`nm0IO9j)eZ(vPoI|;I1T&&k~0|a22_;OXk;vd$@?2>>|K(is2% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0d94bff0848f99614fd6fc5f4ee6a654071ba7cc GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s78 zo-U3d6>)E88G120inOJ>ZrC)*w3Uld_sY3z_rf-Q;c629pdjab@Y*3g^NwW!94lO7 z)~s0*cK?yXrkO00_MFtq-#$*!hWBsohH$jBgP8Lj&xbGpnLZu|JeH9G~5~jnm)mTD*C6#`;%6ZymF@K7XjcE`RR*&VNPT2Z<7 z@3&tvscW|GW_6m{&#HfP)zk)onm4|)G&V*(F`K~Y|L*6Ejqxcp-aD_|;+(qFBl!Ii z%}@@%ChOhoM-M4KV{+M>RBUEp#`$aJk0)O)t=;;qo7wIElLXj*6g!6Kn2#|@_~3QbRbWwk(4Xqni-`Ep-{ldp=dUh@CO k|C8E{i-I8m+VGq8)%oi}kyDtz03(yZ)78&qol`;+0Fut%MgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..78c7ce4606e0f452d62181f81c2b320bf192df3a GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlT zPZ!6KinzD8tho+32sAtl-P71~-Q($0COJnIYi(|AN1L|R-fe7ag1W^g%sA)%Jh@e8 zQkwcov&Zrrnnu!P`_4={&}S&aq0qpvt{J!fNC0#yF* zc%EhxxiaeiJ=KJ%lm0%7*0_Em!rM>$`DV_tt)#J?nhZcTN$0B>_ej0S5*g z1c%RpZ+7y3nY@0n?x}8m+I97szQQdzedUZ-;wxAetc+jqNod1W5N*WpmuWuNf_Q}u i^Cg!xGcavsy{8dYDfxT$`L)1sWbkzLb6Mw<&;$VGaE!?S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..88a173b3bc02ca31cc7c17e22219f014bca7ece3 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nkI zPZ!6KinzD8tho+3h_pVG-oD_0*_t~+2UI%}(o+*vJ5F!da53!Qsi->*M@sChrV6S@ zsH-13YA>+iq~Z7EHj&~pI|LjU7+Elg2lH8ku5Q?z`CoGLrF$OJR#)whDn9h#_~C6k z_8VsXO?Iqso{$(h?Pk?hjYU>-*Ht=BU}!n1>{MqLx%q0?j(;l7Oa>C?CKue#-}&~t zH8)3`9;buMx1!oT^?Byr`k!ZuD6DDPAo^%p!QusV7f)K~+I7Cl`GnyHBzHA#Vp@0p z<4Y9|E6z)s4{kcW;Y{%=zozJh3I^#e$xtiKJjRf@EZZ3hZ-=~9*}=YG@`p&S5}{Ky fUKMPNEOB2yS06s+_wXbz5E(pO{an^LB{Ts5JRpj! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f639b8211c83eaa529caee4cbbf83506bf8240 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlM zPZ!6KinzDe?70pZh#dcTMO&jnA=b7{WRA=n7Xe2g+4AU-?^cjoa4%yO&%tG^uFQAdt?xf$7ONoTu-yL5_EkRO9qbo4cAveq z?Dttob%v4&8dkF+Kh&tS8XRH%v3KV3^hUmQg8QC3&1=hOxLENtmGO7;f$ql^`s;uH vzU=wEe*dv|_WGQHSX_qYP%yWPdk>=uw^RId=O^XBuww9Z^>bP0l+XkK`B`{T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..375b66b5b1abdfa0b67d7ab221437fac64a3e790 GIT binary patch literal 352 zcmV-m0iXVfP)F6XAut*OqaiTTLx7Rk0GK(g>OZpD^sF|b_2RRG zC__M&JG=P8&AET?Cd0jZw-~752!akkw;bjQYB_?5*eC#52m&x#QAwRaNlA?XJ!*(G z52lVN2Y@UESqP&^wFIAf7JQNudeZ+J7??49`t$)s+1ocS;r!RHUsL2BybgeweD%t4 z20lIkFa}xv_RU>}Teog8eEIs1p{9N|!E}Vrg#@GE!i7^{{V@9YvF&j4D77495J3lk z6oGt7D}Xl&AQry`+x`99TLzHtL1M7rr-q~Oh5#stY3X~Sq5wIbVTq0!iI1dm06nOw yk@!fCzLv&Rl*))?14cEBhQMeDjD`S?5C8y(2XS_z{!4=Z00002BR01_mZp zPZ!6KinzD4Z2b;92(+4asAV?0Ja%64i0MKRt5wSpK_vmF1u}|CUc!Ye4vQMO1D*=x zP4GPK-+r-MB0~3HxYi$?=Cv>=wnYT8S`V~1n@%c-wPBfeC-UoqKmF?c(zo&K`vN&yIU)jFo&ndB)zfL~3dvLJ-snKf&mfB*|;=6J8J=JT%wryCH`1JW_ z_V3?zZ8%f=@;1+bizl}f*X^2LUVYzk!P3=Y@2cI8+3w$C{bS>jgfbQZlcwofi=;Q4 zS{1eBeNt8SESpD$tO`?|t&>k~U9)K8Zxic7G7PsQwD+`m9(i}!=ihlN2fO6b`3G;* z-V%7xkIkoG??<^f{N28JJ$uyaDyh;SQ8y>s0;95@_3aCOMa!K0b*j&;bxrLGCWj4+ z7_Od7xYl{}SGXm2qn3#@%nBlc?DiW32|7;o0UG-F)H z=b*CAN_Kh~YVHgI3fv@ zr-759cbfjEL__-xMht77v4^oSST%iS4omN@^K4*=@_xW9Y4-HQM$HRbfvJSS)78&q Iol`;+0QH##Y5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cd79dfc2d1f74959c98441f597c6caeb86d5806b GIT binary patch literal 642 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_mY* zPZ!6KinzD4_WK<+5I7cl6_E8yS2(8(I6 zGUJy(Y{1K7^Lr13e{D*>bIii`$%^?)wY;jfy|3H1d38-_S1*f412&YflOrVO;kR9H zJ?3ravkIF%!N63CceSiv`}Lqx zQ`3XlXL&>8qs6zcDO~fy@AbjQmR9|4izhrP`o>z9eNbCx)jUC?fH{oMPVuvyfAu-} zjZI=l+xF|?tD;tGpKQrYbFYe2_hQgoA6#AiKdAlq-v{3rr2l;W7n@q2Z@ubT-G0}a zv~F*QFzG873gV|d*vNm=?!$et>3oVC*%jVid?J+;_4|j3{yGVUOR{J8{PK|qn!ja- zkfg$FXUTK_{yR)duDMtEZ~n&&ZzdH7>_}Bj;E#3vi@MDwb_M6P&a(0!SQc?s$f{Pz z@MGAG^aiEhK3h+<>P2ZXbSzO_byaEM|B1(A+0C;A(Q}mwq@wMG!Ffhv!TB&Ku^|$t- zz^7|kdl?<-&BKo@+i$Jow5n64dWP}U9U0A=FNb~kQX%^C`l8wsM)S+rUQC|$vz~P( zAWz;orrJ@wooj4j0z7&s>!2on6k#=4eekC(XdM_{62@O1TaS?83{ F1OSiK7@YtB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json new file mode 100644 index 0000000000..d5810b2d0d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Icon by frogoo. (Discord), recolored by paige404. Additional sprites created by paige404 based on that icon.", + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2209c031e7c3b545efc37dde3a55ab62fd152df7 GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s9G zo-U3d6>)E8ZS-Px6lgO~TAXWB(;HIBm|M%k84I+8vXR`b%I^%- z;_dqVtaQs+t()~CYCbN$LS4Iiyq!*BVX zVL^$V;iY@Gzb78QRlJI!z_Vvf?!h+ZPzDG0%KP$Kj6ugdc^jT^JoU)gQTSE1uKIHH z3C=6mCwZ8JbGA5bNc!+JU}{ruU^Pcp^}+g3%|-rG7zAo}g)MdY&2xb7v3z>^_FREF zWv15f8=+Z&RR^?==T?h8+;vjv*PL@f%`b%aPgaREQq1Dtu-doF>-{1&h1+*me44#W fHu#nFtOGLbPrp|2^W+=^rUM2~S3j3^P62BR01_s6p zo-U3d6>)E8?e=0Z6lptt)X$nVK3O~7AzI#9Y>mzu7Xe2g+2Xn(wwhZyH+I9Vs2WDe z?Vm5L{L?6GG&3=6+YQg6XZ$*+C!KlvyJ*tMbDq;SUSQzGioTpa(A90d&+gyk`-_{q zonlW#MHMc*c>DF0x;xE5?du;)G4O4$-d#QI^UIHRr$5`I=2gFcz|b#JuxoBMi^t6R zJ+qHlym<1(?Wh1ly9dMk_%#e6=hF0Vp8p=hyXSxt(~bkry*Dr|JI}A>w2$-9a}%bN zJ&%8Xe!cyrjOVrH(@#Y>q#4`YlZ~Hk?Wx^Ay~W#t`|I=c-`{@DPx-D_ak=(!Yyki4 z%a{&tsA9gj_h;_ZBNuMzDo!$P-Q(b~u|b}1`&(TF`-`qsd8R5`>fiRB)%|==?*04S zr+i$687BxTSqe{O@Qf;%IlIHHVfK~_vu0<^$y=xAzW0>B3D?U-j&Gehx`kS;-Ttgt zHHT$&Sx<>zpW?c}-2z48s!{3BF3BkDeXr-G6?{r@S2pMMo;2AFEZf4CuaRLYpL{!~ zHg`eU_KxgjB8>m$3#?6!SDC_cB~LX|G$hA`*<`|m#`^Qo-xxm#omd5oa0X9TKbLh* G2~7ZA)$3va literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ef1fa419254e54f4170f812ea337d01cf7971a GIT binary patch literal 1371 zcmbu9i#O8?0LOoeHtf<8+gQapOCBw{x7)~jUKv9kDHKVYN0M9ZvMgqkc}rdITd}TP z_mD`_71vfNsfH$@M$(wqY>Z}xuKtG3`F_5ibH0DTH~XmX5p69)EdT(t@t$r0n?C&= z4e(}6u*EMQ9&6JEuMi^VV4-}7dow$kij^{G&zqYb&pS%w zsY@m<7}lBBfb-fjvK9M~@?A$TzSN*ZuKGal5Io3vNP_(VTjd|*AzT``+-ho@u%dNu zf43{7N1WgbE+SQcaC(zGv(spp&60f}Y2_942I$U1z3$HB@}S_@?)ydCdTQ)TuW~BW zoKPa=>|M6Jf(Xof$%J@K++8OM7Wn#<`wE0&#}U=v;)$sqgD1-{^1Gau*-5C9UyCKH zahJiZ765JzjfW_iu!=60ph z#C)U$t;7rCY@@p{z+klauWz9Q56j#5^oVaW9|O4JV%A2#LpCW2LWsp6RWfFz0(ikg z72Rf*y`D1weoN75FAn}PHf&X-Z*ZTP7+-_Elg9Q6w^?giOFP6_PGyt zFUp=M{&IOKePa~;lFs^MxlS20P~WTETNIPK zxB?B*HU7b*r>GOG37F9^eO8;NB^@EKx~Xjl%ThZZ*XV~-6D!;IrM9LAaTA@Wf!unk zyoXlnytMTxwl{`bg<@O{s4cJRh?SyObR{NdKUW?HSX;PEGgHzJVVL7D*rJbbFN#Y`&=F~bQF`NI|C6q0BrMMn znrtIh(L7=X#7HXdFkBA~hnHEJK_lALX!^8b?Z~veyu&^g7n8i}R1U-D&pC~FtVCu( zf$Ky!gYx^d_(&NJfk za-em}O$vhFAy!VnYRC@DV6Exg5HKdZ+Iv~&)kIwQw2-zf!bSV$qbkBU z{0b!dtImwQGO$lsZ#z`OgpHMpFn F{}1W9e|P`@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-1.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2227b0fb19563d76bcc5e541b8b469612c18c6cc GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP%z)q z#W5tq`R#>`ybT6CEC&<}my|b7dNWD)ph!UAG1f~vOFn*!&u(L2WMbhEP;h8~Fn%mO zVD$U7;jxcXB?W)Ki7vkvC9unO=FczOQ;wdy^L>>PtF4O=Trr%nLU;$mEIF>O{@gEL QfL1ejy85}Sb4q9e0Onmgq5uE@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-2.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..7c59c880e789dea22173923429c198ceff5055cc GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP_V+& z#W5tq`RzqRz6J#W76+dimHLa9j^EK2?OnL&iB_A?q^D);MA{h`nOHak6dW4Bj5V4Y z&aRUcysokNTGhFKug~5VcIppI)BYBFUT;$1g7f#=-b&}OzWcA3D$Lm};0e(K*9>GR c_&;Fe(BY|lGkw)wpc@!GUHx3vIVCg!0HUKkEC2ui literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-3.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..bf0d1d016b2111909d7bd940b3f1a76473b4ebab GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP;io` zi(^QJ^V>@Yd7BLcSR8`GHIC@+P}=^$$tl+J55rH#juhE`kHg$^pC*^Pc*!xba0n$SxWnon=+KY#qD?EWcpQOtrE`p@YBZ)}znYw7KGy+GG7c)I$ztaD0e0sw@1 BOI!c| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea0ecb26fa89dc25d814450f4e904cf98c28c54 GIT binary patch literal 741 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvg0|V1^ zPZ!6K4Cmwo3D(7m22xCzM1bM}kKAr?^W%TTrwTMk|NeE9olW4ra;ebOw~MyjmMlAS z?sxy`fSRI^at=$jCZ~B5?2@hs7%|7r>kQ%DamBvw!@LE7M^-3iaLi&_wdC}+l>7ff zi_M$Q8htr`R7&`{xgXnU<<+WJH{Q6iIpDCsjKjQd|44*gV>R}8Wo=wjT{N-L+fCk2 z{p-7b_5UuYEx5#fWs^`2-%&$`q8tA2@_D4Yk{|Lt78hgOJkgfnlK_WB*jMA2+xyxX z#gwP~YSXG@c=F@JvaJa{JPCbmosBkI_OG45C=z^yNko02tnlT7eD`g2`yal4Kfj>7 zw&pk6J4KI6i45xM{eNciv|saEJngrpzf(|=*8`u^XHM~bV>r=h!0<`NC+5xtX_-$3 z{dUzQ{g0k_Pqkq%VtK;(=E zUu|1>Z?gEC7th7NH_37yT9CrBDDkBFWk=RG6~(rkt5g-cJ~Nz9UBGqfgwsUECxTbX z0vMbhe>O?S7#NjI(+Gt=iQ%)EKrw>i;k5yRov z;*1IXjZ$Um`g<2-@dT*KR!L?46MvYRSWs-(a{Rzf;qMRS7^{2wWo4KZCS2Lmni!D! zXimWP{|f9)3>se?Gi9btaab5<_nRYvZ_2{^dn>ro>i_=g)M|7Wbxv^A)L7e`l{mxs zVs^>|3yt9WmfPlOeQRQB(poB@VcF2-DbR2+iEF~8_POGh)-Y7^g{%p>{86EJrI=7c zI1{6}`ThEUWIh%LSFIl3-1ft7q?fuoCz!CfVIfZNF*4Yu{K&s>aM>GRx@GWm^>bP0 Hl+XkK;QBN1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0e44821542cc509a65f5f2653d592b78bd7c3ef0 GIT binary patch literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9GGLLkg|>2BR01_q|H zo-U3d6>)Fxoc9h16glwmale4b(OwlTp@)Y;4JU}`-RYI+b7jeGc`<#qg1GAiJtYIj zJ6#G}Uh;Qr3XlrdJ!ICoXz2z1%p3zDE#*Xoib}a2AE!OX&(wam`&w;&*x>!W;&;#Q z%(Pyue8_=;kwt(=f``+`pQoyAnpWn_9Zv!;sddf$^WvZDa@PXc_`9dNk7}32JzQqI z`hIupu@id^{V3FEo9N4`YgDrJ{ruqlziThl1kXRN+V2%C&9(bn&~a1G9GQLr~_35uB z|EH}D-v0FA+9g|KMD|tf{%|=ytL)Q_sM*usJnz3&bb@_b75g2VkHLKERZCz0DP5VH z@iD%1$#FK{E9PIMepa+rX2j{WU1i!67crfErP0m+b4}@PW4k@`4lVSS4g0?Cqsh8s z*KJJX&z?TIp^ANu%{7huH2d8D_ny^!X**U``7J5ZXm$OXcd`HfeldBjQfjGr|62VI zOOvaik!Ka<&t%=49o1hY+P*5~k>92JTljQO?OhrF>EG4l?44Um=Y4)RZ=L90w^tse z+fN@Th%%DD7kT=iC!@)Vyf}TEy&Yde+q+Nu^EV$m_xzy}yL!B3lTrf%6Ndt�@cv z3uou%B>&f+_i~?8ShedB){RqaV$5f1seZ3DzMe8!bM;xPZ&|Frj?b^iU!JDYr51c` zcJQ06N-lR(x~vr*xPWLT77>M4YQc9H8Cg4aofIi|a9~`NXXMK0^hdkHd-6(wm7h4U fIMtzt^&iu@2BR01_q|{ zo-U3d6>)Fx*k%L=iX8YDtSO=;D(mGPEii6z=skpCCjTL-0|IXAqr(Rp! zR!v&_Y>t#|s0Z)c;*ZastvlAW`|Pf$ht}Qg=j$S(? z*S_A_TyvSDPao&~UO)Nj-1O8>KDVZ9-pQVl-?vkt?c4k*>)tVbU-x7A_S(!TuEFOn z%4io~Q}7a-)^MhO!N1$5!j*@76D pbJAV#1~VgzfCB?6p}^A^e`Dt(zZa)Z-2kR{22WQ%mvv4FO#m?&R$Bl7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json new file mode 100644 index 0000000000..a1deeaa3ed --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by paige404 based on the wooden bucket created by Jaraten (github/discord).", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Tools/mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..3c5d256839a339c97501da9c1b56f1915d6b1e5c GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s8R zo-U3d6>)E8ZS-Px6le=?jnGU=6jox?71C8{U9hxwU*q1`drs9SS3eOATDDCfNTY=% zT5#=_&VP-foGrKa&Yd{>?EZqQZ_mB^e|G=$oqH{gFLQqI>rF!`}bp1k7~@S z-@C&3)Zdr4!%r3LPToCz?vppwUvKFJ6dri}dwKFVR^Bx)nF`ruu6z$O|LtM*ZGXb2 zdgr;@`O>8}y2>`N+WFX-d^w+dC|3J!fbf!QV%-d`vJ2+U{rBPK+-=f}F3(^xkg;9s zxOWM+4`V~cj)d~+;47@pnmqq0%_wfznUkp-af-F1A*}76^12r8O+^kfgKnBITw&e! zrLAI5TfZE8;CrQIj6ZUp9evD`WK-AKG=Y_&o}u{m?&7m)cenQGKNC&%xXtl0Ea+xf& z4vTI&rE`wisYUPgWYvaae!4R}%NX{2{ab!SN$4h{hR~i0dus;u-_e2f7fUISX_!{dUCIi%Jl>gpUN*M8mT2Z>m~15~oXyK{8F{%-t+t|a zMC#64vC$%?^f-;U#LfGtysaS_PJcts^Z9%~|G}5-Npw|*>B0a2P{+A}-dhd+CPZax z$8N-1ZUq|Sb}9}4cK-NHCGl{w0sxc|I1uZb5H!mrQ2kutqJIiu)o&ub#SAyhY5)>+ zuM17D01X4E+I~ZI^`7@_&P!dU@tqyT&YzsXo)0cBGFiIHTI_nbnm@h<;*~`es}Ovu z5bf{R&=U5*4HF4BG4bT)?maql{P?MqWGR=Em}X@la7*3c7Tgb^I9(a4xo@T`nKx-> zVmt8sjg^P$)XE2JU1NuW(UjY`Ro3p|d%0_N@pJIzUA~)RvWLC)rnU#E`L+s^tPQJc zKR8ZY?@mc+J?ua?Dr6sNi)Bb!N**_aVzEoNA{}Q0jV-8%B_@R~=?PnTvvbyRJEdks zrbU|r&}Qwj!z?2!=3P6KL@!a^cREy4m9b8!QXI83K>HQvLG3p_hsQ1U>l3dx_cHI~ z?=e?pwA_6;%V_x;TMSr;Py7VUF`d)6vq4xGYSgoHZbTjnla|fltj5;-lkB+y@kbbBQJVe+%=0E;ljZwm(``I zlHi@XWRB`RjWUc4`4YNuM1Ge14AZ)j&~2TKN!z;}2rNI&!>?>!@S@kEh_6vG@p3lh z&ZhA@8O^1%N^BQ6Ak^X9T8|%}eqeEQFBsX`znBw~b-t&32A+{MZ~1oV=82(nAGwHN z6vp^UY8K#69Ii?UU*mkzuqnwzyk$u-Cbep*rXFTKqUOD~_VP(vih&-IrK3D;!uHpX9X<)z7HXvAe0MV zdJ6ti!a8}ox_R;ok)s&e=S!)u zj1oh|T;Ph&{Em78J#AOaB&*9%C_t5LL)gM6iLcz_hA&@@*l#%6rd>~Pejjbn=M9ax~rNoRg9sZFvNnu}BcyyfW-hUabG=AoCj%iah~zI5{XH^XUvE4~GeA z;j)@Fa(ixOXav?3snhyWYcxlBN}6dEQRH4jJLVJKc9pXZF?3|9pXxYE|Cg{+NV`J& zF__68XGD@eI|81k#TC_J*E~+<$IFjhhQf>XJsljD8n_x~t1WAkI%VTF&6Tue9HxYx zUHQS7WOnu0ra-D4Mrpm>7ActhJm;u>yqnj_3MJDdeIfo_t@YG%jn_C2m6}{#R8V{w zpW`EedrwP4^k{t&>rzn{KLyOWNUs;PBL$Ga;6m)l%#UOAN_DtcyY>K85M5rW@B7qr z0S#RUaj!6*X7H-?4FhaCLkBcrU=2Ap;gD&&w@qeAx7oLM`3}T{krdc7Br|FPx&3`s;mRCt{2nlWe^Q5eVnk%nNDs|Ti9;nGwc(m{o0NW~%4!E}gAf>UcCgl^I; zi_j_HlC5+rB~ZuGDH$4vLWa-0!j;Nrssm*V89Nf88!Z3E<)j z%WHi#wSj187}3x$6sIIC+zE(!V5PLYC}USYB%i&dsD} zB1{ztD2U>en)LPeOLLP>8vwi?VdeE>ja zKHf3|XMKMW5h{Yphmg2Mhq-z4@e#DI+q5+z#Bi|EOng zg9Jek1VIo4K@bE%5ClOGM))V&b%7 diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png index 71a3395c360b172ad262dc337b0b7c1465773984..2227b0fb19563d76bcc5e541b8b469612c18c6cc 100644 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP%z)q z#W5tq`R#>`ybT6CEC&<}my|b7dNWD)ph!UAG1f~vOFn*!&u(L2WMbhEP;h8~Fn%mO zVD$U7;jxcXB?W)Ki7vkvC9unO=FczOQ;wdy^L>>PtF4O=Trr%nLU;$mEIF>O{@gEL QfL1ejy85}Sb4q9e0Onmgq5uE@ literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E}kxqArY-_ z&u`>qP~>qAR5na0d+2rJXtY!Nx&?~7XX{f{PWQ1eFvw|dXT1Hlq`yPoc!8SH+wfiT j8*Ej3-v}@;d^p2o7t7VPZ*Jrhpm_|Qu6{1-oD!MGR c_&;Fe(BY|lGkw)wpc@!GUHx3vIVCg!0HUKkEC2ui literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-kvUwArY-_ zFBoz$C<-_Sirb{Tdo)c>ZTl6sH92Ny#r}o!Hag4znzQ5X=dB65=NEbA8!cd)TgH{^ q?mUTc_L9Gjx0B~yRA*o~kgt|~ji>e$qdyDKSO!m5KbLh*2~7Z^IWFx0 diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png index e58ebe020b1ea7b5b54b982470594c25d1f779b3..bf0d1d016b2111909d7bd940b3f1a76473b4ebab 100644 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP;io` zi(^QJ^V>@Yd7BLcSR8`GHIC@+P}=^$$tl+J55rH#juhE`kHg$^pC*^Pc*!xba0n$SxWnon=+KY#qD?EWcpQOtrE`p@YBZ)}znYw7KGy+GG7c)I$ztaD0e0sw@1 BOI!c| literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY-_ zFJ9zqFyLu<6@{DX1i+a^bI1#9uVSIF(ZLdf$Qjc#Jg+EMdaw(#X~O@r zH+sa^lIBiN?%s6P1Kns&oXB`iFUnl`$h=&5j)cf=k)ki`!I`@mBWqZ7_>sqsu z%4DUM^Kh&y0AgRW4n0qP_CSNhMSSfS06~ajHI)?j`-4nHY!!*@0g%6brka2LFr>{r z2zoy}PNTLJ;Er z4vM?qK?BbQSx8HBjB~>7J;?)2L_qj(h#n1$u&WiWn3>E9U!RXxQQ}GyK?sE5!|v_S ztY`(S&jAoUS9g^60NTh@;KQ20P+yOxZ+((ZaA#nXp z|7)JZn`&}?iM~uvi>wPw5g@#U0ES-2DQt-5p2)b5O7*=Q7Fic-ioAu;4mf2IW~@0B z;Q!&^E*>EcuUSd*z!llV0P+!Y@G)md8$pt7!{8d~fI6TKr~~SNI-m}y1L}Y}VC%p? X&e-&n$S;Fz00000NkvXXu0mjf0}D>c literal 701 zcmV;u0z&Px%cS%G+R9J=WmCZ{OaTv!x8)Lq(v(3WTZc7X4?!j0Tb`yM~gP?0cU6M|gpwUI5 zKfqfEUZhKhE>RchSeGKgGU!lKP)SO*hf%kbWjCcA)@@hWXgb&ox(5EHJOu6MGR!mI zd7kg@`Mp7f3Kjl$Tuy(O92+$2{fhm*nl`BSE1bG~!*MRhJic|+{F86{!sOWCo&`iS z;%C#a$qQcSsF4OCAbLYtiT0>s+ zOp&m!)_zV5^_kgRUNoJ}o=zu*`pi#xlWA?NMkVH>hquV;#! z>j*KsnA$%BmI6EUfIu=! zDz^#1nRpWe7rKf6x{y}W2Crw+jyfQ;S5L=|o2o1k?}^$Sc=u|_HUbdvR1<4&0N~p7 zM`#IMD7TR4%K5k%@Kghk%5Bot;2BR01_q|} zo-U3d6>)Fxoc9h16gluQnL~(YvC~Y>S55~r6S)+V92>by6T1b>e=;x1-I9ITEaUP$ zUvBY7^$(n4ZzyTpRpDCHeNdkDpT-G!ACK8_bJ>j}1oA8HmA~7(uiV%s?VauOx_5hv z@4xD}AmG5j$U-FH&a`>`e73$etLp}tCm+X5?zmm~>gbN^t{-IM@9G^r+I{=|n7N`PbU0Pb*4H7Zx4AY5P;}eEU0=tv7vc zq&~mCxqn&Zo~kSId2NR$H@(>0AC@Q?^6>r|S&!FSPcPkYweAM5EnfvdmosN!o?znn3w(`e<(>6I?<&~3&n@kl`H^3_9*Y5+7_qF-??4P{-bfx5* z)1C9!=I+otRaJMp#`j! vrz^BQyeFy*W_-9jq>6yXP)z4*}Q$iB}N1Z_T literal 600 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U=s3laSW-L z^Y+&MY~ezgV;{?1CpdZNX3Q45a?s)N1dS;Ix13npw>Zl>6?WP$*wHoHJN)3%-QCXY zAMH;pki4`o;cSwJL)GDnOEizTEW9Yd8EK>LtiCg5|MaR~d$!5knf$($e?HImh7K4o z%#XJ%{nyrG{PovQ<@5Xnv#Re}J$HX`vRVG>t$D?M_pH0*56=+qe{WU)%Vrgi`MKYM zw_bd?853Wmc36>t&$`xMGFn=j&tdoFr4JPk_ZnVqoc-GS+_~jq7hirnxV3YoyNO`l1p9GjhX z`mL<;sVVGxdbRShJ8R91h7hGg$N590=Gp-joSxYI>B%Rtqh6D@mh{}6 z^z$RT{4|9Fhi?}i&->cp*Ppz-ioscbLuLEjNX`ZsjyIW15>;3BSg j!CT-=iJ;5B2BR01_q{2 zo-U3d6>)Fx*k=R>iX8uVIY_|Jtu-s#f%UC`;3_30C5|o^c3GF05SBtA7j^OQh24`C ztSl@<)L*Kt2xOV~BRw;)y^Q0AR>t4vwT23dKAhP(NkG+NPWgS~lYj3m%xo)v|FiZT zueo<02Qwp!fCB?@M22F)^IJ1DOlE95X;byEqTt8Z!_Snf^Y2XlomREZu(iMG(Y486 zKA)AGy;*&4-szw2esVt^fBFCS-+qy)9~SL1{(f}j_uQwuV{A5F&pi~gRO{Ei+wEyK z^%?G4bY>R@rYEJn+t{S}$H#P%zWhDYWg7ectL--9IdLN5q|N%R^R~>pJx{)?jZMsK zTJ)x*rE5-pIkEF~x$n%g^BdUD$De-JyV}*rvi#Rqmo=}}pZewd+U1y6X62H7eR2k8 zqt35kUC~-P!~DUCgKLBK*elN8_pc;-zU|hdd+%xaMP|S3cwYAI_uS8yu2yf|KYwX` z;rtax-+uHA{`-vgLO#Q`ts?|Woz_yJ8a|SKlOC>vM8%Z3qLMjeo8PqMvfIQyyg9n&jsBCT7hNLP-Kn@EIN_R->Eg7jXJ*CnUO8mtBko>n zxOc*r`n^-WFkQQTv0Xp;Y$ordXT@K;BaB~H7=^z3btd!ICNU-sg$4%72o}u?X1zU5 zSNIpkPk3Kz`afu2sA6H=ruWtn1)p0ltkLZB{rXM#_vLo(iQmp%T(~wyYj1a!uXWeG zXZ}hx)@NR_YFv5dYiD-hwCn=j?k`{X*Pp#Q%PjToYBRH`!QY4ZR8 literal 676 zcmV;V0$crwP)Px%UP(kjRCt{2+A(MoQ5?tdZ%RReXKJ7}X`lvbhDaeQ5<(G#ilh#42;ve&C{BXt zLZL&^-7z*2A{bDbxuNkqtynHVE}KMsvBsyb-vPLL>ns3y zRdYM9>&{D)i>`b8+CHoB*(%>$*Y>}-@x)WSkz0T5@GVH#>&PHnRJ}xHJyh~UUe+ETb9>! zGU+%g8$0AxjZ`8`Q7^Te-?E^M#$zTxEaXSutq}|PnS1%Rs|(=1{X(ek)&O{|>7K|f zgb+dqA%qY@2qA_5mkI7h9eC12S^M@7#j&SdImhKWsA(OyxcQj$MFJq zxo5zR;{_<{CDIqqG~ak89cOxWk-fsVj)nUd+A3aN?imn5So#54CFbdqB3$GE0000< KMNUMnLSTZr`8Nyz diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json index 8445bf3412..1675c69164 100644 --- a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Jaraten (github/discord) , modified by vladimir.s", + "copyright": "Created by Jaraten (github/discord) , modified by vladimir.s, resized to 48 and modified by paige404", "size": { - "x": 32, - "y": 32 + "x": 48, + "y": 48 }, "states": [ { diff --git a/Resources/migration.yml b/Resources/migration.yml index 40fe48c4ef..1e49d4f670 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -188,7 +188,7 @@ CP14VialTinyChromiumSlime: CP14VialSmall CP14VialTinyLumiMushroom: CP14VialSmall CP14VialSmallHealthPotion: CP14VialSmall CP14VialSmallManaPotion: CP14VialSmall -CP14SpellScrollCounterSpell: CP14ActionSpellMagicSplitting +CP14SpellScrollCounterSpell: CP14ActionSpellMagicSplitting #2025-04-03 CP14TravelingStoreshipAnchor: null @@ -265,7 +265,7 @@ CP14FenceWoodSmallGate: CP14FenceGateWooden CP14FenceIronGrilleStraight: CP14FenceBigIron CP14FenceIronGrilleGate: CP14FenceGateBigIron CP14FenceIronGrilleGateGuard: CP14FenceGateBigIronGuardBarracks -CP14FenceIronGrilleGateGuildmaster: CP14FenceGateBigIronGuildmaster +CP14FenceIronGrilleGateGuildmaster: CP14FenceGateBigIronGuildmaster CP14FenceIronGrilleGateDemiplaneCrystal: CP14FenceGateBigIronDemiplaneCrystal CP14FenceIronGrilleWindowStraight: CP14FenceWindowIron @@ -343,6 +343,9 @@ CP14ClothingRingFireball: null CP14ClothingRingFlashLight: null CP14ClothingRingIceShards: null +# 2025-06-04 +CP14BaseMop: CP14ModularWoodMop + #2025-06-15 CP14FoodMeatMole: CP14FoodMeatMonster CP14FoodMeatMoleCooked: CP14FoodMeatMonsterCooked