From af9bcf50d935a73589ae5b597e90869a00932807 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 27 Dec 2024 01:02:46 +0200 Subject: [PATCH] Keg = cask --- .../Objects/Consumable/Drinks/drinks_keg.yml | 15 ++++++++++----- .../Consumable/Drinks/keg_steel.rsi/icon.png | Bin 1044 -> 808 bytes .../Drinks/keg_steel.rsi/icon_open.png | Bin 808 -> 0 bytes .../Consumable/Drinks/keg_steel.rsi/meta.json | 2 +- .../Drinks/keg_steel.rsi/stopper.png | Bin 0 -> 603 bytes .../Consumable/Drinks/keg_wood.rsi/icon.png | Bin 1139 -> 834 bytes .../Drinks/keg_wood.rsi/icon_open.png | Bin 834 -> 0 bytes .../Consumable/Drinks/keg_wood.rsi/meta.json | 2 +- .../Consumable/Drinks/keg_wood.rsi/stopper.png | Bin 0 -> 603 bytes 9 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon_open.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/stopper.png delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon_open.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/stopper.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml index b65374da65b..65054b438f6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml @@ -1,20 +1,25 @@ - type: entity parent: BaseItem id: DrinkKegBase - name: keg + name: cask abstract: true - description: I don't have a drinking problem - the keg solved it. + description: I don't have a drinking problem, the cask solved it. components: - type: Sprite sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi state: icon + scale: 0.8, 0.8 layers: - state: icon + - state: stopper + visible: true map: ["enum.OpenableVisuals.Layer"] - state: paper map: ["enum.PaperLabelVisuals.Layer"] - type: Item - size: Huge + size: Large + shape: + - 0,0,2,2 - type: Clothing sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi quickEquip: false @@ -48,8 +53,8 @@ visuals: enum.OpenableVisuals.Opened: enum.OpenableVisuals.Layer: - True: { state: "icon_open" } - False: { state: "icon" } + True: { visible: false } + False: { visible: true } enum.PaperLabelVisuals.HasLabel: enum.PaperLabelVisuals.Layer: True: { visible: true } diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon.png index aa1db87fd2e47752ef20fdc6ea2df5bcc5d31c9c..aa4a2fa7c1bc329009198f3adcb1eb78ad674e5e 100644 GIT binary patch delta 796 zcmV+%1LORZ2&e{-8Gi!+002a!ipBr{0fK2mLr_UWLm*IcZ)Rz1WdHyu&y|r)C`3^l z#eW8oMiXWsS-i!tqJ(6rAySlPMj0%;_r?r0@6Ghy$i`CHDhnSQUke*+widQZDIX!zEZ zjE^R$I6iKvQtM5(%Hn^cF}3KLP^AeEnR%xmydXTVTF5Kj5e}P6dP?|IxXY0X3g0W; zDDsQqjL!j;8Fmt}Vd1c_mMLSSjLjv-67Cm{q%2$V12aWVDPB`-Wmn9fd#V=(7wze| z(q*Dh!I_zvhK7cqprCkoc%q`BbaZr^ zo12A&g^i7kmX?;Wv9X<k1Xk)WNf<|1510e`d=T3`GiTtnC$=g?G#&V&_P^DN|?1|eEpH)b1q!DBK14k9h36Ot$1U!jtY0*stF z1n3|^JEvoZWe~7}3xK$`3hx4HGV3}DFnsH|lp^^{*k2SJkFb1vQ9B4KJXQ|FCw@TK awiO4!2}z_!IH!jI0000z@WrT zJ&|6_z;k@v!^hXVD9`df_vh$W@+Jd(BJmv44U2e#cxKbmIqwsPSV>Zd&xywkx*+i* z*JYRAI2RojcxK4Rq~?i3#A307gLnWRjjwq@|`9juZh4U6?wNhiPd-4|s^4dz8 z>oi9Y#}X1qLVtve8p^1^LX=jG6cZ`hk9qiq9e5bWxZDB4 zPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4S#TO2#gged)?#Ry`8=Nd#2Uj z4`~r{qf=Ik{{R3024YJ`L;#uqfB;Kk&IeWi000SaNLh0L04^f{04^f|c%?sf00007 zbV*G`2j>hK2q7{2CNS>+000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-} z0005(Nq?JTS&! z7{<%})oK-!$s{!s-&q+*PX0)qJfoDp-CLB5%W>c(hOJEqr)9E{%4geqwL)fYEVU;xRL`+3YvCq7?rOEz61rg8=~Ga5y|VJr(tOU6cp_=JWYmA7n~Q z$bShTB5)Q6A>f=t*L66KQ@jM%>lNK@7q07q5P~2GatWx_YT%qh(=?pV=i&mQD8hET zg|6#T-LlbW003Oq{oI6?%LR_(fDj@AXW@7}f^&Y?DGLekeIKf-f^!Z+NbU>-K>*G< zeBT#FEF_@SYJpM;RaHe`88F6Rnr3RVQhzdTwYcB!L(?<>z-qP1Mci(;#pgI4k5gN* zk|&*U9D@)d0_XL>dcFSKgkcy80WuzlqA0Wex$lDH?%(hCnL?r{lJbd?W4eh=(|qc5 zudv(g?oLf9#YgkNtBL4QOmbb{lFCd(|2`9zC{f}EsVN3I+B-r$00000NkvXXt^-0~ Eg3DysbpQYW diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon_open.png deleted file mode 100644 index aa4a2fa7c1bc329009198f3adcb1eb78ad674e5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmV+@1K0eCP)4Tx04UFukxeK>Q5?m829ZV+W+7R;#jv7;WT_!ilx9X5EWG!|3^nh~^xnwE zQrRjC9~)l_8*8=}wn`}q`u$C!fqm0cZ#}e)rj-)JG@&hwP zPAOhfY-Lx>pL?no1{dw=xYA{|GsZZROrc@0!ZKM3bjxas;u4enXa#?p@1GKvA+BXi zag30|LihcsKlt6Po9^o^CIzEV`{a3V9Z~iF zJzwG7_2s?&dB*RL=r?H*a--4%EhYc}07y_wR7FTgNUpA~rlzKqm6g-e)4{>PnVFe} zhK8V^pm=zAqN1X7bab1Wn}vmijg5_#mX@)xv7Mcrii(P|va)k?b7p2{fq{Vl004g8 z6#f7J02p*qPE-H?|NsC0|NsC0|NsC0|NsC0|NsC0{{YPsF6saP010qNS#tmYE+PN` zE+PS{;@y$}007iUL_t(IPt}skvcez`M0to2all+c^8bHo2ZzysRd=grLxw)7=>=;0 zhp!V9!(-(&AkbPHW2}95h2l=Cd)oCYCUTsLMLd%EX>4Tx04UFukxeK>Q5?m829ZV+W+7R;#jv7;WT_!ilx9X5EWG!|3^nh~^xnwE zQrRjC9~)l_8*8=}wn`}q`u$C!fqm0cZ#}e)rj-)JG@&hwP zPAOhfY-Lx>pL?no1{dw=xYA{|GsZZROrc@0!ZKM3bjxas;u4enXa#?p@1GKvA+BXi zag30|LihcsKlt6Po9^o^CIzEV`{a3V9Z~iF zJzwG7_2s?&dB*RL=r?H*a--SxIZXfn010qNS#tmYE+PN`E+PS{;@y$}000JJOGiWi zngD_yUW#%3L004jsX#g~n3JcPX<9h%A002ovPDHLkV1giW`KkZ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon.png index 1feb2f18d3ebd8b2e3b7241d3cded03d1bb11539..26bdf5d55156292fbdc700e1db62d5add2d67e70 100644 GIT binary patch delta 822 zcmV-61IhgJ2*L)C8Gi!+002a!ipBr{0fK2mLr_UWLm*IcZ)Rz1WdHyu&y|r)C`3^l z#eW8oMiXWsS-i!tqJ(6rAySlPMj0%;_r?r0@6Ghy$i`CHDhnSQUke*+widQZDIX!zEZ zjE^R$I6iKvQtM5(%Hn^cF}3KLP^AeEnR%xmydXTVTF5Kj5e}P6dP?|IxXY0X3g0W; zDDsQqjL!j;8Fmt}Vd1c_mMLSSjLjv-67Cm{q%2$V12aWVDPB`-Wmn9fd#V=(7wze| z(q*{EC5d>07fAISSbK1Dk=Z~0BjFYAOHXW8gx=l zQ~&?}|9}7g|NsC0|NsC0|NsC0|NsC0|Ns906e0lH00009a7bBm001r`001r`0jlEN zk^lez=1D|BR5(x7lF^cbAPhx;)U_!#0aBj2c@AY)ok*YVJS6D%h|MrZ*cuC>B0JoEoi)^&aMf|OuZ zV=oDzRy+v#M2W)^hL0yIBSAs8g}2Qo{(-Pz@WrT zJ&|6_z;k@v!^hXVD9`df_vh$W@+Jd(BJmv44U2e#cxKbmIqwsPSV>Zd&xywkx*+i* z*JYRAI2RojcxK4Rq~?i3#A307gLnWRjjwq@|`9juZh4U6?wNhiPd-4|s^4dz8 z>oi9Y#}X1qLVtve8p^1^LX=jG6cZ`hk9qiq9e5bWxZDB4 zPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4S#TO2#gged)?#Ry`8=Nd#2Uj z4`~r{qf=Ik{{R3024YJ`L;#uqfB;Kk&IeWi000SaNLh0L04^f{04^f|c%?sf00007 zbV*G`2j>hK2oE%eOU+CG000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-} z0006@Nq(%san(}D4{}Dpd>i2)_E}8I*y_7BObcsNLRksKKK4l?)lxD12dc1 z8QWag2|0zK*Z0pxxHS`DMW5Vp-dh8w-?T>EVSkul5<$dYEja=QCYZ;Q{U2R-4TpX~ z%mopz{1M|$&n>R3yv8(5+FPrq&Oa}~hacWM5%b#t`a4*lT zUpfF%9ISq@vu*pPldvb}Y3}P21Mp-ZYwE<83#5~fmc+tAT3Qm~-G>EkAL`RH(CI;H zyTs!26PVVuKs#{hnehL)rqPND;ZYxIYkwM249ukh0II5v7_d12s8*|}s!Dxb!y3SG zpJ))?y$Gp%W1yzwMK7YseK9LwDJTET%H;}s6l^v`ozT7~ z$T!=&%IinSj?)vlx$bM<)%eu?sOLQ6RLL@-jfoF8Y?!8*ytwDA>T#iW;(beWqCYVk zyZULy1?QxOpP661N}Nsn?aLjPQnwi&vzY9&Fmb~nqe!lj(^=h*geL#ZV6C71e!kFj z#dWDZg*_7vJAMDV!v4qIwX@&7)>UI&9Ps-|Wxi~{cGmdW^S)QUsEl_H_{$+)c5=RT z!@=^4=H5{$@=mV{$|5iI$hj+g|-TSxl*!%t$=9z*;i!U+jssSU#FTf|n)li(F+?=7vlp)Q4 zVS+P5iycFzAw!HdL#{DHb#-;V3B#mGlY-P3vJ4rbwHV^!;%seg6LcBU4H&YG7~*so z{8bs;6d58k8ML&tfJWx<2Pyz5sgfYS;QzP)gNPEtEubpS0*}aI1_nJP5N2HU=I zx^JX8*K9p!*|7NXyECa0`;N&w$kg6pDK6A|er(0%rd@oh`G>x$JlN2`;aivb!)Ke7 zJc3^rzG5lfFKoEz`waa>E2T;~T_#FRR46%gW7lzqz{B-F&EY#MouBGhgxV?4zS@nO78*=r3_4zyG?U@t~^f7~{tDnm{ Hr-UW|#!_jL diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json index a1bd68a8f45..63de9c888a2 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "icon_open" + "name": "stopper" }, { "name": "equipped-BACKPACK", diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/stopper.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/stopper.png new file mode 100644 index 0000000000000000000000000000000000000000..7e72ee5650f2975966b75d3644e92f92f43f4f6d GIT binary patch literal 603 zcmV-h0;K(kP)EX>4Tx04UFukxeK>Q5?m829ZV+W+7R;#jv7;WT_!ilx9X5EWG!|3^nh~^xnwE zQrRjC9~)l_8*8=}wn`}q`u$C!fqm0cZ#}e)rj-)JG@&hwP zPAOhfY-Lx>pL?no1{dw=xYA{|GsZZROrc@0!ZKM3bjxas;u4enXa#?p@1GKvA+BXi zag30|LihcsKlt6Po9^o^CIzEV`{a3V9Z~iF zJzwG7_2s?&dB*RL=r?H*a--SxIZXfn010qNS#tmYE+PN`E+PS{;@y$}000JJOGiWi zngD_yUW#%3L004jsX#g~n3JcPX<9h%A002ovPDHLkV1giW`KkZ_ literal 0 HcmV?d00001