From: Prole <172158352+Prole0@users.noreply.github.com> Date: Wed, 16 Jul 2025 22:51:09 +0000 (-0700) Subject: Inconsistent Produce Inhands Fix (#38860) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a921594f1ecfadbfbd36607e50f94df2c73d7d9c;p=space-station-14.git Inconsistent Produce Inhands Fix (#38860) * V1 Sprites * Adding heldPrefix * Updated Sprites * 4 New Inhands & Sprite Tweak * WaterMelon/HolyMelon Front Change * Meta Guh * Sugarcane Updated Inhands --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 90a8e98af1..2cdd881510 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -90,6 +90,8 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/oat.rsi + - type: Item + heldPrefix: produce - type: SolutionContainerManager solutions: food: @@ -1070,6 +1072,8 @@ Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/apple.rsi + - type: Item + heldPrefix: produce - type: Produce seedId: apple - type: Extractable diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json index 47289a1341..b2eb3125e9 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/aloe.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, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index e2c84ff57b..f8eb0352e2 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png 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 index a51d00e482..3a8b36ef1e 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.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 9c4e3cc701..6b87ec6d4e 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/apple.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index de30ed8ecd..08e01eb9c9 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png 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 index df50dd92e2..b3be81aff2 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png 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 be72e24bbc..064ed98da3 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.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/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 9aa160ec98..147567b052 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png 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 index 23be44f469..162e668517 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/banana.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 b1afd4b72d..974b3afff0 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index fcb9d0de5e..61023cb489 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png 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 index aebaa93515..0167604000 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.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 b1afd4b72d..974b3afff0 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 26d1be589c..f031830af9 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png 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 index 1358899281..a4fe914276 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png 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 e8994282cd..5822217677 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, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 26035cc79b..d052b3cf10 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png 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 index eedee61f40..a554c30631 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.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 d6374a3793..a43d18e6fd 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, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 333b7a1db6..a501d6acde 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png 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 index 2ba546c055..5b7091c18b 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png 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 f7affdef4c..5bb785b97e 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, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 5b30fba7d8..c741b9ff64 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png 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 index 0722440afd..13b5762c20 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.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 f7d57e59d0..c5665a460a 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), produce modified from https://github.com/space-wizards/space-station-14/commit/484eb0bba44d3e014873e7d7026a99d7ba56f7b9#diff-5b9a7a38ef618b5f482f5baf4bb8db27dc87f9af7602d67cae9133e624aa3f91 by Chaoticaa (GitHub), Growth, harvest, and dead created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), produce modified from https://github.com/space-wizards/space-station-14/commit/484eb0bba44d3e014873e7d7026a99d7ba56f7b9#diff-5b9a7a38ef618b5f482f5baf4bb8db27dc87f9af7602d67cae9133e624aa3f91 by Chaoticaa (GitHub), Growth, harvest, and dead created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 3af8c810fa..125d8caebe 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png 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 index c1bb4508ed..88ba50ee1e 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.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 c6b8930b4e..c2bddfac98 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.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, inhands by mubururu_ (github), produce created by Chaoticaa (GitHub), Growth stages, harvest, and dead modified by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), produce created by Chaoticaa (GitHub), Growth stages, harvest, and dead modified by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index fe84056f95..9e9fc50746 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png 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 index 588dca2f4f..5b9abe178e 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.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 9c4e3cc701..6b87ec6d4e 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index fc13545587..34e30be1bf 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png 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 index b8e6333def..dda80e802d 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png 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 be6a0f367c..e73e83cd39 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/grape.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, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands by mubururu_ (github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands by mubururu_ (github), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index fbfb1453cd..c086e3acac 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png 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 index 6ec6fcc745..eea7e61c34 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png 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 026589b450..b21d2f2bfa 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.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 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), produce sprite modified by Chaoticaa (GitHub), Growth stages, harvest, and dead sprites created by Chaoticaa (GitHub)", + "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), produce sprite modified by Chaoticaa (GitHub), Growth stages, harvest, and dead sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index b969a2e201..f4864f288e 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png 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 index 2fc31a58a2..d1c40609de 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png 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 4c84d306f8..7c5a58be82 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json @@ -1,7 +1,7 @@ { "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), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)", + "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), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index cbb98daec0..b561223098 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png 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 index dd517d4301..bb80c91a1c 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png 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 ea94e38df7..67057449a1 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/lemon.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 41fcbe7010..d3c9fc1f57 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png 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 index 8f5898154b..2b821daa69 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.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 ea94e38df7..67057449a1 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/lime.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index d93bcdcbe3..de8f416ca0 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png 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 index e8041c2925..c2a66617f5 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/lime.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 c4233795e8..e4e8d4aad6 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "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), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 9977b5564e..015a110db7 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png 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 index 49e5bc92b6..26f0b95401 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json index 1ff69a9dbb..477a0e1aac 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (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/oat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..d85fc9b6f7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..86101df3e7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.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 9b816e9c2c..d2f06f1abd 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/onion.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, inhands by mubururu_ (github), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 73b95de513..b27f456904 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png 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 index a5674e38fe..9fe779b9f3 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png 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 21e0530172..eadabf6bb1 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.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, inhands by mubururu_ (github), seed modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-6b89a02e399bc4dd9c50c16ad274a353a92c8a0f462083fab0c1e5045d957ad2 by Chaoticaa (GitHub), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), seed modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-6b89a02e399bc4dd9c50c16ad274a353a92c8a0f462083fab0c1e5045d957ad2 by Chaoticaa (GitHub), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index eb2433df4f..de343133f0 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png 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 index 631cb579f8..75ff15179e 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png 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 de4ed6fbe0..369affc8fd 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/orange.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), seed.png modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-1ee24e9bb4023f490a3f87c861b65e459bd3fda10e688471cdf72b8a8aab381b by Chaoticaa (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), seed.png modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-1ee24e9bb4023f490a3f87c861b65e459bd3fda10e688471cdf72b8a8aab381b by Chaoticaa (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 7ed63766ce..d67415c4bf 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png 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 index d2b4672d04..12b6e14c8a 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/orange.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 012feb5906..9129d5c165 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json @@ -1,7 +1,7 @@ { "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), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 031838f8b8..5959966d1f 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png 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 index ec0da4c5ee..455d5e4e52 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png 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 19bce5327f..56f9d1820d 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, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/31012/commits/f840c12356368798ab2dbe7de8232ed8181d29d6#diff-2ca7537b4a0f25517344be1d3a98d6cc33a3176c0af385bc5882b96d77afc64d by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/31012/commits/f840c12356368798ab2dbe7de8232ed8181d29d6#diff-2ca7537b4a0f25517344be1d3a98d6cc33a3176c0af385bc5882b96d77afc64d by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 073fb84097..bfeb6505ae 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png 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 index 8614972430..d47a011c3d 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png 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 3d679a29ad..aeb8752af5 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/potato.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, dead, harvest, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, dead, harvest, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index e00ffb663e..bac5e614c8 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png 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 index 22b0343762..ae062a722c 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/potato.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 dbbf0cdad9..a4c78d04f8 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/rice.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, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 3b2e5fbbac..06f12bd335 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png 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 index 46eccd1fbf..433be8703f 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/rice.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 7c890d6313..c358b5eb91 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.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/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", "size": { "x": 32, "y": 32 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 index 249620539d..6b3cbc836e 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png 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 index 9dcc51d373..5b7f50e976 100644 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.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 5b56a84b55..2e37fa931e 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.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 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/14587/files#diff-3d6e5b157c429de7aa62396e8677d0a2fab073a2d6d6e796af4931cb8d979330 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce sprites Created by Chaoticaa (GitHub)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/14587/files#diff-3d6e5b157c429de7aa62396e8677d0a2fab073a2d6d6e796af4931cb8d979330 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce sprites Created by Chaoticaa (GitHub),", "size": { "x": 32, "y": 32