From 36999e5a06d3a63046041754a223d0c17c1fc0ba Mon Sep 17 00:00:00 2001
From: GrownSamoyedDog <61863648+GrownSamoyedDog@users.noreply.github.com>
Date: Sat, 19 Apr 2025 07:25:09 -0700
Subject: [PATCH] Gave Bartender Pineapple Juice Cartons (#34769)

pineapple juice core pina colada maxxed
---
 .../VendingMachines/Inventories/boozeomat.yml  |   1 +
 .../Consumable/Drinks/drinks-cartons.yml       |  15 +++++++++++++++
 .../Drinks/pineapplejuice.rsi/icon.png         | Bin 0 -> 272 bytes
 .../Drinks/pineapplejuice.rsi/icon_open.png    | Bin 0 -> 277 bytes
 .../Drinks/pineapplejuice.rsi/meta.json        |  17 +++++++++++++++++
 5 files changed, 33 insertions(+)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index 97a3d0f5a1..9127438674 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -26,6 +26,7 @@
     DrinkGrenadineBottleFull: 2
     DrinkJuiceLimeCarton: 3
     DrinkJuiceLemonCarton: 3
+    DrinkJuicePineappleCarton: 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 9dd3cffbe6..c33e24ad3e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -209,3 +209,18 @@
           Quantity: 50
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
+    
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkJuicePineappleCarton
+  name: pineapple juice
+  description: Tastes like a tropical vacation far from space.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuicePineapple
+          Quantity: 50
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/pineapplejuice.rsi
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9876e1862e4a01c6ecd6611d146c855a69d537a5
GIT binary patch
literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|<N|y`T!D0U
zTH>-~;oHqp->1laza(oDcrbbP|GisRe}8k|vE*GhPz6^>kY6yve;BCi6bS>0c6quu
zhFJ7Ion$R^)PRGzIk)cn{tv=?rU>SCUC6T4k&3_W?(Xu;qKHB3+y=%KH|7Ybb%f3p
zY&%k$+n>&TGJ{Eqr@=AO=)kYsz}GhqZcyCdZa#5KPl3$F>xm3in>IHVD4Y%DFKti^
zD`4+GQI_C(RkUD6*CA2oz^j37*F78l@tEwJsQFJh`Ol?44BZP^R=0HSJP33ZgQu&X
J%Q~loCIBkQZFc|w

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6a7ac6653fed2adc48e34958f89319238359231
GIT binary patch
literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|6a#!hT!FNl
zoNRVl;<9An+s#tnr^tT4Bx@6RFnRX>y<1m*e{=uSCe9k5BJPqPzhH*{a8O%Tdle|$
z?djqeV$u6_lA+KM0}kfor04_x<!cV@G+MOxQN~s|vEKEs{g0pdWwD7->zo5~2+wqu
zo{tjiI1CEqKU8er(BmB7%xI$F&H7-E?yI_T26LA0Z!}dV3ij=NzE|YHybWrCyec*C
zRb?|yh~7G={K;a)qE}p2C9WU4maTZD@%V~n!)M8qKd!reINti<{+aO&D{H}io?J7a
Pvlu*G{an^LB{Ts5)cSD{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json
new file mode 100644
index 0000000000..31a3eae2e6
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "GrownSamoyedDog on Github. A variant of orangejuice carton from: https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}
-- 
2.51.2