add icons for drinks in Solar's (#25301)

* add icons for drinks in Solar's

fixed colors of tea

* consistently use capitals for color codes

* don't add extra whitespace

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 352ea769d9af325d62327a1d0ee20e17de6807fb..1b4e5deb35ddac68b72df3254316908442127364 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -184,6 +184,9 @@
         reagents:
         - ReagentId: HotCocoa
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/hot_coco.rsi
+    state: icon-vend
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coco.rsi
     layers:
@@ -209,6 +212,9 @@
         reagents:
         - ReagentId: Coffee
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
+    state: icon-vend
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coffee.rsi
     layers:
@@ -252,6 +258,9 @@
         reagents:
         - ReagentId: Tea
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/teacup.rsi
+    state: icon-vend-tea
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
     layers:
@@ -277,6 +286,9 @@
         reagents:
         - ReagentId: GreenTea
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/teacup.rsi
+    state: icon-vend-green-tea
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
     layers:

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 77a387da7b581a9118e73f72189d9597b4952a34..ce93bbc46314cac535fa26dc41a83fbf763793d8 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -67,7 +67,7 @@
   desc: reagent-desc-green-tea
   physicalDesc: reagent-physical-desc-aromatic
   flavor: tea
-  color: "#C33F00"
+  color: "#7EB626"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/glass_green.rsi
     state: icon
@@ -107,7 +107,7 @@
   desc: reagent-desc-iced-green-tea
   physicalDesc: reagent-physical-desc-aromatic
   flavor: icedtea
-  color: "#CE4200"
+  color: "#5B821B"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/glass_green.rsi
     state: icon
@@ -119,7 +119,7 @@
   desc: reagent-desc-iced-tea
   physicalDesc: reagent-physical-desc-aromatic
   flavor: icedtea
-  color: "#104038"
+  color: "#6C3916"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/icedteaglass.rsi
     state: icon

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png
new file mode 100644 (file)
index 0000000..765112b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
index 6dfbe5d8c0cc94f7d15d084157c350f2f1da0f00..b22da85aa90616b1c6eac9168740ee9b2309c112 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
@@ -20,6 +20,9 @@
         },
                {
             "name": "icon-4"
+        },
+               {
+            "name": "icon-vend"
         }
        ]
 }

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
new file mode 100644 (file)
index 0000000..765112b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
index 6dfbe5d8c0cc94f7d15d084157c350f2f1da0f00..b22da85aa90616b1c6eac9168740ee9b2309c112 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
@@ -20,6 +20,9 @@
         },
                {
             "name": "icon-4"
+        },
+               {
+            "name": "icon-vend"
         }
        ]
 }

diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png
new file mode 100644 (file)
index 0000000..5c83dd9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png
new file mode 100644 (file)
index 0000000..771497c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
index 6e813512e7c2bd758e55ee396edf2bff4293c668..2666be145a85ede28d0c9bf45aae694fd7047bde 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
@@ -21,6 +21,12 @@
         },
                {
             "name": "icon-4"
+        },
+               {
+            "name": "icon-vend-tea"
+        },
+               {
+            "name": "icon-vend-green-tea"
         }
     ]
 }
\ No newline at end of file