From 5a1e4807cf6c1146391eb2b1c309f02d5d657754 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Tue, 8 Feb 2022 16:54:28 -0500 Subject: [PATCH] Added Fly Amanita and Galaxythistle (#6538) --- .../Catalog/Fills/Crates/botany.yml | 2 + .../VendingMachines/Inventories/seeds.yml | 1 + .../Objects/Consumable/Food/produce.yml | 48 +++++++++++++++++- .../Objects/Specific/Hydroponics/seeds.yml | 22 ++++++++ Resources/Prototypes/Hydroponics/seeds.yml | 46 +++++++++++++++++ Resources/Prototypes/Reagents/medicine.yml | 37 ++++++++++++++ Resources/Prototypes/Reagents/toxins.yml | 15 ++++++ .../Prototypes/Recipes/Reactions/medicine.yml | 12 ++++- .../ambrosia_vulgaris.rsi/equipped-HELMET.png | Bin 0 -> 597 bytes .../ambrosia_vulgaris.rsi/meta.json | 4 ++ .../Hydroponics/fly_amanita.rsi/dead.png | Bin 0 -> 1421 bytes .../Hydroponics/fly_amanita.rsi/harvest.png | Bin 0 -> 1404 bytes .../Hydroponics/fly_amanita.rsi/meta.json | 29 +++++++++++ .../Hydroponics/fly_amanita.rsi/produce.png | Bin 0 -> 1032 bytes .../Hydroponics/fly_amanita.rsi/seed.png | Bin 0 -> 563 bytes .../Hydroponics/fly_amanita.rsi/stage-1.png | Bin 0 -> 743 bytes .../Hydroponics/fly_amanita.rsi/stage-2.png | Bin 0 -> 949 bytes .../Hydroponics/galaxythistle.rsi/dead.png | Bin 0 -> 1083 bytes .../Hydroponics/galaxythistle.rsi/harvest.png | Bin 0 -> 1070 bytes .../Hydroponics/galaxythistle.rsi/meta.json | 32 ++++++++++++ .../Hydroponics/galaxythistle.rsi/produce.png | Bin 0 -> 238 bytes .../Hydroponics/galaxythistle.rsi/seed.png | Bin 0 -> 217 bytes .../Hydroponics/galaxythistle.rsi/stage-1.png | Bin 0 -> 699 bytes .../Hydroponics/galaxythistle.rsi/stage-2.png | Bin 0 -> 782 bytes .../Hydroponics/galaxythistle.rsi/stage-3.png | Bin 0 -> 919 bytes 25 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-3.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 6c93859f04..617a6148dc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -18,6 +18,8 @@ amount: 2 - id: NettleSeeds amount: 2 + - id: FlyAmanitaSeeds + amount: 2 # - id: RainbowBunchSeeds # amount: 2 # - id: StrangeSeeds diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 18054fb29d..f3f8f9a0e5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -13,6 +13,7 @@ ChiliSeeds: 10 CornSeeds: 10 EggplantSeeds: 10 + GalaxythistleSeeds: 10 LemonSeeds: 10 LingzhiSeeds: 10 PoppySeeds: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index eba58394e1..ba6c2f4e3c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -666,6 +666,52 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi - type: Produce - seed: lingzhi + seed: ambrosiaVulgaris + - type: Extractable + grindableSolutionName: food + - type: Clothing + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + Slots: + - HEAD + +- type: entity + name: galaxythistle + parent: FoodProduceBase + id: FoodGalaxythistle + description: A medicinal plant used for its antitoxin. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Stellibinin + Quantity: 25 + - type: Sprite + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + - type: Produce + seed: galaxythistle + - type: Extractable + grindableSolutionName: food + +- type: entity + name: fly amanita + parent: FoodProduceBase + id: FoodFlyAmanita + description: A delicious-looking mushroom like you see in those cartoons. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Amatoxin + Quantity: 25 + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + - type: Produce + seed: flyAmanita - 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 2c06cd4ede..43538038cd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -247,3 +247,25 @@ seed: ambrosiaVulgaris - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + +- type: entity + parent: SeedBase + name: packet of galaxythistle seeds + description: "Brushes of starry nights." + id: GalaxythistleSeeds + components: + - type: Seed + seed: galaxythistle + - type: Sprite + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + +- type: entity + parent: SeedBase + name: packet of fly amanita seeds + description: "The iconic, extremely deadly mushroom to be used for purely ornamental purposes." + id: FlyAmanitaSeeds + components: + - type: Seed + seed: flyAmanita + - type: Sprite + sprite: Objects/Specific/Hydroponics/fly_amanita.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index ab1f969fa4..c4a5dd6645 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -577,3 +577,49 @@ Min: 1 Max: 2 PotencyDivisor: 50 + +- type: seed + id: galaxythistle + name: galaxythistle + seedName: galaxythistle + displayName: galaxythistle + plantRsi: Objects/Specific/Hydroponics/galaxythistle.rsi + productPrototypes: + - FoodGalaxythistle + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 3 + waterConsumption: 6 + chemicals: + Stellibinin: + Min: 1 + Max: 25 + PotencyDivisor: 4 + +- type: seed + id: flyAmanita + name: fly amanita + seedname: flyAmanita + displayName: fly amanita + plantRsi: Objects/Specific/Hydroponics/fly_amanita.rsi + productPrototypes: + - FoodFlyAmanita + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 2 + waterConsumption: 6 + chemicals: + Amatoxin: + Min: 1 + Max: 25 + PotencyDivisor: 4 + Nutriment: ## yumby :) + Min: 1 + Max: 5 + PotencyDivisor: 20 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index fb9d8e1497..e228ca6f8c 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -560,3 +560,40 @@ min: 1 reagent: Ultravasculine amount: 0.5 + +- type: reagent + id: Stellibinin + name: stellibinin + group: Medicine + desc: A natual antitoxin with particular effectiveness against amatoxin. + physicalDesc: starry + color: "#2b2f77" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Amatoxin + min: 1 + reagent: Amatoxin + amount: -3 + +- type: reagent + id: Siderlac + name: siderlac + group: Medicine + desc: A powerful anti-caustic medicine derived from plants. + physicalDesc: milky + color: "#f4dab8" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Caustic: -5 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 5f517a79a5..ef3a3fe7c9 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -295,3 +295,18 @@ damage: types: Poison: 4 + +- type: reagent + id: Amatoxin + name: amatoxin + group: Toxins + desc: A potent toxin found in some mushrooms. + physicalDesc: nondescript + color: "#D6CE7B" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 6 diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 9c00c7b5be..0ab9f3582a 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -454,7 +454,7 @@ amount: 1 products: SpaceDrugs: 3 - + - type: reaction id: Ultravasculine reactants: @@ -465,3 +465,13 @@ catalyst: true products: Ultravasculine: 2 + +- type: reaction + id: Siderlac + reactants: + Aloe: + amount: 1 + Stellibinin: + amount: 1 + products: + Siderlac: 2 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..894b71c8d9794085ab8feefd65e8d86bcf655b25 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|OJg zr;B4q#hkaZ&ie~HiX7jcALYMjO6-Adc6}|zg%V#A9v$6(r@NEgblWH8Q2iDOPTgoR zlcWOc`0`zgj^5_*zO?82&XQd>-^_lWp8oCAGR~(n7&MNv9J#ZnV*9~=%O|#cydzcd zLr$n}_HtjIs@6Mu*yZY57O3UjEw>Tue;gO8T&rYrQ@rN>*GW3f_ZWYs#r)M^RQ&UH zdBQ){D-V7|sV;o*MyTS-YWn2}MYdy?+>d&k9o~{CW zS?%_7DW1R1DOA9^<E`DwpdcUE@sbv4-^R0j9 ze`s7O6u_>=aLSM|ppUbm$cJG{GSdPXVFri?94yhL=ByOCP{rW4?V$dpnSEjg*V*`Y zPbj%-_`1ULb{~u3n@!*N3V%ub*~sp(_}Bb3jgJ}v1Gm18_U@}Zf4$r;A#Eww{3-bd zOl>BGZus%Ca0~CudJUTbm#Asy?_Ig9$A4Z{{*1ffS!=HD7S`M-N!=uRmA&nA=e zSNPl8t1?q&sO)}lZT6}D2dPPTJq7iz``(85yQ_CpJi6u~0Zbzopr0DN=` AQUCw| literal 0 HcmV?d00001 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 9345881060..8160725332 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json @@ -36,6 +36,10 @@ }, { "name": "stage-6" + }, + { + "name": "equipped-HELMET", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..619a057e98ac00b93fe23a24877c3053a3eb3d57 GIT binary patch literal 1421 zcmV;81#EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9SHq)$8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b17=A?K~z}7?Uh|jn^hRcfA8B<`T>Q4Ep!VQf&+<@ubG9! z37ZiY60>HyOoy3QsCOnNOLUoEjKnZCFcS9E0Xu`+WRyZF zAf@g5wm{#$$BSji5}4bSH~rn5Fp+?CHPxU(Kax) zepUtOY^aufEsZjxsGK`@p77!lA3lAAF9$~%zZzs^b&Ziw7){fudHa1{KKRI%uKSK0 zkYx`)y6(*4aANg%QB{?2Or!tOB%eQ2Fa1JD0L#aR{c?wpcA@Bzkb}PMOm$3+y z{nh1E6c@7N&{GsgLJS2%lsR(Hejg<|J>M~5nkP3V|LDOw*>LO?OjRW^bP;_m&0;jh zrT*^-OwACC#%X=-dBn^l%eih!mZBXZJT*yyfaK5s!{b+IdG#1C)Q6cJ{gp&&1$V9k zV|JPxn~f%qo4orQ=skUUQ}A-q6|H2H0Mo|%}&&g~wS^c3NkzGeOWLdbhc zir80K#=UR8$6S9O6JMWUJQ5{1w+KLMT@^`T~FV(X}1+vKHM9Y}$^c0dK zEJWfOBiF)YOcPhGgM^*}xMlMJw0n!>aze*xw-M8l0Mxd%kzZQMOI=+`M@^*+h9aaT ze7YQ0l#S{gR>3y6i>mD&#-`?&T~1I|UWRYa9$x$8v)g`xej((kfdO>WWNdVlg_#h? zPj=pv>xL0=BiLgY3Wfox75ocPc_y7^etw?8!9fDU!*?`XdJIG9*}a=nZ@exGz1~gt zZ+eCsdAI!usn+JRx9VTRXTRuTZEX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9SpU;iQAZth{Kru5LL_=y-gsIfaz(hvuEY7_)i@j z61jO3qq`d=#bYfHK#xRFTCv)pkrDPfJF(_}D>mUoEGC~@7P?`u>AK_%gMeXRm?n+E zAi8an^Z9T@Fdc`^3m4dX{FtAcnixtZ4`gAkBOhQUxW zskEVFQvDbRU>6F!@49^W^eHWd!K&->JfG)}TemRo+~J6A6Y=>7Bogc#JzBB$TV8{# zD->K8M+5;}U|$6PjT>x7qnM8SR{TH{PQ+r8vn)OaK2Qp!X`~t&XxrUIdwtOc5aAcU zzbyJvo;JtflbIQ|#>Uus^oZZJgFjoTt*S(z<#IHX?B)Ibssz=XDE&^w<2XAzT#3hP zpF8X8>oPt*F1N2=mwz$~W@l&R?&zpYJ$WKEPr~KpWzlsVuh(0=q>9&~(P+&Pn5J1K z7z_r>>^+A!Ha0e7X=w@5H0kN-VR3PhUuS0c?A$p_)09dimBbeo7HIVOc($;>#@Z^M z_Eokob08cJtI{%9mIXj>Z*R@fzY&?6n-jaRM|=CRs`h1X!QGK7GSD5A-V=XK(CP1P z^W{fMM!)&Grhe!>fqeBvhZOd0@|MZu*f6DhReRukS3vT)V#G~8jop30b&F%f>rw36 zLikt*-_Nb8zY}i_dD+O?gquBY*MjYm-gcN>c{eX`9d*?4|G}SwzjB)9jwbp50000< KMNUMnLSTZJZ;^`t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json new file mode 100644 index 0000000000..72b9a92f7e --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "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" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..96d1e506be753256c0e60cf467594f7adcc7dac1 GIT binary patch literal 1032 zcmV+j1o!)iP)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9St|T<+~aZD=}(SAQ(`+1~ek zp6C7M`2`^%At5h}nAET`Gb7`wO7ZXzmY4r}ixi8*cXve)0g*{RFC~*BhpQ`mO~ZFx zL^jLi$_kPFeVnBw>GgW3`8>eHg6=gsou8Mlb)DquDnB+hh#3acnud9PjAEgH;H1;&i3F(nTrKEd( zjkC7KZKuPx;c%i7DEAqZY+D?gCZ6l^*7tdTaKIZ)o0`Jh z*Gz3^-3<)m zpR7Ik{5G3SS*z9Lr}cIDEPG%a%d(`ZszjsFQ4lc-lg(xy98YzfA5q3o9_Q#dFTJK+y9r|`oHAX z|3x?d&%OSC&b9xuul=8O?f=ZH|7TqNKkdqYpyH#?{~vtzfA{168}I*LefR&WJ0OiK zZiDm!H7>mQf6jFjUDL0CGy-ij>pl7Z|Nl=5X5VUWcwAZVBO~f=TGZXt$fqH$Z#_)^ z*r@%qQvGWv^-@dtzZ}bdS*HIojQ^z>KFhJ})t0&_$9X}H^Q=7Aae3||3cLpu_@tTq z4*@-ER1)MD%n%3%3oyV5Y{0yaaT-wfc~2L|kcwMxFJ9+sau8s>5cnqhaNM#q}kevNbIgTaP;|3T9C{gsU4o2tCaCX=W=x&- zQTr1A8SUKI>gjP{MGHfsNa4X)Pjo24x*A!pGX(Pazt8iS{+pUXO@ GgeCx+Ei_O7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d7e4eab5f155b9ea1708a0c7d5545771a7e1fc GIT binary patch literal 743 zcmV?P)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9S3-!F!)g*EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9SZ)vtu8Sj6ds5{34)`m7_;OX z}Hh zzyodpZ+@Ovv$L!;o93Zmt+h41jv@etzzmQ8FMz`FF}c-Mrbi=_8eo#ojfS+p&!E|4 zz11?0HIG0Zu(-E}nVaLRQo$RSfcs{{@hVUFrVh5&s?+Jv?RKfvYUZhL$)2C9+v{J8`Oj?J-@jST$ XJ8Y+KNJ}ze00000NkvXXu0mjf&9S6* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..24d9d41a4fac12ce4491829c2f51e17fede4cd47 GIT binary patch literal 1083 zcmV-B1jPG^P)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9So6Hyrco_6YzA~_|4fnd)?TF9V-xOR{Z zM<9#K13Lr)?NYeHfur;dfj0?(3=S@WMnXWR?m^;^A)6N)sA6a?NU{W%@^|r_*UMe* znq&~UZ+hI_d*Ao{|NFlK5+wNFAO)v?LPWW=6HCaARXdl0lieRc&t;%Q%oD>_>D)36 z8c(Lsa~UWRc7K4qCx>{*pR$E3@aaX3qTEZtXUJRaE*xhx_Y4+?{Pz937=HbZ-Ipa6 zM1E+!VE|Ap5SDe-x9R^fs zp-WgU?U0_!008vO?964-Zl&C{s5IGM!awh|G^F69Z)O*pf_vFJu=@jSq}DN>Ok>Tu zWg1j(beN{4v5{IwtKD_QT}yxzoZ6ip^jrqx$rO$=g5!+bvWJNfl_rydQ?+)&?A{sb zjSjO+gO(btVj)ld-o{D2pgq@WffSs)y$y2`7Br6^ZLKC?!kk#95gNHF8EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9S9v79#48jL#{V zI6u-xioI| z*x_+?!+F#nF)ke1nh3dYXzov9=h!A}&m{oyy_-b-Ee*$1c!f#4-2SGdZfCVG$i%L2 z*`0K*C@I>k)aS|2Uf!Cw>Kup1Rho)HEVv)12dNraKE1;FPjb@v!wQ#S`TV`y_Nx`V zh06^GI*eOAChg|_MC&}2fbF^T_x|NWw_D6YaN*Fn)njQSY|o{s7_hlNG42l^?z!A< zBx)cl6L~aH%BpvnzO+bm!|3$-?0ZU47YP>*>73i1OIaDpl>r%v&XHObs?E67%hjGs zS!$LCPQ`%Po=Z{_No33I1_gJ|@!mREWxf?Mr{U*F14MpMY#giORzAJde|10d1I+smOefs5an17d0X6ke of5hbBR-LDIxgB=cVTU~U2ZY-~4~Rcrm;e9(07*qoM6N<$g0k}7HUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json new file mode 100644 index 0000000000..8b6952d030 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.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/galaxythistle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..7a4af796266a5a23a36390911c44a35f9f162805 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*+{{^W%(z~z)RQ;T zSZ7s|N_V(;hP}q@Sm}HhHV5St?;VeTiWy6S{DK)Ap4~_Ta;iOD978lFCMQUE95`{J zLrY=BiWLn?2UJvARy9R>vYr)CW)Io7v6H)tqqty0H@A@efh$+8oH=@sLGOT+jLe*Q zO>0}I~cDwM}#8-whI iEJkMLS+Ch885n*Y5-wm0+Moe+27{-opUXO@geCxl%ug!- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..a3ae4316d1c000464de302d5b488807bc48f829c GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*8>L*s6?fSSvcqxG}z7E z?7sPoVRg?ju37fKr^GsBimcY(p^;HgM z-h{4T+Ff>bZdcZ^TdP-SElO5){%CcE^#s48P=Wy)BXf^~LzVvL;C=dc4)ffg}% My85}Sb4q9e0E6L1T>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..41b16f0069d21de18661d72b67c71024035e2eca GIT binary patch literal 699 zcmV;s0!00ZP)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9SWYK>z>%8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0F+5YK~z}7V_+BsqhJ(_f>AIEM!_f;>41@3jXJB6{(n0C zoPkY@kKs<~O0vyiB3C2K@|WlC&_0-SRwez%Ce9ma{GU>@nTWCY$HT7!mj-wvjsJ@q zsW31wFfhD4cZcEg^0SO8-QoXXd~qWchR^37GQ3=Vf)ShE&&$s;QpKg{!Oa_K{2%6! hQ7{Td!6={v002puFL8`Sg6#kR002ovPDHLkV1oBSCawSg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..82de1b5dcc1a2901d4d72bbab8bd9135d6547e2f GIT binary patch literal 782 zcmV+p1M&QcP)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9SAIEMmk_5SK~3``v1a~stj+B z-)68n+sHT|u9qwI{68QeptCCJKLY~;!>7~F8Q8@57#J8B819s=WTc4$bXFz(hgpPd ziCn4Ye>O2bhL`8=FnnHqmh32CBBTIj`O9;6P#pEBdpje{a%w~cUceh^{GSwY^r)gJ z1Q-|?7{rZKND_yE9}mA$76s@&EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k zlL;xCTa`ku5DO4_d?D+x z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF zET9S(=is2R4&ZZ!Y^j>pgp+w`Xe zSSNK%pWaZb+gRk&ojhPxnf2iEntFbh0KgTT-tPvmTMaDoDJG*FlTi*91++J(mPyQ_ zfUJ&BR>$8Tu`4*af>SeW6N>_pUAlr307&v(x;LtHU#r^~r$ZERvhv^R__Y4ET)gzj zFuXC8Jm3mWuhG3B$=5q|Jhm}bl8@8j?~J1C{U_Hvc{clI(&ZwGG*jDx