From 0023e906f4b7dec7cfc2b14f79b042dd90164888 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sun, 19 May 2024 20:05:35 +0300 Subject: [PATCH 01/12] Drinks cartons return --- .../VendingMachines/Inventories/boozeomat.yml | 12 +- .../Consumable/Drinks/drinks-cartons.yml | 170 +++++++++++++++++- .../Drinks/ananasjuice.rsi/icon.png | Bin 0 -> 670 bytes .../Drinks/ananasjuice.rsi/icon_open.png | Bin 0 -> 690 bytes .../Drinks/ananasjuice.rsi/meta.json | 17 ++ .../Consumable/Drinks/applejuice.rsi/icon.png | Bin 0 -> 638 bytes .../Drinks/applejuice.rsi/icon_open.png | Bin 0 -> 648 bytes .../Drinks/applejuice.rsi/meta.json | 17 ++ .../Drinks/bananajuice.rsi/icon.png | Bin 0 -> 655 bytes .../Drinks/bananajuice.rsi/icon_open.png | Bin 0 -> 664 bytes .../Drinks/bananajuice.rsi/meta.json | 17 ++ .../Drinks/berryjuicecarton.rsi/icon.png | Bin 0 -> 591 bytes .../Drinks/berryjuicecarton.rsi/icon_open.png | Bin 0 -> 586 bytes .../Drinks/berryjuicecarton.rsi/meta.json | 17 ++ .../Drinks/carrotjuicecarton.rsi/icon.png | Bin 0 -> 624 bytes .../carrotjuicecarton.rsi/icon_open.png | Bin 0 -> 648 bytes .../Drinks/carrotjuicecarton.rsi/meta.json | 17 ++ .../Drinks/catdespairjuice.rsi/icon.png | Bin 0 -> 541 bytes .../Drinks/catdespairjuice.rsi/icon_open.png | Bin 0 -> 550 bytes .../Drinks/catdespairjuice.rsi/meta.json | 17 ++ .../Consumable/Drinks/molejuice.rsi/icon.png | Bin 0 -> 682 bytes .../Drinks/molejuice.rsi/icon_open.png | Bin 0 -> 705 bytes .../Consumable/Drinks/molejuice.rsi/meta.json | 17 ++ .../Drinks/syndicatejuice.rsi/icon.png | Bin 0 -> 531 bytes .../Drinks/syndicatejuice.rsi/icon_open.png | Bin 0 -> 514 bytes .../Drinks/syndicatejuice.rsi/meta.json | 17 ++ .../Consumable/Drinks/unatijuice.rsi/icon.png | Bin 0 -> 658 bytes .../Drinks/unatijuice.rsi/icon_open.png | Bin 0 -> 669 bytes .../Drinks/unatijuice.rsi/meta.json | 17 ++ 29 files changed, 330 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bananajuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bananajuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bananajuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index e4f4440bd3c9ad..b1f837c57a07f3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -7,9 +7,6 @@ DrinkVacuumFlask: 5 DrinkFlaskBar: 5 DrinkShaker: 5 - DrinkJigger: 5 - DrinkIceBucket: 2 - BarSpoon: 3 CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 @@ -18,7 +15,6 @@ DrinkCognacBottleFull: 4 DrinkCoconutWaterCarton: 3 DrinkColaBottleFull: 4 - DrinkEnergyDrinkCan: 8 DrinkMilkCarton: 2 DrinkCreamCarton: 5 DrinkGinBottleFull: 3 @@ -45,5 +41,13 @@ DrinkSakeBottleFull: 3 DrinkBeerCan: 5 DrinkWineCan: 5 + DrinkJuiceAppleCarton: 3 + DrinkJuiceCarrotCarton: 3 + DrinkJuiceBerryCarton: 3 + DrinkJuiceBananaCarton: 3 + DrinkJuicePineappleCarton: 3 + DrinkJuiceUnatieCarton: 1 emaggedInventory: DrinkPoisonWinebottleFull: 2 + DrinkJuiceSyndicateCarton: 1 + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index aef0c5a8f5ad25..e3a7420fa9cced 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: DrinkBase id: DrinkCartonBaseFull abstract: true @@ -193,3 +193,171 @@ Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/oatmilk.rsi + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceAppleCarton + name: orange juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceApple + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/applejuice.rsi + - type: Label + originalName: яблочный сок + currentLabel: Яблочный сок полон сахара и вкуса! Сделан из спелых и сочных яблок! + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceCarrotCarton + name: carrot juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceCarrot + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/carrotjuicecarton.rsi + - type: Label + originalName: морковный сок + currentLabel: здесь могла бы быть ваша реклама + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceBerryCarton + name: berry juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceBerry + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/berryjuicecarton.rsi + - type: Label + originalName: ягодный сок + currentLabel: Освежающий аромат и вкус, с нотками дикой природы + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceBananaCarton + name: banana juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceBanana + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/bananajuice.rsi + - type: Label + originalName: банановый сок + currentLabel: Состоит из 75% бананов, 24% робуста, 1% бананиума + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuicePineappleCarton + name: pineapple juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuicePineapple + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/ananasjuice.rsi + - type: Label + originalName: ананасовый сок + currentLabel: Освежающий и бодрящий продукт! В составе более 90% спелых и вкуснейших ананасов! Без добавления консервантов + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceSyndicateCarton + name: syndicate juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Stimulants + Quantity: 5 + - ReagentId: DoctorsDelight + Quantity: 25 + - ReagentId: Tricordrazine + Quantity: 20 + + - type: Sprite + sprite: Objects/Consumable/Drinks/syndicatejuice.rsi + - type: Label + originalName: cинди сок + currentLabel: зделано на заказ компанией "Еnergy DOOM™" + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceUnatieCarton + name: Unatie juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/unatijuice.rsi + - type: Label + originalName: унати сcок + currentLabel: Сссделан на 99% исс вех! (не сспрашшивайте как) + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceCatDespairCarton + name: cat despair juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: MuteToxin + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/catdespairjuice.rsi + - type: Label + originalName: cat despair juice + currentLabel: Зделано из 50% кота и 50% тёмной глубокой бездны + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkMoleCatDespairCarton + name: mole juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceOrange + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/molejuice.rsi + - type: Label + originalName: mole juice + currentLabel: сделано на 99,99 изз Бззз! + diff --git a/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5e27aae759d9beb57409b62bb41c04e7d7669ceb GIT binary patch literal 670 zcmV;P0%84$P)Px%K1oDDR9J=Wma%J7K^(_F34*VXK_ZegklKKR5Q0Mygiw6hvPe6*M8QF*P^v@z z02jeYGMEOMI+TEoLqKQkA2_{`2=0R2}~DTMM8=(ea>4zJ;vbfFb| zXayg}?LCTDau}6knDC+7qC(bBsRFt!Dwyy=(44i=_5x7euJ+z39zNyG##>-b%2T=m zxok!h+pjPx$L36f0W?P)fbd@24B|^LJ>`|P1QaVUJ>{iL!h}}hXbuw!5WacCH2gBh z^4(oht8$*wn?-D16dmEG6UqZ8W$y04z(rp?n%sV-#9rAjk#*c#r3-eAop?vQXRgv-%Sda(I{nZE1 z_}&_AfPQFsyV^U5EN~*39$kP$GCgnyI16muic+g`KO^Y?mT@AP9=MF02CGVW2~GzY z7ChEimi_?dHr3;tad15V000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef){BePx%Qb|NXR9J=WmQ83AK^TUg#G)$})QaQ>QX7#{N)aid5{lcCxwR)RQScyCDA7YN z-U=dkDmhpKO+82tt%pD$p#&5ut;pKew2IhEg+h}WQwv2Q(5;4yhq$rn56lFEm%NwR zomt-J-I>{M2kNS;uKz5X?1R(O(+7@4C&mQ8^}wyNUw3!6l&@Vjz(L^X#F!Ykd#7rT zhHAk87TE1_F!X2;ZK+Mnh!@hcT6F*m?sho<&?dd5&h|F+Ex%F-R7Edyie}#6*i@xO-NbWDC0J_aDIO>J=(p#H(4*)SES$<|};~}wl5_l%%c}Nz1 z?66H}XYb=$nxydM7Y!HOH2heh@bfs=94j^!|L@R}k1OUcdY7ZE|?$mgbN~7Og zm-1E$P;{K9m^1esw>!1J*Xtj#>DyA?%7w`8)UZ1>`ey~_9xu~BD=OdsuQMm){Zs>3 zdO82OqTQ*hp6|5{FcQfU?rP=zy-vbit&Bvn)z|=4R>Cu$CVZWZ0Oi(FF=t{|D8@=N zU~RzF%qGTS9spx8&uV6qV$P(PGbwZ=2#yE-eSqM2fb^-S6muqhy-lp8H+UXT^KC6l zUvCqIjzswrRgv-%SdiQF?CAr@eqFC^fSpidE>$i>7C1B}kjCDh($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..293b374a8f235112de1fb7cd8b61f879506693b7 GIT binary patch literal 638 zcmV-^0)hRBP)Px%9!W$&R9J=WmN95kK^(?^S`qD#P8t$;rAeS56}qIPh{1$HmxfL)fECjrUBx`u)cA5 z(*)L54|zMQ($JdHA*5OmFNXDz1rL5a*pe>%^FbO~ldbA*XU@Z)_j%cR!v{8nJcTQu z7V`R&&^isRNkePmpAS-b^&WueaRPw!#ROxcio}v6D=;>ykp9|+MYTUrfEzw90CRgw z{22Q5?*nWPy<@rgg_1AV23Hd>YX%$oc%>m6Kzb8;D5K zyLZ?Q@;t;rc_06!pb4(H6}D?z!hTW}h%Q!71?h&%RzSK1Q^O9Xh8;cOid*h480an- z6fPYgt@_wGs2+Qh&&bNc|KF8O8p|}-F zlR1f{^bx?20h-%eVmvUxuK%@Z{99f84CpJs$si~100W%LWX~=@Dw8$60saOyUPaF~ z#4aP@0ETfYlQlg?y1}xNZb5gDe!-S38Tt*O_sw#We&2Ec000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$g3#O-djJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..02dbc0a40248890f2feb538bce0e2032ec1e2973 GIT binary patch literal 648 zcmV;30(bq1P)Px%C`m*?R9J=WmOp4yK^(_FS}EEgoirryN|QiADs)Ln5rYYZf;Lo;7QrE6r3Qp{ zNGA~`5OffmA;BR9Q{oT^4+@GYF5-hgX>1)j6rtcB3>Xq8Gt@s2o=B{3A`1yQ3A>X5-0osApOj-{whC22* z)+rdk0NZU=9zD3nxx44}l`Bt$s|sCIAiNmDZnI*yS+PVNSfUOFXI(63gZiNcSk4CZ z)e~zb@XINco8PZfu2!T&NG-u~HmDEIy71z{5_RC6@l&o=Sbw(B7<1>xE!Jxryk$+u zQ@8?ZCapgVtWd62C|4_ZXZ+-!zXm|N@P^BmE)wsLFg&El%t@{S!$S)3&k+EYs`WPB zUvJNP+yG4P&hxGB{l5>e)%S{p$|rK3R2^K1z?2zm=-tV(Z~*B|=*|al=K~FJGrahr z$my?EVL$0};Qoz|^&n3I>}z{?kNZt<#i_7W+!Xecs=(4*p(RK&T($zzOE5lQV|>8Y z7Optu{(`RVf^Ol`0phBM?Sm5A2PNXFhY{as3p_WLVxl%F>?ynnCu);~PlZ@eZ#TZ} zYkT}U^Ap9XkQ+-$Or?VWh78d3?mQ#DQFgp9O#NR<;%7id0saiKS=ea-#}diI3lK{r zO>cm|fsI$u<5jWCNH~CD97`lkkCA4utfZHqIY_7Ao_aF$8|i}0az_^S5C8xG4rN$L iW=%~1DgXcg2mk;800000(o>TF0000Px%FG)l}R9J=WmN94(Q5?p9O@kgnB@SttKx?oO9E64Fn4Pg4|GsDm4^9lKyL<5`zP9+mscqY`fhq+rY zfDU%pZOlbxF}=U56-E|?s|u&6KzJsE!*0W2x1m%6DAfRFw*^lvsLA+9SHM#XYPX*c z(y-5>R09AsuDl~(Ea7*pVs=;Xl!F?A-eAg1g)RPw<`-V|Hh^v%jm6szBb{JbNpC@CkZ!?!^`+|{6T82&s})6k p0000EWmrjOO-%qQ00008000000002eQPx%I7vi7R9J=WmOp3{Q5?rVNkcu%5(_bZpfzZPB4R@kB*h^F^^8juEvSo&Ar5xQ z;3$ZYNwTCJ(iWs0+CniXg+hqLENxo*$1HZKjiAyb7DNTbLdZFUJDbqLyEMTiUwFg4 zd-wf(@An=*9<PEI0!sDHKBxtf^~bC z>IDO+V5h^zv+!e#udgT>`;3))@rUvj70?P3H zOcgk_^OT3<9*oCN=?i$g@opZf-Xy z=5r4?*;Bw^?x0-yg(3e5I_zA#R6;Tj@bSwTTwR@H-mbB-mVF}PtE&R8u1->!n*jJc zFW_fZd+xt*9snsR6Y(jGjEZ>*pV-}*(@MKy;Lqg*0E^43Rp7x}cbE%)1G$g#*Dcz5 zR)oBDA3`Z9BPC@Gtj^8FUA%W%0Vrj^3;XHs19D#lnvn4UB>&BA=5{%1|G^2jrHKJ* zg6tn%>a$UHx0I2MW;JZ)IowGYjv2v#{+$v=IqcAe6dD z?(8Ha)++^8mqbk><3nFMI)on8yi41jznWsmyueqUg_R~+936UTWU$w yUw4qik>~+o?f?J)4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px$?@2^KR9J=Wma&V|P#niU>Ol~+UKh(%ua^S{;nXgL!<#zTf8g3%T-m~?YItfCS3bzG}OAl``1fgV#L;6BmJji>ry5zgO$9v)X{p7vh zOCDs(l<7a~LfQvMqtUr@{hk#996Wp!`&FyeRK6F}0-P7z?^)rqr%#kU)>MN5L~wDV zz|r9=>bD2s^ADBOtEvnj!iyUP0F3f59&a{mDF|tRX2TA3?LNiBLL6Lqy~d@pAJDmh z8~8LEc1X(llB$83F>c^vl!v&1j~n<=_)Lbi#rFP5YR}XF{hk#X))u;!L)UV+fgktZ zA6@0<-83XGan#n$JdkH^w*oL*nVsbWeE+yZ>(e({<61Oe z+5qhBRxrv#21NC6>+(8o;4dFQn2W+|jca`QYR}E7Nct3rAOSL9s2r{YkOY|=yx{cg zHYR zPx$>PbXFR9J=WmN94(Q5?p96(I-`o5hfTZ3-QPfVTvSoidn3heFdXE^c+|(g%u* zqhK*vftl1UM=MCf+Vn^Nr3;}F74=WxE`5-i+35?$_F-tpe!`+oP{ z|J^;vlqu7H)=JWe!{PASv3}180QR3gi~Q>KdLrK&Ndc}4?)Qw~=02y2^ z6?ymOHO>2G@ZwV~@v15V$nbKh2!PP6sQ-9xlnNsC798)5g5cyK#bC0kk{anLEJWg5|B~ zz5Zdb0MfYK>CRk6=7ZBJ^%l&7s0L@sB=sBqgu!NAJD4E=000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$g3sv?OaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8db29d107a6f8b5f76505f66ac698c806185187c GIT binary patch literal 624 zcmV-$0+0QPP)Px%5J^NqR9J=WmOp3{Q5?rVHPR3%Lb#zMT-!JZMRc%MgtpMb4B_Z>f=e76>r#bV zih~&q0XYmoFkMPO0unG&4Ml_tLZF!9kfq>I|DiYp7iq9m&*6B-HClLgn7ZT(H@(OA z`+2|jd-om;HPlf5StGI&ZQDL_tX8c!0N1lOJwHv;qb0MZKzFY}o|5P<=9@)>7d9V3~@dBH}Z zO>3)-x@&q6NcLACfSr8CNiQgXyK3X&DF9kqZEwzpnIfH!&w+I*Pw6JCRV&Wf+fPvA z5!85u%c&^!H+ulg?V2vg8H?29gsdeHumY*c30hcgC?>DpxuF1aSKRHWug-Ge(|2i4 z>1KJHi8`m%F^qy+Zc%oBFn}KG^7L(#Tbn=reGlld?jMaO!u41;h*dZM0U<&G>d#T6Y8<9_W>B%;_(6qHMil#!3ZE zflq-5@*hXPK7aW-SO7nW{|*qrR;fHV0IO6!^al7_uy_?cT9dnsqydDnRVp8PjPwTw zRp2e?2MHTI)KEgd0f6JZ!mj&_Pyhe`4rN$LW=%~1DgXcg2mk;800000(o>TF0000< KMNUMnLSTZE(F`*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..fc6a6f15226dd5fca245049e84219579c81e8203 GIT binary patch literal 648 zcmV;30(bq1P)Px%C`m*?R9J=WmOp3{Q5?rVHPR3fA>0rW(l#B0A}Ux<1PwHp;W!IQ0xofItV?Qz&` zFn|>t3IGUAU^Q0j%&)FaUs_kpYNDC0=F~M-Yyepp{k3i#yK<1q0|A z89gHtNG|i*bA_TeqV1OuqPHjm$Xxw-yJ$lFl`RA1W; zO5_?ggr1R6eQhUJ?f@(ZD-=L~0xRlCRHNn!!1YO}`r7sbkciFfFMy@m20Y&$VS3>e z{w>e`0@OBO_I8ZbyurOozxgq`L$xCf4xryWo*ZR0Z!mMVJ67#TBytU!6DeU&;U;WO zq)5-tQC*q^x;?P{af{6p64eg&_H-)8yTA(S-HyHb`tAE*0eV5KbD%d^D-;I@pcRU{ z?g0M_wr)iaR>Xcr!T^@BRw(YejPwUPmE$Go2XPxb)KHfG0E1Y)g9wMI000004rN$L iW=%~1DgXcg2mk;800000(o>TF0000^TPJ0|C*FAjttB%b~smTW)V}54H_tISgbZgfXn!xD6B)a4~!g zq7xw~-n*MC8DwN+z!>C^g9i_S&4&5h$Hj_4K~5H*eHd~ig#gHKkR>on@7}!&=UbVZ zfW_l7%NRi7!~&un0E+jDre20c)4SkigB%01xO>`SV(mmxN3;WAx?mQSX2rte9watx z+BC2dTU%R_973`KkR7sN!v=-N5)u*&FJ8PL$#Rflq7xx5laVb4If7I`u>)W} zC&zNCgaF78nB_r1L8Jx%;PnkSQ~4?ErVIyH+d%Q8~`#Ly$yhF@zh!KNoo&} zq!{Ei0@?kEP)=nw$Kdyu~u!t?qg-H`d6YT();UFJ^0LUSrP=N8R z%uT@JahYXcabf|{4gke_MN==sqUl|5vq6@_EbgARm{>be)Di6fm@b$_rCG5I$4;IB z3xmX_O`8U0+uGWqSU`wFvIAfSf-K#zVFN=zKmgcs2?+^?7cX8AvJXR^qLL6~8nWde zN016Ab^y%hgy=*FG89z)FI~S2 z#qg}GEHEFGE64#vI{;=l%p&CMh-~q*=PyZe2gwdVc8ImHCfqWZ#eI`!(#`=O!_nIS z=oS-O3Bg=RRE>q~CFI7)gGZ0SH6I9&YB5Q{giSFe?Lchijf#!j5C8zD9h|HKLvFSJ o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f*pd{rvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2287df63327bad8f4a87eb475dc5367f6195abb3 GIT binary patch literal 682 zcmV;b0#*HqP)Px%N=ZaPR9J=WmOW?_VI0PPieLy$T9Kwnq%{FSnypYVs6#qPhs@RwV$_N)ShAdg zI7Ax)iV(7d4nZs=NYDm5D^ilhkkk}QL5EtXi#9FxLn9goIfwK;wWaXh(cqG2x%ci~ zp5Jr-_v2n@s;Q>_v-Ze#%;)nvzRPA(D!`cwmoz`0&nM-(S2n;-;A|$PDxqP+9{Y@f z0R-6T=pc6Q4r8G~wRiZgbX5%p5OAlX1Awv6AOHcy&*OMRR|wq!%E^f8rvB9eJdzlv zP%2}yu4*BWoL{;El#>xPp!k9MS1Y4u0mzlgTA#Nohgr0^q&=l4VK$Redji+7SzEAK zTL>tA;-gOi=sU7n53+C&S68Pr9CTK|)zwLEflVkH6yU`1UH~TUE4Zs0(w@?jC3e0~ zZFjaYa61k_VYBRig8_nJFXK0ITz&L>_vb(`>?IwogG3Mk4~D(k{rdNx(w@3k!N9fC zRF*#SW$_s=p1cB}|J+GFyjjQYIE2Yw<$!sA;{urMRa|x}%kSahP(J`GU%%n%u>w_~ z!4(j)AG^tq&x`f;Q8((w14BNB15{qeFxB2^ZTMx#N7v6N9W4S-t5|5Ym?=(8Qk1MVxqrFQJk5FP?o`S_UAl0}eWN!jYjX+s*)mQd!&k1z4PlWKTrW6%fYp zMDm{?TfuszdkD4$F$!*~DWTshdd!KUdTd?*000hUSV?A0O#mtY000O800000007cc QlK=n!07*qoM6N<$f>jAKh5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..63d4d672c1d60709e5d0e6e3b19aeff1cec8329d GIT binary patch literal 705 zcmV;y0zUnTP)Px%VM#cIqkDW`;5i&_tId$`;iD#E!JM=$%noOAE_ z@%?_!@BI5g0R~y{9UC4TkO9uNUDEj6ZnqHcHc3~d%{^YY(N!v*sB2O_jLf!?r-H;D4@%PZUd=sKz5iS%SZgjZJvq-rOz8KvKRP-$Z` zdjM!U)&RgzuOC--MVM1~vji_R%N34tJa<9>j3rYWgaN$WjXb>>xW)V`O0{SoHWeF{9+PLrAc!uQ!1ym|f(fR^(onESAd&Au0tEz53mN&XC& zY*{3mm4(l6v9kq$#UDSB>a9Q)$a4l%*pA-f_qSQ4f5?Tr^3V{EVFQ_oAg0_Wtq-e) zcyv8Rk)8wqxr~J}iknIC=RtLy!NhwX0TXr>B;fo_edrjQ54}V*oaufA!zj`2_$%I>bT8O?ad8 z%7z+XESW;8cCHatt0K{gNH_y3ai}l6#>jeMz0kb`>x~!{E}#Gve*r*!&Q(4>KIH%a n01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf5OzK< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b26294d1cec10386c549a4ea7c7b6e996ea8f345 GIT binary patch literal 531 zcmV+u0_^>XP)Px$vq?ljR9J=WmOoFzKp2OglZul%@CDk$kg&Sn28&^Fa5Zs(FQ6fvhzrEX7toQ9 z;Nl=#cM}%}C8@K9LD`_qIl#ezf6^VXERLS9hF3!YBT@C0}Q+>$$6^LkR_UdqHV6C0>Vsp5K_ov~tP ztSICK;k56ct4G}4^yt^>?78l*ah7G(1ADGZzgC|-UtckR`TGUBZ}&dqCIT zYqtUDzr1__!=xmkVm&?Ji3uq5{e@JAzE9V2=sNbB$|?h%u{t#7Ue|GG#?ivJwPe7Q zHsc9s#u4YabR%V@QEV!$iPV$Olm<8BXrVMoWR-!Rf;Z!c<7fi++HI>rlsE(TQc{+Z zu+;+QJ)lkL?P)9P5@^tD-!FmRhr{(6FpcP8WP*D^us#F5AfP<0@9y^Yx8S=VusUI_ zk7IoqDND)QV8FxUV=C~Px$yh%hsR9HvtmcL5FP!z^bXw|7W1ovC0f?a%qY`TOlBEEus0Yy5AON-POXh&BO zm(oSIJb_CGEwsBt&~9Rhd^bJjwothD;%%YyOz92D_dDPD(|EMx@RqDkYk;)_tKq;= z5G0tUrzkQ`$oK(uY+3lY64GO*yEp(<7(iROyySX4zn~j38*M8G0D!DjVF37>9>w2@ z5ri?oC6TQ6-fdH6%-3RH&|Bq{zBbGti~t~xED^}GIC*-vb1%;T&_AovORuNh5842* z{h(Z?QoAL^I8%mzFrp*`J#_UO(g@%r45>dHrb6u&4HBYpH5119pjMOjb(>KefNNiD zG^D^Eh!FBO3&RnBIRW68Ll7W5f3azGry>OE%;WU{H%+=SP; z48my%<^kZGAr=k*VYU8lr$Ct-wFKM~XijH);4ld2qh6QUsuRIe!R2uZuw5uj&;4XC zu=wX_M9)#=W);H$2H<6cJ%E5P0^$hWj}z@p$lm~fKmY`bXvg=hgxN7|0DeFPd5>fH z&u5acI>xv*2ABoWwR%?A+JSj5vOTwUz*g|zO0Y5jzkOEIA>Tn69{>OV07*qoM6N<$ Ef+=6(2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..013f89c0436a635c34dacfec085271c0fa0cb936 GIT binary patch literal 658 zcmV;D0&V??P)Px%GD$>1R9J=WmO+S8Q5c0kHB*Y-Mo^T-#)LrLHVDGP5yF+Ti8dulAv_px<5rR> zsnsA%G6S|5W;0MmMM29(hy=k!5pE(0hCy+56@?q94B1b*;dmjWnzv~lL`Z9!XCGa zwZ~bUieG)3dM}(RoFIX8O2OlH;c>f=az3P-4{t0$v=CN}@EA@YS_rG1^M|atvq(7~ z06*`4r&6u)$i4|NG!sHe7%~togjH`W0DzS9acy}CfJ(Kd_dGeh%1g&PHrNv46yAc; z&bIpc-ZNa16PM)VQb^{*n_Ymx%7IL0g+=dzC?#Mpfkp2EnZ1>PsISQ{D@2giX z1K?Erh71Uw*mF0{D!@Up0UX6XF5H)`^nP^dt ze4#iy1NlO6U5fyNrYlXvFzKapW;FE^HKrw_x1Jq{4H|q2Vvs9K_Sq sG}fa4000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g2W>rI{*Lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..8b17a68260f374a94c7cd249633e1364db3a4e59 GIT binary patch literal 669 zcmV;O0%HA%P)Px%JxN4CR9J=WmS1R6VHn1LYUU_9H-e%xn+buO+aL%FCzKGlpopMEDTD)q-RyQC zE2*m?ELmVT!<)e}>>o&1O^AfSE{c#rG#Fz{++9SW$l2*)oRh8w-*HMeK6i)r<9UAP z{l4>_4~80QsQ)aB=)y{+a%io%RL}r!-ANjL;c!^U*D4BdSa5NvpiNIHJ$oGMH5fn- z_IljRJx=3N0@~ZD_rhI;BXnSTO2O-K(ay0N!0KQhHrxUD|{=I)qRsOaa7l5zQA50w87lT$&gMptM{z);u{rOUYSgfkh!t z;VmdG6|`6PmvKuj+>(oPVVMtaRsdMPy~&O1*O+NeGUgi2ZEOX!7e}%czZPi`yP) z6sMvgS`HP9#nkZYAHe+G4IC{S%37EcX$R1~HGKy-XnrzLCmM_}arO$SXo$=582}Q_ zWd8vY&Lp2^tJrF710)p<@%hIWUTnPt;N$ae#%C%j)BgfJz@-FOtgZZ2+o?AO3(y%> zU0pK<(N4X=PQ5`kmmeHJHka?Z1L(ne4gTDU7M_XyjD!Jn<7_V9bs0GrY*wbX;2=n^ z!9xwD>o@m4#uBtRU?Ttk01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf DzZ)Po literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} From 1690e1aee242306afccde54ead10ab903d280b6a Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Mon, 20 May 2024 10:15:42 +0300 Subject: [PATCH 02/12] Fix --- .../consumable/drinks/drinks-cartons.ftl | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index a61cc63bd3d6ed..674c08cef33201 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -1,4 +1,4 @@ -ent-DrinkCartonBaseFull = { ent-DrinkBase } +ent-DrinkCartonBaseFull = { ent-DrinkBase } .desc = { ent-DrinkBase.desc } .suffix = Полная ent-DrinkCartonBaseLargeFull = { ent-DrinkCartonBaseFull } @@ -21,3 +21,21 @@ ent-DrinkSoyMilkCarton = соевое молоко .desc = Белая и питательная соевая вкуснятина! ent-DrinkOatMilkCarton = овсяное молоко .desc = Это овсяное молоко. Бежевая и питательная вкуснятина! +ent-DrinkJuiceAppleCarton = яблочный сок + .desc = Сок выпуска 3023 года, свежего кислотного-отжима, с добавлением экстракта из семечек яблок и синди-ароматизаторов. +ent-DrinkJuiceCarrotCarton = морковный сок + .desc = Богат витамином А и имеет необычный вкус. Люди, работающие за терминалами, являются их главными клиентами. +ent-DrinkJuiceBerryCarton = ягодный сок + .desc = Любимый сок сладкоежек, как жаль, что его производство упало в связи с уменьшением количества потребителей на станциях НТ. Однако поговаривают, что особый ингредиент позволяет им оставаться на рынке и продавать более половины товара в неизвестные сектора. +ent-DrinkJuiceBananaCarton = банановый сок + .desc = Почуствуй вкус бананового сока! Стань клоуном! Стань робастом! +ent-DrinkJuicePineappleCarton = ананасовый сок + .desc = это освежающий напиток, который обладает ярким и свежим вкусом. Каждая капля этого сока словно маленькая звезда, приносящая радость и удовольствие после трудового дня в открытом космосе. Его аромат наполняет кабинеты станции нотками тропических фруктов, создавая атмосферу уюта и комфорта даже в условиях далекого космоса. +ent-DrinkJuiceSyndicateCarton = cинди сок + .desc = Сок "Космическое Оружие" — это напиток, который станет тайным оружием каждого агента синдиката. Его яркий вкус сочетается с нотками экзотических специй, создавая взрывной вкусовой опыт, способный зарядить энергией на самые сложные миссии. Каждая капля этого сока — это заряд адреналина, готовый вдохновить на подвиги и победы. +ent-DrinkJuiceUnatieCarton = унати сок + .desc = Только для насстоящих унатхов! (и для тех кто сстал ими душшевно) +ent-DrinkJuiceCatDespairCarton = cat despair juice + .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра? +ent-DrinkMoleCatDespairCarton = мофф сок + .desc = Рекомендуется всеми мофф From d664225021748967847e019ae7074a35ba9d812b Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Wed, 22 May 2024 20:30:54 +0300 Subject: [PATCH 03/12] apple juice update --- .../Consumable/Drinks/applejuice.rsi/icon.png | Bin 638 -> 640 bytes .../Drinks/applejuice.rsi/icon_open.png | Bin 648 -> 651 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png index 293b374a8f235112de1fb7cd8b61f879506693b7..7832ca4e2069f7616a606a8f9796bfb366662d01 100644 GIT binary patch delta 568 zcmV-80>}OS1b_vQF@GRQL_t(oh3%F5#2nsECZdWN)2}<*cy= zD7A9d`h^V_*j)X}+od+TX?PCdX$VTKoHe~1LnVe(j-sX)&`pD_Uf=2S@ZdhL25x`dViX#pqmD|X`rST=)QgrK;icq0JU>#%tXQ-e#v76W+Gu~-~Pf1=07OF z^|?3z@otLqXZD0Wg=g%wdlBnkX^OtO3E-4{7z`jwK|X%iV*l|kA#YEUP?mzkyD8$` zlmoWmvJ^y?f&g6kAq#tY-Un>RyUSO3`QRdZ*`LVmIe%B5FPC&-KVSPmA=4ufP^i?W zNCXrLnVzfNO9gxdNCXr@-?v@we&u^7+zHPf`CT`S@ddEWvs#2t`@7DQ)gsRR&{sE^ zA1n%c3QxlM!6L=kJn8Mb0MrgAo^Bd&2=*h-tH1`?>wXlxvn##=d<7T|GJFQu;A*`w zz5vyF!!30OI0|gvik`2F9Y(?dY~yOZ;kt~Bg1yS~5R3-#3!Z2qTYmtLg2sy`o-vk_ GSOO*=W(oTM delta 566 zcmV-60?GY=1^xt(F@GLOL_t(oh3%FxXj4HP#(!E7?T}6y5_qLapdb~xq@;+!ghH2w zPA!5%gh~kr&5%qYl|ZP2*bE5{DVP$6KzQIFMqI=|pft1&9g0xUiUC97!gB~O z_N4~y5{t|G#&^f}`|kh0cXwdPlBNHwbD|T=<#Nw4wUE~V7Ju*D?f3-(0U_V>q5*n= z)k0p6twj3vxX>>czyLcPcAh?d#Ld-P`ugn`!c~Oykp9|+ zMYTUrfEzw90CRgw{22Q5?*nWPy<@rgg_1AV23Hd>YX%$oc%>m6Kzb8;D5KyLZ?Q@;t;rc_06!pb4(H6}D?z!he2J6^JfYPX+0Q%T_?T1yjQg zriL9o;fh=CFBs@97!)oYAg%h?IjXaBR41+a7!ORGf|n+9Ot)r)J%u;nbZds#)drSuWNkO7+8TVgyg!LI+cY5ZGV{0!(Tz{wyd?*Idw%4E+j zKq`|py(It1}(%Z3>27z~tB zK~@Bz6%i~7>!CgDAj+`dL2M5#9=gk@hhixVlri*Vr7*14vzMI|HWF`{%y}sBu%#?@ zgD;Wdr4NLVsf zWezkzuAVZNPA}WQZ)Y3a`*jD+&>e?x^a*nHlsPsRLM4Qh52D7W(F~oH*K55o4|gB1 z(p}>V%R-*Q6@O^ds^+s;0nO0S3>`H-P3z5j0Gd}napU?mN+XMm2mDUn$yo))1Aa>1 z76Hf@d*{-~-ucpG7=Umq#;FtA!k)r2_Tv43xjQ>bM_mPAz1{f>3?NHhK7Lqd=gDs& zZ%30*mb`>pF~Y4_4{X6@$%`y`0XY9d7WQ=92Q0|DbAK0jwQz>*V>_(1Pfd#VGeLr|}OMC^m z3UDxp)i{g}f{W$K-~trO726)*FtD{Nda)$-GZGG985heH+h(L6>{O0FL4Odp;Gu@H R^as}s#*1*P$Agn%0w$5?5jX$< delta 576 zcmV-G0>Ax>1&9TZF@GpYL_t(oh3%FWNl6id359|- zRFD?IA!4Nlgmy?L5hW0G5St;vAq7+75C{(niYYGQgFtC)9Xb@D;2#Va5+^g%KMDtzq@yL&{I!6{bwB!9jIwq+degu)_(!!u3l^S`FuVh-=m@d z+JV(fS`ROVI`%l$DHy;2+ig}JJ-ElYyXW13SCqnycoi6vtqYdu|yqMq7DXU zT`XsV`k@9`&Ia|>6Kf{$%PEzc->*}yR-{8nEx~d&s1MG%@Z!P}b>N-xQ?6E6f40#W zbLYn`)@vKQWq(b`Q@8?ZCapgVtWd62C|4_ZXZ+-!zXm|N@P^BmE)wsLFg&El%t@{S z!$S)3&k+EYs`WPBUvJNP+yG4P&hxGB{l5>e)%S{p$|rK3R2^K1z?2zm=-tV(Z~*B| z=*|al=K~FJGrahr$my?EVL$0};Qoz|^&n3I>}z{?kAM43aK)*xRooQzld8bdT%jdM zGhDU;(n~NtU}Jp1))uZf<^F=M?t*UN(gEVChwXzB+Xp4$s)rHZXbU_ymSUndDeNh{ z2`6fkginQ7P;WQB?Q47dI`b37sgN5>Nlc}K0EP_E^zJ+(zEO6(FHHSkO5$fgM*;o} zvRT+^0X4@G$-@f}OC(KifWLu_SJC5DvCBv}fMFa Date: Fri, 24 May 2024 10:56:33 +0300 Subject: [PATCH 04/12] sprite update --- .../Drinks/ananasjuice.rsi/icon.png | Bin 670 -> 0 bytes .../Drinks/ananasjuice.rsi/icon_open.png | Bin 690 -> 0 bytes .../Drinks/ananasjuice.rsi/meta.json | 17 ------------- .../Consumable/Drinks/applejuice.rsi/icon.png | Bin 640 -> 0 bytes .../Drinks/applejuice.rsi/icon_open.png | Bin 651 -> 0 bytes .../Drinks/applejuice.rsi/meta.json | 17 ------------- .../Drinks/bananajuice.rsi/icon.png | Bin 655 -> 0 bytes .../Drinks/bananajuice.rsi/icon_open.png | Bin 664 -> 0 bytes .../Drinks/bananajuice.rsi/meta.json | 17 ------------- .../Drinks/berryjuicecarton.rsi/icon.png | Bin 591 -> 0 bytes .../Drinks/berryjuicecarton.rsi/icon_open.png | Bin 586 -> 0 bytes .../Drinks/berryjuicecarton.rsi/meta.json | 17 ------------- .../Drinks/cardboardjuiceboxes.rsi/icon.png | Bin 0 -> 396 bytes .../cardboardjuiceboxes.rsi/icon_apple.png | Bin 0 -> 472 bytes .../cardboardjuiceboxes.rsi/icon_banan.png | Bin 0 -> 450 bytes .../cardboardjuiceboxes.rsi/icon_berry.png | Bin 0 -> 402 bytes .../cardboardjuiceboxes.rsi/icon_carrot.png | Bin 0 -> 450 bytes .../icon_catdespair.png | Bin 0 -> 334 bytes .../cardboardjuiceboxes.rsi/icon_lemon.png | Bin 0 -> 457 bytes .../cardboardjuiceboxes.rsi/icon_mole.png | Bin 0 -> 539 bytes .../cardboardjuiceboxes.rsi/icon_open.png | Bin 0 -> 438 bytes .../icon_pineapple.png | Bin 0 -> 464 bytes .../cardboardjuiceboxes.rsi/icon_syndi.png | Bin 0 -> 322 bytes .../cardboardjuiceboxes.rsi/icon_unati.png | Bin 0 -> 486 bytes .../Drinks/cardboardjuiceboxes.rsi/meta.json | 23 ++++++++++++++++++ .../Drinks/carrotjuicecarton.rsi/icon.png | Bin 624 -> 0 bytes .../carrotjuicecarton.rsi/icon_open.png | Bin 648 -> 0 bytes .../Drinks/carrotjuicecarton.rsi/meta.json | 17 ------------- .../Drinks/catdespairjuice.rsi/icon.png | Bin 541 -> 0 bytes .../Drinks/catdespairjuice.rsi/icon_open.png | Bin 550 -> 0 bytes .../Drinks/catdespairjuice.rsi/meta.json | 17 ------------- .../Consumable/Drinks/molejuice.rsi/icon.png | Bin 682 -> 0 bytes .../Drinks/molejuice.rsi/icon_open.png | Bin 705 -> 0 bytes .../Consumable/Drinks/molejuice.rsi/meta.json | 17 ------------- .../Drinks/syndicatejuice.rsi/icon.png | Bin 531 -> 0 bytes .../Drinks/syndicatejuice.rsi/icon_open.png | Bin 514 -> 0 bytes .../Drinks/syndicatejuice.rsi/meta.json | 17 ------------- .../Consumable/Drinks/unatijuice.rsi/icon.png | Bin 658 -> 0 bytes .../Drinks/unatijuice.rsi/icon_open.png | Bin 669 -> 0 bytes .../Drinks/unatijuice.rsi/meta.json | 17 ------------- 40 files changed, 23 insertions(+), 153 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/bananajuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/bananajuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/bananajuice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_apple.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_banan.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_berry.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_carrot.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_catdespair.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_lemon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_mole.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_pineapple.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_syndi.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_unati.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/icon.png deleted file mode 100644 index 5e27aae759d9beb57409b62bb41c04e7d7669ceb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmV;P0%84$P)Px%K1oDDR9J=Wma%J7K^(_F34*VXK_ZegklKKR5Q0Mygiw6hvPe6*M8QF*P^v@z z02jeYGMEOMI+TEoLqKQkA2_{`2=0R2}~DTMM8=(ea>4zJ;vbfFb| zXayg}?LCTDau}6knDC+7qC(bBsRFt!Dwyy=(44i=_5x7euJ+z39zNyG##>-b%2T=m zxok!h+pjPx$L36f0W?P)fbd@24B|^LJ>`|P1QaVUJ>{iL!h}}hXbuw!5WacCH2gBh z^4(oht8$*wn?-D16dmEG6UqZ8W$y04z(rp?n%sV-#9rAjk#*c#r3-eAop?vQXRgv-%Sda(I{nZE1 z_}&_AfPQFsyV^U5EN~*39$kP$GCgnyI16muic+g`KO^Y?mT@AP9=MF02CGVW2~GzY z7ChEimi_?dHr3;tad15V000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef){BePx%Qb|NXR9J=WmQ83AK^TUg#G)$})QaQ>QX7#{N)aid5{lcCxwR)RQScyCDA7YN z-U=dkDmhpKO+82tt%pD$p#&5ut;pKew2IhEg+h}WQwv2Q(5;4yhq$rn56lFEm%NwR zomt-J-I>{M2kNS;uKz5X?1R(O(+7@4C&mQ8^}wyNUw3!6l&@Vjz(L^X#F!Ykd#7rT zhHAk87TE1_F!X2;ZK+Mnh!@hcT6F*m?sho<&?dd5&h|F+Ex%F-R7Edyie}#6*i@xO-NbWDC0J_aDIO>J=(p#H(4*)SES$<|};~}wl5_l%%c}Nz1 z?66H}XYb=$nxydM7Y!HOH2heh@bfs=94j^!|L@R}k1OUcdY7ZE|?$mgbN~7Og zm-1E$P;{K9m^1esw>!1J*Xtj#>DyA?%7w`8)UZ1>`ey~_9xu~BD=OdsuQMm){Zs>3 zdO82OqTQ*hp6|5{FcQfU?rP=zy-vbit&Bvn)z|=4R>Cu$CVZWZ0Oi(FF=t{|D8@=N zU~RzF%qGTS9spx8&uV6qV$P(PGbwZ=2#yE-eSqM2fb^-S6muqhy-lp8H+UXT^KC6l zUvCqIjzswrRgv-%SdiQF?CAr@eqFC^fSpidE>$i>7C1B}kjCDh($ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/ananasjuice.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/applejuice.rsi/icon.png deleted file mode 100644 index 7832ca4e2069f7616a606a8f9796bfb366662d01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 640 zcmV-`0)PF9P)Px%AW1|)R9J=WmOp3{VH}1Z{~#Ldbuz~V5*ktjaWtVtJWMHc3Yi)NA#rdB3eAuV z4pJ!w9K>Wua7dSO4#5y`kRm!62^52Ib}0x7Eq88LDOCvPVDHR@7QVX@T=K#Vci+eR zy!ZS5!bB5I^q+M~v}32!Ikv6c)GUC^?K_TNGMNhES;dvSZ;!Kn!2mWm zq{uvb@`xL&H?7L87s6GA6I7tMk|(6dgcKR697QTenO=@jYUQl41}L?1*7}7F7ua0= z%G;$jx@mY0;b{m;t(-Nz9783BRF0yi7tl?EtzO^h^YGw4uLf`U%!ZJsa0S{;&3c-u zpqmD|X`rST=)QgrK;icq0JU>#%tXQ-e#v76W+Gu~-~Pf1=07OF^|?3z@otLqXZD0W zg=g%wdlBnkX^OtO3E-4{7z`jwK|X%iV*l|kA#YEUP?mzkyD8$`lmoWmvJ^y?f&g6k zAq#tY-Un>RyUSO3`QRdZ*`LVmIai-Amvmu2U;98I(<2d3sMM!O1QZIHo~zwU1$+fa z1QbHww_Wdk<$EXG3C|w+T{n&K1+dMtT7*ygyUvrFv7!)D9<}ZW?e1_9M@$zy{gteiXd3E4~7J1sD!8dKY~PBW zuZtZTF0000Px%D@jB_R9J=WmQQHYU>L@K{$Xfw*~x|!T2?v)@o3A280;7flu|)f1fdlXEDGzP zJ?tRLu;4*#4=oaHfgplOp z`8|2_eQ!P(YN(<9vyO=lY&M%mK5NvfCP3oW?VevW8Wr+AE*jt{aHCc=v-4@!9w*&` z0W7djk$L{~F_#}*F$*_e3Re~Wp#s_YG(JVfr^rb8AW}Za*j$KQJ!K9wK(3xLmrgI+ zz;9<8-1~J0&Cnf(aP$ds^^`d_7eXb3lnD!WC%L zs^+s;0nO0S3>`H-P3z5j0Gd}napU?mN+XMm2mDUn$yo))1Aa>176Hf@d*{-~-ucpG z7=Umq#;FtA!k)r2_Tv43xjQ>bM_mPAz1{f>3?NHhK7Lqd=gDs&Z%30*mb`>pF~Y4_ z4{X6@$%`y`0XY9d7WQ=92Q0|Da~F8EaE9&VPvpj=ZOqrRny{a%K9EVYiFgzWZdi|lJt}@k~ z5%v_Ggj3xavJ+|I8+QRH?N2<-&|x3!Mvhm31+vzCKX`LXdPx%FG)l}R9J=WmN94(Q5?p9O@kgnB@SttKx?oO9E64Fn4Pg4|GsDm4^9lKyL<5`zP9+mscqY`fhq+rY zfDU%pZOlbxF}=U56-E|?s|u&6KzJsE!*0W2x1m%6DAfRFw*^lvsLA+9SHM#XYPX*c z(y-5>R09AsuDl~(Ea7*pVs=;Xl!F?A-eAg1g)RPw<`-V|Hh^v%jm6szBb{JbNpC@CkZ!?!^`+|{6T82&s})6k p0000EWmrjOO-%qQ00008000000002eQPx%I7vi7R9J=WmOp3{Q5?rVNkcu%5(_bZpfzZPB4R@kB*h^F^^8juEvSo&Ar5xQ z;3$ZYNwTCJ(iWs0+CniXg+hqLENxo*$1HZKjiAyb7DNTbLdZFUJDbqLyEMTiUwFg4 zd-wf(@An=*9<PEI0!sDHKBxtf^~bC z>IDO+V5h^zv+!e#udgT>`;3))@rUvj70?P3H zOcgk_^OT3<9*oCN=?i$g@opZf-Xy z=5r4?*;Bw^?x0-yg(3e5I_zA#R6;Tj@bSwTTwR@H-mbB-mVF}PtE&R8u1->!n*jJc zFW_fZd+xt*9snsR6Y(jGjEZ>*pV-}*(@MKy;Lqg*0E^43Rp7x}cbE%)1G$g#*Dcz5 zR)oBDA3`Z9BPC@Gtj^8FUA%W%0Vrj^3;XHs19D#lnvn4UB>&BA=5{%1|G^2jrHKJ* zg6tn%>a$UHx0I2MW;JZ)IowGYjv2v#{+$v=IqcAe6dD z?(8Ha)++^8mqbk><3nFMI)on8yi41jznWsmyueqUg_R~+936UTWU$w yUw4qik>~+o?f?J)4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px$?@2^KR9J=Wma&V|P#niU>Ol~+UKh(%ua^S{;nXgL!<#zTf8g3%T-m~?YItfCS3bzG}OAl``1fgV#L;6BmJji>ry5zgO$9v)X{p7vh zOCDs(l<7a~LfQvMqtUr@{hk#996Wp!`&FyeRK6F}0-P7z?^)rqr%#kU)>MN5L~wDV zz|r9=>bD2s^ADBOtEvnj!iyUP0F3f59&a{mDF|tRX2TA3?LNiBLL6Lqy~d@pAJDmh z8~8LEc1X(llB$83F>c^vl!v&1j~n<=_)Lbi#rFP5YR}XF{hk#X))u;!L)UV+fgktZ zA6@0<-83XGan#n$JdkH^w*oL*nVsbWeE+yZ>(e({<61Oe z+5qhBRxrv#21NC6>+(8o;4dFQn2W+|jca`QYR}E7Nct3rAOSL9s2r{YkOY|=yx{cg zHYR zPx$>PbXFR9J=WmN94(Q5?p96(I-`o5hfTZ3-QPfVTvSoidn3heFdXE^c+|(g%u* zqhK*vftl1UM=MCf+Vn^Nr3;}F74=WxE`5-i+35?$_F-tpe!`+oP{ z|J^;vlqu7H)=JWe!{PASv3}180QR3gi~Q>KdLrK&Ndc}4?)Qw~=02y2^ z6?ymOHO>2G@ZwV~@v15V$nbKh2!PP6sQ-9xlnNsC798)5g5cyK#bC0kk{anLEJWg5|B~ zz5Zdb0MfYK>CRk6=7ZBJ^%l&7s0L@sB=sBqgu!NAJD4E=000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$g3sv?OaK4? diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/berryjuicecarton.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..92cdd2d12290efd618db430e7e0d2b2531742fc1 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T)c78bdT6BJyM?c#4UL{fT!^e+13*Y6aZ_Bl|xOOF!oniG?;p^N@2Ufj1 z5thJl=St}JU!UH@JiaH&!@yz|rRbg95_sur_`@tF7V{`ZhC><;%PRxBRE{uR*?Y0; zV5C&??%RhmjtXtCiC1d;SJxicq|?jDaQp7O=QTBTo?f@)4=r1_>uD0-V$pIhZG-BX zgo!Uxbc6)f9w;$-miPO@zs)8}jIZV$IDPbvq)*{LzB$}>(GP+?GQ~NleE9phI+}5| zhw9w?!-@rQQ?3i2=>GIT{(;Dhb&t;8{+-IY;=}*Y(@Mt^GLJ+T=se>3_Hp4K#$yi) otnI^DU4Vhemm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!0E-f(*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_apple.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..59e5131b813b03191e36847b59f19579792cd39e GIT binary patch literal 472 zcmV;}0Vn>6P)Px$cu7P-R9J=Wl)r1jKorNnmSzbULGTU>&0;CYjUt_dltRZsL1~w|yO_bhqJx9& zU(jySA<{pf3NCf%7`ixFC?sx9g$}QSm>LneODJ9LGhHq(?|t8oJV2w-X#Sautl?-h ziq4MXY_+MhZ0cS;W_Hz%7RH^AN|5 z008)xzOt`W2v5+e1)KMkmMuL8(k-a8Z2CISMwxDAyk42t!c^9++6-`u0p2p}bpgT? z#4Q%tmFFC9m`V9m{tdasz%7PB-lXeWMuWT=3l0G9g+SV0qCL=VOi(q8=-y{hHH&CB zCb9SBIsaP$RkMhLk7?{VDTz1X=i$-T`(P0&`B56eU=e~_3^xyUtn7DBCsAP4eUNGq ztwbdWoEqT?T8YtUG@3O00NgEgx(?EABme*a4rN$LW=%~1DgXcg2mk;800000(o>TF O0000>$uyf18cfKTxCMGygUg7b%wRw>9%7A1?Rkdn^5BsfJ*VJLFWBC7*9GLAcMN?P?uZ&}lZ`-NpQeyZJ+by$2c;~)2&&+^4i`u=l@SH?K1@p69B zRl2Wq*ep=)ipSDr3n%fo1ncFb9rR*UzOTfPu(W}Zp;yM}johiXQj7^Jxu>w38s!KF zy96hn?(=W@K4(p-;?;-+Q-GS74t!bIe&(`q3rqCJDcOIyq%2kH9F^XQX?*$Q_1&TC z!fD~1t@+&Ya&LrpvM!qFy#C<4Ee)SkMTFkGn5LR^wKOI^btCVCrGGVI{UaH!-rb>@ zVRmgN_r@(&$7bc83rtw{GJHi1<5E`>{vhEM=DRe)iY&_W|M@Mr_hON~%wiylIGI>c z*`Jo(0qR)@4$?Zl5Qb-(Al(8@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_berry.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_berry.png new file mode 100644 index 0000000000000000000000000000000000000000..e733ceb9aff36429b90148a871e6115a1e536300 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T-lkI0kc|?Yy*Fa=lNgrRc&9} zGcz+gho6}Ff5{6~OO{(Ec^3jk_t*yy=+MpA>!`xlSmlx$s=GcQ_vzDH3G_y5n41Lw~jFKBvY~>FvAH#Ee)LW*<1}>!LE@fyP~H zuCC}85<1t4H|V$AnC2bzx=5bo(9^qn-xs}?T@aul^1nw-TB0rSSKh2=M41MJ#EPVc||6CTlFL-#H=WX7az(-}~*BBHEvlm6CbI9l^{4D3@ z{35G2tCa0Q`t`NVTR%>>=)L)NkN0~yjR0nsN7q;w_VBt@)cs`elt^FSdVN;+k+qyw zO*;F|wjBQ&|M>C*J0_s5$=SBH@Bj399y3b1<1jsTTLf=}TTjiyz@pO~%l%`fFn9(8 zN$uYDEwMFFvvF$B=3`1<7#vRL=!7?PR2_J{yzTI5^&GzN>DmHc8!i_Mmxn7_smDu% zxbN_fSZKPWdipMf=$xrP p<+gvlyH5avo-Z}RGtJkRK?}&{0Adih6g(M3dAjt=`Ln2z= zPT82-Y9QjuAK12F`Le?PJ8^V%Gjcd%r*0E55d&ievA0 zCIjE#t@YblK%usrV*bI!OIw{D>i%Tfv?hL9-7_U^pwIbIBRtc5 aeHpZXYz`m>flI-YL6oPfpUXO@geCw?dx(nw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_lemon.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_lemon.png new file mode 100644 index 0000000000000000000000000000000000000000..d9e3abc6438a8013a177dd8c393bcd74805267d3 GIT binary patch literal 457 zcmV;)0XF`LP)Px$X-PyuR9J=Wlrc-gKorM+X%7V}0SC#_!J$j&CUoi&KSjEB5d^>r$R{OnrV|^|{pV=TYO>5@?5&Fo4wYSsWu*G@|Md%|!pH{z)cb3uW z*9#XfBmiI@jkviz1)zKN$bA3n?*z=F5j&Mjrm{_G5$ErpKde_uF#+YY%2c)iSd_W| zyuKZ9d^9U0z)JRPkRd{!a$4nOSO(zYuFCbu>~$MU#oQAG-GjqSp5I2?}O z_y!bCerz(l6mS3l01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf@m0K~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_mole.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_mole.png new file mode 100644 index 0000000000000000000000000000000000000000..2939bd2b2b26ab5b35046bb37f7f2431d4eda275 GIT binary patch literal 539 zcmV+$0_6RPP)Px$yGcYrR9J=WlsiZxQ51&1h_EpjAB8ZxHl`BOEhq>!nL=E!O0zoPqYxi;l6FzC z5=QG-SWFP?+-j>uHf2Obu@It#HewW6#fWB$&9zAGMa0M4xN)2LnmKdl%zys-I^f~q z;qjmGxlK%`(<+WcB2VVnmMJ1ja3MU?YR@jM0g%ghoaWyZN$G*5WpmhdDzI6jA z@zI6vK3Tl{4S>trKdv>k3;=u`?V(ywpyjRJPwEd0000EWmrjOO-%qQ d00008000000002eQb=w%Al2ELc?lpl7qXKuK> zxj69rw%nDwtT!=L9s~;Q-nA!S-NxloJPbBBj3le>n*C8YBbJ_+%w%)NNRr_IztcyZ zF5yWmkqz~GQ;h`Q?BshVFPAve$HSqhejg{oiaX*${<(l|3LFbP0l+XkK$#Ae~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_pineapple.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_pineapple.png new file mode 100644 index 0000000000000000000000000000000000000000..3e21238c7961fe1a00151edb560d442764c73815 GIT binary patch literal 464 zcmV;>0WbcEP)Px$a7jc#R9J=Wl(9+!K@f(&J(XP0BBTn!ApuDtq)A~RqSx8^2105PA4U>L3L%eR ztJR%_1Q9I+30ld4Lzs_$aPv63424rw9MLdX_bR~uro*Vw?i+ISa>39BkfRZ-#TGo~h{O~uI; zVF{$wk+A1{tOQYvTJ9t+D;T^1O~2*{fW15mR~@v8>`q{u>qqo!PE?9G1FtONXMVo~ z;%DSVO3b*I3O=8B;FSfyD%c#K<$(L&HK3Dgp|937YtB>hoF)dekX5kRZVQWh*KD_C zL>%Ba$o-uG&C%)2$Qb8OZvddtyraHa;$pW#eYHfRc{fQK!0-)d7MwgQl{tWD)C{{J zmO(=r85nj$tb)yL@ED1oocFj59vOD?08y7D#rX5kU9f-fz^j@ft3tLm=Z%FYHZX1k z%uk(?l9CeV4asGJY~Mib%m4rY4rN$LW=%~1DgXcg2mk;800000(o>TF0000j@` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_syndi.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_syndi.png new file mode 100644 index 0000000000000000000000000000000000000000..0bae3ee1f332c57f74a7b8ed918e0aa6abc4f30f GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}k33x*Ln2z= zPO;@{au8_UfAuPN0aM;{&O4JLs+hC%o^j^raHi;-U~#(E(jJz!pG$1U_h;>mP74Em zs0+>b<@;l4K`Eb2^<%vwQ+apXkUjKCY60(!*Gp!0tg0xT_h{L@HD#Ty57+PY^gJn= zaaiT~%w3(`f0xajH1W;_)lbjo-?-CMy8pW5@6T2ToPUV(-HxBz^xViNA-1O^P)gH5 z#>t#Ha z-pj3>9bq)Vc+;6M(SK5<4@J0I52@b^z8x_0!O2H4K;QDEMtG+A`Z8z%*&IL&0+)g( OgD6i|KbLh*2~7ZpCxsmV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_unati.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_unati.png new file mode 100644 index 0000000000000000000000000000000000000000..c154a07af2b8f7f7a556fe92b08e50c60fe9669d GIT binary patch literal 486 zcmV@P)Px$hDk(0R9J=Wls`+uKp2Ogq#h|saMMNHOTI#dG!C6ANJonxC{9xF0|@#JO238T zb+RD3h!&+Kq~{ITc)-^B=QAdh8aj zNmYVj+^Q|zs;%7z+OCyo_joY!jk=FLLG;p3`rfW{7unY&`S;}_CV|jVo$KKTjFiM$NND)xyyI-Wm7Gp&2o{x6JuGE4?rpd zjkP$%L@d8OV+R000hUSV?A0O#mtY c000O800000007cclK=n!07*qoM6N<$f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json new file mode 100644 index 00000000000000..887274fd9b36e4 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { "name": "icon" }, + { "name": "icon_open" }, + { "name": "icon_apple" }, + { "name": "icon_banan" }, + { "name": "icon_berry" }, + { "name": "icon_carrot" }, + { "name": "icon_catdespair" }, + { "name": "icon_lemon" }, + { "name": "icon_mole" }, + { "name": "icon_pineapple" }, + { "name": "icon_syndi" }, + { "name": "icon_unati" } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon.png deleted file mode 100644 index 8db29d107a6f8b5f76505f66ac698c806185187c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)Px%5J^NqR9J=WmOp3{Q5?rVHPR3%Lb#zMT-!JZMRc%MgtpMb4B_Z>f=e76>r#bV zih~&q0XYmoFkMPO0unG&4Ml_tLZF!9kfq>I|DiYp7iq9m&*6B-HClLgn7ZT(H@(OA z`+2|jd-om;HPlf5StGI&ZQDL_tX8c!0N1lOJwHv;qb0MZKzFY}o|5P<=9@)>7d9V3~@dBH}Z zO>3)-x@&q6NcLACfSr8CNiQgXyK3X&DF9kqZEwzpnIfH!&w+I*Pw6JCRV&Wf+fPvA z5!85u%c&^!H+ulg?V2vg8H?29gsdeHumY*c30hcgC?>DpxuF1aSKRHWug-Ge(|2i4 z>1KJHi8`m%F^qy+Zc%oBFn}KG^7L(#Tbn=reGlld?jMaO!u41;h*dZM0U<&G>d#T6Y8<9_W>B%;_(6qHMil#!3ZE zflq-5@*hXPK7aW-SO7nW{|*qrR;fHV0IO6!^al7_uy_?cT9dnsqydDnRVp8PjPwTw zRp2e?2MHTI)KEgd0f6JZ!mj&_Pyhe`4rN$LW=%~1DgXcg2mk;800000(o>TF0000< KMNUMnLSTZE(F`*H diff --git a/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/carrotjuicecarton.rsi/icon_open.png deleted file mode 100644 index fc6a6f15226dd5fca245049e84219579c81e8203..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 648 zcmV;30(bq1P)Px%C`m*?R9J=WmOp3{Q5?rVHPR3fA>0rW(l#B0A}Ux<1PwHp;W!IQ0xofItV?Qz&` zFn|>t3IGUAU^Q0j%&)FaUs_kpYNDC0=F~M-Yyepp{k3i#yK<1q0|A z89gHtNG|i*bA_TeqV1OuqPHjm$Xxw-yJ$lFl`RA1W; zO5_?ggr1R6eQhUJ?f@(ZD-=L~0xRlCRHNn!!1YO}`r7sbkciFfFMy@m20Y&$VS3>e z{w>e`0@OBO_I8ZbyurOozxgq`L$xCf4xryWo*ZR0Z!mMVJ67#TBytU!6DeU&;U;WO zq)5-tQC*q^x;?P{af{6p64eg&_H-)8yTA(S-HyHb`tAE*0eV5KbD%d^D-;I@pcRU{ z?g0M_wr)iaR>Xcr!T^@BRw(YejPwUPmE$Go2XPxb)KHfG0E1Y)g9wMI000004rN$L iW=%~1DgXcg2mk;800000(o>TF0000^TPJ0|C*FAjttB%b~smTW)V}54H_tISgbZgfXn!xD6B)a4~!g zq7xw~-n*MC8DwN+z!>C^g9i_S&4&5h$Hj_4K~5H*eHd~ig#gHKkR>on@7}!&=UbVZ zfW_l7%NRi7!~&un0E+jDre20c)4SkigB%01xO>`SV(mmxN3;WAx?mQSX2rte9watx z+BC2dTU%R_973`KkR7sN!v=-N5)u*&FJ8PL$#Rflq7xx5laVb4If7I`u>)W} zC&zNCgaF78nB_r1L8Jx%;PnkSQ~4?ErVIyH+d%Q8~`#Ly$yhF@zh!KNoo&} zq!{Ei0@?kEP)=nw$Kdyu~u!t?qg-H`d6YT();UFJ^0LUSrP=N8R z%uT@JahYXcabf|{4gke_MN==sqUl|5vq6@_EbgARm{>be)Di6fm@b$_rCG5I$4;IB z3xmX_O`8U0+uGWqSU`wFvIAfSf-K#zVFN=zKmgcs2?+^?7cX8AvJXR^qLL6~8nWde zN016Ab^y%hgy=*FG89z)FI~S2 z#qg}GEHEFGE64#vI{;=l%p&CMh-~q*=PyZe2gwdVc8ImHCfqWZ#eI`!(#`=O!_nIS z=oS-O3Bg=RRE>q~CFI7)gGZ0SH6I9&YB5Q{giSFe?Lchijf#!j5C8zD9h|HKLvFSJ o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f*pd{rvLx| diff --git a/Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/catdespairjuice.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon.png deleted file mode 100644 index 2287df63327bad8f4a87eb475dc5367f6195abb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 682 zcmV;b0#*HqP)Px%N=ZaPR9J=WmOW?_VI0PPieLy$T9Kwnq%{FSnypYVs6#qPhs@RwV$_N)ShAdg zI7Ax)iV(7d4nZs=NYDm5D^ilhkkk}QL5EtXi#9FxLn9goIfwK;wWaXh(cqG2x%ci~ zp5Jr-_v2n@s;Q>_v-Ze#%;)nvzRPA(D!`cwmoz`0&nM-(S2n;-;A|$PDxqP+9{Y@f z0R-6T=pc6Q4r8G~wRiZgbX5%p5OAlX1Awv6AOHcy&*OMRR|wq!%E^f8rvB9eJdzlv zP%2}yu4*BWoL{;El#>xPp!k9MS1Y4u0mzlgTA#Nohgr0^q&=l4VK$Redji+7SzEAK zTL>tA;-gOi=sU7n53+C&S68Pr9CTK|)zwLEflVkH6yU`1UH~TUE4Zs0(w@?jC3e0~ zZFjaYa61k_VYBRig8_nJFXK0ITz&L>_vb(`>?IwogG3Mk4~D(k{rdNx(w@3k!N9fC zRF*#SW$_s=p1cB}|J+GFyjjQYIE2Yw<$!sA;{urMRa|x}%kSahP(J`GU%%n%u>w_~ z!4(j)AG^tq&x`f;Q8((w14BNB15{qeFxB2^ZTMx#N7v6N9W4S-t5|5Ym?=(8Qk1MVxqrFQJk5FP?o`S_UAl0}eWN!jYjX+s*)mQd!&k1z4PlWKTrW6%fYp zMDm{?TfuszdkD4$F$!*~DWTshdd!KUdTd?*000hUSV?A0O#mtY000O800000007cc QlK=n!07*qoM6N<$f>jAKh5!Hn diff --git a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/icon_open.png deleted file mode 100644 index 63d4d672c1d60709e5d0e6e3b19aeff1cec8329d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 705 zcmV;y0zUnTP)Px%VM#cIqkDW`;5i&_tId$`;iD#E!JM=$%noOAE_ z@%?_!@BI5g0R~y{9UC4TkO9uNUDEj6ZnqHcHc3~d%{^YY(N!v*sB2O_jLf!?r-H;D4@%PZUd=sKz5iS%SZgjZJvq-rOz8KvKRP-$Z` zdjM!U)&RgzuOC--MVM1~vji_R%N34tJa<9>j3rYWgaN$WjXb>>xW)V`O0{SoHWeF{9+PLrAc!uQ!1ym|f(fR^(onESAd&Au0tEz53mN&XC& zY*{3mm4(l6v9kq$#UDSB>a9Q)$a4l%*pA-f_qSQ4f5?Tr^3V{EVFQ_oAg0_Wtq-e) zcyv8Rk)8wqxr~J}iknIC=RtLy!NhwX0TXr>B;fo_edrjQ54}V*oaufA!zj`2_$%I>bT8O?ad8 z%7z+XESW;8cCHatt0K{gNH_y3ai}l6#>jeMz0kb`>x~!{E}#Gve*r*!&Q(4>KIH%a n01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf5OzK< diff --git a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/molejuice.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/icon.png deleted file mode 100644 index b26294d1cec10386c549a4ea7c7b6e996ea8f345..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^>XP)Px$vq?ljR9J=WmOoFzKp2OglZul%@CDk$kg&Sn28&^Fa5Zs(FQ6fvhzrEX7toQ9 z;Nl=#cM}%}C8@K9LD`_qIl#ezf6^VXERLS9hF3!YBT@C0}Q+>$$6^LkR_UdqHV6C0>Vsp5K_ov~tP ztSICK;k56ct4G}4^yt^>?78l*ah7G(1ADGZzgC|-UtckR`TGUBZ}&dqCIT zYqtUDzr1__!=xmkVm&?Ji3uq5{e@JAzE9V2=sNbB$|?h%u{t#7Ue|GG#?ivJwPe7Q zHsc9s#u4YabR%V@QEV!$iPV$Olm<8BXrVMoWR-!Rf;Z!c<7fi++HI>rlsE(TQc{+Z zu+;+QJ)lkL?P)9P5@^tD-!FmRhr{(6FpcP8WP*D^us#F5AfP<0@9y^Yx8S=VusUI_ zk7IoqDND)QV8FxUV=C~Px$yh%hsR9HvtmcL5FP!z^bXw|7W1ovC0f?a%qY`TOlBEEus0Yy5AON-POXh&BO zm(oSIJb_CGEwsBt&~9Rhd^bJjwothD;%%YyOz92D_dDPD(|EMx@RqDkYk;)_tKq;= z5G0tUrzkQ`$oK(uY+3lY64GO*yEp(<7(iROyySX4zn~j38*M8G0D!DjVF37>9>w2@ z5ri?oC6TQ6-fdH6%-3RH&|Bq{zBbGti~t~xED^}GIC*-vb1%;T&_AovORuNh5842* z{h(Z?QoAL^I8%mzFrp*`J#_UO(g@%r45>dHrb6u&4HBYpH5119pjMOjb(>KefNNiD zG^D^Eh!FBO3&RnBIRW68Ll7W5f3azGry>OE%;WU{H%+=SP; z48my%<^kZGAr=k*VYU8lr$Ct-wFKM~XijH);4ld2qh6QUsuRIe!R2uZuw5uj&;4XC zu=wX_M9)#=W);H$2H<6cJ%E5P0^$hWj}z@p$lm~fKmY`bXvg=hgxN7|0DeFPd5>fH z&u5acI>xv*2ABoWwR%?A+JSj5vOTwUz*g|zO0Y5jzkOEIA>Tn69{>OV07*qoM6N<$ Ef+=6(2><{9 diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/syndicatejuice.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon.png deleted file mode 100644 index 013f89c0436a635c34dacfec085271c0fa0cb936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 658 zcmV;D0&V??P)Px%GD$>1R9J=WmO+S8Q5c0kHB*Y-Mo^T-#)LrLHVDGP5yF+Ti8dulAv_px<5rR> zsnsA%G6S|5W;0MmMM29(hy=k!5pE(0hCy+56@?q94B1b*;dmjWnzv~lL`Z9!XCGa zwZ~bUieG)3dM}(RoFIX8O2OlH;c>f=az3P-4{t0$v=CN}@EA@YS_rG1^M|atvq(7~ z06*`4r&6u)$i4|NG!sHe7%~togjH`W0DzS9acy}CfJ(Kd_dGeh%1g&PHrNv46yAc; z&bIpc-ZNa16PM)VQb^{*n_Ymx%7IL0g+=dzC?#Mpfkp2EnZ1>PsISQ{D@2giX z1K?Erh71Uw*mF0{D!@Up0UX6XF5H)`^nP^dt ze4#iy1NlO6U5fyNrYlXvFzKapW;FE^HKrw_x1Jq{4H|q2Vvs9K_Sq sG}fa4000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g2W>rI{*Lx diff --git a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/icon_open.png deleted file mode 100644 index 8b17a68260f374a94c7cd249633e1364db3a4e59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)Px%JxN4CR9J=WmS1R6VHn1LYUU_9H-e%xn+buO+aL%FCzKGlpopMEDTD)q-RyQC zE2*m?ELmVT!<)e}>>o&1O^AfSE{c#rG#Fz{++9SW$l2*)oRh8w-*HMeK6i)r<9UAP z{l4>_4~80QsQ)aB=)y{+a%io%RL}r!-ANjL;c!^U*D4BdSa5NvpiNIHJ$oGMH5fn- z_IljRJx=3N0@~ZD_rhI;BXnSTO2O-K(ay0N!0KQhHrxUD|{=I)qRsOaa7l5zQA50w87lT$&gMptM{z);u{rOUYSgfkh!t z;VmdG6|`6PmvKuj+>(oPVVMtaRsdMPy~&O1*O+NeGUgi2ZEOX!7e}%czZPi`yP) z6sMvgS`HP9#nkZYAHe+G4IC{S%37EcX$R1~HGKy-XnrzLCmM_}arO$SXo$=582}Q_ zWd8vY&Lp2^tJrF710)p<@%hIWUTnPt;N$ae#%C%j)BgfJz@-FOtgZZ2+o?AO3(y%> zU0pK<(N4X=PQ5`kmmeHJHka?Z1L(ne4gTDU7M_XyjD!Jn<7_V9bs0GrY*wbX;2=n^ z!9xwD>o@m4#uBtRU?Ttk01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf DzZ)Po diff --git a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/unatijuice.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} From b97bb04609b3977cf402172f503addd9d1a6d996 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Fri, 24 May 2024 16:29:51 +0300 Subject: [PATCH 05/12] updete --- .../Consumable/Drinks/drinks-cartons.yml | 6 ++- Resources/Prototypes/Reagents/fun.yml | 32 ++++++++++++ .../Drinks/cardboardjuiceboxes.rsi/meta.json | 50 ++++++++++++++----- 3 files changed, 74 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index e3a7420fa9cced..fdcfcfff368073 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -356,7 +356,11 @@ - ReagentId: JuiceOrange Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/molejuice.rsi + sprite: Objects\Consumable\Drinks\cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_mole - type: Label originalName: mole juice currentLabel: сделано на 99,99 изз Бззз! diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index befa8d829688ed..f44a8c04257fe2 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -348,3 +348,35 @@ conditions: - !type:ReagentThreshold min: 50 + +- type: reagent + id: JuiceThatMakesYouBuzz + name: reagent-name-buzz + group: Toxins + desc: reagent-desc-buzz + physicalDesc: reagent-physical-desc-vibrant + flavor: buzz + color: "#fbec5d" + metabolisms: + Poison: + metabolismRate: 0.25 + effects: + - !type:Emote + emote: Buzz + showInChat: true + probability: 0.5 + - !type:Polymorph + prototype: ArtifactLizard + conditions: + - !type:OrganType + type: Animal + shouldHave: false + - !type:ReagentThreshold + min: 50 + - !type:AdjustReagent + reagent: JuiceThatMakesYouBuzz + amount: -20 + conditions: + - !type:ReagentThreshold + min: 50 + diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json index 887274fd9b36e4..58ed649bfd35f0 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json @@ -1,23 +1,47 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github)", "size": { "x": 32, "y": 32 }, "states": [ - { "name": "icon" }, - { "name": "icon_open" }, - { "name": "icon_apple" }, - { "name": "icon_banan" }, - { "name": "icon_berry" }, - { "name": "icon_carrot" }, - { "name": "icon_catdespair" }, - { "name": "icon_lemon" }, - { "name": "icon_mole" }, - { "name": "icon_pineapple" }, - { "name": "icon_syndi" }, - { "name": "icon_unati" } + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_apple" + }, + { + "name": "icon_banan" + }, + { + "name": "icon_berry" + }, + { + "name": "icon_carrot" + }, + { + "name": "icon_catdespair" + }, + { + "name": "icon_lemon" + }, + { + "name": "icon_mole" + }, + { + "name": "icon_pineapple" + }, + { + "name": "icon_syndi" + }, + { + "name": "icon_unati" + } ] } \ No newline at end of file From 5ca9ad3ee8f2fb87dabea4873675ef80888184ca Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Fri, 24 May 2024 18:37:38 +0300 Subject: [PATCH 06/12] big update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit интересный факт пока я делал этот коминт у меня пк крашнул 5 раз :catdespair: --- .../consumable/drinks/drinks-cartons.ftl | 6 +- .../VendingMachines/Inventories/boozeomat.yml | 6 ++ .../Consumable/Drinks/drinks-cartons.yml | 93 ++++++++++++++---- .../cardboardjuiceboxes.rsi/icon_orange.png | Bin 0 -> 410 bytes .../Drinks/cardboardjuiceboxes.rsi/meta.json | 2 +- .../Drinks/orangejuice.rsi/icon.png | Bin 617 -> 0 bytes .../Drinks/orangejuice.rsi/icon_open.png | Bin 631 -> 0 bytes .../Drinks/orangejuice.rsi/meta.json | 17 ---- 8 files changed, 86 insertions(+), 38 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_orange.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index 674c08cef33201..fe39d634a26ea9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -8,7 +8,7 @@ ent-DrinkCartonVisualsOpenable = { "" } ent-DrinkJuiceLimeCarton = лаймовый сок .desc = Кисло-сладкое наслаждение. ent-DrinkJuiceOrangeCarton = апельсиновый сок - .desc = Полно витаминов и вкусностей! + .desc = Сок который любят большинство экипажа на станции! ent-DrinkJuiceTomatoCarton = томатный сок .desc = Ну, по крайней мере, это ВЫГЛЯДИТ как томатный сок. При всей этой красноте ничего не скажешь. ent-DrinkCoconutWaterCarton = кокосовая вода @@ -37,5 +37,7 @@ ent-DrinkJuiceUnatieCarton = унати сок .desc = Только для насстоящих унатхов! (и для тех кто сстал ими душшевно) ent-DrinkJuiceCatDespairCarton = cat despair juice .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра? -ent-DrinkMoleCatDespairCarton = мофф сок +ent-DrinkJuiceMoleCarton = мофф сок .desc = Рекомендуется всеми мофф +ent-DrinkJuicelemonCarton = лимонный сок + .desc = это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index b1f837c57a07f3..6737bd9e106d28 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -7,6 +7,9 @@ DrinkVacuumFlask: 5 DrinkFlaskBar: 5 DrinkShaker: 5 + DrinkJigger: 5 + DrinkIceBucket: 2 + BarSpoon: 3 CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 @@ -15,6 +18,7 @@ DrinkCognacBottleFull: 4 DrinkCoconutWaterCarton: 3 DrinkColaBottleFull: 4 + DrinkEnergyDrinkCan: 8 DrinkMilkCarton: 2 DrinkCreamCarton: 5 DrinkGinBottleFull: 3 @@ -46,7 +50,9 @@ DrinkJuiceBerryCarton: 3 DrinkJuiceBananaCarton: 3 DrinkJuicePineappleCarton: 3 + DrinkJuicelemonCarton: 3 DrinkJuiceUnatieCarton: 1 + DrinkJuiceMoleCarton: 1 emaggedInventory: DrinkPoisonWinebottleFull: 2 DrinkJuiceSyndicateCarton: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index fdcfcfff368073..526d73f8ed38c0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -66,10 +66,6 @@ enum.OpenableVisuals.Layer: True: {state: "icon_open"} False: {state: "icon"} - - type: Sprite - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - type: entity parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] @@ -99,7 +95,14 @@ - ReagentId: JuiceOrange Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/orangejuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_orange + - type: Label + originalName: апельсиновый сок + currentLabel: Полно витаминов! - type: entity parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] @@ -207,7 +210,11 @@ - ReagentId: JuiceApple Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/applejuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_apple - type: Label originalName: яблочный сок currentLabel: Яблочный сок полон сахара и вкуса! Сделан из спелых и сочных яблок! @@ -225,7 +232,11 @@ - ReagentId: JuiceCarrot Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/carrotjuicecarton.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_carrot - type: Label originalName: морковный сок currentLabel: здесь могла бы быть ваша реклама @@ -243,7 +254,11 @@ - ReagentId: JuiceBerry Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/berryjuicecarton.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_berry - type: Label originalName: ягодный сок currentLabel: Освежающий аромат и вкус, с нотками дикой природы @@ -261,7 +276,11 @@ - ReagentId: JuiceBanana Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/bananajuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_banan - type: Label originalName: банановый сок currentLabel: Состоит из 75% бананов, 24% робуста, 1% бананиума @@ -279,7 +298,11 @@ - ReagentId: JuicePineapple Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/ananasjuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_pineapple - type: Label originalName: ананасовый сок currentLabel: Освежающий и бодрящий продукт! В составе более 90% спелых и вкуснейших ананасов! Без добавления консервантов @@ -300,9 +323,12 @@ Quantity: 25 - ReagentId: Tricordrazine Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/syndicatejuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_syndi - type: Label originalName: cинди сок currentLabel: зделано на заказ компанией "Еnergy DOOM™" @@ -320,7 +346,11 @@ - ReagentId: JuiceThatMakesYouWeh Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/unatijuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_unati - type: Label originalName: унати сcок currentLabel: Сссделан на 99% исс вех! (не сспрашшивайте как) @@ -338,14 +368,18 @@ - ReagentId: MuteToxin Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/catdespairjuice.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_catdespair - type: Label originalName: cat despair juice currentLabel: Зделано из 50% кота и 50% тёмной глубокой бездны - type: entity parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkMoleCatDespairCarton + id: DrinkJuiceMoleCarton name: mole juice description: Full of vitamins and deliciousness! components: @@ -353,15 +387,38 @@ solutions: drink: reagents: - - ReagentId: JuiceOrange + - ReagentId: JuiceThatMakesYouBuzz Quantity: 50 - type: Sprite - sprite: Objects\Consumable\Drinks\cardboardjuiceboxes.rsi + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi layers: - state: icon map: ["enum.OpenableVisuals.Layer"] - state: icon_mole - type: Label - originalName: mole juice + originalName: мофф сок currentLabel: сделано на 99,99 изз Бззз! +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuicelemonCarton + name: lemon juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceOrange + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_lemon + - type: Label + originalName: лимонный сок + currentLabel: ОПАСНО! может прожечь язык + + diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_orange.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..ef19fc62c6e9392dd39c21abbd2a41c142a67c8d GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T(T*py1U6@e>a&UEJ5~p}1Q=U`6wV z2VzXDyrGw0FEIDGP&7GV_nmyMo$BBJpYttpSbQ;~tY=}A1dC(YTZ?n+P0iP7`mKA{ z<7-;^Eriv~P%?_?!J1^FuXlVN#j~W%(^hltK4@W-@*zP+lA$xdyY76_tDQ_oFYBrp ze2%&JKJq~Lb@AoB@26_4w%k`2_D+tghI!JF?W_(G%WZ7dP7rFJ-hHS#ROw@`V!Y$O zeN#dlZ${<)3Sa&+;HvP-m0W*#PPL1^+_9-4#V)J!v#a|V_qCTEE@eGrvGliCasBQk zr?nI3Px%BS}O-R9J=WmOp3{Q5?rVnqZ+gv}7oWmzoYj9V{q{(1bG*2)*;b}rBZ3vu|h6u0!&Wdbo}D+xRCE*(Ez)F3%RVByfx$6!|xUh zV1q-!A@oP{WUq~yqYsM0RdpS}hKGVf04&}=3qT?kU^%5pg^&)gk|1QR+!21cLn~6<{N!nTc2cuvR^Bx*vebYSo$Z?aUKujd#FHAy45ZEabB0iQBJH z27M@lKF&q@SX|o%V7#8Rf{YkMhQp$kfMf+C!(l2I7L+8PzF1Iz@$=SpY(9%}>g!Ko zPvK^HuJxITSO8^q1!$Mu29sB<0KZynjkLIMy(#1^e-7kT$g6E|2OL1T;^XtH-@;3(nrquo?{5#Pu=%FN$r}SuZ0>)6#|;gAY{>}{fQd*VH?r=z$R zZdX7?dk@e7r!4=v)E3+g7nxhv0MN&l_&DJI3$DzrP-{Fy^dJ%rP&+=&<*PI3A10k= z-{0@Rog)@}%Ej_!0ywfkd6i=q{SYd{RC{>qhgkQ!56}^0r{f=BgN=0N-~t%wOxGRY zUts%I^z_9(_ke9|q%&QYkzTN@q_?0qh+D8HPqzL55!kg{O4+YY00000NkvXXu0mjf D;V2yU diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png deleted file mode 100644 index 971467080429a9c939ca195b1dac56d28a74ccb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)Px%F-b&0R9J=WmOW@wQ5c3FO|a0ZAwx*KsmUPJ!GaPIOt?m(TyU^jD3q!=mJa?< zQi6+vgIPjQg4no7P(mO>Xoo_e#TZDyA1E|~+5AbZWDuP?HC%_=n?Eg_b6auAyWM-v zeV_My=evgk0}V9Lf7T(Ym zFn|g6xLqV3Js@*^Odq>n6t1e}04Chyb^%a`1ptVIoUFw)sSwgzP>*YRu(gcG?V=D1 zP>2O^O)gTgT|sf!h=iQf{Lf-P{Ku(36 z+5vaL0h9?FA7B0wwv+x1qZ=0iNTAYO--b`aok0~gms*^-IReGz!3TKU&`6B0wu1y& z?txP_DzLU7-UItOiu>Va1!T1U09|m(@}Em>!98!0=!OOu|NgrX`yX&+u0pNx5YdB3 zI6&>#441CXl6W)Ke)sM54%|Irz^5%NUnW3XCMc(J^nx8cWti>^Z+#c*e(M3cg6!-b zM&00KD*f*QBva|0JHX$-=B?=I^8@Yy(>R$*_gqH$!LpLxg8m>@!2=Cs>NgZkwH@Y< RQ=0$)002ovPDHLkV1mpAAKU-{ diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json deleted file mode 100644 index 9e1d9a9075dcc1..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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" - }, - { - "name": "icon_open" - } - ] -} From 375ecac77a08790377881e6b2cebf66e007a2f2c Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sat, 25 May 2024 12:55:02 +0300 Subject: [PATCH 07/12] Big juce update --- .../Locale/ru-RU/flavors/flavor-profiles.ftl | 3 +- Resources/Locale/ru-RU/reagents/meta/fun.ftl | 4 +- .../consumable/drinks/drinks-cartons.ftl | 6 +- .../VendingMachines/Inventories/boozeomat.yml | 1 + .../VendingMachines/Inventories/sec.yml | 1 + .../Consumable/Drinks/drinks-cartons.yml | 54 +++++++++++++++++- .../Prototypes/Entities/Objects/Fun/toys.yml | 16 +++++- Resources/Prototypes/Flavors/flavors.yml | 5 ++ Resources/Prototypes/Reagents/fun.yml | 8 --- .../cardboardjuiceboxes.rsi/icon_SB.png | Bin 0 -> 860 bytes .../icon_watermelon.png | Bin 0 -> 451 bytes .../Drinks/cardboardjuiceboxes.rsi/meta.json | 9 +++ 12 files changed, 93 insertions(+), 14 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_SB.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_watermelon.png diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl index 50ed96a54ee923..bd9cec05bea75a 100644 --- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl @@ -1,4 +1,4 @@ -flavor-profile = На вкус { $flavor }. +flavor-profile = На вкус { $flavor }. flavor-profile-multiple = На вкус { $flavors } и { $lastFlavor }. flavor-profile-unknown = Вкус неописуем. @@ -274,3 +274,4 @@ flavor-complex-sax = как джаз flavor-complex-bottledlightning = как молния в бутылке flavor-complex-punishment = как наказание flavor-weh = как вех +flavor-buzz = как бззз diff --git a/Resources/Locale/ru-RU/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/reagents/meta/fun.ftl index 8d8fc7a9993263..9efff04a7dc1c8 100644 --- a/Resources/Locale/ru-RU/reagents/meta/fun.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/fun.ftl @@ -1,4 +1,4 @@ -reagent-name-carpetium = ковриний +reagent-name-carpetium = ковриний reagent-desc-carpetium = Таинственный химикат, обычно поставляемый с планеты клоунов, который покрывает ковром все, на что попадёт. reagent-name-fiber = волокно reagent-desc-fiber = Сырье, обычно извлекаемое из шерсти или других тканых изделий. @@ -18,3 +18,5 @@ reagent-name-laughter = Смех reagent-desc-laughter = Некоторые говорят, что это лучшее лекарство, но последние исследования доказали, что это не так. reagent-name-weh = сок, заставляющий говорить Вех reagent-desc-weh = Чистая сущность плюшевого унатха. Заставляет вас говорить Вех! +reagent-name-buzz = сок, заставляющий говорить Бззз +reagent-desc-buzz = Чистая сущность плюшевого моли. Заставляет вас говорить Бззз! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index fe39d634a26ea9..13ff4e74f04b63 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -38,6 +38,10 @@ ent-DrinkJuiceUnatieCarton = унати сок ent-DrinkJuiceCatDespairCarton = cat despair juice .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра? ent-DrinkJuiceMoleCarton = мофф сок - .desc = Рекомендуется всеми мофф + .desc = Рекомендуется всеми мофф. Бззз! ent-DrinkJuicelemonCarton = лимонный сок .desc = это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии. +ent-DrinkJuiceWatermelonCarton = арбузный сок + .desc = это удивительный напиток, который сочетает в себе сладость спелого арбуза и таинственную энергию космоса. Его ярко-красный цвет напоминает о красоте красных планет, а сладкий вкус арбуза дарит ощущение летнего солнца и свежести. +ent-DrinkJuiceCbCarton = сок службы безопасности + .desc = это освежающий и бодрящий сок, специально разработанный для служб безопасности и охраны. Уникальное сочетание натуральных ингредиентов помогает поддерживать высокий уровень бдительности и энергии в течение дня. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 6737bd9e106d28..7628ce27813748 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -51,6 +51,7 @@ DrinkJuiceBananaCarton: 3 DrinkJuicePineappleCarton: 3 DrinkJuicelemonCarton: 3 + DrinkJuiceWatermelonCarton: 3 DrinkJuiceUnatieCarton: 1 DrinkJuiceMoleCarton: 1 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 619c5bb7d8432d..50fd7d95d7cba9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -21,6 +21,7 @@ RiotLaserShield: 2 RiotBulletShield: 2 RadioHandheldSecurity: 5 + DrinkJuiceCbCarton: 1 # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index 526d73f8ed38c0..b005d568dfaa15 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -409,7 +409,7 @@ solutions: drink: reagents: - - ReagentId: JuiceOrange + - ReagentId: JuiceLemon Quantity: 50 - type: Sprite sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi @@ -419,6 +419,56 @@ - state: icon_lemon - type: Label originalName: лимонный сок - currentLabel: ОПАСНО! может прожечь язык + currentLabel: ОПАСНО! Может прожечь язык! + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceWatermelonCarton + name: watermelon juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceWatermelon + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_watermelon + - type: Label + originalName: арбузный сок + currentLabel: На этикетке изображена на вид сладкая, спелая и красная долька арбуза + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceCbCarton + name: cb juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Bicaridine + Quantity: 3 + - ReagentId: Tricordrazine + Quantity: 7 + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Saline + Quantity: 20 + - type: Sprite + sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: icon_SB + - type: Label + originalName: сок службы безопасности + currentLabel: Самый безопасный сок во вселеной! diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 0671355db75463..5d3b463a340899 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1,4 +1,4 @@ -## Plushies +## Plushies - type: entity parent: BaseItem @@ -773,6 +773,20 @@ requiresSpecialDigestion: true useSound: path: /Audio/Voice/Moth/moth_scream.ogg + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouBuzz + Quantity: 30 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 10 + - ReagentId: JuiceThatMakesYouBuzz + Quantity: 10 ## Cheapo Figurines diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 73ded93e0f2d5d..ef5e7e268d8e1f 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1079,6 +1079,11 @@ flavorType: Base description: flavor-weh +- type: flavor + id: buzz + flavorType: Base + description: flavor-buzz + - type: flavor id: fishops flavorType: Complex diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index f44a8c04257fe2..d67eca238c218f 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -365,14 +365,6 @@ emote: Buzz showInChat: true probability: 0.5 - - !type:Polymorph - prototype: ArtifactLizard - conditions: - - !type:OrganType - type: Animal - shouldHave: false - - !type:ReagentThreshold - min: 50 - !type:AdjustReagent reagent: JuiceThatMakesYouBuzz amount: -20 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_SB.png b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_SB.png new file mode 100644 index 0000000000000000000000000000000000000000..1b1b604b0ee2b9f3d3e46e64a576536fa6409ba2 GIT binary patch literal 860 zcmV-i1Ec(jP)EX>4Tx04R}tk-JO7P!z_$ww4yDi0DwHLx$=g7DPcDoT{`47D`*es)NZ*A3~Cb zB*n#1a4k59F1`l+14LH`S3wXILB!G7*CHjJn*>^<^@hv&<-6y6+;cAAKUbJ)_Dle( zW*ND3Qdlmo2%$Fw5yb#~g2+rglTQ`Ub$vg;$K!p1dv(w2xccOh$pD`~oMO6R5m$+) zH!Yp>5%CbKiZby9@wh=3B!1<(JT>V$MaVh$V%r}hKxh|eHf;On*tVM|K;Rj;)>`#7 zn&ZqD>5Y~aKLq-z&&!*ZChY-NJ3#bF7Y)&o0<`_*GVp#z&s78l?||M_cYfYEP9K57 z7O;2=>>mK574lx|(s$UK-vTno{+r`X@E04dbj9h1lj8sY00v@9M??U10B8Vc&D^Il z00009a7bBm001r{001r{0eGc9b^rhX2XskIMF;2w7!ouRJij*X0000SbVXQnLvL+u zWo~o;Lvm$dbY)~9cWHEJAV+LzZE$mC?oJp70003ENkl#v;h`%MURGq}qTA}mC>lP+QTPKE=pC?C!#)N65dM)gE zrFi1FdXYzq6e?Yy9`37ru4UFISCb=@6(AZxUw=Jczp5E#tw1$U1O59*?JsFT{gyc%x6Ww*UYD m4rN$LW=%~1DgXcg2mk;800000(o>TF0000~`^F=!ZCtTds@)bE zv2P~$HN`GnAKWA|b&to(N%>rRW*7V2+q-iD5PUeV5y-v#a^{a1z3KedMC7{{)n5(w zyZT2>)bxPnr#>|x+Vqm=+A$%c_i-m?MM`@=k?l>*Uiw7Vmq905n{|Oa@}5+JZ+CN4h^>3SsR}3UUUC?i(;2;=Gx60o^Rub z+TdRrBzV6@*Sfk9EwBky;j ol5Ik7u_iF=`BEc1(|mmyw18|5AO?X;!IMFhr>mdKI;Vst0P&c(j{pDw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json index 843a8a87e8441d..96839de1dacc6b 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json @@ -42,6 +42,15 @@ }, { "name": "icon_unati" + }, + { + "name": "icon_orange" + }, + { + "name": "icon_SB" + }, + { + "name": "icon_watermelon" } ] } \ No newline at end of file From 1187c8c723d01f9a6cf5be49a2f2ba83acc8a3dd Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sun, 26 May 2024 12:50:05 +0300 Subject: [PATCH 08/12] fix --- .../Consumable/Drinks/orangejuice.rsi/icon.png | Bin 0 -> 617 bytes .../Drinks/orangejuice.rsi/icon_open.png | Bin 0 -> 631 bytes .../Drinks/orangejuice.rsi/meta.json | 17 +++++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59bfce31f9fb9bb3e223b76d6d1cb993546197ce GIT binary patch literal 617 zcmV-v0+#)WP)Px%BS}O-R9J=WmOp3{Q5?rVnqZ+gv}7oWmzoYj9V{q{(1bG*2)*;b}rBZ3vu|h6u0!&Wdbo}D+xRCE*(Ez)F3%RVByfx$6!|xUh zV1q-!A@oP{WUq~yqYsM0RdpS}hKGVf04&}=3qT?kU^%5pg^&)gk|1QR+!21cLn~6<{N!nTc2cuvR^Bx*vebYSo$Z?aUKujd#FHAy45ZEabB0iQBJH z27M@lKF&q@SX|o%V7#8Rf{YkMhQp$kfMf+C!(l2I7L+8PzF1Iz@$=SpY(9%}>g!Ko zPvK^HuJxITSO8^q1!$Mu29sB<0KZynjkLIMy(#1^e-7kT$g6E|2OL1T;^XtH-@;3(nrquo?{5#Pu=%FN$r}SuZ0>)6#|;gAY{>}{fQd*VH?r=z$R zZdX7?dk@e7r!4=v)E3+g7nxhv0MN&l_&DJI3$DzrP-{Fy^dJ%rP&+=&<*PI3A10k= z-{0@Rog)@}%Ej_!0ywfkd6i=q{SYd{RC{>qhgkQ!56}^0r{f=BgN=0N-~t%wOxGRY zUts%I^z_9(_ke9|q%&QYkzTN@q_?0qh+D8HPqzL55!kg{O4+YY00000NkvXXu0mjf D;V2yU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..971467080429a9c939ca195b1dac56d28a74ccb9 GIT binary patch literal 631 zcmV--0*L*IP)Px%F-b&0R9J=WmOW@wQ5c3FO|a0ZAwx*KsmUPJ!GaPIOt?m(TyU^jD3q!=mJa?< zQi6+vgIPjQg4no7P(mO>Xoo_e#TZDyA1E|~+5AbZWDuP?HC%_=n?Eg_b6auAyWM-v zeV_My=evgk0}V9Lf7T(Ym zFn|g6xLqV3Js@*^Odq>n6t1e}04Chyb^%a`1ptVIoUFw)sSwgzP>*YRu(gcG?V=D1 zP>2O^O)gTgT|sf!h=iQf{Lf-P{Ku(36 z+5vaL0h9?FA7B0wwv+x1qZ=0iNTAYO--b`aok0~gms*^-IReGz!3TKU&`6B0wu1y& z?txP_DzLU7-UItOiu>Va1!T1U09|m(@}Em>!98!0=!OOu|NgrX`yX&+u0pNx5YdB3 zI6&>#441CXl6W)Ke)sM54%|Irz^5%NUnW3XCMc(J^nx8cWti>^Z+#c*e(M3cg6!-b zM&00KD*f*QBva|0JHX$-=B?=I^8@Yy(>R$*_gqH$!LpLxg8m>@!2=Cs>NgZkwH@Y< RQ=0$)002ovPDHLkV1mpAAKU-{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json new file mode 100644 index 00000000000000..9e1d9a9075dcc1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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" + }, + { + "name": "icon_open" + } + ] +} From 77070d738e294ef5b32d3e2e33a3082a9fb1ad72 Mon Sep 17 00:00:00 2001 From: MilenVolf Date: Mon, 27 May 2024 03:54:50 +0300 Subject: [PATCH 09/12] Update juice --- .../starshine/flavors/flavor-profiles.ftl | 3 + .../en-US/starshine/reagents/meta/fun.ftl | 2 + .../Locale/ru-RU/flavors/flavor-profiles.ftl | 1 - Resources/Locale/ru-RU/reagents/meta/fun.ftl | 2 - .../consumable/drinks/drinks-cartons.ftl | 2 +- .../starshine/flavors/flavor-profiles.ftl | 3 + .../ru-RU/starshine/reagents/meta/fun.ftl | 2 + .../objects/consumable/drinks-cartons.ftl | 24 ++ .../VendingMachines/Inventories/boozeomat.yml | 9 +- .../VendingMachines/Inventories/sec.yml | 1 - .../Consumable/Drinks/drinks-cartons.yml | 289 +----------------- Resources/Prototypes/Reagents/fun.yml | 23 -- .../Objects/Consumable/drinks-cartons.yml | 238 +++++++++++++++ .../Prototypes/Starshine/Reagents/fun.yml | 16 + .../Starshine/Voice/speech_emotes.yml | 6 + .../Prototypes/Voice/speech_emote_sounds.yml | 22 ++ .../Drinks/cardboardjuiceboxes.rsi/meta.json | 56 ---- .../Drinks/cardboardjuiceboxes.rsi/icon.png | Bin .../cardboardjuiceboxes.rsi/icon_open.png | Bin .../cardboardjuiceboxes.rsi/label-apple.png} | Bin .../cardboardjuiceboxes.rsi/label-banana.png} | Bin .../cardboardjuiceboxes.rsi/label-berry.png} | Bin .../cardboardjuiceboxes.rsi/label-carrot.png} | Bin .../label-catdespair.png} | Bin .../cardboardjuiceboxes.rsi/label-lemon.png} | Bin .../cardboardjuiceboxes.rsi/label-moff.png} | Bin .../cardboardjuiceboxes.rsi/label-orange.png} | Bin .../label-pineapple.png} | Bin .../cardboardjuiceboxes.rsi/label-sec.png} | Bin .../cardboardjuiceboxes.rsi/label-syndi.png} | Bin .../label-watermelon.png} | Bin .../cardboardjuiceboxes.rsi/label-weh.png} | Bin .../Drinks/cardboardjuiceboxes.rsi/meta.json | 56 ++++ 33 files changed, 384 insertions(+), 371 deletions(-) create mode 100644 Resources/Locale/en-US/starshine/flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/en-US/starshine/reagents/meta/fun.ftl create mode 100644 Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/ru-RU/starshine/reagents/meta/fun.ftl create mode 100644 Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl create mode 100644 Resources/Prototypes/Starshine/Entities/Objects/Consumable/drinks-cartons.yml create mode 100644 Resources/Prototypes/Starshine/Reagents/fun.yml create mode 100644 Resources/Prototypes/Starshine/Voice/speech_emotes.yml delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json rename Resources/Textures/{ => Starshine}/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png (100%) rename Resources/Textures/{ => Starshine}/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_open.png (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_apple.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-apple.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_banan.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-banana.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_berry.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-berry.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_carrot.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-carrot.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_catdespair.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-catdespair.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_lemon.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-lemon.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_mole.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-moff.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_orange.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-orange.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_pineapple.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-pineapple.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_SB.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-sec.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_syndi.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-syndi.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_watermelon.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-watermelon.png} (100%) rename Resources/Textures/{Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_unati.png => Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-weh.png} (100%) create mode 100644 Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json diff --git a/Resources/Locale/en-US/starshine/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/starshine/flavors/flavor-profiles.ftl new file mode 100644 index 00000000000000..698472e1ee2f37 --- /dev/null +++ b/Resources/Locale/en-US/starshine/flavors/flavor-profiles.ftl @@ -0,0 +1,3 @@ +## Generic flavors. + +flavor-buzz = like bzzz diff --git a/Resources/Locale/en-US/starshine/reagents/meta/fun.ftl b/Resources/Locale/en-US/starshine/reagents/meta/fun.ftl new file mode 100644 index 00000000000000..f5fd23599c5d9a --- /dev/null +++ b/Resources/Locale/en-US/starshine/reagents/meta/fun.ftl @@ -0,0 +1,2 @@ +reagent-name-buzz = juice that makes you Bzzz +reagent-desc-buzz = Pure essence of moth plush. Makes you Bzzz! diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl index bd9cec05bea75a..745db67c1704d3 100644 --- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl @@ -274,4 +274,3 @@ flavor-complex-sax = как джаз flavor-complex-bottledlightning = как молния в бутылке flavor-complex-punishment = как наказание flavor-weh = как вех -flavor-buzz = как бззз diff --git a/Resources/Locale/ru-RU/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/reagents/meta/fun.ftl index 9efff04a7dc1c8..7b232f2e5e4785 100644 --- a/Resources/Locale/ru-RU/reagents/meta/fun.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/fun.ftl @@ -18,5 +18,3 @@ reagent-name-laughter = Смех reagent-desc-laughter = Некоторые говорят, что это лучшее лекарство, но последние исследования доказали, что это не так. reagent-name-weh = сок, заставляющий говорить Вех reagent-desc-weh = Чистая сущность плюшевого унатха. Заставляет вас говорить Вех! -reagent-name-buzz = сок, заставляющий говорить Бззз -reagent-desc-buzz = Чистая сущность плюшевого моли. Заставляет вас говорить Бззз! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index 13ff4e74f04b63..0139a4f360e143 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -8,7 +8,7 @@ ent-DrinkCartonVisualsOpenable = { "" } ent-DrinkJuiceLimeCarton = лаймовый сок .desc = Кисло-сладкое наслаждение. ent-DrinkJuiceOrangeCarton = апельсиновый сок - .desc = Сок который любят большинство экипажа на станции! + .desc = Сок который любит большинство экипажа на станции! ent-DrinkJuiceTomatoCarton = томатный сок .desc = Ну, по крайней мере, это ВЫГЛЯДИТ как томатный сок. При всей этой красноте ничего не скажешь. ent-DrinkCoconutWaterCarton = кокосовая вода diff --git a/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl new file mode 100644 index 00000000000000..370fc3e39b01bc --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl @@ -0,0 +1,3 @@ +## Generic flavors. + +flavor-buzz = как бззз diff --git a/Resources/Locale/ru-RU/starshine/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/starshine/reagents/meta/fun.ftl new file mode 100644 index 00000000000000..7c7d99162ed5ac --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/reagents/meta/fun.ftl @@ -0,0 +1,2 @@ +reagent-name-buzz = сок, заставляющий говорить Бззз +reagent-desc-buzz = Чистая сущность плюшевого моли. Заставляет вас говорить Бззз! diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl new file mode 100644 index 00000000000000..ed6999956d25fb --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl @@ -0,0 +1,24 @@ +ent-DrinkJuiceAppleCarton = яблочный сок + .desc = Сок выпуска 3023 года, свежего кислотного-отжима, с добавлением экстракта из семечек яблок и донк-ароматизаторов. +ent-DrinkJuiceCarrotCarton = морковный сок + .desc = Богат витамином А и имеет необычный вкус. Люди, работающие за терминалами, являются их главными клиентами. +ent-DrinkJuiceBerryCarton = ягодный сок + .desc = Любимый сок сладкоежек, как жаль, что его производство упало в связи с уменьшением количества потребителей на станциях НТ. Однако поговаривают, что особый ингредиент позволяет им оставаться на рынке и продавать более половины товара в неизвестные сектора. +ent-DrinkJuiceBananaCarton = банановый сок + .desc = Почуствуй вкус бананового сока! Стань клоуном! Стань робастом! +ent-DrinkJuicePineappleCarton = ананасовый сок + .desc = Это освежающий напиток, который обладает ярким и свежим вкусом. Каждая капля этого сока словно маленькая звезда, приносящая радость и удовольствие после трудового дня в открытом космосе. Его аромат наполняет кабинеты станции нотками тропических фруктов, создавая атмосферу уюта и комфорта даже в условиях далекого космоса. +ent-DrinkJuiceSyndicateCarton = cинди сок + .desc = Сок "Космическое Оружие" — это напиток, который станет тайным оружием каждого агента синдиката. Его яркий вкус сочетается с нотками экзотических специй, создавая взрывной вкусовой опыт, способный зарядить энергией на самые сложные миссии. Каждая капля этого сока — это заряд адреналина, готовый вдохновить на подвиги и победы. +ent-DrinkJuiceWehCarton = унати сок + .desc = Для унатхов 3 лет и сстаршше! +ent-DrinkJuiceCatDespairCarton = cat despair juice + .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра? +ent-DrinkJuiceMoffCarton = мофф сок + .desc = Рекомендуется всеми мофф. Бззз! +ent-DrinkJuicelemonCarton = лимонный сок + .desc = Это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии. +ent-DrinkJuiceWatermelonCarton = арбузный сок + .desc = Это удивительный напиток, который сочетает в себе сладость спелого арбуза и таинственную энергию космоса. Его ярко-красный цвет напоминает о красоте красных планет, а сладкий вкус арбуза дарит ощущение летнего солнца и свежести. +ent-DrinkJuiceSecCarton = сок службы безопасности + .desc = Это освежающий и бодрящий сок, специально разработанный для служб безопасности и охраны. Уникальное сочетание натуральных ингредиентов помогает поддерживать высокий уровень бдительности и энергии в течение дня. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 7628ce27813748..c52e9c52fd11f0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -45,15 +45,18 @@ DrinkSakeBottleFull: 3 DrinkBeerCan: 5 DrinkWineCan: 5 +# Starshine-start DrinkJuiceAppleCarton: 3 DrinkJuiceCarrotCarton: 3 DrinkJuiceBerryCarton: 3 DrinkJuiceBananaCarton: 3 DrinkJuicePineappleCarton: 3 - DrinkJuicelemonCarton: 3 + DrinkJuiceLemonCarton: 3 DrinkJuiceWatermelonCarton: 3 - DrinkJuiceUnatieCarton: 1 - DrinkJuiceMoleCarton: 1 + DrinkJuiceWehCarton: 1 + DrinkJuiceMoffCarton: 1 + DrinkJuiceSecCarton: 1 +# Starshine-end emaggedInventory: DrinkPoisonWinebottleFull: 2 DrinkJuiceSyndicateCarton: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 50fd7d95d7cba9..619c5bb7d8432d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -21,7 +21,6 @@ RiotLaserShield: 2 RiotBulletShield: 2 RadioHandheldSecurity: 5 - DrinkJuiceCbCarton: 1 # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index b005d568dfaa15..3e32a1eb69e199 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -66,6 +66,10 @@ enum.OpenableVisuals.Layer: True: {state: "icon_open"} False: {state: "icon"} + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] - type: entity parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] @@ -95,14 +99,7 @@ - ReagentId: JuiceOrange Quantity: 50 - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_orange - - type: Label - originalName: апельсиновый сок - currentLabel: Полно витаминов! + sprite: Objects/Consumable/Drinks/orangejuice.rsi - type: entity parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] @@ -196,279 +193,3 @@ Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/oatmilk.rsi - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceAppleCarton - name: orange juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceApple - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_apple - - type: Label - originalName: яблочный сок - currentLabel: Яблочный сок полон сахара и вкуса! Сделан из спелых и сочных яблок! - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceCarrotCarton - name: carrot juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceCarrot - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_carrot - - type: Label - originalName: морковный сок - currentLabel: здесь могла бы быть ваша реклама - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceBerryCarton - name: berry juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceBerry - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_berry - - type: Label - originalName: ягодный сок - currentLabel: Освежающий аромат и вкус, с нотками дикой природы - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceBananaCarton - name: banana juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceBanana - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_banan - - type: Label - originalName: банановый сок - currentLabel: Состоит из 75% бананов, 24% робуста, 1% бананиума - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuicePineappleCarton - name: pineapple juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuicePineapple - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_pineapple - - type: Label - originalName: ананасовый сок - currentLabel: Освежающий и бодрящий продукт! В составе более 90% спелых и вкуснейших ананасов! Без добавления консервантов - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceSyndicateCarton - name: syndicate juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Stimulants - Quantity: 5 - - ReagentId: DoctorsDelight - Quantity: 25 - - ReagentId: Tricordrazine - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_syndi - - type: Label - originalName: cинди сок - currentLabel: зделано на заказ компанией "Еnergy DOOM™" - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceUnatieCarton - name: Unatie juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceThatMakesYouWeh - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_unati - - type: Label - originalName: унати сcок - currentLabel: Сссделан на 99% исс вех! (не сспрашшивайте как) - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceCatDespairCarton - name: cat despair juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: MuteToxin - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_catdespair - - type: Label - originalName: cat despair juice - currentLabel: Зделано из 50% кота и 50% тёмной глубокой бездны - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceMoleCarton - name: mole juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceThatMakesYouBuzz - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_mole - - type: Label - originalName: мофф сок - currentLabel: сделано на 99,99 изз Бззз! - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuicelemonCarton - name: lemon juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceLemon - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_lemon - - type: Label - originalName: лимонный сок - currentLabel: ОПАСНО! Может прожечь язык! - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceWatermelonCarton - name: watermelon juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: JuiceWatermelon - Quantity: 50 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_watermelon - - type: Label - originalName: арбузный сок - currentLabel: На этикетке изображена на вид сладкая, спелая и красная долька арбуза - -- type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] - id: DrinkJuiceCbCarton - name: cb juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Bicaridine - Quantity: 3 - - ReagentId: Tricordrazine - Quantity: 7 - - ReagentId: Nutriment - Quantity: 20 - - ReagentId: Saline - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/cardboardjuiceboxes.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon_SB - - type: Label - originalName: сок службы безопасности - currentLabel: Самый безопасный сок во вселеной! - - diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index d67eca238c218f..81183839bb372d 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -349,26 +349,3 @@ - !type:ReagentThreshold min: 50 -- type: reagent - id: JuiceThatMakesYouBuzz - name: reagent-name-buzz - group: Toxins - desc: reagent-desc-buzz - physicalDesc: reagent-physical-desc-vibrant - flavor: buzz - color: "#fbec5d" - metabolisms: - Poison: - metabolismRate: 0.25 - effects: - - !type:Emote - emote: Buzz - showInChat: true - probability: 0.5 - - !type:AdjustReagent - reagent: JuiceThatMakesYouBuzz - amount: -20 - conditions: - - !type:ReagentThreshold - min: 50 - diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Consumable/drinks-cartons.yml b/Resources/Prototypes/Starshine/Entities/Objects/Consumable/drinks-cartons.yml new file mode 100644 index 00000000000000..729f4bd1c70f30 --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Consumable/drinks-cartons.yml @@ -0,0 +1,238 @@ +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceCartonBase + name: apple juice + description: Juice release 3023, fresh acid-pressed, with added apple seed extract and donk flavours. + abstract: true + components: + - type: Sprite + sprite: Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceAppleCarton + name: apple juice + description: Juice release 3023, fresh acid-pressed, with added apple seed extract and donk flavours. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceApple + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-apple + - type: Label + currentLabel: Яблочный сок полон сахара и вкуса! Сделан из спелых и сочных яблок! + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceCarrotCarton + name: carrot juice + description: Rich in vitamin A and has an unusual flavour. People working at terminals are their main customers. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceCarrot + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-carrot + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceBerryCarton + name: berry juice + description: A favourite juice of the sweet tooth, what a pity that its production has fallen off due to the decreasing number of consumers in NT stations. However, it is said that a special ingredient allows them to stay in the market and sell more than half of the product to unknown sectors. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceBerry + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-berry + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceBananaCarton + name: banana juice + description: Taste the flavour of banana juice! Become a clown! Become robust! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceBanana + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-banana + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuicePineappleCarton + name: pineapple juice + description: This is a refreshing drink that has a bright and fresh flavour. Each drop of this juice is like a small star, bringing joy and pleasure after a hard day's work in outer space. Its flavour fills the station's offices with notes of tropical fruits, creating an atmosphere of coziness and comfort even in the conditions of distant space. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuicePineapple + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-pineapple + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceSyndicateCarton + name: syndicate juice + description: Space Weapon Juice is a drink that will become the secret weapon of every syndicate agent. Its bright flavour combines with notes of exotic spices to create an explosive taste experience that can energise you for the most challenging missions. Every drop of this juice is a charge of adrenaline, ready to inspire feats and victories. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Stimulants + Quantity: 5 + - ReagentId: DoctorsDelight + Quantity: 25 + - ReagentId: Tricordrazine + Quantity: 20 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-syndi + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceWehCarton + name: weh juice + description: For Lizards 3 years and older! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-weh + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceCatDespairCarton + name: cat despair juice + description: The more you gaze into the juice, the more you want to close that examine window. Wait, examine window? + suffix: DO NOT MAP, Admeme + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: MuteToxin + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-catdespair + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceMoffCarton + name: moff juice + description: Recommended by all moffs. Bzzzz! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceThatMakesYouBuzz + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-moff + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceLemonCarton + name: lemon juice + description: This is a drink that not only refreshes you, but also transports you to the amazing reaches of space. Its bright yellow colour reminds you of sunlight, while the freshness of lemon adds notes of acidity and energy. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceLemon + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-lemon + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceWatermelonCarton + name: watermelon juice + description: This is an amazing drink that combines the sweetness of ripe watermelon and the mysterious energy of the cosmos. Its bright red colour reminds of the beauty of the red planets, and the sweet taste of watermelon gives a feeling of summer sunshine and freshness. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceWatermelon + Quantity: 50 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-watermelon + +- type: entity + parent: DrinkJuiceCartonBase + id: DrinkJuiceSecCarton + name: sec juice + description: This is a refreshing and invigorating juice specially formulated for security and safety services. The unique combination of natural ingredients helps maintain high levels of alertness and energy throughout the day. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Bicaridine + Quantity: 3 + - ReagentId: Tricordrazine + Quantity: 7 + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Saline + Quantity: 20 + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: label-sec diff --git a/Resources/Prototypes/Starshine/Reagents/fun.yml b/Resources/Prototypes/Starshine/Reagents/fun.yml new file mode 100644 index 00000000000000..771154a4825fe6 --- /dev/null +++ b/Resources/Prototypes/Starshine/Reagents/fun.yml @@ -0,0 +1,16 @@ +- type: reagent + id: JuiceThatMakesYouBuzz + name: reagent-name-buzz + group: Toxins + desc: reagent-desc-buzz + physicalDesc: reagent-physical-desc-vibrant + flavor: buzz + color: "#fbec5d" + metabolisms: + Poison: + metabolismRate: 0.25 + effects: + - !type:Emote + emote: Buzzing + showInChat: true + probability: 0.5 diff --git a/Resources/Prototypes/Starshine/Voice/speech_emotes.yml b/Resources/Prototypes/Starshine/Voice/speech_emotes.yml new file mode 100644 index 00000000000000..044c1c46135b7f --- /dev/null +++ b/Resources/Prototypes/Starshine/Voice/speech_emotes.yml @@ -0,0 +1,6 @@ +- type: emote + id: Buzzing + name: chat-emote-name-buzz + category: Vocal + icon: Interface/Emotes/buzz.png + chatMessages: [chat-emote-msg-buzz] diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index e86b05f4c88787..581b015984f37a 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -34,6 +34,8 @@ collection: Whistles Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg - type: emoteSounds id: FemaleHuman @@ -70,6 +72,8 @@ collection: Whistles Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg - type: emoteSounds id: MaleReptilian @@ -88,6 +92,8 @@ collection: MaleCry Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg - type: emoteSounds id: FemaleReptilian @@ -106,6 +112,8 @@ collection: FemaleCry Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg - type: emoteSounds id: MaleSlime @@ -142,6 +150,8 @@ collection: Whistles Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg params: variation: 0.125 @@ -180,6 +190,8 @@ collection: Whistles Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg params: variation: 0.125 @@ -205,6 +217,8 @@ collection: BikeHorn Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg params: variation: 0.125 @@ -223,6 +237,8 @@ path: /Audio/Voice/Arachnid/arachnid_click.ogg Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg - type: emoteSounds id: UnisexDwarf @@ -257,6 +273,8 @@ collection: Whistles Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg params: variation: 0.125 pitch: 0.75 @@ -294,6 +312,8 @@ collection: Whistles Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg params: variation: 0.125 pitch: 0.75 @@ -315,6 +335,8 @@ path: /Audio/Voice/Moth/moth_squeak.ogg Weh: collection: Weh + Buzzing: + path: /Audio/Voice/Moth/moth_scream.ogg - type: emoteSounds id: UnisexSilicon diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json deleted file mode 100644 index 96839de1dacc6b..00000000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "mede in Astr0naut and greedl_", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon_open" - }, - { - "name": "icon_apple" - }, - { - "name": "icon_banan" - }, - { - "name": "icon_berry" - }, - { - "name": "icon_carrot" - }, - { - "name": "icon_catdespair" - }, - { - "name": "icon_lemon" - }, - { - "name": "icon_mole" - }, - { - "name": "icon_pineapple" - }, - { - "name": "icon_syndi" - }, - { - "name": "icon_unati" - }, - { - "name": "icon_orange" - }, - { - "name": "icon_SB" - }, - { - "name": "icon_watermelon" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_open.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_open.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_open.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_open.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_apple.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-apple.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_apple.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-apple.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_banan.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-banana.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_banan.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-banana.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_berry.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-berry.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_berry.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-berry.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_carrot.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-carrot.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_carrot.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-carrot.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_catdespair.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-catdespair.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_catdespair.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-catdespair.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_lemon.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-lemon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_lemon.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-lemon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_mole.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-moff.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_mole.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-moff.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_orange.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-orange.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_orange.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-orange.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_pineapple.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-pineapple.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_pineapple.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-pineapple.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_SB.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-sec.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_SB.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-sec.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_syndi.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-syndi.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_syndi.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-syndi.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_watermelon.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-watermelon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_watermelon.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-watermelon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_unati.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-weh.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/icon_unati.png rename to Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/label-weh.png diff --git a/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json new file mode 100644 index 00000000000000..fc36e50981de28 --- /dev/null +++ b/Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Astr0naut and greedl_", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "label-apple" + }, + { + "name": "label-banana" + }, + { + "name": "label-berry" + }, + { + "name": "label-carrot" + }, + { + "name": "label-catdespair" + }, + { + "name": "label-lemon" + }, + { + "name": "label-moff" + }, + { + "name": "label-pineapple" + }, + { + "name": "label-syndi" + }, + { + "name": "label-weh" + }, + { + "name": "label-orange" + }, + { + "name": "label-sec" + }, + { + "name": "label-watermelon" + } + ] +} \ No newline at end of file From 98a1ea155146102b2056c6aef13c5fd45946cb7f Mon Sep 17 00:00:00 2001 From: MilenVolf Date: Mon, 27 May 2024 03:56:47 +0300 Subject: [PATCH 10/12] Meh --- .../consumable/drinks/drinks-cartons.ftl | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index 0139a4f360e143..9246479d3cb4a1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -8,7 +8,7 @@ ent-DrinkCartonVisualsOpenable = { "" } ent-DrinkJuiceLimeCarton = лаймовый сок .desc = Кисло-сладкое наслаждение. ent-DrinkJuiceOrangeCarton = апельсиновый сок - .desc = Сок который любит большинство экипажа на станции! + .desc = Полно витаминов и вкусностей! ent-DrinkJuiceTomatoCarton = томатный сок .desc = Ну, по крайней мере, это ВЫГЛЯДИТ как томатный сок. При всей этой красноте ничего не скажешь. ent-DrinkCoconutWaterCarton = кокосовая вода @@ -21,27 +21,3 @@ ent-DrinkSoyMilkCarton = соевое молоко .desc = Белая и питательная соевая вкуснятина! ent-DrinkOatMilkCarton = овсяное молоко .desc = Это овсяное молоко. Бежевая и питательная вкуснятина! -ent-DrinkJuiceAppleCarton = яблочный сок - .desc = Сок выпуска 3023 года, свежего кислотного-отжима, с добавлением экстракта из семечек яблок и синди-ароматизаторов. -ent-DrinkJuiceCarrotCarton = морковный сок - .desc = Богат витамином А и имеет необычный вкус. Люди, работающие за терминалами, являются их главными клиентами. -ent-DrinkJuiceBerryCarton = ягодный сок - .desc = Любимый сок сладкоежек, как жаль, что его производство упало в связи с уменьшением количества потребителей на станциях НТ. Однако поговаривают, что особый ингредиент позволяет им оставаться на рынке и продавать более половины товара в неизвестные сектора. -ent-DrinkJuiceBananaCarton = банановый сок - .desc = Почуствуй вкус бананового сока! Стань клоуном! Стань робастом! -ent-DrinkJuicePineappleCarton = ананасовый сок - .desc = это освежающий напиток, который обладает ярким и свежим вкусом. Каждая капля этого сока словно маленькая звезда, приносящая радость и удовольствие после трудового дня в открытом космосе. Его аромат наполняет кабинеты станции нотками тропических фруктов, создавая атмосферу уюта и комфорта даже в условиях далекого космоса. -ent-DrinkJuiceSyndicateCarton = cинди сок - .desc = Сок "Космическое Оружие" — это напиток, который станет тайным оружием каждого агента синдиката. Его яркий вкус сочетается с нотками экзотических специй, создавая взрывной вкусовой опыт, способный зарядить энергией на самые сложные миссии. Каждая капля этого сока — это заряд адреналина, готовый вдохновить на подвиги и победы. -ent-DrinkJuiceUnatieCarton = унати сок - .desc = Только для насстоящих унатхов! (и для тех кто сстал ими душшевно) -ent-DrinkJuiceCatDespairCarton = cat despair juice - .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра? -ent-DrinkJuiceMoleCarton = мофф сок - .desc = Рекомендуется всеми мофф. Бззз! -ent-DrinkJuicelemonCarton = лимонный сок - .desc = это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии. -ent-DrinkJuiceWatermelonCarton = арбузный сок - .desc = это удивительный напиток, который сочетает в себе сладость спелого арбуза и таинственную энергию космоса. Его ярко-красный цвет напоминает о красоте красных планет, а сладкий вкус арбуза дарит ощущение летнего солнца и свежести. -ent-DrinkJuiceCbCarton = сок службы безопасности - .desc = это освежающий и бодрящий сок, специально разработанный для служб безопасности и охраны. Уникальное сочетание натуральных ингредиентов помогает поддерживать высокий уровень бдительности и энергии в течение дня. From 8bbd8bd5e9fa1eda2336f4e064433ff2340a688b Mon Sep 17 00:00:00 2001 From: MilenVolf Date: Mon, 27 May 2024 03:58:00 +0300 Subject: [PATCH 11/12] Weh --- .../Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index c52e9c52fd11f0..e6eda894402988 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -60,4 +60,3 @@ emaggedInventory: DrinkPoisonWinebottleFull: 2 DrinkJuiceSyndicateCarton: 1 - From 5158dccde8c56e42c045860b4139426d433e1318 Mon Sep 17 00:00:00 2001 From: MilenVolf Date: Mon, 27 May 2024 04:00:31 +0300 Subject: [PATCH 12/12] Wut --- Resources/Prototypes/Flavors/flavors.yml | 5 ----- Resources/Prototypes/Reagents/fun.yml | 1 - Resources/Prototypes/Starshine/Flavors/flavors.yml | 4 ++++ 3 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/Starshine/Flavors/flavors.yml diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index ef5e7e268d8e1f..73ded93e0f2d5d 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1079,11 +1079,6 @@ flavorType: Base description: flavor-weh -- type: flavor - id: buzz - flavorType: Base - description: flavor-buzz - - type: flavor id: fishops flavorType: Complex diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 81183839bb372d..befa8d829688ed 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -348,4 +348,3 @@ conditions: - !type:ReagentThreshold min: 50 - diff --git a/Resources/Prototypes/Starshine/Flavors/flavors.yml b/Resources/Prototypes/Starshine/Flavors/flavors.yml new file mode 100644 index 00000000000000..05f4f19efa9aba --- /dev/null +++ b/Resources/Prototypes/Starshine/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: buzz + flavorType: Base + description: flavor-buzz