Gave Bartender Pineapple Juice Cartons (#34769)

pineapple juice core pina colada maxxed

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index 97a3d0f5a19bf913cbcad80a4db76b79dc867cdc..91274386743cd254853726af06d7be91d20dc195 100644 (file)
--- 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 9dd3cffbe6929d168e3d5abae1384fbb99ddd854..c33e24ad3e49cc6f6e0cb6fc3dc6e73f2114ad93 100644 (file)
--- 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 (file)
index 0000000..9876e18
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon.png differ

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 (file)
index 0000000..d6a7ac6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/icon_open.png differ

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 (file)
index 0000000..31a3eae
--- /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"
+        }
+    ]
+}