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 31538aabaf..03bdacf9fb 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-right.png index 795844cdb8..f00d861ca5 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-right.png differ 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 d476c2c15a..0000000000 Binary files a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/deathspray.png and /dev/null differ 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 a7bb126fd4..0000000000 Binary files a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/nolabelspray.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/pestspray.png b/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/pestspray.png deleted file mode 100644 index 12783de11f..0000000000 Binary files a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/pestspray.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/weedspray.png b/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/weedspray.png deleted file mode 100644 index 0f3f7d66cd..0000000000 Binary files a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/weedspray.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json b/Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json new file mode 100644 index 0000000000..4e2c0cc4de --- /dev/null +++ b/Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "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": "seedextractor", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "spawner" + }, + { + "name": "traitcopier" + }, + { + "name": "traitgun" + }, + { + "name": "traitscanner" + } + ] +} diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/sextractor.png b/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/sextractor.png rename to Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/spawner.png b/Resources/Textures/Constructible/Hydroponics/machines.rsi/spawner.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/spawner.png rename to Resources/Textures/Constructible/Hydroponics/machines.rsi/spawner.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/traitcopier.png b/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitcopier.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/traitcopier.png rename to Resources/Textures/Constructible/Hydroponics/machines.rsi/traitcopier.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/traitgun.png b/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitgun.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/traitgun.png rename to Resources/Textures/Constructible/Hydroponics/machines.rsi/traitgun.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/traitscanner.png b/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitscanner.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/traitscanner.png rename to Resources/Textures/Constructible/Hydroponics/machines.rsi/traitscanner.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json b/Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json new file mode 100644 index 0000000000..35b9d13cfa --- /dev/null +++ b/Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "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": "moldcreep0" + }, + { + "name": "moldcreep1" + }, + { + "name": "moldcreep2" + }, + { + "name": "soil" + }, + { + "name": "spaceworms", + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] + }, + { + "name": "vine_flowers" + }, + { + "name": "vine_fruit" + } + ] +} diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/moldcreep0.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep0.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/moldcreep0.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep0.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/moldcreep1.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep1.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/moldcreep1.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep1.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/moldcreep2.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep2.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/moldcreep2.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep2.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/soil.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/soil.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/soil.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/soil.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/spaceworms.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/spaceworms.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/spaceworms.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/spaceworms.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/vine_flowers.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_flowers.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/vine_flowers.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_flowers.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/vine_fruit.png b/Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_fruit.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/vine_fruit.png rename to Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_fruit.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_alert3.png b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/alert3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_alert3.png rename to Resources/Textures/Constructible/Hydroponics/overlays.rsi/alert3.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_harvest3.png b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/harvest3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_harvest3.png rename to Resources/Textures/Constructible/Hydroponics/overlays.rsi/harvest3.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lowhealth3.png b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowhealth3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lowhealth3.png rename to Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowhealth3.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lownutri.png b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lownutri.png rename to Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lownutri3.png b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lownutri3.png rename to Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri3.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lowwater3.png b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowwater3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/over_lowwater3.png rename to Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowwater3.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json new file mode 100644 index 0000000000..dbc5e2045f --- /dev/null +++ b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json @@ -0,0 +1,84 @@ +{ + "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": "alert3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "harvest3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lowhealth3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "alert3" + }, + { + "name": "lownutri3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lowwater3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan black stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan black stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan black stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan black stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan blue stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan blue stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan blue stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan blue stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan lime stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan lime stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan lime stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan lime stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan purple stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan purple stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan purple stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan purple stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan red stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan red stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan red stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan red stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan white stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan white stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan white stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan white stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan yellow stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan yellow stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan yellow stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan yellow stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/cyan.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green black stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green black stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green black stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green black stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green blue stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green blue stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green blue stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green blue stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green lime stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green lime stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green lime stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green lime stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green purple stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green purple stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green purple stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green purple stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green red stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green red stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green red stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green red stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green white stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green white stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green white stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green white stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green yellow stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green yellow stripe.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/green yellow stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green yellow stripe.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/plantbag.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/plantbag.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/plantbag.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/plantbag.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/portaseeder.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/portaseeder.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/portaseeder.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/portaseeder.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/seedbag.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/seedbag.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/seedbag.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/seedbag.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/shovel.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/shovel.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/shovel.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/shovel.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/spade.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/spade.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/spade.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/spade.png diff --git a/Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/disk.png b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/disk.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/disk.png rename to Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/disk.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json new file mode 100644 index 0000000000..ab98f8e78a --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/disk.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/hatchet.png b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hatchet.png rename to Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/icon.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-left.png new file mode 100644 index 0000000000..629c774dd0 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-left.png differ 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 0000000000..915780d0ad Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json new file mode 100644 index 0000000000..ab98f8e78a --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.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/hoe.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/hydro_tools.rsi/hoe.png rename to Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/icon.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png new file mode 100644 index 0000000000..8b657275ee Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png differ 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 0000000000..284d846906 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png differ 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 0000000000..e5cc8f3989 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png differ 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 0000000000..b1ae85201b Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png differ 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 0000000000..c904094565 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png differ 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 0000000000..89e4a52317 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png new file mode 100644 index 0000000000..c63f147686 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png differ 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 0000000000..7ba95e6632 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/deathspray.png differ 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 0000000000..f4e2137318 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-left.png differ 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 0000000000..76a33161c1 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/inhand-right.png differ 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 0000000000..311ceb879f Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/nolabelspray.png differ 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 0000000000..1514b3ec00 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/pestspray.png differ 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 0000000000..7764faa213 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-left.png differ 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 0000000000..9989e359b6 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/plantbgone-inhand-right.png differ 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 0000000000..a6c610e409 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/sprays.rsi/weedspray.png differ diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/icon.png b/Resources/Textures/Objects/Tools/shovel.rsi/icon.png new file mode 100644 index 0000000000..8b742375e9 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shovel.rsi/icon.png differ 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 0000000000..17d86781ee Binary files /dev/null and b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png differ 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 0000000000..3c9463c816 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png differ 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" + } + ] +}