From 11b946079d212fe00ee1f5e979d50953734ff6c5 Mon Sep 17 00:00:00 2001 From: ATDoop <1959416+ATDoop@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:17:20 -0500 Subject: [PATCH 1/6] updates original lollipop, add fruit and cloth lollipops --- .../Objects/Consumables/Food/meals.yml | 78 +++++++++++++++++- .../Recipes/Cooking/meal_recipes.yml | 35 ++++++++ .../meals.rsi/big-lollipop-inhand-left.png | Bin 415 -> 425 bytes .../meals.rsi/big-lollipop-inhand-right.png | Bin 419 -> 423 bytes .../Food/meals.rsi/big-lollipop.png | Bin 322 -> 391 bytes .../meals.rsi/cloth-lollipop-inhand-left.png | Bin 0 -> 525 bytes .../meals.rsi/cloth-lollipop-inhand-right.png | Bin 0 -> 514 bytes .../Food/meals.rsi/cloth-lollipop.png | Bin 0 -> 449 bytes .../meals.rsi/fruit-lollipop-inhand-left.png | Bin 0 -> 627 bytes .../meals.rsi/fruit-lollipop-inhand-right.png | Bin 0 -> 687 bytes .../Food/meals.rsi/fruit-lollipop.png | Bin 0 -> 674 bytes .../Consumable/Food/meals.rsi/meta.json | 23 +++++- 12 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop.png diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index f19e6d08b6b631..6199d7c3248556 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -6,6 +6,9 @@ id: FoodMealBigLollipop description: Wow!!! It's as big as your head!!! components: + - type: Tag + tags: + - FoodSnack - type: Food trash: - FoodKebabSkewer @@ -21,9 +24,82 @@ - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 30 reagents: - ReagentId: Nutriment Quantity: 5 - ReagentId: Sugar Quantity: 10 + +- type: entity + name: cloth lollipop + parent: FoodMealBigLollipop + id: FoodMealClothLollipop + description: Woven with love. + components: + - type: Tag + tags: + - FoodSnack + - ClothMade + - type: Food + requiresSpecialDigestion: true + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - sugar + - cotton + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: cloth-lollipop + - type: Item + heldPrefix: cloth-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + - ReagentId: Fiber + Quantity: 10 + +- type: entity + name: fruit lollipop + parent: FoodMealBigLollipop + id: FoodMealFruitLollipop + description: Didn't this come out of a microwave? How did the chef even do this? + components: + - type: Tag + tags: + - FoodSnack + - type: Food + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - fruity + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: fruit-lollipop + - type: Item + heldPrefix: fruit-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 5 + - ReagentId: JuiceOrange + Quantity: 5 + - ReagentId: JuiceApple + Quantity: 5 + - ReagentId: JuiceWatermelon + Quantity: 5 diff --git a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml index 6e580b13a23588..7b56e2d66db04c 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml @@ -7,3 +7,38 @@ Sugar: 10 solids: FoodKebabSkewer: 1 #it's healthy for microwaves + +- type: microwaveMealRecipe + id: RecipeClothLollipop + name: cloth lollipop recipe + result: FoodMealClothLollipop + time: 5 + reagents: + Sugar: 10 + Fiber: 10 + solids: + FoodKebabSkewer: 1 + +- type: microwaveMealRecipe + id: RecipeFruitLollipop + name: fruit lollipop recipe + result: FoodMealFruitLollipop + time: 5 + reagents: + Sugar: 10 + Ice: 5 + JuiceOrange: 5 + JuiceApple: 5 + JuiceWatermelon: 5 + solids: + FoodKebabSkewer: 1 + +- type: microwaveMealRecipe + id: RecipeMeatLollipop + name: meat lollipop recipe + result: FoodMealMeatLollipop + time: 5 + reagents: + Sugar: 10 + solids: + FoodKebabSkewer: 1 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-left.png index 723cbf77b1f1bd9fe00ef787d89f90c251fec607..9154a7fdd99a6d73d5dd9e0dbcd73b0aa1fc860a 100644 GIT binary patch delta 385 zcmV-{0e=3U1E~X$F@Ix8L_t(|obA~^QiDJg$MF|uu(2>@D)kUv%M+yL1fIY{cnc1J zR8A@^Y)nB4XJG|R6G3TraAuC)K zRdc_)v+e$Pw*BMf=VC);Q8kaRw`bexJhQLQZ`lweMg8XMJb&wa-q(;@)8=ZZhHw+R zpyM~c-5)z=!q8f`f1PKO)=niGfa3-+wvnm(hmsFqZX@l#kLnsA8-U+<-*sTjdb8g_ zY~FVN<1R3CG3#5SY~E}I&jHG30J-0{{R30002eBh3Zc z+d^J(t73C`I(qE87L5*(AmoA-yPhxk=KvXXKKQ5e$EChpjN=fF#q8ct zXNA8kpKY-@Uq1U@pIVE_v%=p#pDx#j?c9##k8BYnp>gqt?SK60yQX5oxLC+gEy82! zz#vRK-U0Q+Xc`-jS!~XBTqmERnVCIkVy|^AylIT;Cm>sZ@Z|awU(c9*Ev0|f5_wkm zepk7#O7~Ui`(5SrfA=oq)bqUgV^Dbn%KdsJe}XsbUWy;(6quZQdHQDT000000000? zji<3n2GZMkt?inh7@wRnoc zm3fi{NYNVq&-}sqw#LWKG~*c5QTGRLy8k%V8Q V3F*C99pV50002ovPDHLkV1n-;!c+hN diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-right.png index 241a451ad666659d15fa3416b839f3a9dc1bfc56..d2dc192a46228a729dc45dcdb98894282958e845 100644 GIT binary patch delta 383 zcmV-_0f7Fa1E&L!F@Ir6L_t(|ob8#vaf2`%g{9n)CPgS+B^e_7WP(gU%>&xzssnWDW`D}g1XcXlR>pN*%bnh# zZl=Y#v8@ajb3hfZ>e*stz;$4*!gXx)7!{xn%n`M`ZGOm21Jv@#(Fpl@km}#~&%W0W zTRUfN8=%hoc3K{Vx3ui`JwOOkkF%EJ`D_?c9D6rma}xxOJy!u00000000000P#Qsw zyh9(Sr#znbo_N$Hing6EWlZlip=%UvJD*O>nBMzP)Fp~`oi{~HAM8{(WVD_#rVnO7 zjK!u%r@akOg@;~jikLpiQ^04#N*&V|{~i#8*xBK~&L&eWF4lbrM}0_LnlbK21poj5 d0001#$OV%1{kLb0fhdi1ET|wF@If2L_t(|obA~$Zi6rs2H;0kx^xI*rnHCXeR6`FfSD8I1icT3 zpeTbE6f$%PQeLJY<2Wh~epU_tx8cCU&sag?CjtNfSggbxsLGo4U?e8PYAa<>EY3;S)P&Yq?hM)JK*m=rrd$f~UQ zcxafnig~N}cxc%CH;u`dK4$wGBpUYeR38^^qJ8?_%zY88ZvimOc^6;@0000000000 zz`}U><}Z;YgmlU$yi9a#6zx(oR7^jqplcNEQd1`x(?1MH$8w3HUF+)gq+)unpT&L0 z>LFtK$qO)u(FI7?pG+cB4;j-h{x#@@bawc!v&m4Cle!PW(J4Z2O^N$q2LJ#70000i Z(G_;P4K4KMS1JGi002ovPDHLkV1i&_v)BLt diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop.png index 3513e829576301749c620e4950248aa373573af4..447c407eca72968a53481474b5909196078423c0 100644 GIT binary patch delta 352 zcmV-m0iXWD0*3>TFn<9-Nklb;z6o&txX6itP4xLcWP;mps?Cn{q&JhRb zDL4Ql3o{ZE6HA~-AXvhX0V*{eswdfx(z`)aR(* zvs$~c0D-$NkJ|Wgms^Q65=dw3f`fUEyIhoT7Es|&pFgE@vVSBrN;nB{IDvT7cU2M( zE&^o$z6)6rB1=M1&`F@|+{+*|M&subFd9yZ_m6?L3!Sv-l>G!ogS^%H5CvY`USqN0Wvr{^1?%4taj+5x4y{Xz!BC`a_ zLLdk8G*vq&VJ)D-cjuROjLbu$gp~k?6NpFc>yy~p2x$7X* zM(uGDL0JgoyRexmU<&O7t=<%;0<`Ke;6((6&blv?YalzN0j~qTYMsa;e}P)%eMM-> zVi%DLcYYCdSR(*{xU^qy0FU#lnBaH$fW!V6{PZ#6aJA3&Ii3XXu*Tc-issRd1f3002ovPDHLkV1gU(hm8OL diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7e09f904ce8bc97442ea15c8309b49ff120ffc GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zk9)c}hE&XX zduw-JlYFmgN2G0e0|A()% zU{7~QJH#)@z;MFz(jK|0{a<#+m`ysm+p56k4cqsfOL{rK9rB!Y{rKU$$xA9_clc%h zzW(*v?S-njK6?wrbISJhtggS!eEp@(so1&Uxxa4}B*-(wN`^nVr8u?ls#M3uvZ`p$ zH_R7og61Vp%x>Sp`+c%i@G;Tc!?ruiJmw`A{@)`uaeu?Ve?_||KaU8RW8CHUFXQ)% zC&7j1P893xy7O*t>CQdgBB6^W`={0{d(H3rYR|oO9h>)G4}4&MUS~m1?8U1&3-{eN zFZL*#=aIqih0k>R*;saub&N-9>uRpMoDM6=Uc=Fjx*yh87z&(<&}2=(?~oh!BJjOwSF2Dx5y<&8U=FNn`xy=&QdzK**h zu~IY(+h}D4FVdQ&MBb@0Id(_bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e99cb54990cc4aedf8c304f224169fec2c9e4d5d GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z_jtNEhE&XX zJ9BSelY@wx{TVS4riGJPd~<4;q~&VnHy%^pV0iIl);7hiR@vy@M#sV*v+ow}4}NJ7 z^Xwjv_#s9P#TJIyZ}(;V%2&3sv|O*YCY;+{b~EGMn0L%T;Tb>UbT7P|l)N{}0?6C2 zRAPORX20*exeAwf7z{q!-k7!LjH6O9Q0NMS(pjM3Ka*9g8#;^ld@Dn^fZWd+ob^(Q zAMTuTk)ECOVCRSBg3m5~$`sUM?U*dk{+O@v`J*}awS;qbvYvWv^W2U_AE_KsynDC)wucS3Y~d-ciE@QI&7K#&f0t{uT(=`QY-g^#?Zqwkm~*PQrUZVz zc+PR&kFP&-V;={VcaU>9%#dJ#;Nq-yNVi@MDJX=QcB+Pt94 z-=m&LI33-x?7gT*=*3k{S2kSVL)H9OD>7nzvVNUo z4cNY@uj|^;CCk>o{HS-tlS5YYuGun9-}}2~IhVe@f9cEK`AkI@Uu`tJ$NX>2vgz*% zUa+OME;HY{W8*q!%UkT1qlc)78&qol`;+0Ij{| AzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop.png new file mode 100644 index 0000000000000000000000000000000000000000..43692f2b2a143ed9d91bcf08bcc692110d8c7b53 GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=R9J=Wm9c8VKpe)uw1N&M(k+21WXS^*m(DIim%d0Jz$Ykl?Td5?xHxqv z1*uEB=pd+Q2tpeJ#dbM|a&2$i)DwAl#y%*ARqTdV}rmUbmz19-hovx;}Zndm#@uZt9`A0#)HzP3)ZlUhH{F rcwo_Rp@Cz-0l~lE81Pc1N&&zQkYWDx@-P+%00000NkvXXu0mjfSaroN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..48713bcea37038a2b4970c879d086d4e6ec545a0 GIT binary patch literal 627 zcmV-(0*w8MP)Px%ElET{RCt{2*}qF0VHgMSZ$y`vICOYT#*Udnpi99HN|%5c+_E@0Ib=0t^G!C- z{s{%U2+bxWL&rc@2N8sfIwf)mMK2hz9@ybHm3Us`-97%`z8?rAmpt#?``l0R1&D|! zz7mpyn+M(c~Ne!lu)u$}C8 zf$Yf8=qQw+(5@JIX}r82A77G+D@?sWLwSz0N@BKXje>RHfm3 zHrf>vM_2*iG%(vzVi!WO2H5KxjlyaZh1Dhipp=5|)ui_OClX+Y3u+>cjmZm&Q8bea@-1A;{3(~kEr zHV-=9q}V?Ph>^|*-*o=?QX3b=dKivI?WGURu#G0& N002ovPDHLkV1kL5CVT(@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d3a46a6cc67affe1a883791ce1b627785a0ce91b GIT binary patch literal 687 zcmV;g0#N;lP)Px%X-PyuRCt{2+A(O`KokbxUq)FR+e3$oHFor53|$KC(9p#Y57{)-gQpB$<7&%A zThw;#R7i#vs;wXwvel5agDC_&rbDoe652+lhSUOg5OPctD$6>F*nS@vWb1T#@A-s< zo&iD#A*)N8eq(>??EgD}Z5M8Rwg_g;B{h9OHqG$o(FV_^8T{8>6Ww=Va!E}e;1t&z z8@~=FJCAb)U$i2G&1JFzoZ@=p!Np#>*8${ngUj!ac;zj_an9h$g)c^!Tx5Ua`eZNN z1JJirDEI;ZcqjirKDoGs36smD0E)%X#wGxujZK`_P2>TT9Zes=P9SVC*mhxm^x_Sl zHJ3>N+-glP{q&Yd`?HEl25`HYo?z_4tbN#(M&`>g5S&X2@TxW#-c+WfndpwZ?ZMDq z$e+SB^_2t!=d!f-0l@8iLg(_)J{${-XE7~%5mLcJ$WpHYS^(nL;BoaSBVPj7CtmV> zO9fgCfY*wi*VnUyo8wyyeM?2J16*9i^FM{i1yC$6NWg1FH|sX?J1)x3eBW5v(e(U| zi)P)PwCnqp3dLekL%mbv0=U(hUfMEI+A;wEl?>)i-dA=sy^`^^{kh$0_{(V)kqRKX ztv)?pcjV3Ii>pn)^7jEk#N9i**S*Q4f{W`s)Etc>>7^OR`Dg_YLI@#*5JJc*`U{;W VPe$F^S!4hJ002ovPDHLkV1j?!LQ((# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop.png new file mode 100644 index 0000000000000000000000000000000000000000..a56c5b55152648560eca5e54dea3c279d4bd04ff GIT binary patch literal 674 zcmV;T0$u%yP)Px%TuDShR9J=Wl}|{MaTv!xt2c<@6sNtoNtbzX-ew08><~y0uE2|pAV|uSgm}q1 z#NJVtog~CV1gi+z*u_vn=;B4_59kP@c}THvuDt_aHp32k-8zhSb8~<6-SpDF@G|zk z&z{fc_xyN&gGT=M80ytXo(oF{zl+0msdQzX1vIe9C>Gq`-II?ba;8>zdcZbrGKzfs z?sXr0W-^MHjN+lm)J;Hxx2*n|1-Lv2@kCxC(c3h>*z9#zlh7ql3>U0Jv9l)b79G36cMamcQKqV z(E7;F3t{Kb@6^;D%hN%rW&thHaQ?E`A>?)Co{gzyfRZA`5%daNXqoc7?(({aB#F@c z8Wy?|2;UD6I201Mr8I3*m;Ku)61{FImiF$M0No$@G&O*SIy3`~wlH4A7_Z;yJuJ?N*y zneXXv21q~NC;dd_-o-4uS|8m<@u!s!8RhRTgIk|-_vHQw#N;yowo@R+E3Y1OPQWkw zGVcrv#CIa7t=Uz^Vqji7@7Yde;pcwb^eBlz+N!sMD`nxwieL6+9_}TsYUTAx)n+FNuPSiT@QMPb0f!3bz-ho6X`~T=e~5=KEPE<<3IG5A07*qo IM6N<$g7^_Y$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json index b22645ab43fefc..caec319e24721b 100644 --- a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json @@ -17,7 +17,28 @@ { "name": "big-lollipop-inhand-left", "directions": 4 + }, + { + "name": "cloth-lollipop" + }, + { + "name": "cloth-lollipop-inhand-right", + "directions": 4 + }, + { + "name": "cloth-lollipop-inhand-left", + "directions": 4 + }, + { + "name": "fruit-lollipop" + }, + { + "name": "fruit-lollipop-inhand-right", + "directions": 4 + }, + { + "name": "fruit-lollipop-inhand-left", + "directions": 4 } - ] } From 49c34212650cfb4271a7c5d818965b0a3ec9e333 Mon Sep 17 00:00:00 2001 From: ATDoop <1959416+ATDoop@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:10:44 -0500 Subject: [PATCH 2/6] lollipop expansion real --- .../Spawners/Random/Food_Drinks/food_meal.yml | 4 ++ .../Objects/Consumables/Food/meals.yml | 67 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 1 + .../meals.rsi/entro-lollipop-inhand-left.png | Bin 0 -> 578 bytes .../meals.rsi/entro-lollipop-inhand-right.png | Bin 0 -> 592 bytes .../Food/meals.rsi/entro-lollipop.png | Bin 0 -> 762 bytes .../meals.rsi/meat-lollipop-inhand-left.png | Bin 0 -> 536 bytes .../meals.rsi/meat-lollipop-inhand-right.png | Bin 0 -> 451 bytes .../Food/meals.rsi/meat-lollipop.png | Bin 0 -> 432 bytes .../Consumable/Food/meals.rsi/meta.json | 24 ++++++- 10 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml index ac22eb989a2dd4..89f4fe4c94b8f3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -72,6 +72,9 @@ - FoodMealCornInButter - FoodSoupStew - FoodMealBigLollipop #impstation edit + - FoodMealFruitLollipop #imp + - FoodMealClothLollipop #imp + - FoodMealMeatLollipop #imp chance: 0.8 offset: 0.0 #rare @@ -95,4 +98,5 @@ - FoodSoupEyeball - FoodSoupElectron - FoodNoodlesCopy + - FoodMealCultLollipop #imp rareChance: 0.05 diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index 6199d7c3248556..58e116c1390421 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -103,3 +103,70 @@ Quantity: 5 - ReagentId: JuiceWatermelon Quantity: 5 + +- type: entity + name: meat lollipop + parent: FoodMealBigLollipop + id: FoodMealMeatLollipop + description: It's still dripping... + components: + - type: Tag + tags: + - Meat + - FoodSnack + - type: Food + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - meaty + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: meat-lollipop + - type: Item + heldPrefix: meat-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + - ReagentId: Blood + Quantity: 5 + +- type: entity + name: entro-pop + parent: FoodMealBigLollipop + id: FoodMealCultLollipop + description: It seems to flicker in and out of view, your eyes never truly focusing on it. It's cosmically delicious! + components: + - type: Tag + tags: + - FoodSnack + - type: Food + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - strange + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: entro-lollipop + - type: Item + heldPrefix: entro-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + - ReagentId: MindbreakerToxin + Quantity: 10 diff --git a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml index 7b56e2d66db04c..9aec06221163ef 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml @@ -42,3 +42,4 @@ Sugar: 10 solids: FoodKebabSkewer: 1 + FoodMeat: 1 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a81fa84bdb12953a7ec4e4c28864fa5f275cdc5f GIT binary patch literal 578 zcmV-I0=@l-P)Px${7FPXRCt{2nLSHFVHC&zMuD^xXt@|&M7V>S(9kF}ij!@LbCWnlAE8P72;x|i z-LcPbCk+IV3vIqYixN282D>*gvwZG34_7?DNz`-nygc&Y4-f=F7v)0D)e$3viNy&P zQX#fE7rh&KYF{Ygnc}x&kegnp(G%ig8 zH(yh{NF)Hvr)rx9tgZuG*8|5;z|w$NvxnE*3|7+dr)dv{u(}Rn%^sp{XX6;FRgG|b zSGFTC8%%I!zt1NJ_=Tv%G?SS%RU^~R$UnRGVCcU#X*+o8*MAiBTTG)>jd0!t z*g6Y*Ut&HUt`NO@0f3douZ#KX{h{XezUg0THjPz@2^C)Pi*R3SRbagbEVI??ya}tO zA6B$(fFKBhAP9mW2!bH&7}R=8wD~qbt+_e0Ih!7**4$j$oYf9fX>Lw!PTl}&&CRXN z+5Qxz*4$j$ocuR{T61%2bMgkLsBxY7mSH&pDr#J3zD39zprXcg=39o%)v2g)o%z@a zqQ=+ZE)=;w(Z7X(2N1VIo4LD)q;0k@%!%jUyl QEC2ui07*qoM6N<$f`RD-egFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a55993876ad449daa2d11defb5d2dfcb45cbe962 GIT binary patch literal 592 zcmV-W0Px%3Q0skRCt{2nXyX4P!xv$gbL!K(5j1KD1{8&3J#8fV|0+ZS)84UllTPURO;d^ z85IZZ=rd$eK`15QR$Fjs5jw=7CRC_x+I#Mex1Mim+T8T~hjSCi2QUot8%KMUAn6*Y zn58Uo8SGRsTh_X3ak8X_EpTogg0x%jf7y^%piJUsF$WhcZf~Gn%E7TMv`aZGYCSlNA1-|+O1>$$yXXe zgxbNbk*(YXakE5Qpx5kR-TUZw2#6Nw$mPkt5jTqo0N3{?M)$cD?Gdl}9-Yv6@^Ra! z8j@=!=jyy<0OPa#I0)~MpBForKYauMEyITtv*lo_EY8hC0075lt~QUq-w3lzMKN0r zW}ykAFh~8U^Z1i8%Tq9N0vLv27=~dOhG7_ni4C<*(^1d;Kd803Dovjnf692MwYo}8 zFZ@c3TC1zp^g<1w*6K-UdXkr-)LLDorWd*gP;2!hG`&y*sI__$nqGJdP-}J7nqH^@ z)LK0WO;2(`YOSuFrVrhrkcu9H7Mgxoan#RinVMdT9Hk!DKRf=aM^ncCu^wj_hG7_n eVHk$_k9+|korc^h0=(J)0000Px%v`IukR9J=WmcMHgVHn3hZ%k^;6>CVFf;RLhLWN#I3Pl_`1lO2B>YTAS6(|1* zAxI}j=_I_1GA$01%(&jHYAD1veN)Oo>loum9gwJ&5b?jb^*|Cnot{p07X-6Koqp1Er}%- z(i7}tr?Cvv5w*XzX#?E2o#?O?DhbVs4$whfn~Hh9mSJKUCW@v4aQde;907`^;wQHZ zv+o(eUY=RKyZ}FGKk~%fc-OVS(&&Xk{ygrMVG>I#j=KSJvnng|8gGAADDCRbe5Tx> zwS5RU;d3e|R1(&vV&tAYWFbA_nO~fo1Yl)e^R6vH*{D<6)rr5-J!e7*NUc}d$y)p{ zz60=U;SRZ3)e-US;J_iwlp6rFwhu`G{$Pa?AVVOLDK{vgJL4d7aNO^~(0W0p+;HOV zCznYm%ki=TL~~=0SX$}3QIfko5Q&d?5`SO;?>@gAXul+vI6FSU-9y5LKr}b@I*j)s z4vIg7Z$@@vZk+o2Eze|X`w*5ENv&5q$RqI)aqIqF+ux7|_JI5m)!%OsO(uj{(LJ{- z8+B(a*CO!|adv!yS<%lsq6-5FkmUPoo5UtYMf<3QqNzlaqmB?+39f__uDA<-L%Og4 zKe<)^>lnRx&-vF20PEQU53x)-MN@5mDPAZC3i+a)m>UlwcV0S*rqXVj9D_K0G{vXa zFM>=B{vvYUJeo{+$bCjdbWEZ2{ApKPK_%QX1pb@1k6M0mw~IU8ffqqn0g_y1d%(^8 s7`V0fJoNwNOEj4Xy!kb*agAZ&A4N%E#(_|p)c^nh07*qoM6N<$f}%EC-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1e5713a2826197019d9ac2ffe73190a0293cc322 GIT binary patch literal 536 zcmV+z0_XjSP)Px$(n&-?RCt{2+P_Z1P!tC6Ph*@gaUq1o!RX*132w$WKnGVAncNv%To_nb9Ne8? z@dbc4AZ(h{!2v@Ii!qIf2~I9`I?d%z)s}m%l77F5+_vZTTn=s113*MX>9wL6+#mG= z02q6NaBTbJ?Atkq?N%V4HwwD|fb7;rQ};?!28wHSn*x0Dw(=0?OFG@Be!?^yasI(Zf)mv4L2OT+WFQh9cdD9 za>^<X=FxcvHlE{1D2H|;1dvg;FA5S#sS zhHThj?LGT*y?8&F1TOS-njE!g7hhDp8E=}Z$y(KG_GkE(pD))t{vu{_RMLV!b6@cN zy}4z__8In_d>583+j?Y0g+$MWbJI@fsWUX_m(1n4B3fMeKIrs%P6mOTkGGCK_cr9b zouw)DEOSvw^5(-IzY3(AZ+FaT2>tGE%X;N{(5@4gT^OIfSGn@2aemdBtc&$(QExA( zKRoX{L5r_aw18DW5CXRLo|w43WX(I{W$$zHgZ!<+zRO;YwhgcfyYKFkU#p=dyZU$E z%e86_U;+Iy9X+5x*Gt!8#+L_wb-Y|_F7h(sZn=;CCx@32wmW9rD=qu6ezRwMbMaTX pw#8;O`o7}tA9E=vfk4*c{8ij)-<1CQTm!}mgQu&X%Q~loCIAV%!L0xQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop.png new file mode 100644 index 0000000000000000000000000000000000000000..b77db7523f9d880686424655dcb520be75ac58ae GIT binary patch literal 432 zcmV;h0Z;ykP)Px$YDq*vR9J=Wm8(tzK@^7n1zI%OG&s`q0U(vY8)phyP_V| zjDutmh?0h^AaS%HlGIch|-sf&*}oy95ywfREf3#8yZEgsa?y zcLgYWmHhPS9sn@u4wQ3MRq(EWeAHBO5~+B3eq0+1YJsWrx&RkwD#t7B0hvj6u#)HJ zSI+ai_W)fmK9U8RXr(=zUEWqd1+G`DEH@E+5zWRUVXFekb=d>Jc8Hu8OziH**gHAG zJbMV10|70d$7h*O(diGPMw+aNspmF1;Msz*oW`@bEgETpubT`MkWK6jFPPv36Lbn> zvbZheuMbWw&}B{}A8*0gS|{4%RWUC3({e!50_wM~JY)|j7ygaR31tOZ2gi}_RjaA_ ab9@7#ug1Z}HdWsM0000 Date: Fri, 20 Dec 2024 13:18:53 -0500 Subject: [PATCH 3/6] i hope i didnt forget anything --- .../_Impstation/Entities/Objects/Consumables/Food/meals.yml | 2 +- .../Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index 58e116c1390421..9e94ce98876024 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -141,7 +141,7 @@ - type: entity name: entro-pop parent: FoodMealBigLollipop - id: FoodMealCultLollipop + id: FoodMealCultLollipop #no recipe yet but it is a rare spawn from meal spawners description: It seems to flicker in and out of view, your eyes never truly focusing on it. It's cosmically delicious! components: - type: Tag diff --git a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml index 9aec06221163ef..725d121a1e0ee6 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml @@ -26,7 +26,7 @@ time: 5 reagents: Sugar: 10 - Ice: 5 + Ice: 5 #i don't KNOW!!! JuiceOrange: 5 JuiceApple: 5 JuiceWatermelon: 5 From f56b9aef3d2c612f00d32aa08de703df1abd7193 Mon Sep 17 00:00:00 2001 From: ATDoop <1959416+ATDoop@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:21:03 -0500 Subject: [PATCH 4/6] i did forget something. --- .../_Impstation/Entities/Objects/Consumables/Food/meals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index 9e94ce98876024..2afb69f88f9b3a 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -76,6 +76,7 @@ - type: Tag tags: - FoodSnack + - Fruit - type: Food trash: - FoodKebabSkewer From 38a569019df449ea034d4baafad3a93f0fe88418 Mon Sep 17 00:00:00 2001 From: ATDoop <1959416+ATDoop@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:25:49 -0500 Subject: [PATCH 5/6] entropop has frezon in it now --- .../_Impstation/Entities/Objects/Consumables/Food/meals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index 2afb69f88f9b3a..a980c096975283 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -169,5 +169,5 @@ Quantity: 5 - ReagentId: Sugar Quantity: 10 - - ReagentId: MindbreakerToxin + - ReagentId: Frezon Quantity: 10 From ff2be1e5d9273cc96d85018f5934641291f5cafc Mon Sep 17 00:00:00 2001 From: ATDoop <1959416+ATDoop@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:02:58 -0500 Subject: [PATCH 6/6] it have fresium now --- .../_Impstation/Entities/Objects/Consumables/Food/meals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index a980c096975283..ce08998531a27e 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -169,5 +169,5 @@ Quantity: 5 - ReagentId: Sugar Quantity: 10 - - ReagentId: Frezon + - ReagentId: Fresium Quantity: 10