From f0d6f59abf40ea3b349e6adbcd417b2a3206d273 Mon Sep 17 00:00:00 2001 From: Shadowtheprotogen546 Date: Sun, 28 Apr 2024 23:19:00 -0400 Subject: [PATCH 1/4] add lemon juice and fix bad sprite allocation --- .../VendingMachines/Inventories/boozeomat.yml | 1 + .../Consumable/Drinks/drinks-cartons.yml | 15 +++++++++++++++ .../Objects/Consumable/Drinks/drinks.yml | 2 +- .../Consumable/Drinks/lemonjuice.rsi/icon.png | Bin 282 -> 288 bytes .../Drinks/lemonjuice.rsi/icon_open.png | Bin 0 -> 300 bytes .../Drinks/lemonjuice.rsi/meta.json | 18 +++++++++++++++++- 6 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index a309b1d61df4..7003cf2e556f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -24,6 +24,7 @@ DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two DrinkGrenadineBottleFull: 2 DrinkJuiceLimeCarton: 3 + DrinkJuiceLemonCarton: 3 DrinkJuiceOrangeCarton: 3 DrinkJuiceTomatoCarton: 3 DrinkCoffeeLiqueurBottleFull: 3 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index aef0c5a8f5ad..bbf2b2e46941 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -193,3 +193,18 @@ Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/oatmilk.rsi + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + id: DrinkJuiceLemonCarton + name: lemon juice + description: First it's sour, then it's still sour. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceLemon + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/lemonjuice.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index a729eed9c8f1..bf4291257364 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1170,7 +1170,7 @@ - ReagentId: JuiceLemon Quantity: 30 - type: Icon - sprite: Objects/Consumable/Drinks/lemonjuice.rsi + sprite: Objects/Consumable/Drinks/lemonjuiceglass.rsi state: icon - type: entity diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png index 01abf17a3634448791d7c35c2a9b8c7f0e35d526..5fb7e2ff1d59a0eb1c0aa1c0700af5c57365787b 100644 GIT binary patch delta 260 zcmV+f0sH=%0-yqrB!A^eL_t(oM`L6dV8A%Q_A`t+U^E0qLtr!nhHeOmUSjxB+s;(tsdE=ovt z0J`Ouul!@s)nS5ro0aPZNoJCy7-S2~0q7RPTtHI?;0k(><$cHwBE=CTg#aPnlM@PL zIRH8TBl{f2rfCSUa9(Hl^Ia2fOO9?1phiL@DGFe@09z=K6Z|0a$Z`NkBd(|*CHTp5 z0CHJCN%n&!B9cP@rV+hNAl2s-JAhgp8nQ!R)B&R*K&=n}0EC8UA*m~}{{R3007*qo KM6N<$f&c()4`-JE delta 254 zcmV;M*CZUzehZuOe&C!b@JV_^6}nt7x; z00yx6bjNoFtWiT%2mJZ;Mv{Snfx+JX#D8?TEvs}G7&v)IGIx*UT<{;mS{T@YM~;dP zK(-J;@4%;!Ru1rhTI@l-5tKOqW;yx3r_ceTAwaq13=CuzMC?316kAM@11ODmWWY#H zvwZW5FIbBlUkM&YQq3YO1jw-n7Z~sc$*2QH9Wd$u0F9+H35cWTo&W#<07*qoM6N<$ Ef`))@djJ3c diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..37ced1c62e781d5ee824a76785d5e6829d869cd4 GIT binary patch literal 300 zcmV+{0n`48P)&+9Lm~>kmwz(Y*-MLkqqNSdH?iPH`7(y^mV@ZX6B{MsNo}P zI6gUm8*l@#fzgJF!#v&eH~?&bch13zisLd(8B72S!M&ijaqbI!FSbw20GHGF4Pdy= zA3WW~3o8b~1P}(7kOINiu_b~5!rl zfDHV~-eSQ7pvO;VF6XrxX!rJXJx{)V$^8u=MI%BbkSX|N!J?nvX9D1bWu-v$n*j7) yP-Xn2iC_b=Fx(T+%qs(=`k^r!Z~!-u%D^2TmvJFwUh;7O0000 Date: Mon, 29 Apr 2024 00:05:29 -0400 Subject: [PATCH 2/4] Updated sprites --- .../Consumable/Drinks/lemonjuice.rsi/icon.png | Bin 288 -> 387 bytes .../Drinks/lemonjuice.rsi/icon_open.png | Bin 300 -> 399 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png index 5fb7e2ff1d59a0eb1c0aa1c0700af5c57365787b..7f37864ba605560dc594ae12b33a363099b21c2a 100644 GIT binary patch delta 361 zcmV-v0ha!t0)qpPBYy!%Nkl;N#V(I?jHHGN*$!Y}V8C#I`2-D=Vns59 zpJ1qv<$&EgbTKT4*<5o25iKVRZV)t|paS%g5@fl9oe<6f^nbvicMPr`mx(r)XoVmf zku5)S<|%`Ti8S0H$b3>9LAC>6HlsTPBu*0t5DI$qI3d;%M27&(0io}HFsv5hU;xn| z0Aqt_5P->3)d9%9M|J?R<=7lVj3bB&0dxnT2RCwvz(R%Cv_P^0NNK>(Bm|J-8CQCM zg#t|+0J9X`A!5i0lIjjXFNBDR24Z{c- z#0Eb}Q2?_PUsViKL$lhDkk84HCn*ZZv4D`CQ3s5M0018e(jm=jd-VVS002ovPDHLk HV1fVuWa*A; delta 261 zcmV+g0s8)f1E2zsBYyzpNklt0*?cbBYy!^Nkl0LxVZQLx;hIE$_ZD_)HZh^p$KM4nwoS$8EFBC$tBL(SMAg| zzp+EfIgta1ljx&+a~diWgcZPc-N}ig^5Xo+AUL~33;^PTexuNs-TtPA;}d&cc1KX8 z;)lak^?I!gguY84tN~D22Z44k04D48m~bK34j{nnc2~pP`0=-<<-`)l&c} z{tbu&!E!(c&~ELfj-V^tTo40Deqg*fK;vAL59opy02I|hXhJ#%&<`O_7&xnkd0076 z1mNN{WCKu$GGT7^ql;DmrVw!L7li;t%dTSVe1FQm&BYyz%Nkl&+9Lm~>kmwz(Y*-ML zkqqNSdH?iPH`7(y^mV@ZX6B{MsNo}PI6gUm8*l@#fzgJF!#v&eH~?&bch13zisLd( z8B72S!M&ijaqbI!FSbw20GHGF4Pdy=A3WW~3o8b~1P}(7kbeTf*Rdsn0m9(h-Hm3` z)-&x+KZo84J=inL$fq)GB%HCqZ1fa)HXD;Wp8ff?SbUjbLe#!j} zAVniWC6FojWWl1J-)92gg=M8c^qT Date: Mon, 29 Apr 2024 00:13:59 -0400 Subject: [PATCH 3/4] git bugged out --- .../Consumable/Drinks/lemonjuice.rsi/icon.png | Bin 387 -> 0 bytes .../Drinks/lemonjuice.rsi/icon_open.png | Bin 399 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png deleted file mode 100644 index 7f37864ba605560dc594ae12b33a363099b21c2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmV-}0et?6P);N#V(I?jHHGN*$!Y}V8C#I`2-D=Vns59pJ1qv<$&EgbTKT4*<5o25iKVRZV)t| zpaS%g5@fl9oe<6f^uVEa46YuRi8hyLg&-S|EkASSDT9fLG~6M`d{P`iwgX@`qdNp7 zP7?0LxVZQLx;hIE$_ZD_)HZh^ zp$KM4n+U-lX#t4ICC=Jc?bJBGu|vr@kpqa6=%agc8Y&Zn6~K1g$%&)# z;{3=UIJ-m)0OEswqtKY${-%cG6MJ5EM^L2Vhr?C%daVqEzDppi0Z>^7fp#wdChPT> za3Rr?WT^PE8JWV14w>gyf{GP zT$B&!f)@Z3)j?=NItS1XAx;=LtA}}5IZy=P;xuFfP>3>NZuX;#Rsg0DaP1d`07c8L tV(jDXHZ-l==DR2aHUg$Ge}KOOFB5OuArzGlFaQ7m07*qoM6N<$f&lSpq$B_U From 01502c45157cf3272cd66052bcc9118f6b5016f4 Mon Sep 17 00:00:00 2001 From: Shadowtheprotogen546 Date: Mon, 29 Apr 2024 00:14:40 -0400 Subject: [PATCH 4/4] Changed sprites --- .../Consumable/Drinks/lemonjuice.rsi/icon.png | Bin 0 -> 387 bytes .../Drinks/lemonjuice.rsi/icon_open.png | Bin 0 -> 399 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7f37864ba605560dc594ae12b33a363099b21c2a GIT binary patch literal 387 zcmV-}0et?6P);N#V(I?jHHGN*$!Y}V8C#I`2-D=Vns59pJ1qv<$&EgbTKT4*<5o25iKVRZV)t| zpaS%g5@fl9oe<6f^uVEa46YuRi8hyLg&-S|EkASSDT9fLG~6M`d{P`iwgX@`qdNp7 zP7?0LxVZQLx;hIE$_ZD_)HZh^ zp$KM4n+U-lX#t4ICC=Jc?bJBGu|vr@kpqa6=%agc8Y&Zn6~K1g$%&)# z;{3=UIJ-m)0OEswqtKY${-%cG6MJ5EM^L2Vhr?C%daVqEzDppi0Z>^7fp#wdChPT> za3Rr?WT^PE8JWV14w>gyf{GP zT$B&!f)@Z3)j?=NItS1XAx;=LtA}}5IZy=P;xuFfP>3>NZuX;#Rsg0DaP1d`07c8L tV(jDXHZ-l==DR2aHUg$Ge}KOOFB5OuArzGlFaQ7m07*qoM6N<$f&lSpq$B_U literal 0 HcmV?d00001