From 64cecdde8421b29938e4304c3de42cc481102aa5 Mon Sep 17 00:00:00 2001
From: Sybil <azurerosegarden@gmail.com>
Date: Mon, 19 Feb 2024 09:40:43 -0600
Subject: [PATCH] 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
---
 .../Objects/Consumable/Drinks/drinks_cups.yml     |  12 ++++++++++++
 .../Reagents/Consumable/Drink/drinks.yml          |   6 +++---
 .../Consumable/Drinks/hot_coco.rsi/icon-vend.png  | Bin 0 -> 295 bytes
 .../Consumable/Drinks/hot_coco.rsi/meta.json      |   3 +++
 .../Drinks/hot_coffee.rsi/icon-vend.png           | Bin 0 -> 295 bytes
 .../Consumable/Drinks/hot_coffee.rsi/meta.json    |   3 +++
 .../Drinks/teacup.rsi/icon-vend-green-tea.png     | Bin 0 -> 196 bytes
 .../Drinks/teacup.rsi/icon-vend-tea.png           | Bin 0 -> 245 bytes
 .../Consumable/Drinks/teacup.rsi/meta.json        |   6 ++++++
 9 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 352ea769d9..1b4e5deb35 100644
--- 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 77a387da7b..ce93bbc463 100644
--- 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
index 0000000000000000000000000000000000000000..765112be764715026b84a09ea1947aa20a14b84f
GIT binary patch
literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;Ymb6R9J=WlsyW<KoCa1sHBNVQpHA_c!o3<-b!%=3&Duq!Nb_*2$EDbrZFLy
zCLn7S(fok3h!)PPc4v2I9?UWT!!XRhqp3U!eNR5`9akvjQ4$D!Pg<r8y*B~?<Y|C7
ziIgQsk3!#*MmxiDx_*hTb_--TLrH=xu$_zAv)RUbtSKTbia@zgIp(-Rb6lZaj(b_T
z)If(SV3~GB!ZK~dNkmPhCIA5Ta17lT008prgggxZ0N3+D0zkJvdAkKl0!>f~7m)wJ
try&VAuF&dw{k1tz@X1NYFbu=|oI4v3LA<DpZo2>g002ovPDHLkV1gcBbJ+j@

literal 0
HcmV?d00001

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 6dfbe5d8c0..b22da85aa9 100644
--- 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
index 0000000000000000000000000000000000000000..765112be764715026b84a09ea1947aa20a14b84f
GIT binary patch
literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;Ymb6R9J=WlsyW<KoCa1sHBNVQpHA_c!o3<-b!%=3&Duq!Nb_*2$EDbrZFLy
zCLn7S(fok3h!)PPc4v2I9?UWT!!XRhqp3U!eNR5`9akvjQ4$D!Pg<r8y*B~?<Y|C7
ziIgQsk3!#*MmxiDx_*hTb_--TLrH=xu$_zAv)RUbtSKTbia@zgIp(-Rb6lZaj(b_T
z)If(SV3~GB!ZK~dNkmPhCIA5Ta17lT008prgggxZ0N3+D0zkJvdAkKl0!>f~7m)wJ
try&VAuF&dw{k1tz@X1NYFbu=|oI4v3LA<DpZo2>g002ovPDHLkV1gcBbJ+j@

literal 0
HcmV?d00001

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 6dfbe5d8c0..b22da85aa9 100644
--- 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
index 0000000000000000000000000000000000000000..5c83dd91ad7c2207c5023d1bc19efa722f92957c
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|<N|y`T!D1m
zHnrWmcVD@3<@)vO&z?Pd{rdI0cke!Y`0)S#e^tBPj6fA!B|(0{3_v~v)OCu40Y&XR
zT^vI!df%Qi<OAB`94OFT@t?c<O{uBczOD5uPJCYx##epaq=HE|IHFNYDI<a5&fOo~
ju?K#f)VY-TKQGGrG{bVqc(xlrlNdZ*{an^LB{Ts5TE9?m

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..771497c2293da636f696b125b8bc8b610d4acd35
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pfi@Ln2z=
zPBP?UQWS8tSBq(wrToTpN8{4D$An*S=IHjSUpVKNY`j%fHoYOo`4H!Z+iNBsx|xz}
zygtcp=0jEn7DoY=hv!#l`nrTf?=0@K?Z4~bay6>^cjDiP`F{Kr?{6yQG)g4zeKYOs
z-oIa2mrhYy^lSBzCT#|W)sNq5-<~&LW9f$Ujrj^K0lkLKYq!c>tG%zh)a1SJ78M4C
s=RNCQKl|U3+*xS*v;b(0BSV9E4v&eF=yhLppwk&VUHx3vIVCg!0Mt`pF8}}l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
index 6e813512e7..2666be145a 100644
--- 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
-- 
2.52.0