From 83f102ea75791772beca448ed9ec0936efb71fe7 Mon Sep 17 00:00:00 2001 From: Swept Date: Wed, 17 Feb 2021 12:59:15 +0000 Subject: [PATCH] Cleans up Hydroponics content. (#3025) * Adds to IgnoredComponents.cs * Jackboots * Half Done * Moved to diff PR * Everything functional * Fixed Sprays * Nice * Fixed * Update submodule * Fix tests Co-authored-by: Metal Gear Sloth --- .../Botany/PlantHolderVisualizer.cs | 14 +- Resources/Maps/saltern.yml | 6 +- .../Catalog/LatheRecipes/botany.yml | 28 ++-- .../Prototypes/Catalog/LatheRecipes/tools.yml | 11 ++ .../Constructible/Power/seed_extractor.yml | 4 +- .../Constructible/Specific/hydroponics.yml | 4 +- .../Storage/Crates/Filled/crate_botany.yml | 6 +- .../Hydroponics/produce.yml} | 12 +- .../Specific/{ => Hydroponics}/seeds.yml | 0 .../Objects/Specific/Hydroponics/sprays.yml | 63 +++++++++ .../Objects/Specific/Hydroponics/tools.yml | 59 ++++++++ .../Entities/Objects/Tools/botany_tools.yml | 129 ------------------ .../Entities/Objects/Tools/tools.yml | 15 ++ .../Shoes/Boots/jackboots.rsi/inhand-left.png | Bin 263 -> 323 bytes .../Boots/jackboots.rsi/inhand-right.png | Bin 264 -> 340 bytes .../claypot-item.png | Bin .../claypot-large.png | Bin .../claypot.png | Bin .../hydrocover.png | Bin .../hydrotray.png | Bin .../hydrotray2.png | Bin .../hydrotray3.png | Bin .../Hydroponics/containers.rsi/meta.json | 32 +++++ .../hydro_tools.rsi/deathspray.png | Bin 354 -> 0 bytes .../Hydroponics/hydro_tools.rsi/meta.json | 1 - .../hydro_tools.rsi/nolabelspray.png | Bin 299 -> 0 bytes .../Hydroponics/hydro_tools.rsi/pestspray.png | Bin 368 -> 0 bytes .../Hydroponics/hydro_tools.rsi/weedspray.png | Bin 335 -> 0 bytes .../Hydroponics/machines.rsi/meta.json | 38 ++++++ .../seedextractor.png} | Bin .../spawner.png | Bin .../traitcopier.png | Bin .../traitgun.png | Bin .../traitscanner.png | Bin .../Hydroponics/misc.rsi/meta.json | 40 ++++++ .../moldcreep0.png | Bin .../moldcreep1.png | Bin .../moldcreep2.png | Bin .../{hydro_tools.rsi => misc.rsi}/soil.png | Bin .../spaceworms.png | Bin .../vine_flowers.png | Bin .../vine_fruit.png | Bin .../alert3.png} | Bin .../harvest3.png} | Bin .../lowhealth3.png} | Bin .../lownutri.png} | Bin .../lownutri3.png} | Bin .../lowwater3.png} | Bin .../Hydroponics/overlays.rsi/meta.json | 84 ++++++++++++ .../bags.rsi}/cyan black stripe.png | Bin .../bags.rsi}/cyan blue stripe.png | Bin .../bags.rsi}/cyan lime stripe.png | Bin .../bags.rsi}/cyan purple stripe.png | Bin .../Hydroponics/bags.rsi}/cyan red stripe.png | Bin .../bags.rsi}/cyan white stripe.png | Bin .../bags.rsi}/cyan yellow stripe.png | Bin .../Tools/Hydroponics/bags.rsi}/cyan.png | Bin .../bags.rsi}/green black stripe.png | Bin .../bags.rsi}/green blue stripe.png | Bin .../bags.rsi}/green lime stripe.png | Bin .../bags.rsi}/green purple stripe.png | Bin .../bags.rsi}/green red stripe.png | Bin .../bags.rsi}/green white stripe.png | Bin .../bags.rsi}/green yellow stripe.png | Bin .../Tools/Hydroponics/bags.rsi}/plantbag.png | Bin .../Hydroponics/bags.rsi}/portaseeder.png | Bin .../Tools/Hydroponics/bags.rsi}/seedbag.png | Bin .../Tools/Hydroponics/bags.rsi}/shovel.png | Bin .../Tools/Hydroponics/bags.rsi}/spade.png | Bin .../Tools/Hydroponics/disk.rsi}/disk.png | Bin .../Tools/Hydroponics/disk.rsi/meta.json | 22 +++ .../Tools/Hydroponics/hatchet.rsi/icon.png} | Bin .../Hydroponics/hatchet.rsi/inhand-left.png | Bin 0 -> 404 bytes .../Hydroponics/hatchet.rsi/inhand-right.png | Bin 0 -> 476 bytes .../Tools/Hydroponics/hatchet.rsi/meta.json | 22 +++ .../Tools/Hydroponics/hoe.rsi/icon.png} | Bin .../Tools/Hydroponics/hoe.rsi/inhand-left.png | Bin 0 -> 211 bytes .../Hydroponics/hoe.rsi/inhand-right.png | Bin 0 -> 214 bytes .../Tools/Hydroponics/hoe.rsi/meta.json | 22 +++ .../Tools/Hydroponics/scythe.rsi/icon.png} | Bin .../Hydroponics/scythe.rsi/inhand-left.png | Bin 0 -> 902 bytes .../Hydroponics/scythe.rsi/inhand-right.png | Bin 0 -> 875 bytes .../Tools/Hydroponics/scythe.rsi/meta.json | 22 +++ .../Tools/Hydroponics/spade.rsi/icon.png | Bin 0 -> 397 bytes .../Hydroponics/spade.rsi/inhand-left.png | Bin 0 -> 319 bytes .../Hydroponics/spade.rsi/inhand-right.png | Bin 0 -> 319 bytes .../Tools/Hydroponics/spade.rsi/meta.json | 22 +++ .../Hydroponics/sprays.rsi/deathspray.png | Bin 0 -> 335 bytes .../Hydroponics/sprays.rsi/inhand-left.png | Bin 0 -> 309 bytes .../Hydroponics/sprays.rsi/inhand-right.png | Bin 0 -> 312 bytes .../Tools/Hydroponics/sprays.rsi/meta.json | 45 ++++++ .../Hydroponics/sprays.rsi/nolabelspray.png | Bin 0 -> 297 bytes .../Hydroponics/sprays.rsi/pestspray.png | Bin 0 -> 363 bytes .../sprays.rsi/plantbgone-inhand-left.png | Bin 0 -> 334 bytes .../sprays.rsi/plantbgone-inhand-right.png | Bin 0 -> 337 bytes .../Hydroponics/sprays.rsi}/plantbgone.png | Bin .../Hydroponics/sprays.rsi}/sprayparts.png | Bin .../Hydroponics/sprays.rsi/weedspray.png | Bin 0 -> 337 bytes .../Objects/Tools/shovel.rsi/icon.png | Bin 0 -> 257 bytes .../Objects/Tools/shovel.rsi/inhand-left.png | Bin 0 -> 347 bytes .../Objects/Tools/shovel.rsi/inhand-right.png | Bin 0 -> 348 bytes .../Objects/Tools/shovel.rsi/meta.json | 22 +++ 102 files changed, 545 insertions(+), 178 deletions(-) rename Resources/Prototypes/Entities/Objects/{Consumable/botany.yml => Specific/Hydroponics/produce.yml} (96%) rename Resources/Prototypes/Entities/Objects/Specific/{ => Hydroponics}/seeds.yml (100%) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Tools/botany_tools.yml rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/claypot-item.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/claypot-large.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/claypot.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/hydrocover.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/hydrotray.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/hydrotray2.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => containers.rsi}/hydrotray3.png (100%) create mode 100644 Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/deathspray.png delete mode 100644 Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/nolabelspray.png delete mode 100644 Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/pestspray.png delete mode 100644 Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/weedspray.png create mode 100644 Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/sextractor.png => machines.rsi/seedextractor.png} (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => machines.rsi}/spawner.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => machines.rsi}/traitcopier.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => machines.rsi}/traitgun.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => machines.rsi}/traitscanner.png (100%) create mode 100644 Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/moldcreep0.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/moldcreep1.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/moldcreep2.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/soil.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/spaceworms.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/vine_flowers.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi => misc.rsi}/vine_fruit.png (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/over_alert3.png => overlays.rsi/alert3.png} (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/over_harvest3.png => overlays.rsi/harvest3.png} (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/over_lowhealth3.png => overlays.rsi/lowhealth3.png} (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/over_lownutri.png => overlays.rsi/lownutri.png} (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/over_lownutri3.png => overlays.rsi/lownutri3.png} (100%) rename Resources/Textures/Constructible/Hydroponics/{hydro_tools.rsi/over_lowwater3.png => overlays.rsi/lowwater3.png} (100%) create mode 100644 Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan black stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan blue stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan lime stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan purple stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan red stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan white stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan yellow stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/cyan.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green black stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green blue stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green lime stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green purple stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green red stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green white stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/green yellow stripe.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/plantbag.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/portaseeder.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/seedbag.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/shovel.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/bags.rsi}/spade.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/disk.rsi}/disk.png (100%) create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi/hatchet.png => Objects/Tools/Hydroponics/hatchet.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi/hoe.png => Objects/Tools/Hydroponics/hoe.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi/scythe.png => Objects/Tools/Hydroponics/scythe.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/deathspray.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/nolabelspray.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/pestspray.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-right.png rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/sprays.rsi}/plantbgone.png (100%) rename Resources/Textures/{Constructible/Hydroponics/hydro_tools.rsi => Objects/Tools/Hydroponics/sprays.rsi}/sprayparts.png (100%) create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/weedspray.png create mode 100644 Resources/Textures/Objects/Tools/shovel.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/shovel.rsi/meta.json diff --git a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs b/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs index cf0b2da7d7..4b6f5dd70f 100644 --- a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs +++ b/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs @@ -1,4 +1,4 @@ -using Content.Shared.GameObjects.Components.Botany; +using Content.Shared.GameObjects.Components.Botany; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; @@ -22,18 +22,18 @@ namespace Content.Client.GameObjects.Components.Botany sprite.LayerMapReserveBlank(PlantHolderLayers.AlertLight); sprite.LayerMapReserveBlank(PlantHolderLayers.HarvestLight); - var hydroTools = new ResourcePath("Constructible/Hydroponics/hydro_tools.rsi"); + var hydroTools = new ResourcePath("Constructible/Hydroponics/overlays.rsi"); sprite.LayerSetSprite(PlantHolderLayers.HealthLight, - new SpriteSpecifier.Rsi(hydroTools, "over_lowhealth3")); + new SpriteSpecifier.Rsi(hydroTools, "lowhealth3")); sprite.LayerSetSprite(PlantHolderLayers.WaterLight, - new SpriteSpecifier.Rsi(hydroTools, "over_lowwater3")); + new SpriteSpecifier.Rsi(hydroTools, "lowwater3")); sprite.LayerSetSprite(PlantHolderLayers.NutritionLight, - new SpriteSpecifier.Rsi(hydroTools, "over_lownutri3")); + new SpriteSpecifier.Rsi(hydroTools, "lownutri3")); sprite.LayerSetSprite(PlantHolderLayers.AlertLight, - new SpriteSpecifier.Rsi(hydroTools, "over_alert3")); + new SpriteSpecifier.Rsi(hydroTools, "alert3")); sprite.LayerSetSprite(PlantHolderLayers.HarvestLight, - new SpriteSpecifier.Rsi(hydroTools, "over_harvest3")); + new SpriteSpecifier.Rsi(hydroTools, "harvest3")); // Let's make those invisible for now. sprite.LayerSetVisible(PlantHolderLayers.Plant, false); diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index aa2a83ac36..38f7cee3ee 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -13892,14 +13892,14 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 1107 - type: Scythe + type: HydroponicsToolScythe components: - parent: 853 pos: -20.5,-1.5 rot: -1.5707963267948966 rad type: Transform - uid: 1108 - type: Hatchet + type: HydroponicsToolHatchet components: - parent: 853 pos: -20.5,-2.5 @@ -13997,7 +13997,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 1122 - type: MiniHoe + type: HydroponicsToolMiniHoe components: - parent: 853 pos: -20.5,-1.5 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/botany.yml b/Resources/Prototypes/Catalog/LatheRecipes/botany.yml index d011c676da..4cd6a0979f 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/botany.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/botany.yml @@ -1,8 +1,8 @@ - type: latheRecipe id: MiniHoe icon: - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: hoe + sprite: Objects/Tools/Hydroponics/hoe.rsi + state: icon result: MiniHoe completetime: 500 materials: @@ -12,8 +12,8 @@ - type: latheRecipe id: Scythe icon: - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: scythe + sprite: Objects/Tools/Hydroponics/scythe.rsi + state: icon result: Scythe completetime: 500 materials: @@ -23,33 +23,21 @@ - type: latheRecipe id: Hatchet icon: - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: hatchet + sprite: Objects/Tools/Hydroponics/hatchet.rsi + state: icon result: Hatchet completetime: 500 materials: steel: 60 glass: 10 -- type: latheRecipe - id: Shovel - icon: - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: shovel - result: Shovel - completetime: 500 - materials: - steel: 60 - glass: 10 - - type: latheRecipe id: Spade icon: - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: spade + sprite: Objects/Tools/Hydroponics/spade.rsi + state: icon result: Spade completetime: 500 materials: steel: 30 glass: 10 - diff --git a/Resources/Prototypes/Catalog/LatheRecipes/tools.yml b/Resources/Prototypes/Catalog/LatheRecipes/tools.yml index 8c1e7bb34c..0bb6483cf0 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/tools.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/tools.yml @@ -105,3 +105,14 @@ materials: steel: 90 glass: 80 + +- type: latheRecipe + id: Shovel + icon: + sprite: Objects/Tools/Hydroponics/hatchet.rsi + state: icon + result: Shovel + completetime: 500 + materials: + steel: 60 + glass: 10 diff --git a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml b/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml index 968872e993..3397231958 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml @@ -8,8 +8,8 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: sextractor + sprite: Constructible/Hydroponics/machines.rsi + state: seedextractor - type: Physics mass: 25 anchored: true diff --git a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml index 2d139cce5e..0bbd53ae00 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml @@ -34,7 +34,7 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi + sprite: Constructible/Hydroponics/misc.rsi state: soil - type: PlantHolder drawWarnings: false @@ -60,7 +60,7 @@ snap: true - type: Pullable - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi + sprite: Constructible/Hydroponics/containers.rsi state: hydrotray3 - type: PlantHolder drawWarnings: true diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml b/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml index 30d2b248a3..fc4947ad76 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml @@ -29,7 +29,7 @@ components: - type: StorageFill contents: - - name: MiniHoe + - name: HydroponicsToolMiniHoe amount: 1 - name: PlantBGoneSpray amount: 1 @@ -37,9 +37,9 @@ amount: 1 - name: PestSpray amount: 1 - - name: Scythe + - name: HydroponicsToolScythe amount: 1 - - name: Hatchet + - name: HydroponicsToolHatchet amount: 1 - name: ClothingOuterApronBotanist amount: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/botany.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml similarity index 96% rename from Resources/Prototypes/Entities/Objects/Consumable/botany.yml rename to Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml index 89b6eb8e13..88f7391bd3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/botany.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml @@ -8,6 +8,7 @@ - type: Sprite state: produce - type: Produce + - type: Grindable - type: entity name: wheat @@ -27,7 +28,6 @@ Quantity: 5 - type: Produce seed: wheat - - type: Grindable - type: entity name: sugarcane @@ -47,7 +47,6 @@ Quantity: 5 - type: Produce seed: sugarcane - - type: Grindable - type: entity name: tower-cap log @@ -81,7 +80,6 @@ sprite: Objects/Specific/Hydroponics/banana.rsi - type: Produce seed: banana - - type: Grindable - type: Juiceable result: reagents: @@ -104,7 +102,6 @@ sprite: Objects/Specific/Hydroponics/carrot.rsi - type: Produce seed: carrots - - type: Grindable - type: Juiceable result: reagents: @@ -127,7 +124,6 @@ sprite: Objects/Specific/Hydroponics/lemon.rsi - type: Produce seed: lemon - - type: Grindable - type: Juiceable result: reagents: @@ -150,7 +146,6 @@ sprite: Objects/Specific/Hydroponics/potato.rsi - type: Produce seed: potato - - type: Grindable - type: Juiceable result: reagents: @@ -173,7 +168,6 @@ sprite: Objects/Specific/Hydroponics/tomato.rsi - type: Produce seed: tomato - - type: Grindable - type: Juiceable result: reagents: @@ -196,7 +190,6 @@ sprite: Objects/Specific/Hydroponics/eggplant.rsi - type: Produce seed: eggplant - - type: Grindable - type: entity name: apple @@ -214,7 +207,6 @@ sprite: Objects/Specific/Hydroponics/apple.rsi - type: Produce seed: apple - - type: Grindable - type: Juiceable result: reagents: @@ -238,7 +230,6 @@ sprite: Objects/Specific/Hydroponics/corn.rsi - type: Produce seed: corn - - type: Grindable - type: entity name: chanterelle cluster @@ -256,4 +247,3 @@ sprite: Objects/Specific/Hydroponics/chanterelle.rsi - type: Produce seed: chanterelle - - type: Grindable diff --git a/Resources/Prototypes/Entities/Objects/Specific/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Specific/seeds.yml rename to Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml new file mode 100644 index 0000000000..f1b6d51c3c --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml @@ -0,0 +1,63 @@ +- type: entity + name: Plant-B-Gone + id: PlantBGoneSpray + parent: SprayBottle + description: Kills those pesky weeds! + suffix: "Filled" + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/sprays.rsi + state: plantbgone + - type: SolutionContainer + maxVol: 100 + caps: Drainable + contents: + reagents: + - ReagentId: chem.PlantBGone + Quantity: 100 + - type: Item + sprite: Objects/Tools/Hydroponics/sprays.rsi + HeldPrefix: plantbgone + +- type: entity + name: weed spray + id: WeedSpray + parent: SprayBottle + description: It's a toxic mixture, in spray form, to kill small weeds. + suffix: "Filled" + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/sprays.rsi + state: weedspray + - type: SolutionContainer + maxVol: 50 + caps: Drainable + contents: + reagents: + - ReagentId: chem.WeedKiller + Quantity: 50 + - type: Spillable + - type: ItemCooldown + - type: Spray + transferAmount: 1 + - type: Item + sprite: Objects/Tools/Hydroponics/sprays.rsi + +- type: entity + name: pest spray + id: PestSpray + parent: WeedSpray + description: Objects/Tools/Hydroponics/sprays.rsi + suffix: "Filled" + components: + - type: Sprite + state: pestspray + - type: SolutionContainer + maxVol: 50 + caps: Drainable + contents: + reagents: + - ReagentId: chem.PestKiller + Quantity: 50 + - type: Item + sprite: Objects/Tools/Hydroponics/sprays.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml new file mode 100644 index 0000000000..389735a99f --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -0,0 +1,59 @@ +- type: entity + name: mini hoe + parent: BaseItem + id: HydroponicsToolMiniHoe + description: It's used for removing weeds or scratching your back. + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/hoe.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + - type: Item + sprite: Objects/Tools/Hydroponics/hoe.rsi + - type: Hoe + +- type: entity + name: scythe + parent: BaseItem + id: HydroponicsToolScythe + description: A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow. + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/scythe.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + - type: BotanySharp + - type: Item + sprite: Objects/Tools/Hydroponics/scythe.rsi + +- type: entity + name: hatchet + parent: BaseItem + id: HydroponicsToolHatchet + description: A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood. + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/hatchet.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + - type: BotanySharp + - type: Item + sprite: Objects/Tools/Hydroponics/hatchet.rsi + +- type: entity + name: spade + parent: BaseItem + id: Spade + description: A small tool for digging and moving dirt. + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/spade.rsi + state: spade + - type: ItemCooldown + - type: MeleeWeapon + - type: Shovel + - type: Item + sprite: Objects/Tools/Hydroponics/spade.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/botany_tools.yml b/Resources/Prototypes/Entities/Objects/Tools/botany_tools.yml deleted file mode 100644 index 9f65f81ba3..0000000000 --- a/Resources/Prototypes/Entities/Objects/Tools/botany_tools.yml +++ /dev/null @@ -1,129 +0,0 @@ -- type: entity - name: mini hoe - parent: BaseItem - id: MiniHoe - description: It's used for removing weeds or scratching your back. - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: hoe - - type: ItemCooldown - - type: MeleeWeapon - - type: Item - - type: Hoe - -- type: entity - name: Plant-B-Gone - id: PlantBGoneSpray - parent: SprayBottle - description: Kills those pesky weeds! - suffix: "Filled" - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: plantbgone - - type: SolutionContainer - maxVol: 100 - caps: Drainable - contents: - reagents: - - ReagentId: chem.PlantBGone - Quantity: 100 - -- type: entity - name: weed spray - id: WeedSpray - parent: SprayBottle - description: It's a toxic mixture, in spray form, to kill small weeds. - suffix: "Filled" - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: weedspray - - type: SolutionContainer - maxVol: 50 - caps: Drainable - contents: - reagents: - - ReagentId: chem.WeedKiller - Quantity: 50 - - type: SolutionTransfer - transferAmount: 1.0 - - type: Spillable - - type: ItemCooldown - - type: Spray - transferAmount: 1 - -- type: entity - name: pest spray - id: PestSpray - parent: WeedSpray - description: It's some pest eliminator spray! Do not inhale! - suffix: "Filled" - components: - - type: Sprite - state: pestspray - - type: SolutionContainer - maxVol: 50 - caps: Drainable - contents: - reagents: - - ReagentId: chem.PestKiller - Quantity: 50 - -- type: entity - name: scythe - parent: BaseItem - id: Scythe - description: A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow. - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: scythe - - type: ItemCooldown - - type: MeleeWeapon - - type: BotanySharp - - type: Item - -- type: entity - name: hatchet - parent: BaseItem - id: Hatchet - description: A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood. - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: hatchet - - type: ItemCooldown - - type: MeleeWeapon - - type: BotanySharp - - type: Item - -- type: entity - name: spade - parent: BaseItem - id: Spade - description: A small tool for digging and moving dirt. - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: spade - - type: ItemCooldown - - type: MeleeWeapon - - type: Shovel - - type: Item - -- type: entity - name: shovel - parent: BaseItem - id: Shovel - description: A large tool for digging and moving dirt. - components: - - type: Sprite - sprite: Constructible/Hydroponics/hydro_tools.rsi - state: shovel - - type: ItemCooldown - - type: MeleeWeapon - - type: Shovel - - type: Item - diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index a91d8bbbae..f7cdd61ebd 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -194,3 +194,18 @@ - type: Sprite sprite: Objects/Tools/rcd.rsi state: rcd_ammo + +- type: entity + name: shovel + parent: BaseItem + id: Shovel + description: A large tool for digging and moving dirt. + components: + - type: Sprite + sprite: Objects/Tools/Hydroponics/shovel.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + - type: Shovel + - type: Item + sprite: Objects/Tools/Hydroponics/shovel.rsi diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-left.png index 31538aabaf316b49ce9c06aea8b388835332b103..03bdacf9fb56813399ffd95046919fd81774980a 100644 GIT binary patch delta 297 zcmV+^0oMM90>c83BYy!3NklZq}7{&3AD)Tp59*IQO^Z?C>atfb-bNMLg zIl_oC`U37mln!0WqbbV&x3N6ohk@a<82|tP0001hCEUGkDfdko=I(Xhw#vx6ecP^5 zf~){{uPG%vbe$^ln?u)GN=aUVq=5O!-=^t)t;l`MH#56UlYe|CND3&WG}m#o5ThdQ zMFej+@+-uV2b7eC|R1OSCEx4U4`+BP!a00000NkvXXu0mjfWO$53 delta 236 zcmVC{pX z+qB*kLjP|H=)HkUGUZ4B000000QfJLQjN!POxw0elALq8ujhHr+VgCEuEw(2vtbz2 z_x*1DtNL8U22cz0E8x9PO|zeC*L9MlX_{W{dA9yjSIcJJ`(+eDP>fN_vM7Y`_!eU< zUjGf#X|`>f-u<(#>*1bf>j3}&00000004kv)jl&>fx?61$qsVap00003~ve2aZ?+cepS zpsKcQnxvZO0QOxchrZ7?1XZ;|-^;%1lIo%YSccxzb(Wj3e1G{(UEiK#Yoj+nL}d0} zuG1tTgetMeUll^AuG1v5_sO+S15j0S&dKb(oX0V{;TIu<>O77zdoRwp=q-2{KqZl2!D+ohrv##lS$!Q@EwF8pM(F~;Q^HG17gi-S+*qSiU0rr M07*qoM6N<$g0Gg1asU7T delta 237 zcmcb@)WI}Cxt`&?r;B4q#hkadZ26iEc-kJW?+{jS+oYI!?#xe1W^3bzTqRzsos{cB zRD$lMcTJJd5mt+4VgP{ydu@`WeJ}eww(y$NwJ0E>JXXAS=cKhi(>Jn5WQSh=nl!g- z?N4{^0`czGIXyEsiovdD;w(tGZIn{3~-}`(1nBMo~ ze_-z>o#k7n^BgX?DLtX;AJ`%gVR8APS>UVB%m*KSs{m4rpBbx}gXYW6IDNf;&r&=4 k4`0X`rg^mxsk`_uLNoHboFyt=akR{08{R36aWAK diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/claypot-item.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-item.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/claypot-item.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-item.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/claypot-large.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-large.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/claypot-large.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-large.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/claypot.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/claypot.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrocover.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrocover.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrocover.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrocover.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrotray.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrotray.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrotray2.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray2.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrotray2.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray2.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrotray3.png b/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hydrotray3.png rename to Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray3.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json b/Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json new file mode 100644 index 0000000000..59eb3e9dc8 --- /dev/null +++ b/Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "claypot" + }, + { + "name": "claypot-item" + }, + { + "name": "claypot-large" + }, + { + "name": "hydrocover" + }, + { + "name": "hydrotray" + }, + { + "name": "hydrotray2" + }, + { + "name": "hydrotray3" + } + ] +} diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/deathspray.png b/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/deathspray.png deleted file mode 100644 index d476c2c15a835a190becdb10a2deb921b011792d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmV-o0iFJdP)Zq}6o$W4y#j-8kO`#Z7zry|M(ji61d%dijW~hlWaA83IE0Y`5=VF)qR>*(Zm(VZ zNlzf_xBs7K%RnR&i9{m*%tCA7Gi$kV1K{>3H7@`x$Qi_fSk^L*TPqf1v)RaR^L0X5 zE8crqgLv;>hEQuuS(b7*9H{Gh99u4z>~=evrWt+TwE_Utbxlze48uU*_Z*MMnMN(Z z^?GHo_-yd~e&=$z%yep7V2t_k(6wzl`o3ue0Lb&45W-k_o@?4oF~*39$gAg9ooWZ1 zbA%882qEB{)3lpnjFB`=XJ7wk9oTNSbX`Z5Wh6;LmSq4WNixx?Zo%nvqU*Y`R;$%a zqxyqL(^U5RJ@B{(s;ZjYg6aXDA)fEw%_9+j4>1yoSRwuU$p8QV07*qoM6N<$g2(Qi AfdBvi diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/meta.json b/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/meta.json deleted file mode 100644 index 8fd6d66a8e..0000000000 --- a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", "states": [{"name": "claypot", "delays": [[1.0]]}, {"name": "claypot-item", "delays": [[1.0]]}, {"name": "claypot-large", "delays": [[1.0]]}, {"name": "cyan", "delays": [[1.0]]}, {"name": "cyan black stripe", "delays": [[1.0]]}, {"name": "cyan blue stripe", "delays": [[1.0]]}, {"name": "cyan lime stripe", "delays": [[1.0]]}, {"name": "cyan purple stripe", "delays": [[1.0]]}, {"name": "cyan red stripe", "delays": [[1.0]]}, {"name": "cyan white stripe", "delays": [[1.0]]}, {"name": "cyan yellow stripe", "delays": [[1.0]]}, {"name": "deathspray", "delays": [[1.0]]}, {"name": "disk", "delays": [[0.1, 0.1, 0.1]]}, {"name": "green black stripe", "delays": [[1.0]]}, {"name": "green blue stripe", "delays": [[1.0]]}, {"name": "green lime stripe", "delays": [[1.0]]}, {"name": "green purple stripe", "delays": [[1.0]]}, {"name": "green red stripe", "delays": [[1.0]]}, {"name": "green white stripe", "delays": [[1.0]]}, {"name": "green yellow stripe", "delays": [[1.0]]}, {"name": "hydrocover", "delays": [[1.0]]}, {"name": "hydrotray", "delays": [[1.0]]}, {"name": "hydrotray2", "delays": [[1.0]]}, {"name": "hydrotray3", "delays": [[1.0]]}, {"name": "moldcreep0", "delays": [[1.0]]}, {"name": "moldcreep1", "delays": [[1.0]]}, {"name": "moldcreep2", "delays": [[1.0]]}, {"name": "nolabelspray", "delays": [[1.0]]}, {"name": "over_alert3", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "over_harvest3", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "over_lowhealth3", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "over_lownutri", "delays": [[1.0]]}, {"name": "over_lownutri3", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "over_lowwater3", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "pestspray", "delays": [[1.0]]}, {"name": "plantbag", "delays": [[1.0]]}, {"name": "plantbgone", "delays": [[1.0]]}, {"name": "portaseeder", "delays": [[1.0]]}, {"name": "seedbag", "delays": [[1.0]]}, {"name": "sextractor", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "soil", "delays": [[1.0]]}, {"name": "spaceworms", "delays": [[0.4, 0.4, 0.4, 0.4]]}, {"name": "spawner", "delays": [[1.0]]}, {"name": "sprayparts", "delays": [[1.0]]}, {"name": "traitcopier", "delays": [[1.0]]}, {"name": "traitgun", "delays": [[1.0]]}, {"name": "traitscanner", "delays": [[1.0]]}, {"name": "vine_flowers", "delays": [[1.0]]}, {"name": "vine_fruit", "delays": [[1.0]]}, {"name": "weedspray", "delays": [[1.0]]}, {"name": "scythe", "delays": [[1.0]]}, {"name": "hoe", "delays": [[1.0]]}, {"name": "hatchet", "delays": [[1.0]]}, {"name": "shovel", "delays": [[1.0]]}, {"name": "spade", "delays": [[1.0]]}]} diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/nolabelspray.png b/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/nolabelspray.png deleted file mode 100644 index a7bb126fd47d8c473e12f003a2e4983ee5860752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmV+`0o4A9P)w0LAJBS9+q~iLu77dbRnS2`WM@nlk#z+ccjCqsr zx+PUrNz*h~Yh7OyMU-X9JkK|PZ=V7H)>?|9;5ZKUeWz{PQ{B73FbpoJy024kAczbTXR{APz2$o!r`DU0gCawj!NxPzN2{Tnln% zu`eJOhr_}_d*0CKV7@8*3HiT234h?fV>JZ@p#tbra?Oxevc`3t2?#>9&V(m=^eH*x zbQ%{zO`=cUyb)=dYLjS02%)5u%EnbvO67T;(vhdJs(tp<<;N9yp4TzQaX45#>HIpD z+9vWm$M=1zs-i4Qf*|NJ?*amYyLvnxk9m(qzbmlG_Kd_DTf8vrT%b2^G7b}Bl@NzX z=ZO~*U;{EM1)(kf&jPOUAkrt$`UbwqtdxQRD76T*p1>pbGnGH{phckd1a{;uM+1Nx z0G7oHL`CNUtzFH=Rp;^$nD&8-<6AAC(%cPg+`9kk{1FWXgTY`h{3&0@17ZU8JZ16# O0000H~1|!3EGIh zkQHP;7}yz@osaise#rbWMP$Jv%iz~lxQe> zt{J<1J(Hzm(gIn;yVx~uay$y%|^m1KFX5p@|4G&U;bbs!z zjZ2HGNcmXT&;bT#w(QFNdp+Gi^^}-}-P_E<3Wkp>KYscWwJYxK93%eY9|PFu3anEW z;Qh7jT!{8#wk4U1mIi&Ol6zn^%d9~Cv9IeosHhC(?lK#`LyZ2@{ zZ48|D(!_UP%#SBFS$@nJ?caZE@2&Xr|8c-8{SBw@9yabXlgrDOvJvXtXCnv)rk+!~ zgJy5lzWMz7d8f6qjDI&CjNZ597vJs57B4gBiwpR#3vyT~KB~xgn;kmQeZ#$mu(<@s{e7|U%UL!l9 vlI7RTOu2=dY8>v)aA)|;;Q|EvH?b}as2BeKujm;tv>7~I{an^LB{Ts54lc7u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..915780d0ade6063aa5d5ca34696486d6a74ad39b GIT binary patch literal 476 zcmV<20VDp2P)JfDQYr%SeSpVG z)A0IfqZnNfTvuUJ1pLbZq*BS5KM95!;P5!*ZKV#_6u5nE=#dC=xr3Q*!osK@#Q_Arq3Y_=L3FXRc0WQ*^w)@RoEA7@P~b7Z98P_23VCDI669%YpM#j&kd;v zRBx(qsV>v6!dMN6XJgW@d(kYn#C@qD0$x8Nx{hA2Gj?J9{wu*cHumTTjfZohD z!5J;y>L)JTY>8W>b^Me{;M{%XW**xF#Q%c~Xwcqr%}q14CerTPuk;st+h=vo`|Yay zgGtV?AuyZQbkqFP)-9>g_GjJyH$=UT*k<}(;NRufi_)vF?geTFf;kyUw`bdH7aW^s zUmcc^c7MK|w!k@dnWbmAe4a4(rLcb5ncT0h&A@PAi@Ck4H|LbdCp$sfJYD@<);T3K F0RTe@P{{xQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..284d846906050d25f78160d659a8862710a639a9 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=b3I)gLn`LHy|t0|uz~<#~lKTgJdiIwwIoAGoWP&*I=OKzBa`gW+q zP5l$MLM1L5d)y9vaqD#bq*bd8D)jAL!yo$B6zi{NW?(pw>VGxVo0H|v^9>+zopr01VhwNdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json new file mode 100644 index 0000000000..ab98f8e78a --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/scythe.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/scythe.png rename to Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/icon.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e5cc8f3989c2bca6e101b32b1d3eca82be8ad125 GIT binary patch literal 902 zcmV;119|+3P)G)o zLM5d%MMT7<oD^s&VQcc?;Pma z>6sF~u2>{Akw`$(G&Ji?dUbWB^tvZcgbEPXRhmqvaCmxz@A!std0)AxRA{wY?YNFu zgl02Yn0XV;hb92PeW}vA?Fkn_SP2BdH(U?5myS{{@3(`|G!5ZY-&jw;%$wLP6cpRG zad>)!WI82kXdMX2fbQVKZM%g+M-~u^P)*a??IEGYvK9!*fV%A|QNf1^f)3AqxINrA zx0j`HT@@mTuoCDO{BEJ3n0XVxn-KkIxE_+}6v86Jb(Jou%Oi`zT>#dZ3KqMl+3)7| z(otNehGaU0C3TqwCHBXA8F`W9z6P+a+_AM7fHxsNqI!L=EPPs^JNYkYxE_8T|K_qo z2tNmWL?8qUuVqE&7w560E>j*EFmWy_m4WM6+uo!i7si<&uB%)`n0N^c%j;T0Uk^+} zpBiUY0N}p}i;JH}5@9TFgCg<$7F?%>m9^EO`p>)ob=y;XzlEoV$4L)GB9TZW5{X12 zkwhT9K?ZMd5=@OZ*pDD{V(}OT>BoZ53Sx_uFlOH`s4BiA88GlZCG9?Jvi=uEVx%uEy!ay}>Ag;JZzegM%M5WSnvl zfx7_xf)CTn66+N_&}p3V6oD(OpQ?NL0mLGd#Vgp#q^8pw(6%?326S?A{O&r|-~)Jw zz`X>j*Y^W?gJD>Ahk)BlM|pXEp5AikN7PIYW0L{VS;xyhA1hI1F${ri#^YWyM{X}m zw=yZ_;Ah?#>89a&2<&qq516`bCxSuj^MNuTIOI$_)$4oZ?#6ldUr`jy+h7p<-HkK) z2*&`cea<965WMTunEwHq23YKKrV?0LTZQY?;QKA!V-(Iu_BoRPPY;jq{nkv)et@*k cC6d1U14@y*;#*;BPyhe`07*qoM6N<$f^WvB{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b1ae85201b6e822bfaaa404f1f81cd7bef3eae20 GIT binary patch literal 875 zcmV-x1C;!UP)dgvlK?CfPHOj9+{#u(fAorGlKywCf-GdfQI4u`|xa5x+ehr@a6sH#fz znogEIk0?pd4+jT2$!4>VWf{Z%kX&D13(K5X*yuH#4EsZP<4VwrT2Vu_T*dHi2mr7i zyQFW}uR;V>Rmpx)L$}*SI-MdH7ng2aA^_~}WKk_wQL0n~!!U5tJVmaMM@ErWz8x}( zMC$b#6h*<|mqTcp2DZ&by`~dcmfZo3#*xrzo5H}dUxf&{LLMj0Qy7MUQl%nP%T?^| zWZml`n|*fRYY|~!+32)Qq0u;UMI!s3H8)|Mw)tf4-YO8s zWuL|SfH<)(B?()d8AT$wLLLLl_8m(TFVa=tk2to$ANx_DExIlxNv@EGW%hiNMymh- z#ME{w(3i!v4St;c6p|Yo_*DLYfn}rn>vy1e(!`4kom~X1OG%PgOSp?&&~ZT%A8Y7> zCx3iDb9-L3TCr>CnV`YPacx>SVFtf)YXIHqEVCEN!n|?yQ z9`5b|#CKcfa5x+ehr{7;IP(#;KN+h(L(A|dLl=OWkN}<;k$&Tr;ZKGtfU2ql0P6J` z03e-Ck-s8v*}U`(f_12lkG~V@PXbt|2%!nUnvnFwRZ$ceh5-O%nh4|k$^Re8qD2Tr z0D4Sy(mcgCd}RY*PhTgBFwLLDf<<_-0IVI=X`4c$ee~pdsZtUAMDX(`5kV!)1wEbJ zE9QN-t*cgR;`SEgjNWT{hQ-_!;LW_>{Y)i1tAZf@WZ$rbwY7Kg5P$}Mdt=UgILW@8 zKnZG71@-+x#cM%R=CPxI@#P+Sn<`8T>iqmH-oZ{{ub5xRBD8D*IYX=k{pNUy1syf> zwCU7c;3cd5GMMMb(!>^6wcr8Z_Qss~wZ5?x5Vi#!74*l_ER`^}0>ZYSqr`DWu*@Dd zx3>b_KURQ;yL&j!Xr;1G=^M7-I3w3a=WsYv`3KR-yPJVQ!L$GX002ovPDHLkV1l}j BnT7xW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json new file mode 100644 index 0000000000..ab98f8e78a --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c9040945657a463f9fcd5455c576dd19f2390e26 GIT binary patch literal 397 zcmV;80doF{P);RX8{}E-o$y2M0w(MKCZh3=9ku6ciyLA*-sZ0000pFf*#AsuBnjEIKJ5{{SK_ zAPH>%8OQ)5{{Red02G@56O8~Gw*V&p02WLR8+8p6j{p^&03`na7fcQrY7G*802r(Q z7EKNmlK>Z|02_7<5On|+p8zNS02^%$6p#QKwg4Q?02fgX5P1L>SquqC02Wyc7g!CU zIR3x@0004WQchC8}GpT}n=?Dm7ab5_M{eDQOfP0-6USskwz500000NkvXXu0mjfR$GER literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..89e4a523173a1c8f865e484a7e1c6d2a9a852505 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ep#Yx{S0HU|ZLO`X4P>xB$YF?M zSP*ha9LQlT3GxeOaCmkj4amu=3W+FjNi9w;$}A|!%+F(BsF)KRR!~&>{Y!Ac$FEPc zymhtCojD)8A=Kca@qSi#p~Mrm#a^CT&0rzH9xM=*~kD=iykq15)@YOwU|+wo54IuO4@13Lvf(3sh%#5As(H{2@s;4^w8~7O*R?D#%o>u>J8fYPdr>mdK II;Vst0K5lm`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json new file mode 100644 index 0000000000..ab98f8e78a --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/deathspray.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/deathspray.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba95e66323a885c0be0bc603709d89bc1fbdfe4 GIT binary patch literal 335 zcmV-V0kHmwP)ftq5eZGwViNtOK+xfF9An>iY}* zSr)Wy%M!pEfn`~r&U>EcOFf@B0*EMzFiq1Lw7v~;fcPk1)xdTj%QAIyf-%FH9;*-g6QL30d9G@D2kN@M{0ja^z#-zO hIfrXB8qMDW-~~k;idfIyt<3-c002ovPDHLkV1fdjjS&C< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f4e213731884f8036ead7ba73b12778455350ff8 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0KHFgCkc&Bqt}w!NDOU zBt%V3?c2J?Gl3F}B|(0{3=Yq3qyag(RUr{2E~&-IMVSR9nfZAP3>9;N!wQN@zkdlX z`1tjSmbb3fxija3H-s8oG=A_%=e&>RNrs}H-W?XkLB^Mjy%gp=nsj7Rh(hqn9Sbxz z8d)0pcXk`AZeAg=q`%vEt%jkw=n=CgL16`7iy3G0FwDIto&UOAK?P`WsHcl#h(~8~ zf&}Yg2I+*5Bgb4Og(oy^o++_mWr6``!$v2b4YvdvrgpN(Y%uZ+oG_{3q!jDo1d#yI z1YM;GPbYeD%N$^-7HnW>c~UrqVTp!>uCfOUgQhyW#4P4>wm=IQJYD@<);T3K0RU+m BYFGdO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..76a33161c1fc86f0a8d51e645e21183dc1b34ea9 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*Z=?jFX7_!@plUo%MQR0$XoLrPyP?DLS$G}iACpfI2sPy}n z;DV1|pJ;jOYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;juiUXf zW22F!p?_z$vFhd(5=;8Kjn`@znu{JWdlD2@@U@t6HV?zxd(!!@%N0~WuJv?r4Dskp zPLN<-%)o1)B_xoNbRgv5iUTbVX0Rj}n;&5~Xm(&3L*xa<*-Y$0B1=>ff*WE>M0%P6 z9hd}!6c#u%a_;9!3wH`L5Dq%vw35lp+)1s6iHU*X!U@*AWd>Tmfp#!>y85}Sb4q9e E07fBe$N&HU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/meta.json new file mode 100644 index 0000000000..464308d1cd --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "deathspray" + }, + { + "name": "nolabelspray" + }, + { + "name": "pestspray" + }, + { + "name": "plantbgone" + }, + { + "name": "sprayparts" + }, + { + "name": "weedspray" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "plantbgone-inhand-left", + "directions": 4 + }, + { + "name": "plantbgone-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/nolabelspray.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/nolabelspray.png new file mode 100644 index 0000000000000000000000000000000000000000..311ceb879f8bc8fe259ad68dbba566b6b597912e GIT binary patch literal 297 zcmV+^0oMMBP)vlc9!lXJb~Z^f+rBXf!N#F=oxH8@CXxjgG;Iq$NUtT2aDqr z-#(UEg&+uj&xvyYSNPPUH+6qstelro09^r6X8C0MN||05hV(q)6H-c1RaN8z=E;>{ z9bKBHl;=5`rm;Q8agZblhGE#1dEp3X^yYCKV_jD)%YvdPSUGHgwry=a&oeiMFAzl$ z>bkb?uIr-fy6*{Sf*`Op_Y}@Y1m1xNumv6mP&1ArD~COVdH^4<;xtXH9QIGd^E}G3 v%+&e@lx4a5D|kp?lh|s`=7JyyzX!k#Z;4j7F|*@700000NkvXXu0mjf-Sd1H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/pestspray.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/pestspray.png new file mode 100644 index 0000000000000000000000000000000000000000..1514b3ec0049b87516f4395105bd8ccda3983f5e GIT binary patch literal 363 zcmV-x0hIoUP)%uTJllYqte@vRDY7;7?d6Fb%jgF1J?;DMd%Jm@!=KAY~EX!v1JkR53{jB!u zSkf2}qV;mPApc($O2}KFso>DEN%We`{cy-8mB*?C{2@woY4XKQZp1@wR&q-IZJA1tx zu0WjE)={6|as*!{$2OO9;Og{VwUiny5HT^$n`}gf!{JyQzz-?$Vgi6A6)^w+002ov JPDHLkV1k(pp{oD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7764faa213dbfe491ee02144ebca26b2616b58e4 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0G*Q%k+OHgKfSn!~Y6~ zZ43-?4B5;vXMqxoB|(0{3=Yq3qyahkRUr{2E~&-IMVSR9nfZAP3>9;N!wQN@zkdlX z`1tjSmbb3fxija3H-s8oG=A_%=e&>RNrs}H-W?XkLB^Mjy%gp=nsj7Rh(hp61$D#q zDw?+T`k|fO#;TiFNGzG$ZM;^)&|LJ0*^{8Kg0IDlvw0aFSjkw(p4fRBXmyUKi(`mK zXL5oB>tP`du7phi4HJ~699+>7%cv|S#+7jFkQ1XC+YB8MW*LE;^fg>e0&f!5a0v;# zNm-L;V0Iv-w<*woYXW1R5fkHsrL1}li+daxWKvm}67-cP@DwPdI5Q}+a<<$th;p02 Z!C?B4%`@`}+isw}44$rjF6*2UngFOUZJGc8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9989e359b6fa32209df81475bc06c03fda9aa2dc GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*Z=?j*ZVU4pUGgGFU#=1 zf?*p2LmY!k%LWOc0>+XczhDN3XE)M-ocyYgh!U67;^d;tf|AVqJO+k}Il*BCMWx@r z1Q&e#`b5iHSL@uF^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4PGATqMc%_26 z;d&KKTYLS`&TeDX%_}69Ozt*bt6^v^dc^EWP*}m&V#e9L3=gbiEM!mYJPoqi)5S5w zqcb@{g7q*D2iF7f)R04~96SWir5wr9o1|eJ#_F+1jqQerLbp}2@d3t8;T~T{1|fCH z*-b1gwXFLG*RYktk*#Hur13T;2G$J%Mom*EFqtuN&FJOa dnJ6N_z_8;3>qX893827Z@O1TaS?83{1OSZ&ag+c6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/plantbgone.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/plantbgone.png rename to Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/sprayparts.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/sprayparts.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/sprayparts.png rename to Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/sprayparts.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/weedspray.png b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/weedspray.png new file mode 100644 index 0000000000000000000000000000000000000000..a6c610e4098b7a7aefad651b7b7f1a42861cb125 GIT binary patch literal 337 zcmV-X0j~auP)%qU*WV{;aAhx*y>cqO>Ms z3@N~`QW2um@vXm{L(??Zvpml+D~i{b<061>%{b?%ZCm1ua5nxLYbX_Qo-Xm-`(4*T ztuAdDNx&y8w$r8eKlr2iClLcK0o9-*g6;dgqyz)8ULBUn?sgwdz##)B6jEOhuqstt z0UisSvgc|qZo(}TMrHW(p_B^{XJBj=*g$z>F;>e;Af8&>@e5na**8>L*m`d>aX~}eiI2Jk? zE=}=PP*7lJXScAhaCLRn)6n2E5y zd77G;dxGoKrAx*WSZ`dmx|F7(pnW33Y^`jh!fIt>FVdQ&MBb@03H5W A4gdfE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..17d86781ee6225f84a752d7bebd3a2ccd92e7be6 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0Fvvg+X7Op|GfM^6GV5 z=if^Kg&0eM{DK)Ap4~_Tak}<+ zU9EFx&IfM@HMnT};E~RGAI*~tMLoScER2JUFB^L)%y~5F$fOX3;FT82`*lp+JG+fl zH?NRb(%o&mR>RO-^oZG$ps<3k#f-DL8KQSc%@@~+TLrYX+0(@_#G~`=l!Lqt3Ougb zu?H*|UD*{*u^jqm%xUPr^Y$qB^nK2nPe14XW#}^MK6>rknl%Sl3?_`~0QPl^WKRB-+i*X}b_-y+^V+r|`;A q{u-7qFF2gqwpemWDxFRL%y8f$r|-YM5HFx}7(8A5T-G@yGywn}1A-X< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3c9463c8160bfb123e0bb06363b26bec6036b494 GIT binary patch literal 348 zcmV-i0i*tjP)V=-0C=2J zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5 zsW>CQEHy`oi!&v&s2HS+i!-e#F*g;&Hsn%PaP@Nmn+pJ2xEh}qEMBSr004wZL_t(Y ziS3lZ4S*mFMZqor=m5F_Miwxz|4c?A5VYT;UivOH^!KNiex(HAd-Tlx4yKmQa00zN ztDZ7Pyumr>^BXMM&BknyA`*n;v%n+4)!I=1wIv9GQsBTF{e`=ypvwq0Fx-gj%G6Yk ud}SAEF+n?@IH3pv2n_OfC4yk${KWy269}VQu>a@)0000iy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/meta.json b/Resources/Textures/Objects/Tools/shovel.rsi/meta.json new file mode 100644 index 0000000000..ab98f8e78a --- /dev/null +++ b/Resources/Textures/Objects/Tools/shovel.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +}