add lemon juice and fix bad sprite allocation (#27465)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index e4f4440bd3c9ad1f6cce1488a2e81a2429cdac22..d62cd8f92f6e88d03ccac012e036225080da9118 100644 (file)
--- 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 f2b2c0450f0895042c260191723ec89571b3f070..0c069f615ee94fd19acbf39dadc808f9fef3cfb6 100644 (file)
--- 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 5c55f9ff17d9e8c4f30b2ccc763cf20d7f195951..5d77c91a5db070c6bb05043039719848cc75f7b7 100644 (file)
--- 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 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
index db0ac608ed068f887d184f45e9acd83fba0a3976..9e1d9a9075dcc15be088a853679d50e6241e6663 100644 (file)
--- 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"
+        }
+    ]
+}