From c74ebf6219bd084a2780453fcacad695e7ece4f1 Mon Sep 17 00:00:00 2001 From: Alchebun Date: Fri, 26 Jul 2024 04:02:14 -0700 Subject: [PATCH 1/7] 2 New plants! :D --- Resources/Locale/en-US/deltav/seeds.ftl | 4 + .../Objects/Consumable/Food/produce.yml | 66 +++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 22 +++++ .../Prototypes/DeltaV/Hydroponics/seeds.yml | 72 +++++++++++++++ .../Random/Food_Drinks/food_produce.yml | 2 + Resources/Prototypes/Hydroponics/seeds.yml | 1 + .../Hydroponics/Cosmic_Revenant.rsi/dead.png | Bin 0 -> 863 bytes .../Cosmic_Revenant.rsi/harvest.png | Bin 0 -> 2735 bytes .../Hydroponics/Cosmic_Revenant.rsi/meta.json | 87 ++++++++++++++++++ .../Cosmic_Revenant.rsi/produce.png | Bin 0 -> 1409 bytes .../Hydroponics/Cosmic_Revenant.rsi/seed.png | Bin 0 -> 473 bytes .../Cosmic_Revenant.rsi/stage-1.png | Bin 0 -> 160 bytes .../Cosmic_Revenant.rsi/stage-2.png | Bin 0 -> 265 bytes .../Cosmic_Revenant.rsi/stage-3.png | Bin 0 -> 323 bytes .../Cosmic_Revenant.rsi/stage-4.png | Bin 0 -> 382 bytes .../Cosmic_Revenant.rsi/stage-5.png | Bin 0 -> 427 bytes .../Cosmic_Revenant.rsi/stage-6.png | Bin 0 -> 445 bytes .../Hydroponics/Ghost_Pepper.rsi/dead.png | Bin 0 -> 460 bytes .../Hydroponics/Ghost_Pepper.rsi/harvest.png | Bin 0 -> 690 bytes .../Hydroponics/Ghost_Pepper.rsi/meta.json | 41 +++++++++ .../Hydroponics/Ghost_Pepper.rsi/produce.png | Bin 0 -> 465 bytes .../Hydroponics/Ghost_Pepper.rsi/seed.png | Bin 0 -> 357 bytes .../Hydroponics/Ghost_Pepper.rsi/stage-1.png | Bin 0 -> 206 bytes .../Hydroponics/Ghost_Pepper.rsi/stage-2.png | Bin 0 -> 325 bytes .../Hydroponics/Ghost_Pepper.rsi/stage-3.png | Bin 0 -> 452 bytes .../Hydroponics/Ghost_Pepper.rsi/stage-4.png | Bin 0 -> 494 bytes .../Hydroponics/Ghost_Pepper.rsi/stage-5.png | Bin 0 -> 540 bytes .../Hydroponics/Ghost_Pepper.rsi/stage-6.png | Bin 0 -> 591 bytes 28 files changed, 295 insertions(+) create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/dead.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/harvest.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/produce.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/seed.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-5.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-6.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/dead.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/harvest.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/produce.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/seed.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-5.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-6.png diff --git a/Resources/Locale/en-US/deltav/seeds.ftl b/Resources/Locale/en-US/deltav/seeds.ftl index 976bcd9fbff..d083a2cf398 100644 --- a/Resources/Locale/en-US/deltav/seeds.ftl +++ b/Resources/Locale/en-US/deltav/seeds.ftl @@ -1,3 +1,7 @@ # Seeds seeds-CrystalThistle-name = CrystalThistle seeds-CrystalThistle-display-name = CrystalThistle +seeds-GhostPepper-name = Ghost Pepper +seeds-GhostPepper-display-name = Ghost Pepper +seeds-CosmicRevenant-name = Cosmic Revenant +seeds-CosmicRevenant-display-name = Cosmic Revenant Pepper diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml index ab69087d2bf..80102aad470 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml @@ -22,3 +22,69 @@ seedId: CrystalThistle - type: Extractable grindableSolutionName: food + +- type: entity + name: Ghost Pepper + parent: FoodProduceBase + id: FoodGhostPepper + description: So hot, you'll have one foot in the grave. + components: + - type: FlavorProfile + flavors: + - spicy + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 39 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: CapsaicinOil + Quantity: 15 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Thermite + Quantity: 10 + - type: TileFrictionModifier + modifier: 0.05 + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi + - type: Produce + seedId: GhostPepper + - type: Tag + tags: + - Vegetable + +- type: entity + name: Cosmic Revenant + parent: FoodProduceBase + id: FoodCosmicRevenant + description: Is this even a pepper? Looks... Haunted. + components: + - type: FlavorProfile + flavors: + - spicy + - spooky + - type: SolutionContainerManager + solutions: + food: + maxVol: 46 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: CapsaicinOil + Quantity: 20 + - ReagentId: Vitamin + Quantity: 8 + - ReagentId: Ectoplasm + Quantity: 10 + - type: TileFrictionModifier + modifier: 0.0001 + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi + - type: Produce + seedId: CosmicRevenant + - type: Tag + tags: + - Vegetable diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml index 4611d5d6201..c1060c84834 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -8,3 +8,25 @@ seedId: CrystalThistle - type: Sprite sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi + +- type: entity + parent: SeedBase + name: packet of Ghost Pepper seeds + description: "Be sure to plant these six feet under." + id: GhostPepperSeeds + components: + - type: Seed + seedId: GhostPepper + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi + +- type: entity + parent: SeedBase + name: packet of Cosmic Revenant Pepper seeds + description: "Harvest dark spirits for the good of the station." + id: CosmicRevenantSeeds + components: + - type: Seed + seedId: CosmicRevenant + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi diff --git a/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml b/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml index 1983efb05b2..815587961fc 100644 --- a/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml +++ b/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml @@ -23,3 +23,75 @@ Min: 1 Max: 25 PotencyDivisor: 4 + +- type: seed + id: GhostPepper + name: seeds-GhostPepper-name + noun: seeds-noun-seeds + displayName: seeds-GhostPepper-display-name + plantRsi: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi + packetPrototype: GhostPepperSeeds + productPrototypes: + - FoodGhostPepper + mutationPrototypes: + - CosmicRevenant + harvestRepeat: Repeat + lifespan: 25 + maturation: 6 + production: 6 + yield: 2 + potency: 20 + idealLight: 9 + idealHeat: 298 + chemicals: + CapsaicinOil: + Min: 2 + Max: 20 + PotencyDivisor: 10 + Nutriment: + Min: 2 + Max: 8 + PotencyDivisor: 25 + Vitamin: + Min: 2 + Max: 8 + PotencyDivisor: 25 + Thermite: + Min: 5 + Max: 20 + PotencyDivisor: 10 + +- type: seed + id: CosmicRevenant + name: seeds-CosmicRevenant-name + noun: seeds-noun-seeds + displayName: seeds-CosmicRevenant-display-name + plantRsi: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi + packetPrototype: CosmicRevenantSeeds + productPrototypes: + - FoodCosmicRevenant + harvestRepeat: Repeat + lifespan: 25 + maturation: 6 + production: 6 + yield: 2 + potency: 20 + idealLight: 9 + idealHeat: 298 + chemicals: + CapsaicinOil: + Min: 3 + Max: 30 + PotencyDivisor: 10 + Nutriment: + Min: 4 + Max: 10 + PotencyDivisor: 25 + Vitamin: + Min: 4 + Max: 10 + PotencyDivisor: 25 + Ectoplasm: + Min: 1 + Max: 10 + PotencyDivisor: 10 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index a14136e2f98..d9337286d00 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -60,4 +60,6 @@ - FoodFlyAmanita - DeathNettle - FoodCrystalThistle #Delta-V + - FoodGhostPepper #Delta-V + - FoodCosmicRevenant #Delta-V rareChance: 0.01 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index ce3a0ed5c8b..8981f3dfd4d 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -948,6 +948,7 @@ - FoodChiliPepper mutationPrototypes: - chilly + - GhostPepper #Delta-V harvestRepeat: Repeat lifespan: 25 maturation: 6 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/dead.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc0d4ef783f41204a5ef8954647ad2e5990d998 GIT binary patch literal 863 zcmV-l1EBngP)Px&8A(JzRCt{2n$L?MH+o9lqD-~)KbGpvY*$*G32?RL6*s&zx^yNtGW|GwI(ss7^vi2iFuAqSuIrUQKa z^!B(4)rUjZ;$GWFumqripqc{m>BFIGao>ZFlLX+%Kr+Sy06decaZH~+4n8i*eJ?(2 zxVNSb_#Qi!WeLTyr~m-cQ5pdNEatN+%g0Aalq89d*G9SW&&6^HKIL-w2o?X0#^?jR zVtcVHs&te_hy4x~^I5f+&nk5=&CP#St~S#4ap5<`;==Xeqd0wpivLD!FbTl`09ihc zI&t^N9KIgj4=W|p(8SqN*3`#^ZyS>h7Zr+c>mw9jmjK!f?8IH@#9hFWL(34FGr(P* zeq$d`zH0?Cey>IREIvZTUnf9Q2BxDlLMT<1k0Ug7*ze%5-|5D)TF9L1cdEdBWTt2XJg*fI6-;hSP{;WF@9e1wYMY8yDb zA67K8G2?7^0XU{>Lg32Pm+!l!RaeYh@%#D+8UINIFntl{pDZ6obkU)zEK6;>@6B(+ z_o+ap?NXcgIedhQ|LjSidJdopGZ42Z^s^*Myq|o^2LR~5-f8PFFHNV*t7 z189n5AG~~jVNC+u;|iabZ=C>i+i`9cisJlDK=|SK#x;N{I=|2oq#DyLNH`??FnsF@ zpcBnN)d=?!Ap9_V>mP%fgeOs*xO=onxs-(O$G4sWY=osJ)c*tspP%ns0k)fUz3-$~ zY!5Br^YWb%V7pmYA3uGLwwrZ5_hk7vqU}B=gnvE0bpjyd+t)Ak^~0avK;MV_BMASx pe33{b5{X12kw_#GiA4Xt{sL~60#X+TWIg}@002ovPDHLkV1gS>pMwAZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/harvest.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..4f02a4e51fbf296a4bbb3ee9b2b55039b9c0b3cd GIT binary patch literal 2735 zcmaJ@eLT}^8~+V?E14oi40*}PLY+ny6V8z+B&CFrLL94v+Gd-Vl)UChsLb(_9P(13 zytH`_#YlDvTS(i?EH9aj{dV^BoIlR<&-2H9eLwf-{#^Ixy1w^yeXl#k%kf;;R4nXz5P7VMlhq*W%K6(8i?-3?co2Ao3dG_d~ zzF~&douI+erv|CP2{us$MqN;cS)=oPmDL^LnqiF83!5+I%%^jlz8m=N4h%l86JMS7 z?#+Y4B^%Y}s!D>E{PT>|H*qZBk(VF18FGeE3yA6NyW+Vn@xmj}$!5YfHhX?8-f`7z zf_0En&bl#g7^kY21a&wv@m?W5s|m38Xe}dyT1r0IveY|)6I)1`P@47&6{`0VV*lj0 zIPKz-a_-7TV}Y$NJZQX{eI`SxT%787i&5kaBj#=5wrEFPM8r;L$wZ zi~>#f&aW%KUJ<=C7`*R8zO{%lsbjmpcnp-S2F(_01j*HVbb#TuHD5=Rhv1ZCc#SN0 z=}Gm84+}(a!PBYcoX03!kEADOLlP#I+$|P+c4IO)*t{>Z@DyEjPXO{rGCFeX5Zt=rl>=C>RWX}QYCeA=snAS zW||vW)-6R;7`%vv26ZtfKBj`}=t>kxNz__8%yNP}%YoNL~7KflpV*}l}8z#2j2Ftc8F-!>Rp7yQk$SF*@@zui~6XJQ5UiMIVp zpI>?a4rJL}g!=8E;TV@1{JbGSYLEz7n*8{|@muGIZnS)VTf0bsA{aWCcIosK2f$au ztUd6#>qfP_>d)?T$5Wblu{79rC(3pwI`#MaCL5-Io4Rt!P{#Dy49sh@41Ckt z2aO`Ep?bj40+UA`TKA;U3(VK<7M_V-QGA;mz`dbkO8RMClew-jy18B(R;JpvPwWTR zUrtRobta;rmum&MEYwh8yARj;HR0Q>zZTxyo-#89=qO#Z^%ppHAUH5$*|oi3H+W>bEAyvQ-OZYUkyP z7rS5V{P^4@w9(ndDjyu3pEg`x8w)rE7Ws-eu`Q5K-IQqb^eNvoZsy#_FYH=-3PmiH z5Jmle8_m#myp5>!yX&CBwN0Y9In305xBUuLS59*T`4r9~goD|K0%rVZA*%;Yc3LPM z0C)S2sy^ok8d17#1-taqhM<3>Q>NQWbAF}qF{ounzDG)^VtxD&jU=3ye8yaLqA{%r z;pKtKCM9$ewF#RdL*tncwJzYR<(>n@@7Uyizn*o+=Z_C60rd5)bQ7yB4xIaJ{un!` z-tY;kWwqkS+|iV_H!hY7-OsE+QSD-N*5P=`w_Qxltr)Y7a{9%0Axq7}8z_ZIWdrf- znhDH7n8i>*dt>a*E+(IF+gGryPE%p%qfH_)ZXFRh$IC5{ijFG;POa#PnN)y*n^$2p zN=)ZHJT-I-$Wr(^c9CmCt~C{Fr7&_#H6!OdjW*A+v$jSsWNe?%mRAdYA2u zWrPYy%Xqu#u1IMJYU!KuOeV9%#Wmbvtr7Wy=Tt zH)qRa?r)s{n&*Ms8!J&$@FjP}64o}LO-LFYWimS#wQH6j=)kirEA8(_f58hvDBbzy zux?kL#D0o;(G<)+z0Cvn$F&#@)GI;hNurCP@aZGOIp-_A)esJKM`?}yDZ4^{JV3(= zbyun)deR51?rCgU6e_3sm*C(@M3f|H1aCiG@4atwJf}j@ug}B`7p9^_a21kRofcs8 z+Wxo?=j>8-1iCRM(afKEoa;)-Gx%GWJJVE zBhk}n`fRs(^jo%qKIdHsDSS4@0J_h(s9W>m-mI>=YTotPmG^y(mJMxJh#$G*^~;^W zlHs@uv5U*C7^IjHQxJI_14gS)4ydFgoYdE`7QP1CBU zbZujRBCyesYis_7AyL>yavdao)b~kX`cEf9BQ=UN2_4XrqU?>?>)rv3s$Mb?&{&)t z>3S|L=?4t{4ZEFUa0OSW>iqv2VLvPjl>cUR#ZE`e5ap{Lp_CK8$_@uG2>^rDF~rAE z=)%j=He-$muPx)ajgM5>nbPa~g$j*@P7OT4JWCegD)k)@N$2qGB^6o|Ju7gyVgNGL zR%$I_`&%{%_0=S^QH#ldNX!~cit>6)(#l-qjKt&=$~AvJJ!WwtQ;3(Q-FIGcTb;5} zT-l#S{!!?c+bz<-PrcUO2E zb@<&?cqVRRH*2#9;5Ly zD09%NxH0{R!lY(-DNUM_(XwpJbz&E$^|ir8>vvFnxHcn`@-j%w8Nn0hX%x1Ql)_ z*sOynB!0hH6Hdv&+xK7#wZs`G#z3T|yXQ2B9F^}KBu3lbvjGQDc7LveTY+s*d#H>K zb-m5giRn2Sk{k7@WbXT+`Zf2;OdAN0@uDpOcKSQRy@P->6G6Nn*eN>AW|uFaQg|6# zkl;A-*&KAKP#~0l@(i~l(+RBFJXIDOdM=Ua8JkXUzBMU7F1Zx=Bla2t*!-&iW3B-? z12kSPx)J4r-ARCt{2oPTH=Wf;f5-AvY9g{m9aQmg|TkVYt_*a;PiKmPEa6s4@4xC(;w zp9r>Nupqb6Uw`aGXrzom@dtJtH61CEC=T(8Oqg?Y!-3f<7f^yIVm4_o&*galf*=TjAP9mW+(nfYi}+awTU}VjZ!i69$$I23 zPDoM$#>es1SZsA+8Ak(sU8nDzjPtCutAOk`{&8?#g*6k?<45Hg<5q5@wbj*aagux6X?k|^IR{C z{NnuFp8?)`*aHCg=2pcS-UK^mBa%0D#o}JR%ujvfhgy6IXEJkp@gY=EdH6 z3A5=emU4OCCCM+)&vgPEKRbiFcYen&f2VLU@dFO~pTh?Y5&&Q}oyE1a9M)JK6W4EY z1wnpsey$BL*56%q{Ok-Se_h6-s6zkkjY5R}I~1S6+wuupib1FEos6#!B)iP`tu6*_ zu61>NAUST*Z&@)&cLUJY2a*w!e$&OEk`i@lD$4G>^9BwlSN`*N?P45b{oS@#0zKiT z*mnN)fu!w~Ku@?yF5i5Gb$u0W83)0oQMGckZ$c{dJyT>PDhjPc7I4x0)>93?uI@f(HCT@ zsxnQ}nC#up5`96(PXO|Z^8?tp3RG2PVXx%8oczN54}uUG0QtrGAyiI&;r_A+g8XH$ z2?&B92!bF8f*=TjAP9o^zvE{e?2!75uyUl^{kx&0uW^a&k2m7h`2<$N-54UWKVC=V zd;r}Kh?|cf4E_6P)2S@;vkvCd+L%vkWBL&|oyyw&y|j>|1a|P-z6px??RHy@=@UR? zf4ngUQS$+GM9xRB15+D7WPiLd22t|?bVSZaunXJf15`?Xyj}iEf#w5LklzkyK0t-} zt%l|URG8mtXg)xN`K^ZL15}XT4oqzTk^S+;7(~qn&=ENw!7jK071aLcdeqvOr{iypEga6O;vR?$0j= zzi>qNr@P%>7KrXoce}qV5Z#~dcE4~$zj(L%%L37Fg4_KBK@bE%5WM^ga~~}T?rI3i P00000NkvXXu0mjf>QJs! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/seed.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..3b7a097e0ec2a30c02d2dc0a47d3c8290da6d6b2 GIT binary patch literal 473 zcmV;~0Ve*5P)Px$lSxEDR9J=Wm9a|#Q5?rVb%#*|cG(~f!L>9v9FdZOQ;R`Ee?UYvHPli|VIa~V zO-(IrI`juL1UW^~5;=H-LrVpLG<2B|MbTkHd6-7NCq)hSSsuLi_YD@w&Y#a1?h4~qb;m?2q*_oD z_p3Uq*M|UfkM$BSq?|QTVQB-?{fTO=&qjWhq2vn35tE(y5wxi|@j}YE1HWPba0G^u zE5tI}T+J;}Hj8Zbyr50RKkc#X($5)aywzp1$jOJeW&~M#^q?6*XI-WZ!U@#JTi(k# zCy!;e(TpG$8(YGn^|bX0%up61pJM@704_e}+CeA*%Puv=YKF3m4|*6~U;ZR6`wFBI zXe?ftStPyh1sdk|0)W;h>TcsxAE~7TG5%?&9L&@-KJ;y7!A?Rg4U- P00000NkvXXu0mjf!p_T# literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-1.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..46b840ee334de27572585c21d34e78b0a6d9dd8f GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}QJyZ2ArY-_ zFKpy(Fc4rlXgn#q(CO72wHVf=0X(b|V$%J+I&!@I$|iBwe-&b2IIv<-Kwv>l?2!ez zZpSAv+_nmumV0yFj4#2fEw|jinAJD2;T`{+>y!6!GwhA~Jymj}ZdOkO&=v+yS3j3^ HP6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-2.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0751851e8acead910ca4a0078129fdb6a41f4bf3 GIT binary patch literal 265 zcmV+k0rvihP)Px#!%0LzR9J=Wlc5fRP!xtg+$?U|L?eaDGf?hh(A~%+3Z2ZxyHI!rtHn%{LOcep z%%r<8HF&;scDDQf|M|BIilQirqWla7!CJ8D8=55xP%a{Elxo(6;R~7bi2B z7j-k~#BuBtVAe0FG9wSuqHeq@Gqam;4p3!A(sDH4Z^vC)E(@V3%71eQ%ycr%OW--l P00000NkvXXu0mjf04i<6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-3.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..e6bb55c147d167900368089b8ac82b136cea4832 GIT binary patch literal 323 zcmV-J0lfZ+P)Px#{YgYYR9J=Wl%a0JFc3hWs|B>u%9hcP(tbloJ|nzRaZpHjaisoBN&aIbbYU$C z2)F^eQB>5kD;3O7vSgp4d#5|c5Q#)0kvC(4Gh_%`;0E;ie5)XNijY`&Io7a8g7Q7Z z9x1>aT`PZk79Zz9JL?V&@%^$eb VOsvmw%^&~(002ovPDHLkV1mHpj}HI< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-4.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-4.png new file mode 100644 index 0000000000000000000000000000000000000000..76aa0ce193b7a2b7a12e9c6fd3d9a14811f47e33 GIT binary patch literal 382 zcmV-^0fGLBP)Px$I7vi7R9J=Wl`U?>Fc5{mR0?Q8V74$MQc+lWNRLn$-aD8q=^e^@j1r%rv}9?Q zHJ||jUf{8JwLenqG_6$mNtQiPGVf*PO#%rC34e@ic7_TAKmojm=ewFkUSi0BT;fK= zEGnSEP+_{2vScH4y@CO|0!4(Ctin(T(FlA4TQc7USBa15d8b#P!E}S#lOKyhu8*gW z&PRixmQ~3D>w)^9C5w5Wmwf~Z=mrHf-UHLoqk-f)oki&GDbz-D^h=>jSl zIR|ILTZwz3z6D`p=uCDkZMYHQLE;F+jbV>1_qi6pLSrZd-KX03+F?WH`yN0JF%>u@ zEir6=;C~X0GJNij5u{#g?a%9{2T#6!dGmSNwwdcK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-5.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-5.png new file mode 100644 index 0000000000000000000000000000000000000000..c62b84e41b1d76388952a57b43b61301447a94e2 GIT binary patch literal 427 zcmV;c0aX5pP)Px$Wl2OqR9J=Wm9cJvKn#YzRJtJ<7&?%SERi~~WzS1wyeDDqlk`P+hOS+*CR-WG zz;GSTCP1qSQ<|aWmrh_G^6#_%GqB*lV>L^Zi~v9ayx3w+Paq@k4r~AiG~zcVac3sZ z3FHJ^-|g!nCQ{kLjjupXXoKsCwE_@NUdi6;+!e?P{#^9QPeS5kX%YtV@d?!MoIFLM zb#(b{5rx-)uL`K+cjO|-krO0%-(_%D-sc!l6R9!c}&4!%7 zPF5xhAiethwg}ep!`KR_`Wt8~v7^-hPBa2n|47&dk)E&?`;E^U=-!Z76UYX`M@9G` zcEzMoY@38CvbD5fBgD1X6JTqBDqbhvS1o{FxP}S`{#^8bJ`j7ZeK$@*dj-0rDS^vO zzw}8+?e~5NQwz$n%k{tJa(yo0o^5fnGT{lZ&!GZ;U5+7^n Vn_0lQ4gdfE002ovPDHLkV1io;znlO7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-6.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..939f9560c8f6a36ad412a13abf08337dfad2d89d GIT binary patch literal 445 zcmV;u0Yd(XP)Px$cS%G+R9J=WmZ5ILFc5~nOfpD8z(6|~Qfa8Hyf0ChCkft@>_z+xqa~v)TfhPW zGT^(&&Zf<7vq+orOO|_f;%l>>B;6ydDcbd|H z6B#*F=Q<>R6%wrp6_G$5Cjg*@=iKnv(nC3i;iQ_9nxQo~?{=Ba*dhQ(x5w;vCTG?_h93Z$}3hsSyYpR0NVL zc6dYW3vYa`0sn?fDxjnfnvWLYgTxKVT@X^f1xnfhxujtw#I3|vAT0%2@!IjeN&)=B zHB=bsi2lb1T+TJ`iJdUr0iSeD&n5AUNipjm62Mx^;nDOuAMQ;MTWfFC^F5U0xDQGF ncsBCm-t;Px$hDk(0R9J=Wm9cJvFc5}+N9iN5v9NXR(4kXV`T|w+4wXQW7?~&&BNBqANY!WX zn`FtBhj5o3Ih?bD$yj~~8SMLxv+oXoRsUUzZnV|_fPUx<0OZ+T0YFt2rfym#!L~x! zG)(~jTiZdN?NwD4rYZ{)vXiCkhCiH7M-W^$t%~Ag@&f7pUUrfK`v?KR-VHhCHr(-C zR!o8Iltg)~%EFvaN6BO{>#PCWupc^8H?1NYX?+PhK78!nClT_ThU^_cGtn zoIj+Gr2uAi0SBWvK@=ymyWkeP^+A$CK2AQCYCt@Jug^CFT#k)Kn)hijtF?yK8tLPM z;p6Melac17D})sTAcNiWWu%MGOF@LPt5&UAMfwHV9McN#EnA-e0000Px%Y)M2xR9J=WmMd}_K@f(&QCVn7fJj0_0s;kWJ|s}Y6<7HPLL%}3asY=J_y__n zlf6J6z+kT+WFjCCA%h8+hr4HY%PNx)b=B0)>+k;iH4>cVKZ^qpk+R{Rd|(&nvJvO+ ze2{x_rz*_&kFef*04{o9fF`XU(;D!9(tHl`YecESYiz*}U`qu2lMn3G$uWIjfv<^F z-WyOzkgp;X+Dd1} z?X3e709lD+MhOuOgl#M&vf&2U>LMI5o{e;=pt?3Hs*M+~cJx}V?f}_{(={|P3X<_$!TK@L zDXAYBO_q5w`am&KIs#iihCpU!yiIZtalFA|i4C!m@>1p~E(uT-Uyjlc0j0=E6NM2@dlakWcZGAgRZbcKpgjw7I-=aSAehd-Nc?>P4 z-HI3c@fyha)%6m#ke}%~|2+Z_FBXqe{ub9DYjFpO1cy9<_#=}eco1>jOVZO4)4A_s zE_yraA?lu!;`O`1G2`WY)BCw~9fZNw9U>qbafb~Ea99I({ji-Xi%XDu;Q*tg`zZi^ zuYQL7^?#>k{gKg6VMU}2|6>|X`3{YIc5`L#)@%J2&=9BrH&@e;$C#qeV$X7xvz#T% YKgmk8^qrBFu>b%707*qoM6N<$g1ufl)c^nh literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json new file mode 100644 index 00000000000..bf2a086caa0 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/produce.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..9abec5c0dd4ce0e9ee4330bb8202178f56ce944d GIT binary patch literal 465 zcmV;?0WSWDP)Px$i%CR5R9J=Wl(9Oll8Ej2|$!^NSz2D9Eh&Uf#;BbWQaNL2ots|sus5FxbGY2jiMQTDn25;%^2LI9xe;ug*`cP8nB>rLIxQa8VEqZ?{r2uT za9-d8P0-$UJ78v@;s%I0_|nxlFuxlh*SPQ+#3Fo{)PBP9o?*68(G`dlcr~dV=^ax0 z2Kh#Bfiv9f(Yk++9#|s)_4XF9!H`Jj zVK@aXz&VHvba0QG9*}i6^YZKrbS{0Spaob`0s*@Mtt?Q2mh7Q;qt(|n0A_W6_WuA} zDnUc_DjuGc5iLLvg#s8v05AvxF!c%i2Y~i1kO1rlI6`^C$1S-w5`Zq$P9f2Sn%t-h zH7`%D^#jnV3ZklfNU9*3a47p;-njFT=)@z`%Zn8&mWjRrxkPx$A4x<(R9J=Wm9b6&K@f&NjTO~2P+VaS5(*{p1@sM|p!FT7s40B}!z&m%3+@fz z5w0>(Vq^<#uA+qkmR!~oX9$TF`z4pT+--LL`Dd~Vkw_%+$DC;w-nW|TPLhy2$Ds%? zn$6Ywo?Fz42%RKBuCA-22mlXvw`=X5YNfDsp;4>-_`jW|02D<5=$yE)2=LT*m4>`5 z7PQk85!s9Q4O0tzaw$EdoB7`Qx*@Sg?SSvAl&T+GW<0)kDSx*LFb|=pKh5|UZ)4S( z+_}>U2&cL~%^2?9hkO@daY5~X1cNsT;<1>A5a7AjWf{a{QJn++6bxOc!rPxa$J6WE zY0m*|Z@&yPV7?19$v;;sRrMwTUW8_yHhClxiTn#T5(s6ky;S-900000NkvXXu0mjf D#!Q#N literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-1.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..321d26da6307f64e9f9fc1e4992c659cc71f6978 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9iA?ZArY-_ zCvOyOFyL_UpU?Ne%|!3<=2GFwigTJIV~z+WEnX_H@k<@|cMBmtg%$y)6ZbRMELz3H zpyJKQF!#!vdM6jT?6ul_JkxcaUaOqJwrKYKzou$F%oo+`lMnrET3_M)!+gW{hYwAo zE;~dWTXeT=OHU}f=*3-zQ+{gf;@kKmHcGp#MWBc&rOqNyXWE8-pqm&xUHx3vIVCg! E098m$2LJ#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-2.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..d194979d085afbd5961a9809d767276337912c59 GIT binary patch literal 325 zcmV-L0lNN)P)Px#|4BqaR9J=WlRb;VKoEwX99IdJSNb1p?9&9UwzU=xtkb8r4ha5-s|B0w{TXR& z(xzRD%!c58L{Yfn=7F%2W#5^1_5&0}Q4~e_W3tH=ODrpi8(;xuV}iOo&->sT%L2Fn zE8rNf^BFC?#STRqU?$%bTP!Wm%6}_!4RG>}d_ZcgG zuMX$w7c(NJy*D4egg{*u)(NY_IjhU!;iGs)8#GXth28D@1Yh%hZnuBT#4B1wQT``4 X`5<2XO-oz|00000NkvXXu0mjf6)uYt literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-3.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..bb07c7666866fc18a01ef81b13a533edf636ca7a GIT binary patch literal 452 zcmV;#0XzPQP)Px$en~_@R9J=Wlc8$^F%-ssH&zpv8k03slQr`(h3di7^ueIIzP`Fp*#A&{P!qrZ zVW#@**-TvC^`*J%l}$`6AC!YMU%uaaFM+JAtgNg*R&mv?1)eEz1gh5KoCCmGJMIOT z0v~DKIKT|gBhZ9H0Qcr1UjiY(pU`;+AZ~j@OFT!w0AJw%1JuBMyfq3hL$!7IiHw3M z@fzZ$H(X4jih?E_QYVg9ivTVEOW;0u4ebbzu`LEz;5&K=6sXYt^A0%Y;02FSm8x-3 z;=2M2-5u%&5OO^;0(DK?l^|>FsmeVCQ%>U|e5I@V^v=ZqLMOqsS|1xhML`)lsEcSq z0Y-rg0-)&i#gTxD;=BrZjzD|E8?|452jJ6Ja2`5KskM?PSoJ*ZzO|sV15)V)lUCG$ zA1G<3uE;)3y6V@v!$lx#Z3MG^pAUL)oN)uI3jPx$s7XXYR9J=Wls#(0KoCZsj4MGZ6G)>w#jf|w&o`ri*=C#Vk1d(>D#rkj0Ur~YkR9L`4;{Q?NP*Oz z3+3<`c7X4%rohlx=o5HT4ggk+D^Xx*6^r6;cuK?yh-9gK3{aDBQ|ERtbQfH+sB;Q5 z-E+SRfi>`DtH^xNIo7Ns7qSGrs8NwDM}yZSu8)m%0{!wg!8x-Dh?2q&4xu=Z9sz7^ zRX6LX4eqsxB3bYj{P_unuuGsOp(1g?HKb=iOROzdEkM1gEGsGoO8G;W+croLaZ+Gh zVk_eQZ`J1}T&CDsB~d@x13IucX>3wy^xCgd6x1zf>140s+3^$5eH2*kbqj`OK!1W# zgbZLx?-Gj@knHsykN}ckPbI*8!o%-h?}4%X;Vj3vAKcgJPi+FbjBdgK`(<;%uGeey zXSv(B3d-~4sl=wR>-9RG0RhY1#t2xRFNwZ?6!diP+0$W|U4#w<5C^X>T@`ZQ=SZ{r kqtEV-8CDH|?wVg#Z8m07*qoM6N<$g09ct$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-5.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-5.png new file mode 100644 index 0000000000000000000000000000000000000000..253b707dd85608d4648ffc362c29c0830be5eead GIT binary patch literal 540 zcmV+%0^|LOP)Px$)=5M`R9J=WRUvZ2Fc4gK8X_7}Vp3EX5^h-RnLI(S${&mk{gRT9lF&?<3aXV? zXDM+(QN1%7$C6gJ+B;u>4gVd@>YeWh0Du<28O=0JX{qbFb^OTH>F0-}PXI3f9Do~u z3jmL>O8fxFE_cLX7 z;3lIrLPj)cO~qQ2QbrebO=@TsFrrC;O`cL-Rj38+xAmf*FS(L}yasqPtDdS^17pE{ z7B9IJ>|~wXq4XKjmYb0KsNU8r(lR_uq3Skn;wEzTNj7OrHiJA z%fOyNn6f)wIwio(GEm~UA;jqa6QUFA~{hUTLNnouLo}*B`jP`*-|5*MT+Moxcx)xkHYv!r~ z?ri=Gq!diklt%Zq3w(B8yX>8N6u;$Kes+i@)SjimwbL=*Yu~E^Ea7zA1&-Q5wcwAq e8#Zj%Kzsw{pF#v_c->L}0000Px%2}wjjR9J=WRxNJBPz?T3tt7N$BxGn8C^y*=hIWCWsW5P`aM~Suhe6*Zq@*+& z%Rp_{_Iuf?Nz+IyJtgnwvp@g61X$#sr2znDwgo!SgyHEOx?jjC2 zV?zXHjkn1~oeveyheUD?*BRNy2n5z1G*;ddF(aQMG^_Iz*H!?)FWg`Q3y~`0-i5i9 z{Z7uSWJ7A)lh?74b?3k;C`z7KA&v2j-8B=0Qo>E=0iSo{vJ4$n44lH8KqrhJ!jlw002EeJBn)+DF}Rb z_%EbP0f5)%he@CGxeoK66#fd!%r@wLJzevx4c&X(# Date: Sat, 27 Jul 2024 02:35:56 -0700 Subject: [PATCH 2/7] adjustments requested --- .../DeltaV/Entities/Objects/Consumable/Food/produce.yml | 4 ++-- Resources/Prototypes/DeltaV/Hydroponics/seeds.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml index 80102aad470..816144fe434 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml @@ -69,7 +69,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 46 + maxVol: 41 reagents: - ReagentId: Nutriment Quantity: 8 @@ -78,7 +78,7 @@ - ReagentId: Vitamin Quantity: 8 - ReagentId: Ectoplasm - Quantity: 10 + Quantity: 5 - type: TileFrictionModifier modifier: 0.0001 - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml b/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml index 815587961fc..3ea381e515d 100644 --- a/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml +++ b/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml @@ -93,5 +93,5 @@ PotencyDivisor: 25 Ectoplasm: Min: 1 - Max: 10 + Max: 5 PotencyDivisor: 10 From 10f6ef8d174008e95c330d98602a769fcb91c8a2 Mon Sep 17 00:00:00 2001 From: Alchebun Date: Sat, 27 Jul 2024 02:58:28 -0700 Subject: [PATCH 3/7] You're a Butt --- .../Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json | 2 +- RobustToolbox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json index ad457c9bdfc..f1a41a5346e 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, editted by Alchebun", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun", "size": { "x": 32, "y": 32 diff --git a/RobustToolbox b/RobustToolbox index 860c9af2bfb..fcd507d1f9e 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987 +Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e From 7260683b9fe9c5b10a956b23586f9d595b9c33b8 Mon Sep 17 00:00:00 2001 From: Alchebun Date: Sat, 27 Jul 2024 03:09:40 -0700 Subject: [PATCH 4/7] Revert "You're a Butt" This reverts commit 10f6ef8d174008e95c330d98602a769fcb91c8a2. --- .../Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json | 2 +- RobustToolbox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json index f1a41a5346e..ad457c9bdfc 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, editted by Alchebun", "size": { "x": 32, "y": 32 diff --git a/RobustToolbox b/RobustToolbox index fcd507d1f9e..860c9af2bfb 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e +Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987 From cc5eac74969da7880cc370b637e146877ee644eb Mon Sep 17 00:00:00 2001 From: Alchebun Date: Sat, 27 Jul 2024 03:11:25 -0700 Subject: [PATCH 5/7] still a butt. --- .../Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json | 2 +- RobustToolbox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json index ad457c9bdfc..f1a41a5346e 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, editted by Alchebun", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun", "size": { "x": 32, "y": 32 diff --git a/RobustToolbox b/RobustToolbox index 860c9af2bfb..fcd507d1f9e 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987 +Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e From e1fb1e86e41b4c6f0489203bed3cb8ae9fdd8205 Mon Sep 17 00:00:00 2001 From: Alchebun Date: Sat, 27 Jul 2024 03:11:54 -0700 Subject: [PATCH 6/7] Revert "still a butt." This reverts commit cc5eac74969da7880cc370b637e146877ee644eb. --- .../Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json | 2 +- RobustToolbox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json index f1a41a5346e..ad457c9bdfc 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, editted by Alchebun", "size": { "x": 32, "y": 32 diff --git a/RobustToolbox b/RobustToolbox index fcd507d1f9e..860c9af2bfb 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e +Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987 From a11bfc9258447a2a97e4313abe793b28c740609a Mon Sep 17 00:00:00 2001 From: Alchebun <47635328+jimmy12or@users.noreply.github.com> Date: Sat, 27 Jul 2024 03:43:05 -0700 Subject: [PATCH 7/7] Update Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: Alchebun <47635328+jimmy12or@users.noreply.github.com> --- .../Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json index ad457c9bdfc..f1a41a5346e 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, editted by Alchebun", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun", "size": { "x": 32, "y": 32