From 77036e8cdde1878d396a24ac45c74a81d2787a01 Mon Sep 17 00:00:00 2001 From: korczoczek Date: Sat, 20 Dec 2025 19:21:49 +0100 Subject: [PATCH] Added sprites for openable ingredients (#41923) * dont you hate it when you open your bag, but it stays closed? * linting my yml --- .../Objects/Consumable/Food/ingredients.yml | 78 +++++++++++++++--- .../ingredients.rsi/cornmeal-big_open.png | Bin 0 -> 346 bytes .../Food/ingredients.rsi/flour-big_open.png | Bin 0 -> 550 bytes .../Food/ingredients.rsi/mayo_open.png | Bin 0 -> 369 bytes .../Consumable/Food/ingredients.rsi/meta.json | 20 ++++- .../Food/ingredients.rsi/oliveoil_open.png | Bin 0 -> 415 bytes .../Food/ingredients.rsi/rice-big.png | Bin 272 -> 476 bytes .../Food/ingredients.rsi/rice-big_open.png | Bin 0 -> 479 bytes .../Food/ingredients.rsi/sugar-big.png | Bin 298 -> 499 bytes .../Food/ingredients.rsi/sugar-big_open.png | Bin 0 -> 496 bytes 10 files changed, 85 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 28dfe41ba8..d9a06b89ef 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -84,8 +84,17 @@ name: flour bag description: A big bag of flour. Good for baking! components: - - type: Sprite - state: flour-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "flour-big_open"} # open + False: {state: "flour-big"} # closed + - type: Sprite + layers: + - state: flour-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -116,8 +125,17 @@ name: cornmeal bag description: A big bag of cornmeal. Good for cooking! components: - - type: Sprite - state: cornmeal-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "cornmeal-big_open"} # open + False: {state: "cornmeal-big"} # closed + - type: Sprite + layers: + - state: cornmeal-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -147,8 +165,17 @@ name: rice bag description: A big bag of rice. Good for cooking! components: - - type: Sprite - state: rice-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "rice-big_open"} # open + False: {state: "rice-big"} # closed + - type: Sprite + layers: + - state: rice-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -178,8 +205,17 @@ name: sugar bag description: A big bag of tasty spacey sugar. components: - - type: Sprite - state: sugar-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "sugar-big_open"} # open + False: {state: "sugar-big"} # closed + - type: Sprite + layers: + - state: sugar-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -211,8 +247,17 @@ name: olive oil description: Olive oil. From space olives presumably. components: - - type: Sprite - state: oliveoil + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "oliveoil_open"} # open + False: {state: "oliveoil"} # closed + - type: Sprite + layers: + - state: oliveoil + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -229,8 +274,17 @@ name: mayonnaise description: Bottle of mayonnaise. components: - - type: Sprite - state: mayo + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "mayo_open"} # open + False: {state: "mayo"} # closed + - type: Sprite + layers: + - state: mayo + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png new file mode 100644 index 0000000000000000000000000000000000000000..411d9e9ede04f0b0c218a611b237bf604f3a5e0d GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvVv45dj$D1FjT2AFf_Cmg87JO~n+-pz_H|J)& zuYc6INLV1KVVVDa@}K1VuDo^BkFVkD-ROL_uGC#W5w` z4NO{&`;^2QDo-vuQh0Ei?Q+Ids;mFrW036Ia>?fC&Eoj97dQRwr5dL3DGTis`Ml}z dwI8pe0@?kEP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk3=|6}I|mnKOaK4@ zd`Uz>R9M69l|4(tP#A@ul)IV>1ye!jAh@-Ii=z;5bn6gG=`WBDrA|d0($Y;Fq`yF< zWN>pYIJ$^mg9r` zoj587^`#MBvxIi?s;bR)HX#g#&zCyf+-sJyvmod-K&#!Sw^zjmde^AhYWL^UKx7+4 zthsj`wQjZhYCl|4wc!5YL-}7UTR%1p*3>iL|LLMMkE=kWQL%PbJ%B-XE7GCe!3ECw ovz8ixFp=L7wRw&lIdTAe0j&zCNAT`;I{*Lx07*qoM6N<$f)r8U5&!@I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe6bb408e1f5f47e39e71e846a6687794209b74 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ zvY3H^TNs2H8D`Cq01C2~c>21szvL0&;bSQ1l{^U)I_~M>7!q;#?NmcPCPe{Pd+GiS z8@~z^u>GDY_IRgG@0OO{rRfdb5?S6ioqWyMxEoV9w@vq9Y&kPu@)M)hR4=x^1$N)^ zHorKzpr(K+JM3B#c?W>YqbUyQHEd8VIr5SIqlhduIgGYJ6dW~1ik6X+< z>y|Lg&Rw!PUjL51)b+Tw^HPR;85nN7GfRl&UMw4N-EOa=^@+M=`wwJwehgQu&X%Q~lo FCIAr4ec=EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index e076f72f17..9d16a6bcd6 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill 2024. Cheese wedge inhand by Orsoniks.", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill 2024. Cheese wedge inhand by Orsoniks. Opened variants of olive oil, mayo and cornmeal, flour, rice and sugar bags by korczoczek, based on the unopened sprites", "size": { "x": 32, "y": 32 @@ -42,6 +42,9 @@ { "name": "cornmeal-big" }, + { + "name": "cornmeal-big_open" + }, { "name": "cornmealdough" }, @@ -84,21 +87,33 @@ { "name": "flour-big" }, + { + "name": "flour-big_open" + }, { "name": "flour-small" }, { "name": "mayo" }, + { + "name": "mayo_open" + }, { "name": "oliveoil" }, + { + "name": "oliveoil_open" + }, { "name": "pizzabread" }, { "name": "rice-big" }, + { + "name": "rice-big_open" + }, { "name": "rice-small" }, @@ -114,6 +129,9 @@ { "name": "sugar-big" }, + { + "name": "sugar-big_open" + }, { "name": "sugar-small" }, diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png new file mode 100644 index 0000000000000000000000000000000000000000..d833c0bc85a1c359b3da8162e8a9bf39c0af05c5 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ zvY3H^TNs2H8D`Cq01C2~c>21szvL0&;gQ;Zv&j%B^wrbFF(l$}a)Jcw;slN61qDz4 zJ3c)1U(>L;Rp{)VL*<&^SS~xXD=F`kdc0ZUU-oO~8{zs!20C-x=0!5gG5I|Cb?@+D z=5yDtwRc=R%Q*kOmawYZW|Ir1lOO)S+Pxy_)-N8O)R#+UyN8+WshZfxXvrl31Z8h- zIPNbx5MVT~vGJkm;m6Od1CEFp=`4wNTyi4k>;jEs-skfxO569b2KxMS5~(^dttG`; zLH*t=MYVcGXTLqBu6zpGymRXJO;EhNd*;DI9;~iCd3-004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF;5&6bm0SnafQ|0003pNklWyv5PwD=9>*qhLZAz%Koz(G zy1-SC*i{@|P>3o}0D%)iXh06c|M`a1jU8DpSw;wbpH`~{B9X{{Ckg(dYTfCa&x?57 zr%-X7DRiNrpCX`({jxryhX3{2uX%pnFMJFCO) z>6Q1R!Q2zB6Mxa#VHp5)rm$}V`AfQ(0I=ggZc}eaC=QYu*zA607T@yI*q>woeDU$x z-M;9RKbER>(yJJD4Gq|Q0N~nRa35+HA3~}mFIVGSIMk0~OH(+O&WbXsd-T(jq07*qoM6N<$g0$zhW&i*H delta 244 zcmVnIan=O*nDf;hSseY|*HCa@E&w9BuI7wLvw%9dBn>Kn54y%?PKtQ50-E48 zqH{TZ>!mjXc=2B@VKyAI29nXCwlC{9phLBZA zghP()I07eNC;cI2q{TJk2%H6V`ZreW3N1DfHkiAh3-%+I7D#>2{Gk)L8W=p~7`W06 u-&XWw1}uk>t#<HBqc)I`$+00000NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ zvY3H^TNs2H8D`Cq01C2~c>21szvL0&*3fA=@}L`NpQ)#dV@Sl|x1rW~M-)V4)~xlN znZ~{C0n2-Zovp=Ovz~~&KK+DcPD7LKr5#ZZxhEW|j}BzGJyFTk>8%E zvagum?XofbJ9ox{zcp_1j$4>FJ!yZo!y_^!YP;a1r1~8V_x_oljN*u8O}f3QV_W>= z{{93G`P^a!Z@$aBVsGwPqI1c#VfyhkjPvd;5L6JlaO&5EybkV#^A45e=Y4pe6zI?W z(59yO>eai8>yo>x&c!ZRvpoEw>b(z!+`I1W^Sb&ZgTe~DWM4fDnYzL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png index fc467656befb08f17c769fd5cad380c737952492..fe544e3a1f7aa359bfe68a9a9589e9c58dd9a894 100644 GIT binary patch delta 473 zcmV;~0Ve*c0`miqB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF;5&6bm2%kjrOG0003=Nklb{m41b3IS9Q)k7?CPv+Izbr{F->78ks#QpVS05$y~1j;$nk(@Jy5Xf39s{d&dZeL$f zN9`3C!uIua?|?KF??}x@#pylui^`>CuOB7 P00000NkvXXu0mjfvI4<| delta 271 zcmV+q0r39w1F8a$B!BTqL_t(oh3%E$34|~Vg`dYQB-}2#iH=}5x$bh%1>B`a#2mF$ zlBoB~eo!J>n%9@KqEe~cp2ljxG)+;OGmfKqU3GFA1jnxHBE!!bk*AWUiAo}Pu4dh* zMZ_=+==*;2&N;V;9V*`Fm};sHdPs0Ua8I{=iAUH(l| zhC@Ao3!73b0XJK^dkv)~JtP1-c3*|+sL=h6mnR0ziGF V>EL(Kg#Z8m00>D%PDHLkV1hONSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ zvY3H^TNs2H8D`Cq01C2~c>21szvL0&){ye9D-{CT=jQ3+7!q;#ZJ2Lfn}R@XUEx{V zw9HE_y4xSftoy=IG`Wg<`h*%z>lT^-udCN386fc=4^Ss`r#?5egQ-aL#H^uTxc?^yn zuw-Wt5R^z(P%1cgP-3?pYrO0JR>Nf$zqHsoUMzL0yOQ(ip1jP;h4!}_J^ufjv{%`Q z!{@SyUUEZ6LeI~;B1c{<{cW~GE)k5xXj_J`2b-KRgU$>#L!V{1!n_$~)@k*>y4zU=lyjenY3RZHcy4^;QR z2oZU7ZQq`!R?nNRS+xi>6~A*|z4ct)