From: mubururu_ <139181059+muburu@users.noreply.github.com> Date: Thu, 20 Mar 2025 00:53:48 +0000 (-0500) Subject: inhand sprites for Produce (#35151) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=eb5610b745a90ee3e381c67353476b384e7a68e5;p=space-station-14.git inhand sprites for Produce (#35151) * awakening * fix test fail * attribution fix * tomater killer inhandered * extrorange inhand spin rate nerfed * fuck webedit --- diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml index 15ac98a9e4..9c67de9115 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml @@ -137,6 +137,7 @@ - type: ReplacementAccent accent: tomatoKiller - type: Item + - type: MultiHandedItem - type: NpcFactionMember factions: - SimpleHostile diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index ce5aa2eef5..ac9757edfb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -44,6 +44,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/wheat.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager solutions: food: @@ -64,6 +66,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/meatwheat.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager solutions: food: @@ -108,6 +112,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/sugarcane.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager solutions: food: @@ -125,6 +131,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/papercane.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager - type: Produce seedId: papercane @@ -159,6 +167,8 @@ Quantity: 5 - type: Sprite sprite: Objects/Specific/Hydroponics/laughin_pea.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: laughinPea - type: Tag @@ -173,6 +183,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/towercap.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager - type: MeleeWeapon damage: @@ -190,6 +202,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/steelcap.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager - type: MeleeWeapon damage: @@ -289,6 +303,8 @@ Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/banana.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: banana - type: Extractable @@ -329,6 +345,8 @@ Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/mimana.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: mimana - type: Extractable @@ -474,6 +492,8 @@ Quantity: 3 - type: Sprite sprite: Objects/Specific/Hydroponics/carrot.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: carrots - type: Extractable @@ -508,6 +528,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/cabbage.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: cabbage - type: Tag @@ -570,6 +592,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/lemon.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: lemon - type: Extractable @@ -606,6 +630,8 @@ Quantity: 16 - type: Sprite sprite: Objects/Specific/Hydroponics/lemoon.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: lemoon - type: Extractable @@ -632,6 +658,8 @@ - sour - type: Sprite sprite: Objects/Specific/Hydroponics/lime.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: lime - type: Extractable @@ -659,6 +687,8 @@ - orange - type: Sprite sprite: Objects/Specific/Hydroponics/orange.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: orange - type: Extractable @@ -697,6 +727,8 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi scale: 0.5,0.5 + - type: Item + heldPrefix: produce - type: Produce seedId: extradimensionalOrange - type: PotencyVisuals @@ -737,6 +769,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/pineapple.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: pineapple - type: Extractable @@ -771,6 +805,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/potato.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: potato - type: Extractable @@ -810,6 +846,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/tomato.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: tomato - type: Extractable @@ -867,6 +905,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/blue_tomato.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: blueTomato - type: Extractable @@ -914,6 +954,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/blood_tomato.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: bloodTomato - type: Extractable @@ -965,6 +1007,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/eggplant.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: eggplant - type: Tag @@ -1030,6 +1074,8 @@ Quantity: 13 - type: Sprite sprite: Objects/Specific/Hydroponics/golden_apple.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: goldenApple - type: Extractable @@ -1167,6 +1213,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/onion.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: onion - type: SliceableFood @@ -1198,6 +1246,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/onion_red.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: onionred - type: SliceableFood @@ -1221,6 +1271,8 @@ Quantity: 5 - type: Sprite sprite: Objects/Specific/Hydroponics/chanterelle.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: chanterelle - type: Tag @@ -1358,6 +1410,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/chili.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: chili - type: Tag @@ -1392,6 +1446,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/chilly.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: chilly - type: FoodSequenceElement @@ -1420,6 +1476,8 @@ Quantity: 10 - type: Sprite sprite: Objects/Specific/Hydroponics/aloe.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: aloe - type: Extractable @@ -1521,6 +1579,8 @@ Quantity: 20 - type: Sprite sprite: Objects/Specific/Hydroponics/lingzhi.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: lingzhi - type: Extractable @@ -1557,6 +1617,8 @@ Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: ambrosiaVulgaris - type: Extractable @@ -1598,6 +1660,8 @@ Quantity: 10 - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: ambrosiaDeus - type: Extractable @@ -1632,6 +1696,8 @@ Quantity: 25 - type: Sprite sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: galaxythistle - type: Extractable @@ -1733,6 +1799,8 @@ Quantity: 5 - type: Sprite sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: flyAmanita - type: Extractable @@ -1796,6 +1864,8 @@ Quantity: 5 - type: Sprite sprite: Objects/Specific/Hydroponics/capfruit.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: realCapfruit - type: Food @@ -1829,6 +1899,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/rice.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager solutions: food: @@ -1879,6 +1951,8 @@ - violets - type: Sprite sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager solutions: food: @@ -1940,6 +2014,7 @@ components: - type: Item size: Small + heldPrefix: produce - type: FlavorProfile flavors: - watermelon @@ -2041,6 +2116,7 @@ components: - type: Item size: Small + heldPrefix: produce - type: FlavorProfile flavors: - holy @@ -2156,6 +2232,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/grape.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: grape - type: Extractable @@ -2187,6 +2265,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/berries.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: berries - type: Extractable @@ -2288,6 +2368,8 @@ Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/pea.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: pea - type: Tag @@ -2320,6 +2402,8 @@ Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/world_pea.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: worldPea - type: Tag @@ -2338,6 +2422,7 @@ components: - type: Item size: Small + heldPrefix: produce - type: FlavorProfile flavors: - pumpkin @@ -2387,6 +2472,7 @@ components: - type: Item size: Small + heldPrefix: produce - type: FlavorProfile flavors: - bluepumpkin @@ -2570,6 +2656,8 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi state: produce + - type: Item + heldPrefix: produce - type: Produce seedId: anomalyBerry - type: Food diff --git a/Resources/Textures/Mobs/Demons/tomatokiller.rsi/inhand-left.png b/Resources/Textures/Mobs/Demons/tomatokiller.rsi/inhand-left.png new file mode 100644 index 0000000000..ac4315c46c Binary files /dev/null and b/Resources/Textures/Mobs/Demons/tomatokiller.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Demons/tomatokiller.rsi/inhand-right.png b/Resources/Textures/Mobs/Demons/tomatokiller.rsi/inhand-right.png new file mode 100644 index 0000000000..ac4315c46c Binary files /dev/null and b/Resources/Textures/Mobs/Demons/tomatokiller.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Demons/tomatokiller.rsi/meta.json b/Resources/Textures/Mobs/Demons/tomatokiller.rsi/meta.json index 57e4c7351f..b8f626c017 100644 --- a/Resources/Textures/Mobs/Demons/tomatokiller.rsi/meta.json +++ b/Resources/Textures/Mobs/Demons/tomatokiller.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": " taken from TG on commit https://github.com/tgstation/tgstation/commit/7e5f13f558253e76865e81c9641b7ec68e57754b", + "copyright": " taken from TG on commit https://github.com/tgstation/tgstation/commit/7e5f13f558253e76865e81c9641b7ec68e57754b, inhands by mubururu_ (github)", "states": [ { "name": "alive", @@ -35,6 +35,50 @@ }, { "name": "dead" + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.75, + 0.75 + ], + [ + 0.75, + 0.75 + ], + [ + 0.75, + 0.75 + ], + [ + 0.75, + 0.75 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.75, + 0.75 + ], + [ + 0.75, + 0.75 + ], + [ + 0.75, + 0.75 + ], + [ + 0.75, + 0.75 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json index 88233c4476..2939c7d55d 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "cream" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "cream" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..e2c84ff57b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..a51d00e482 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/meta.json index 40707f825b..7bca1d5420 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/meta.json @@ -1,53 +1,61 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/bd870d649cc8ac9d8af2fbc046af4a79afb5ab28", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/bd870d649cc8ac9d8af2fbc046af4a79afb5ab28, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..94b7d254e1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..898337d40f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_deus.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json index 8160725332..cd17689f3d 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json @@ -1,45 +1,53 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..be99a43567 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..f3639e9d93 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json index 7d86d10f9b..0707d6a993 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json @@ -1,29 +1,37 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd for Space Station 14, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..dbcc984514 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..c03787071d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..de30ed8ecd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..df50dd92e2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json index 27357cf18e..58a75b93e6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json @@ -1,84 +1,92 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "peel" - }, - { - "name": "peel2" - }, - { - "name": "peel3" - }, - { - "name": "peel-inhand-left", - "directions": 4 - }, - { - "name": "peel-inhand-right", - "directions": 4 - }, - { - "name": "baked-peel" - }, - { - "name": "baked-peel2" - }, - { - "name": "baked-peel3" - }, - { - "name": "baked-peel-inhand-left", - "directions": 4 - }, - { - "name": "baked-peel-inhand-right", - "directions": 4 - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - }, - { - "name": "primed", - "delays": [ - [ - 4.9, - 0.1 - ] - ] - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "peel" + }, + { + "name": "peel2" + }, + { + "name": "peel3" + }, + { + "name": "peel-inhand-left", + "directions": 4 + }, + { + "name": "peel-inhand-right", + "directions": 4 + }, + { + "name": "baked-peel" + }, + { + "name": "baked-peel2" + }, + { + "name": "baked-peel3" + }, + { + "name": "baked-peel-inhand-left", + "directions": 4 + }, + { + "name": "baked-peel-inhand-right", + "directions": 4 + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + }, + { + "name": "primed", + "delays": [ + [ + 4.9, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..9aa160ec98 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..23be44f469 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json index 3dd93d36e3..bef4c8d95e 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation: https://github.com/tgstation/tgstation/commit/696dfcc59c9e65e7bbe3923d1f7e880ea384783f", + "copyright": "Taken from tgstation: https://github.com/tgstation/tgstation/commit/696dfcc59c9e65e7bbe3923d1f7e880ea384783f, inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -35,7 +35,15 @@ "name": "stage-5" }, { - "name": "stage-6" + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..cbe956c5ae Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..0e0bf6c0c1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json index fd70b99058..c1aeb415a5 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..fcb9d0de5e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..aebaa93515 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json index 118139ebe5..608b22835e 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/5d507cfbad6f73d1beaba66d93f31f893adb3a84, modified by potato1234_x (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/5d507cfbad6f73d1beaba66d93f31f893adb3a84, modified by potato1234_x (github), inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..13b8af8178 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..9aaf439ff0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json index fd70b99058..c1aeb415a5 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..26d1be589c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..1358899281 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json index 18d6e7962e..0862a8b1ea 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa, inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ }, { "name": "stage-1" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..26035cc79b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..eedee61f40 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json index 037593e124..798a930f9c 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, redrawn by Ubaser.", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, redrawn by Ubaser, inhands by mubururu_ (github).", "size": { "x": 32, "y": 32 @@ -23,7 +23,15 @@ "name": "stage-1" }, { - "name": "stage-2" + "name": "stage-2" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..d80acd6646 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..01d74326f6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json index 3f97a14afa..8aa302e1a6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..651ce0db6d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..870b2a3702 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json index 3f97a14afa..8aa302e1a6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..c2c8186f04 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..bdfaaf7ab5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json index bf2a086caa..3d233d61c3 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ }, { "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..333b7a1db6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..2ba546c055 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json index 1acde5d635..9de65c4712 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -35,7 +35,15 @@ "name": "stage-5" }, { - "name": "stage-6" + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..5b30fba7d8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..0722440afd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json index b58eccfe5e..0bf3eb4daa 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13. produce-beans drawn by FillerVK", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13. produce-beans drawn by FillerVK, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "dead" @@ -39,6 +39,14 @@ }, { "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..b6ba3dd9c7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..5041e06199 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json index d7f18a46c9..b9d6f93614 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e245d374b2976c73d0aff37cf4a443d2e75c2f57", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e245d374b2976c73d0aff37cf4a443d2e75c2f57, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..15f8915b62 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..96fd7685e3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..3af8c810fa Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..c1bb4508ed Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json index c2fd092c02..abdf3104fb 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json @@ -1,68 +1,128 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce", - "delays": [ - [ - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08 - ] - ] - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4, + "delays": [ + [ + 0.35, + 0.35, + 0.35, + 0.35 + ], + [ + 0.35, + 0.35, + 0.35, + 0.35 + ], + [ + 0.35, + 0.35, + 0.35, + 0.35 + ], + [ + 0.35, + 0.35, + 0.35, + 0.35 + ] + ] + }, + { + "name": "produce-inhand-right", + "directions": 4, + "delays": [ + [ + 0.35, + 0.35, + 0.35, + 0.35 + ], + [ + 0.35, + 0.35, + 0.35, + 0.35 + ], + [ + 0.35, + 0.35, + 0.35, + 0.35 + ], + [ + 0.35, + 0.35, + 0.35, + 0.35 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..fd67377481 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..2293731744 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json index 72b9a92f7e..adc0db541c 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json @@ -1,29 +1,37 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..fe84056f95 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..588dca2f4f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json index 8b6952d030..ee7ab9fc4b 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..115e00a3d4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..399307d170 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json index 72b9a92f7e..adc0db541c 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json @@ -1,29 +1,37 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..a0198a5819 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..e88d76a55d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..fc13545587 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..b8e6333def Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json index 19f7a773af..b668ebaeef 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json @@ -1,29 +1,37 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, edited seed sprite & produce by mubururu_ (github)", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands and produce by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..fbfb1453cd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..6ec6fcc745 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json index 65cf434c0a..f7fecc7013 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json @@ -1,52 +1,60 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce", - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - }, - { - "name": "slice" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "slice" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..b969a2e201 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..2fc31a58a2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json index 2799387216..e7b156c5d8 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..cbb98daec0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..dd517d4301 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..41fcbe7010 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..8f5898154b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json index 7d9b435455..72f12cb017 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and resprite from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "copyright": "Taken and resprite from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ }, { "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..299b5602e8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..28de676578 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..d93bcdcbe3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..e8041c2925 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json index 8b6952d030..ee7ab9fc4b 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..9c9358d6da Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..1442be3f2a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json index cb53758e1c..7b674fb537 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..9977b5564e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..49e5bc92b6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json index 88c277fde7..25ec879674 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json @@ -1,67 +1,75 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "peel" - }, - { - "name": "peel2" - }, - { - "name": "peel3" - }, - { - "name": "peel-inhand-left", - "directions": 4 - }, - { - "name": "peel-inhand-right", - "directions": 4 - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - }, - { - "name": "primed", - "delays": [ - [ - 4.9, - 0.1 - ] - ] - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "peel" + }, + { + "name": "peel2" + }, + { + "name": "peel3" + }, + { + "name": "peel-inhand-left", + "directions": 4 + }, + { + "name": "peel-inhand-right", + "directions": 4 + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "primed", + "delays": [ + [ + 4.9, + 0.1 + ] + ] + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..04f0ae5cfd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..c99c1b634a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json index 7063672bfd..ddad861a8f 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json @@ -1,35 +1,43 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "slice" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "slice" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..73b95de513 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..a5674e38fe Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json index 7063672bfd..ddad861a8f 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json @@ -1,35 +1,43 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "slice" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "slice" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..eb2433df4f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..631cb579f8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..7ed63766ce Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..d2b4672d04 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json index 3f97a14afa..8aa302e1a6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..e888913a94 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..6b96c4e8b1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json index c78dcee56d..185c8ed1a4 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..031838f8b8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..ec0da4c5ee Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json index 7063672bfd..81e4e04be2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -29,7 +29,15 @@ "name": "stage-2" }, { - "name": "stage-3" + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..073fb84097 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..8614972430 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json index fbd39c0953..7f331416d0 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json @@ -1,35 +1,43 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..e00ffb663e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..22b0343762 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json index a6409ac1ff..df17201a0a 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json @@ -1,47 +1,55 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/5d507cfbad6f73d1beaba66d93f31f893adb3a84/icons/obj/hydroponics/harvest.dmi, carved sprites by ps3moira", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "carved" - }, - { - "name": "lantern", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/5d507cfbad6f73d1beaba66d93f31f893adb3a84/icons/obj/hydroponics/harvest.dmi, carved sprites by ps3moira, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "carved" + }, + { + "name": "lantern", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..f3ce028383 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..e3fbce4c05 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json index 4a6e3c94fc..31a8e89cda 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser, using the cotton sprites as a base.", + "copyright": "Drawn by Ubaser, using the cotton sprites as a base. inhands by mubururu_ (github)", "size": { "x": 32, "y": 32 @@ -27,6 +27,14 @@ }, { "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..81201539ca Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..6d3c09defc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json index 57a5caa641..33a3e76ce4 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json @@ -1,35 +1,43 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..3b2e5fbbac Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..46eccd1fbf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json index 97d9a924bc..9e2407ddd4 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json @@ -1,35 +1,43 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..747caefc68 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..b93b0db996 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json index 5d378bcac6..85a341de2c 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/dccc1e60a3c151e2b7fac26da7b3087757f1e116", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/dccc1e60a3c151e2b7fac26da7b3087757f1e116, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..ce2dbc6b17 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..b0d0fb83b5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json index 3f97a14afa..8aa302e1a6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..249620539d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..9dcc51d373 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json index fd70b99058..c1aeb415a5 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..b5da37d038 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..bbec0d5ba1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/meta.json index 3f97a14afa..8aa302e1a6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..c72d989e9b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..0de852b959 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json index 16f3df4df6..46c0cf5415 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json @@ -1,44 +1,52 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - }, - { - "name": "slice" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "slice" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..c3217d464e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..b8f14f3dd9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/meta.json index 775f8df408..3e15b491d2 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - }, - { - "name": "stage-4" - }, - { - "name": "stage-5" - }, - { - "name": "stage-6" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..830b9d5820 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..58a2e4c7d1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/wheat.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json index 01be1e7dc4..a3c9426409 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - }, - { - "name": "stage-3" - } - ] + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..163351e298 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..0b971d4604 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce-inhand-right.png differ