From 3284c24ece7a972373f68ff0f600c9db9ffd181a Mon Sep 17 00:00:00 2001
From: Floofi <126319569+Shadowtheprotogen546@users.noreply.github.com>
Date: Sat, 22 Jun 2024 19:46:19 -0400
Subject: [PATCH] add lemon juice and fix bad sprite allocation (#27465)

---
 .../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 -> 387 bytes
 .../Drinks/lemonjuice.rsi/icon_open.png       | Bin 0 -> 399 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 e4f4440bd3..d62cd8f92f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -25,6 +25,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 f2b2c0450f..0c069f615e 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 5c55f9ff17..5d77c91a5d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1218,7 +1218,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..7f37864ba605560dc594ae12b33a363099b21c2a 100644
GIT binary patch
delta 361
zcmV-v0ha!n0)qpPBYy!%Nkl<ZSVv=I7+}CS!1gnYI$$&eC<=jqC+7cQiFkv|NwUl$
zOB2XakmcX5{Dx;DE*(||avVXn1Kf5P!F>;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{<GKZ)%fXe~YC=H2r0J0<SSxju|hlL_p4j>c-
z#0Eb}Q2?_PUsViKL$lhDkk84HCn*ZZv4D`CQ3s5M0018e(jm=jd-VVS002ovPDHLk
HV1fVuTyu_P

delta 255
zcmV<b0094k1DXPmBYyzlNkl<Zc${NAaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$E
zP27X?hZM~nu;ta?XFisSpRmduzw*pSjF}`ykn8{!UTy{p0dDo0?I)jOlVf1`L7I7_
zIsgW+`E<v32CPv-RR{d}^hT0_fq}u^{=|QDxh<=77#KKtNO&@j<XrF{!&(^Ffk%#t
z4nVdLLGQq)kX8=xfLiQ9z7do;0A@M)zNgRuqai@K<qQmD7DVhkJ``I_kpn1=cVxgw
zPP2UTi!WG<9A60@MpDfpD+I`~2p1Ue2Fa)cMjbHf0051pGYN>J=biun002ovPDHLk
FV1jJXZeIWZ

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..72485a8e566a01f58d98c19829b8c28fbd78cbe8
GIT binary patch
literal 399
zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800041Nkl<ZSV!%a
zu?oU45QfuDTncWY575O$gl^)ZI6CNi_y9gc-^0aGbP>0LxVZQLx;hIE$_ZD_)HZh^
zp$KM4n<n|c{C7zjsESKavA+5}fH;Ys;95FAJAoHXg5nr97ZAS%04uLF1ZX`%gi$@)
zM4RzZ<R%WZ8U%w!>+U-lX#t4ICC=Jc?bJBGu|vr@kpqa6=%agc8Y&Zn6~K1g$%&)#
z;{3=UIJ-m)0OEswqtKY${-%cG6MJ5EM^L2Vhr?C%daVqEzDppi0Z>^7fp#wdChPT>
za3R<ZAi(T)SIb6CK@A0;p@xFrodVF+QvfRd4TuB5azF>r?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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
index db0ac608ed..9e1d9a9075 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
@@ -1 +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"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}
-- 
2.51.2