From d36a58dd2e9c99674945fa4331f7ac24da50527b Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Sun, 11 Sep 2022 23:53:48 -0400 Subject: [PATCH] Add visualizer to hot coffee and tea (#11211) --- .../Objects/Consumable/Drinks/drinks_cups.yml | 17 +++++++++++- .../Drinks/hot_coffee.rsi/icon-0.png | Bin 0 -> 318 bytes .../Drinks/hot_coffee.rsi/icon-1.png | Bin 0 -> 149 bytes .../Drinks/hot_coffee.rsi/icon-2.png | Bin 0 -> 158 bytes .../Drinks/hot_coffee.rsi/icon-3.png | Bin 0 -> 160 bytes .../Drinks/hot_coffee.rsi/icon-4.png | Bin 0 -> 164 bytes .../Consumable/Drinks/hot_coffee.rsi/icon.png | Bin 307 -> 0 bytes .../Drinks/hot_coffee.rsi/meta.json | 26 +++++++++++++++++- .../Consumable/Drinks/teacup.rsi/icon-1.png | Bin 1569 -> 149 bytes .../Consumable/Drinks/teacup.rsi/icon-2.png | Bin 0 -> 158 bytes .../Consumable/Drinks/teacup.rsi/icon-3.png | Bin 0 -> 161 bytes .../Consumable/Drinks/teacup.rsi/icon-4.png | Bin 0 -> 164 bytes .../Consumable/Drinks/teacup.rsi/meta.json | 9 ++++++ 13 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 6ddcfee053..866c45ef86 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -176,6 +176,14 @@ maxVol: 20 - type: Sprite sprite: Objects/Consumable/Drinks/hot_coffee.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- - type: TrashOnEmpty solution: drink @@ -194,7 +202,14 @@ maxVol: 20 - type: Sprite sprite: Objects/Consumable/Drinks/teacup.rsi - state: icon-1 + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- - type: TrashOnEmpty solution: drink diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a5ef967aa5a6572b56ac10e7db2ca8e7afe73c GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AKx2$B+p3WC_;A2_ijBg8UK-O*|jGTej+j2&U{@&|twVJ)djF|JRpg+rG=kO?u0rrr|5X5P9zGAJH63>Fqi! z%r_MbzXT|XO?bi}@L*yYb2JaLf|&;oi$kBnRYeu+2TvC-4iIBHaKzyv!=d+iXH{WSGuHK6WyWRQ?x$ZYd||7+v1>p<@@c)I$ztaD0e F0s!wKYpehO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c97ead8da8530a03451da7a9f4928c5ca14f244b GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+hZGf85DR}Hm3YvsOYqxLG@7H pJ1&NO*I!OG-Q?b{!*C#bm08Ds7N(o54!S^H44$rjF6*2UngDw2Dlq^6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..18ff175dadad15aa8176531790f36105fe7fa7c1 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd z=QDd28$(U{ly#>wcTb(`|Lw3&EF(jmup#5Oh1|dXJ+rd|YG?3t^>bP0l+XkK7|t%k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png new file mode 100644 index 0000000000000000000000000000000000000000..a60b6edb6dbf9af1e7887fdadd418099f0f307d3 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+jELS3<^BV8$SMbKYWBo<3NLl zPj*>0!-4FzMbZAD>bjw}MWtK%cGU7Qd}!=o6wBdYE=qbV4K#qk)78&qol`;+092VR AYXATM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png new file mode 100644 index 0000000000000000000000000000000000000000..52a03df50852262789b681a9fc36bd6d54defc2b GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3xtJ#Y{^{GV9Uu9D+IS|L&FJJ|*=?K=3FI+&y85}Sb4q9e E0B=w+d;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon.png deleted file mode 100644 index cc4cdaddf0b6331854c6c7333f82c8eb97345b0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmV-30nGl1P)8`kua3R+)bC5ltp8lTy(0llOKbR!K@#K-Tf9jm~&@<#ZF8R5<0Myg+Y)@ zXaO%KeYSg(UVq8^q@pZKnoO(F+Y=xG5+DJ9cFZ9qjsN*=ofdxvP}2B3E9hL_0I*t& z0pnv4K>#IPop2B;1yV>1>Yady@bbJxSRjgfdoi^1W15$WDS9^O);GKh5G;i002ovPDHLk FV1kMLfx!R( diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json index db0ac608ed..6dfbe5d8c0 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json @@ -1 +1,25 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [{ + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "icon-4" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png index 0e11389341992c12be555719cf48c0830b8b1522..df42a8ec1a47fb177eeeeb876be6e1f077a1c3ca 100644 GIT binary patch delta 121 zcmZ3;GnH|IauEY#age(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq z{1qucK`l=g$B+p3x5qZ}GAQt{Y)tvTP|;~WgX*EYcU%lV;+9{(c0$f}6T<=TRc84I WS(tv!Irssni^0>?&t;ucLK6Vuh$$NY delta 1553 zcmV+s2JZQl0ig_#BYy*7dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=HYlH4c^ zhW~Sl905rP#Bsnt)!rb--xo}~KW26}GfAatQ)9XfmSsuk;mh^!e+~By7v*R!XtJ1N z^teI}nF|``&+Dwohjm{U?^k$!lDq2#LnNr>e2jhT7s&PgL4OKcUZ3SI9ovp=L*$=a z%k(_kZ3npx37>M>&o1u|N_^F2L z#%MN1KYLd~bbm-!+?~30WwoGKkxp5kMU-h&(N3#m6!XO&pw`gU>U_mRCPu~w1!`1i zP+#>y2SNkXUmhJG3GEQ@^WX^(ROkIvSWy?920;eSu*ecL35LB*GL)98U-i~fd)m`krEXFUqGq|$xTh7&M0GUcw+4!pI} zLw~e_U4*;Cdp)d?cEfp)tG6L_20ND{BdnT1=YdoIqjvg(io2$UJy&zpq7T95BeSLe00D(*LqkwWLqi~Na({1TX>4Tx0C=2zkv&MmKpe$iQ>7{`4i*t{ z$WWauh)U@wRV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5OiM?lG&4Dg7=b4)iZ;tk@+rloVRE_e5tjh}LEzWAC##;B}FZAcNl{D9Bjv)r@A9egma(~I>Dua<@0ad7w96$IU{O;B)%uKsU{ut2vV%s0% zfNvLQ)@}Ry*tVM|fcF`=(%SxN1BiZ-UT@*Z%x1B^WBk|8;gm!?oC z0Pkn?O*vrb78qD_du#3E^a03FSIalR!67hFr0n%B@9yjD?cX!4{(b-mT7Pom)n!bU z00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|UfG zIR?vF5@G-V0I*3!K~z}7?bI;}Lm>3<6OAf_fR*Ed#eYKp0uX=z1h5=%J+p|JYcH?0R?`8@Tp#yax3=xCItm#E zIOnkK&u-0oj~Jt3=K3k()D<}AT5PQa0F+WtN}2x#a?UWuv^f#AIHiP<)1LwmkpfT; z1T!}n5h<!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd y=QDd28^edCfxGmUzjZ6KyUoA3gq5LA$dGZXH1{vbzKn-J?F^o-elF{r5}E+^5G^GD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png new file mode 100644 index 0000000000000000000000000000000000000000..33c8d61792d0a601f55464ebe107f13f5c6d4540 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pqZzOV@QPi+jE*i3<^BV2R{9GFFtdnfr+Oh zcJdAthKB22&nDhVojXPE^|sZ_hpQf?$uRtIaAAJ@kb_y+TKgl=1O`u6KbLh*2~7a_ CR51wv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png new file mode 100644 index 0000000000000000000000000000000000000000..b00f04faeaa028b0416e75d73234aa8aaa43344a GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3-w$ohQ9Z6aDcN)N7rp&f?mhKDZ9J3Be9rT*JbV8A2$09%>FVdQ&MBb@ E0BrLy+5i9m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json index 80ac521b6f..6e813512e7 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json @@ -12,6 +12,15 @@ }, { "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "icon-4" } ] } \ No newline at end of file