From be867fc3a0fc65a6ce87739cd1357a0a14a8fefa Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Fri, 4 Feb 2022 18:17:05 -0500 Subject: [PATCH] Added Poppies and Aloe (#6456) --- .../VendingMachines/Inventories/seeds.yml | 2 + .../Objects/Consumable/Food/produce.yml | 44 ++++++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 22 ++++++++ .../Objects/Specific/Medical/healing.yml | 12 +++++ Resources/Prototypes/Hydroponics/seeds.yml | 48 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 8 +++ .../Specific/Hydroponics/aloe.rsi/cream.png | Bin 0 -> 141 bytes .../Specific/Hydroponics/aloe.rsi/dead.png | Bin 0 -> 738 bytes .../Specific/Hydroponics/aloe.rsi/harvest.png | Bin 0 -> 988 bytes .../Specific/Hydroponics/aloe.rsi/meta.json | 41 +++++++++++++++ .../Specific/Hydroponics/aloe.rsi/produce.png | Bin 0 -> 903 bytes .../Specific/Hydroponics/aloe.rsi/seed.png | Bin 0 -> 755 bytes .../Specific/Hydroponics/aloe.rsi/stage-1.png | Bin 0 -> 623 bytes .../Specific/Hydroponics/aloe.rsi/stage-2.png | Bin 0 -> 691 bytes .../Specific/Hydroponics/aloe.rsi/stage-3.png | Bin 0 -> 749 bytes .../Specific/Hydroponics/aloe.rsi/stage-4.png | Bin 0 -> 824 bytes .../Specific/Hydroponics/aloe.rsi/stage-5.png | Bin 0 -> 980 bytes .../Specific/Hydroponics/poppy.rsi/dead.png | Bin 0 -> 827 bytes .../Hydroponics/poppy.rsi/harvest.png | Bin 0 -> 1001 bytes .../Specific/Hydroponics/poppy.rsi/meta.json | 32 ++++++++++++ .../Hydroponics/poppy.rsi/produce.png | Bin 0 -> 226 bytes .../Specific/Hydroponics/poppy.rsi/seed.png | Bin 0 -> 769 bytes .../Hydroponics/poppy.rsi/stage-1.png | Bin 0 -> 658 bytes .../Hydroponics/poppy.rsi/stage-2.png | Bin 0 -> 682 bytes .../Hydroponics/poppy.rsi/stage-3.png | Bin 0 -> 727 bytes 25 files changed, 209 insertions(+) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-4.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-5.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-3.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index b77b355922..3efc70c04b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -17,3 +17,5 @@ TomatoSeeds: 10 TowercapSeeds: 10 WheatSeeds: 10 + AloeSeeds: 10 + PoppySeeds: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index be2f730c7b..0eb2975e88 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -577,3 +577,47 @@ sprite: Objects/Specific/Hydroponics/chili.rsi - type: Produce seed: chili + +- type: entity + name: aloe + parent: FoodProduceBase + id: FoodAloe + description: A fragrant plant with soothing properties. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 ##I'm pretty sure this has to match the total of 100 potency yields + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Kelotane + Quantity: 10 + - type: Sprite + sprite: Objects/Specific/Hydroponics/aloe.rsi + - type: Produce + seed: aloe + - type: Extractable + grindableSolutionName: food + +- type: entity + name: poppy + parent: FoodProduceBase + id: FoodPoppy + description: A flower with extracts often used in the production of medicine + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Bicaridine + Quantity: 10 + - type: Sprite + sprite: Objects/Specific/Hydroponics/poppy.rsi + - type: Produce + seed: poppy + - type: Extractable + grindableSolutionName: food diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index d6a280e6d6..a74d82b86f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -203,3 +203,25 @@ seed: chili - type: Sprite sprite: Objects/Specific/Hydroponics/chili.rsi + +- type: entity + parent: SeedBase + name: packet of aloe seeds + description: "Soothing." + id: AloeSeeds + components: + - type: Seed + seed: aloe + - type: Sprite + sprite: Objects/Specific/Hydroponics/aloe.rsi + +- type: entity + parent: SeedBase + name: packet of poppy seeds + description: "Do not eat within 72 hours of a drug test." + id: PoppySeeds + components: + - type: Seed + seed: poppy + - type: Sprite + sprite: Objects/Specific/Hydroponics/poppy.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 6c6abc7ca7..267bcaa9aa 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -61,3 +61,15 @@ Piercing: -5 - type: Stack stackType: Gauze + +- type: entity + name: aloe cream + description: A topical cream for burns. + parent: Ointment ##Yes it's a direct reskin + id: AloeCream + components: + - type: Sprite + netsync: false + sprite: Objects/Specific/Hydroponics/aloe.rsi + state: cream + diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index b4a1557a00..894f9053a8 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -469,3 +469,51 @@ Min: 1 Max: 10 PotencyDivisor: 10 + +- type: seed + id: poppy + name: poppy + seedName: poppy + displayName: poppies + plantRsi: Objects/Specific/Hydroponics/poppy.rsi + productPrototypes: + - FoodPoppy + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 3 + waterConsumption: 6 + chemicals: + Nutriment: + Min: 1 + Max: 2 + Bicaridine: + Min: 1 + Max: 10 + PotencyDivisor: 10 + +- type: seed + id: aloe + name: aloe + seedName: aloe + displayName: aloe + plantRsi: Objects/Specific/Hydroponics/aloe.rsi + productPrototypes: + - FoodAloe + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 5 + waterConsumption: 6 + chemicals: + Nutriment: + Min: 1 + Max: 2 + Kelotane: + Min: 1 + Max: 10 + PotencyDivisor: 10 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index f82f4513b4..599ad7ba08 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -495,3 +495,11 @@ time: 10 solids: LeavesCannabis: 1 + +- type: microwaveMealRecipe + id: RecipeAloeCream + name: aloe cream recipe + result: AloeCream + time: 10 + solids: + FoodAloe: 1 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5314d5db979fe924ff50706d9e46c8cac03faf GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*%sEX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0Cl1eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{006p4L_t(o!((6=1*2dTjDk@x3Pu5$pkrqB|Bji}{|C%+ zZ0rFI4Q!z^VNx$a$FY!WY1`I{{|pQa3{~D8jL2eKcSRWr(u*01HHVQL%O_0g{a=s= zu>|J(e=>g=xbBKFz{F_=umx*Ff(uc>O|=j}cFc!!+ZhCmJQ;qlzhmI|Da7zi`88Y~ zIeMrLU}>OjYsG&U8{Ki(#HktrNtxMj3+7FqN|sqHlsMqt+b^Rf@+cSuqkv)n0LtD_ Uq@s4e@c;k-07*qoM6N<$f;Ch*$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..abfa42379317380dac26a19ebf4c02570e82f91b GIT binary patch literal 988 zcmV<210(#2P)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0DILH|coP5s02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00Fc~L_t(o!|hhRO2beXJy)b8K}EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0A|!meDbN4_02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00Cb~L_t(o!|jzZOT$nUg-=2)X^NF2yg4S}? zbW2hZ#ss~tnt>ed4sd-jY6K!y6@)PX03@Po?P3BwS$v_0LUE4L!?2i8_dQlWLi3PeD_;e^KLv2pMMXa zEF;C0JszA@jzVDdq?(pa$MZ?Ho}a;6EeK`+MMu)rB~kEW9+(4^IRXF=S5KP-C~ghQ d9~jsF(if-+u~FH3;57gM002ovPDHLkV1jlafRF$H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..9884c55e7421cdd6ba3bcbd2edc16c9422fdef05 GIT binary patch literal 755 zcmVEX>4Tx04R}tkv&MmP!xqv(@I4u4t9{@kfAzR5EXIMDionYs1;guFnQ@8G-*gu zTpR`0f`dPcRR5#ak>g7@;j_vh+Y3l;+cBJnIUOq+OvczV+| zIPVijSy@(z&xyxO8j$#r>x##3oJ%hAkr6esnR((Uu~_P2rHfhF)QG2ucu!to{5TT%s3aYS?pj{`$LWa(hKK_{Nm&m1%s{%%j z1=OHHcKzUg@H<5YyS zKLQ4}fs5;ortATiJHXJBA)B%*1*wE$5qLkNZ^{FMw?N;Tms|TBrw>4uvP$0o2Zz9D ziF&X5yt}tMw}0=n^ZNnA=yG9yHL}3~000JJOGiWi{{a60|De66lK=n!32;bRa{vGf z6951U69E94oEQKA00(qQO+^Rh0t5mA39$v3KmY&$8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0L)25K~z}7V_+BsqhJ(_bihcg!p8ZL|L>jO%b;ZF%s_~) zPh3v4xy-~Us_Aq2|M12M23b1~25Unhh7Vk_IO)?HRxw1RI5iyFd9RTevss9Bsgj{H zgM}79!{KWm8Eo;;tX?4uzu&(mItrLbjWb&RB!U=$1$001S%QHG$%976yA002ovPDHLkV1iNsNh1IN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7b2ea1af7dcc0832225924af9199b58597e0ae7c GIT binary patch literal 623 zcmV-#0+9WQP)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0Co=UJXv6>j02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{002ixL_t(o!((6=1*2dTjDk@x3P!;w80w&LYtny8^fL{# z2Zpu-G8TFLAMg0077V3eod~F-8CY002ov JPDHLkV1i5K1D*f? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..184dab35756e53ac7203466d2751ed3014fd91e8 GIT binary patch literal 691 zcmV;k0!;mhP)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0C=t-+1$h7f02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004_gL_t(o!((6=1*2dTjDk@x3aAVgAL;%-vMh&LI-r&h zY2PzZ;(&V}uQM<(Ffd$sahHMa4xm<$Gm>k0tW7Cn5|LGnDFyN6|0JnU{>RA4 Z0|3zmIr@_Xs;mG2002ovPDHLkV1kz_AgTZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..1c1de6661d6be6f614e60b2018eb50f06dd56491 GIT binary patch literal 749 zcmVEX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0C?an*WN!cf02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{006~FL_t(o!((6=1*2dTi~=fx#YejTld6Y_-WF2T0n`8# zIpE5RyKr{-nvDO*`~eAp&X5_5bPKxjH5n-JpSLXTKi#7M-4S$k0CI36`<~RCLA5k6 zDQXc}@y|kPzK5lBSO}D_$@u^M*EfoC0$GI)EZED}Wc-Jv1!|-TqCwuWxc}vAGX5hw zgdB4y%D0t^J^wQ>Ffjb%lqb6!V4+56Fnxc>&>p*;_K6T3oIj+F#M{n5cL(hFCqCK+ f83m(Y6i^HR&$?7xRa!lI00000NkvXXu0mjfn;Jwa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-4.png new file mode 100644 index 0000000000000000000000000000000000000000..69fabf4da3a1f212bcd6fac6815fc20a8374d04d GIT binary patch literal 824 zcmV-81IPS{P)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0C^H3yM4bQt02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009t5L_t(o!((6=1*2dTP!TLR*!Q1QJxoL1hmBj4{v*?a zCIrZd4x&Kbvbg`~zQ+~<#5#Z~A<(!r>3_ZVJVs=(hhMJHCJKc4S>WuqAOGMCC3FYT zGz7kVXCqrLRUE*@`HKNpTA-Q(V2P^Udmbaq5?FK~hrrv9e;6i3En=j)10H_4g41`f z5NO<*^dC8m5R(&#b^vmsLJo!UH5vbLsiR36fRzLF-t!p0eP?6f;{1ix(!6DH{}b$s z7^&(2bc?t+f5GFwXo=tdw;%s7a_7qph$}FbYNi#Q*?s0D1o|aHmE90000EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv0DG05WocI6$02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00FE?L_t(o!|hf(OT$nYJvRhVhg#?$)J=+rAgG9|e?U5Q z5(&CUrwm=%Nogm$Wa!kbrIbvaq(dFM7V&{#p>(xN5u!s3ZRvH;8H*+jV{h>mG`lTV zHM!FgNmo#ZTQ))r@1Gr8`*Wuy;%1B08c##`)zfYMCM$9C zJY7xM3dpKNv#~sJc8h!HtV*l|WL2Vxa+Cr4ps-HWCP8EzqC=kX#2m$~e+wH0A zxb^{YsF`!Y?&-$Qy+R{nn}JEn89e!7ZNGI!_9GEo99_Kp592HzZMx(%r2?ytMAkwaVG;TwV2KLAsivEdSzA z!&-0$x}ljJaXz0!itxsg5%|zv%_NK)L^oSR9s(;%tLXnGfa*QuE=LPkix%t3$o9-d z;Q4MDz$O3#z&3!|#P{944O|3j!*&0c(1#Bn-1r7{c;IOuwC7d;0000EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09wU)0#f$&|02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009$8L_t(o!|j$a&ch%Kg&$QV-zf)R^GUL0;{xrr~3 z$#-I+ONr8|zy2f;TD9?lkP@E#>Dd7MdYG+0gb)${#26tWP*u}BYwvx^Yu9zDnQ*Q? zi{JOjTATX5PvbbI!z&LVJXF0*!dknTh^a+p7zTLn0RTjV7$cl>|DJ!XNCyCB(X}Kl zHN<0#AR-XaY|ypcajAhnSDjlkC(*67dKX;v)n*n>!kny002ovPDHLk FV1iQyX|(_V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..99ad68a5d28f795cbac14694e99e691819006533 GIT binary patch literal 1001 zcmVEX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09uv3p^&kKM02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00F^CL_t(o!|jwYOT$nUg};<`bTWnNAUJfCQl}C+xO6P| z16)*!Ao&GO`4PpX(9K=iMeLHHR2NZkEGQI_LbG*D;W?y9leEPoP3n>ZA$iFo=iYP9 zeGn1v^_qCE*TlMYP)Je90j3iJfStVTc`kK(Qep+T$qjRcoXY}Wm@@$6TsBk@nXu$v zKVzm7gPpvLoXcXEGv3ZFx!v9K6cW^qOjrdD_X`;2%qimZ<%3SAL$O%o`~1qYw_hp$ zSwuDrxlQU*g;MtsfZ=e+bAsg!z zI8YYzts?Xjoz`f;-RI5neq&DFj8ToHaJjoy5ombTaGwENnFO~*eoMAeK#CM8QpAK` X$G`Cmy<|(700000NkvXXu0mjftS-bE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json new file mode 100644 index 0000000000..8b6952d030 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "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" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..de8601d255e0b12c92beb137095b0cd4dd6e114d GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*T=aE4Vqv(!Shs

0H#fH_Q>J8RX9Jb|*p|Zqq!>$r{DK)Ap4~_Ta*8}%978lFCMQTlH3Uv@3}A?K z5MY@g%ApAaN-GmXf{Zu=or08Cq|BNpxMYb2L->L>*RI(egTe~DWM4f`8`Z> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..974f03ca790010edeaae25f20c454943536f4ef2 GIT binary patch literal 769 zcmV+c1OEJpP)EX>4Tx04R}tkv&MmP!xqv(@I4u4t9{@kfAzR5EXIMDionYs1;guFnQ@8G-*gu zTpR`0f`dPcRR5#ak>g7@;j_vh+Y3l;+cBJnIUOq+OvczV+| zIPVijSy@(z&xyxO8j$#r>x##3oJ%hAkr6esnR((Uu~_P2rHfhF)QG2ucu!to{5TT%s3aYS?pj{`$LWa(hKK_{Nm&m1%s{%%j z1=OHHcKzUg@H<5YyS zKLQ4}fs5;ortATiJHXJBA)B%*1*wE$5qLkNZ^{FMw?N;Tms|TBrw>4uvP$0o2Zz9D ziF&X5yt}tMw}0=n^ZNnA=yG9yHL}3~000JJOGiWi{{a60|De66lK=n!32;bRa{vGf z6951U69E94oEQKA00(qQO+^Rh0t5mC9}|m;mjD0&8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0NP1JK~z}7V_+BsqhJ(_bihcg!Uk8@|IdH_W{_lMWgtX1 z?B2~tRR=V00000NkvXXu0mjf*WFL- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1e582f92314f1f34a0f72b29de6821956f6b2b7d GIT binary patch literal 658 zcmV;D0&V??P)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09Rl`gh7kY&02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003%9L_t(o!((6=1*2dTjDk@x3Pu5`pn>6k>O8Ce)H05V z98I&&9b=%DBS>>V4g=iM*^j8>2&RFKQPLgohJk@W1Q8YVb-)w`Mihr2^XUnwnG49u shRBI=;2hDwFur+#8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..090715f6a01b29d7f7088ae6ade018166d980af5 GIT binary patch literal 682 zcmV;b0#*HqP)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09TWn+Ge7_U02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004qXL_t(o!|ju?5r7~N1P^Mk8v8M$2#PRc##)FBEyCCy z-V8OAXZX>%%}8MRy9Wp%gnXI^nU+yBS9q;M+E!>J>IDMIqiL^~@YX5n1P%bh6-8fx z8SWu+Klk1Q(>3hcfztHQ?$@sbH0#!O>;ZxZ$vKO58cvnHS^G_!PYC%NC*24v8|*+} Q`Tzg`07*qoM6N<$f;8VDiU0rr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..edcd8617dc7cc32e437cc7ca19614ddf09bccdbe GIT binary patch literal 727 zcmV;|0x127P)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09WXw=*O34K02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{006H^L_t(o!|ju?4FWL?MSn8GO~W`ybT>qXptHm*sa!Hd z>g-?&I1~aDIV*_-epPaX{e0g648!<$oVLK}a**vzM{cg?waqCp=*n+0Lj+1F@q`Fg z2o?Yt!1DMO+G_gQOQ;tpr_ZAW&c*M})qNy;wtqhXGOu~L{a=LoOdKFDlWqdtn^z)F ziCRD*;u{1UCH|awu43sP$$F0^#wgmxPW2L|z5SufXBft>a|70hL{Sky|9}7h002ov JPDHLkV1j6+H~atq literal 0 HcmV?d00001