Drinking Glass sprite updates (#87756)

## About The Pull Request
This was meant to be just fixing the missing pixel... then it turned to
redoing all the glasses in all the basic sprites so they'd match... then
redoing sprites that were outdated...
And THEN I realized that drinking glasses can be using the same
auto-sprite system beakers have and oh man it's spiraling.

As for the (hopefully) full list of changes:
- Removes all `glass_[color]` icons. Any drink that fell under these
will now use the fill_icon and their reagent color. As such, a lot of
reagent colors have been tweaked for readability/realism/lemons don't
have red juice what the hell man
(Some colors shown are outdated. It is very annoying to tweak these. I
don't know how to in-game, if I even can. Relaunching several times is
painful.)

![image](https://github.com/user-attachments/assets/7edae6b4-13ec-4d1e-827c-fb7da1b2013a)

- Resprites the base `glass_empty`; now it is very visibly empty. The
overlay being slightly transparent actually works pretty well with this.
(Old / New)

![image](https://github.com/user-attachments/assets/e262c510-93d7-44b0-b4cc-cf498362b05b)

- Full resprite of Curaçao (now it's actually its beautiful blue instead
of gray)

![image](https://github.com/user-attachments/assets/3447c226-8f78-4fa3-bb55-4cb223a7e991)

- Minor resprites Beer/Green Beer/Iced Beer/Ale
(Yes, Beer/Green Beer have little animated bubbles)

![dreamseeker_Z1U2qBxRlx](https://github.com/user-attachments/assets/43903b24-2053-4571-b17b-f3ad80fa4150)

![image](https://github.com/user-attachments/assets/25327706-3207-4d3f-9ea8-ead29d3a0db0)
- Minor resprite of Monkey Energy
(It's animated now too but otherwise about the same sprite)

![dreammaker_lSqopANAXX](https://github.com/user-attachments/assets/7f797080-ae16-42c3-a1f1-e769506e31fd)

- Minor resprites to Pina Olivida, Banana Juice, Lemon Juice, Carrot
Juice - mostly just color tweaks so that they look more believable and
the banana juice is less green
- Fixes small nits in the sodas so that they are all consistent
## Why It's Good For The Game
Sprite maintenance and (hopefully) improvements - we've got a lot of
drinks in the Bars and the base foundation of that whole system deserves
a bit of love as well
## Changelog
🆑
image: redid most basic drinking glass sprites, and moved several drinks
to use the same color system as beakers. Please bug report any incorrect
colored drinks or juices!
/🆑
This commit is contained in:
OrionTheFox
2024-11-09 11:10:28 +01:00
committed by GitHub
parent 4cede34a49
commit d990e4244e
10 changed files with 22 additions and 53 deletions
@@ -109,7 +109,7 @@
/datum/reagent/consumable/ethanol/beer
name = "Beer"
description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today."
color = "#664300" // rgb: 102, 67, 0
color = "#D7BC31" // rgb: 215, 188, 49
nutriment_factor = 1
boozepwr = 25
taste_description = "mild carbonated malt"
@@ -1531,7 +1531,7 @@
/datum/reagent/consumable/ethanol/eggnog
name = "Eggnog"
description = "For enjoying the most wonderful time of the year."
color = "#fcfdc6" // rgb: 252, 253, 198
color = "#ffe2ad" // rgb: 255, 226, 173
nutriment_factor = 2
boozepwr = 1
quality = DRINK_VERYGOOD
@@ -1541,7 +1541,7 @@
/datum/reagent/consumable/ethanol/dreadnog
name = "Dreadnog"
description = "For suffering during a period of joy."
color = "#abb862" // rgb: 252, 253, 198
color = "#f7ffad" // rgb: 247, 255, 173
nutriment_factor = 3 * REAGENTS_METABOLISM
boozepwr = 1
quality = DRINK_REVOLTING
@@ -1573,7 +1573,7 @@
/datum/reagent/consumable/ethanol/creme_de_menthe
name = "Creme de Menthe"
description = "A minty liqueur excellent for refreshing, cool drinks."
color = "#00cc00"
color = "#467446" //rgb: 70, 116, 70
boozepwr = 20
taste_description = "a minty, cool, and invigorating splash of cold streamwater"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1581,7 +1581,7 @@
/datum/reagent/consumable/ethanol/creme_de_cacao
name = "Creme de Cacao"
description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
color = "#996633"
color = "#350900" // rgb: 53, 9, 0
boozepwr = 20
taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -30,7 +30,7 @@
/datum/reagent/consumable/limejuice
name = "Lime Juice"
description = "The sweet-sour juice of limes."
color = "#365E30" // rgb: 54, 94, 48
color = "#a6f19a" // rgb: 166, 241, 154
taste_description = "unbearable sourness"
ph = 2.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -73,14 +73,14 @@
/datum/reagent/consumable/applejuice
name = "Apple Juice"
description = "The sweet juice of an apple, fit for all ages."
color = "#ECFF56" // rgb: 236, 255, 86
color = "#fff06b" // rgb: 255, 240, 107
taste_description = "apples"
ph = 3.2 // ~ 2.7 -> 3.7
/datum/reagent/consumable/poisonberryjuice
name = "Poison Berry Juice"
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
color = "#863353" // rgb: 134, 51, 83
color = "#792b49" // rgb: 121, 43, 73
taste_description = "berries"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -92,14 +92,14 @@
/datum/reagent/consumable/watermelonjuice
name = "Watermelon Juice"
description = "Delicious juice made from watermelon."
color = "#863333" // rgb: 134, 51, 51
color = "#af5e5e" // rgb: 175, 94, 94
taste_description = "juicy watermelon"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/lemonjuice
name = "Lemon Juice"
description = "This juice is VERY sour."
color = "#863333" // rgb: 175, 175, 0
color = "#ebeb9e" // rgb: 235, 235, 158
taste_description = "sourness"
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -107,7 +107,7 @@
/datum/reagent/consumable/banana
name = "Banana Juice"
description = "The raw essence of a banana. HONK"
color = "#863333" // rgb: 175, 175, 0
color = "#FFFCB9" // rgb: 255, 252, 185
taste_description = "banana"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -167,7 +167,7 @@
name = "Potato Juice"
description = "Juice of the potato. Bleh."
nutriment_factor = 2
color = "#302000" // rgb: 48, 32, 0
color = "#E8A856" // rgb: 234, 157, 58
taste_description = "irish sadness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -175,7 +175,7 @@
name = "Pickle Juice"
description = "More accurately, this is the brine the pickle was floating in"
nutriment_factor = 2
color = "#302000" // rgb: 48, 32, 0
color = "#cde65e" // rgb: 205, 230, 94
taste_description = "vinegar brine"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -362,7 +362,7 @@
/datum/reagent/consumable/icecoffee
name = "Iced Coffee"
description = "Coffee and ice, refreshing and cool."
color = "#102838" // rgb: 16, 40, 56
color = "#462b15" // rgb: 70, 43, 21
nutriment_factor = 0
overdose_threshold = 80
taste_description = "bitter coldness"
@@ -383,7 +383,7 @@
/datum/reagent/consumable/hot_ice_coffee
name = "Hot Ice Coffee"
description = "Coffee with pulsing ice shards"
color = "#102838" // rgb: 16, 40, 56
color = "#462b15" // rgb: 70, 43, 21
nutriment_factor = 0
overdose_threshold = 80
taste_description = "bitter coldness and a hint of smoke"
@@ -950,7 +950,7 @@
name = "Hot Coco"
description = "Made with love! And coco beans."
nutriment_factor = 4
color = "#403010" // rgb: 64, 48, 16
color = "#3b240e" // rgb: 59, 36, 14
taste_description = "creamy chocolate"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1095,7 +1095,7 @@
/datum/reagent/consumable/aloejuice
name = "Aloe Juice"
color = "#A3C48B"
color = "#b3c5a7" // rgb: 179, 197, 167
description = "A healthy and refreshing juice."
taste_description = "vegetable"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1139,7 +1139,7 @@
/datum/reagent/consumable/toechtauese_juice
name = "Töchtaüse Juice"
description = "An unpleasant juice made from töchtaüse berries. Best made into a syrup, unless you enjoy pain."
color = "#554862"
color = "#554862" // rgb: 85, 72, 98
nutriment_factor = 0
taste_description = "fiery itchy pain"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1147,7 +1147,7 @@
/datum/reagent/consumable/toechtauese_syrup
name = "Töchtaüse Syrup"
description = "A harsh spicy and bitter syrup, made from töchtaüse berries. Useful as an ingredient, both for food and cocktails."
color = "#554862"
color = "#554862" // rgb: 85, 72, 98
nutriment_factor = 0
taste_description = "sugar, spice, and nothing nice"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1203,14 +1203,14 @@
/datum/reagent/consumable/cucumberjuice
name = "Cucumber Juice"
description = "Ordinary cucumber juice, nothing from the fantasy world."
color = "#6cd87a"
color = "#B1D861" // rgb: 177, 216, 97
taste_description = "light cucumber"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cucumberlemonade
name = "Cucumber Lemonade"
description = "Cucumber juice, sugar, and soda; what else do I need?"
color = "#6cd87a"
color = "#cbe248" // rgb: 203, 226, 72
quality = DRINK_GOOD
taste_description = "citrus soda with cucumber"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -95,6 +95,7 @@
name = "glass of amaretto"
desc = "A sweet and syrupy looking drink."
icon_state = "amarettoglass"
/datum/glass_style/drinking_glass/cognac
required_drink_type = /datum/reagent/consumable/ethanol/cognac
name = "glass of cognac"
@@ -155,7 +156,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/pruno
name = "glass of pruno"
desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done."
icon_state = "glass_orange"
/datum/glass_style/drinking_glass/navy_rum
required_drink_type = /datum/reagent/consumable/ethanol/navy_rum
@@ -187,7 +187,6 @@
name = "glass of yūyake"
desc = "It's the saccharine essence of the 70s in a glass... the 1970s, that is!"
icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "glass_red"
/datum/glass_style/drinking_glass/shochu
required_drink_type = /datum/reagent/consumable/ethanol/shochu
@@ -255,7 +254,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/hooch
name = "Hooch"
desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
icon_state = "glass_brown2"
/datum/glass_style/shot_glass/goldschlager
required_drink_type = /datum/reagent/consumable/ethanol/goldschlager
@@ -4,7 +4,6 @@
required_drink_type = /datum/reagent/consumable/coffee
name = "glass of coffee"
desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
icon_state = "glass_brown"
/datum/glass_style/drinking_glass/tea
required_drink_type = /datum/reagent/consumable/tea
@@ -58,7 +57,6 @@
required_drink_type = /datum/reagent/consumable/hot_coco
name = "glass of hot coco"
desc = "A favorite winter drink to warm you up."
icon_state = "chocolateglass"
drink_type = SUGAR | DAIRY
/datum/glass_style/drinking_glass/italian_coco
@@ -4,7 +4,6 @@
required_drink_type = /datum/reagent/consumable/milk
name = "glass of milk"
desc = "White and nutritious goodness!"
icon_state = "glass_white"
drink_type = DAIRY | BREAKFAST
/datum/glass_style/has_foodtype/juicebox/milk
@@ -25,17 +24,14 @@
required_drink_type = /datum/reagent/consumable/soymilk
name = "glass of soy milk"
desc = "White and nutritious soy goodness!"
icon_state = "glass_white"
/datum/glass_style/drinking_glass/cream
required_drink_type = /datum/reagent/consumable/cream
name = "glass of cream"
desc = "Ewwww..."
icon_state = "glass_white"
/datum/glass_style/drinking_glass/coconut_milk
required_drink_type = /datum/reagent/consumable/coconut_milk
name = "glass of coconut milk"
desc = "The essence of the tropics, contained safely within a glass."
icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "glass_white"
@@ -4,7 +4,6 @@
required_drink_type = /datum/reagent/consumable/orangejuice
name = "glass of orange juice"
desc = "Vitamins! Yay!"
icon_state = "glass_orange"
drink_type = FRUIT | BREAKFAST
/datum/glass_style/has_foodtype/juicebox/orangejuice
@@ -62,13 +61,11 @@
required_drink_type = /datum/reagent/consumable/tomatojuice
name = "glass of tomato juice"
desc = "Are you sure this is tomato juice?"
icon_state = "glass_red"
/datum/glass_style/drinking_glass/limejuice
required_drink_type = /datum/reagent/consumable/limejuice
name = "glass of lime juice"
desc = "A glass of sweet-sour lime juice."
icon_state = "glass_green"
/datum/glass_style/drinking_glass/carrotjuice
required_drink_type = /datum/reagent/consumable/carrotjuice
@@ -80,19 +77,16 @@
required_drink_type = /datum/reagent/consumable/berryjuice
name = "glass of berry juice"
desc = "Berry juice. Or maybe it's jam. Who cares?"
icon_state = "berryjuice"
/datum/glass_style/drinking_glass/poisonberryjuice
required_drink_type = /datum/reagent/consumable/poisonberryjuice
name = "glass of berry juice"
desc = "Berry juice. Or maybe it's poison. Who cares?"
icon_state = "poisonberryjuice"
/datum/glass_style/drinking_glass/watermelonjuice
required_drink_type = /datum/reagent/consumable/watermelonjuice
name = "glass of watermelon juice"
desc = "A glass of watermelon juice."
icon_state = "glass_red"
/datum/glass_style/drinking_glass/lemonjuice
required_drink_type = /datum/reagent/consumable/lemonjuice
@@ -116,43 +110,36 @@
required_drink_type = /datum/reagent/consumable/potato_juice
name = "glass of potato juice"
desc = "Bleh..."
icon_state = "glass_brown"
/datum/glass_style/drinking_glass/bungojuice
required_drink_type = /datum/reagent/consumable/bungojuice
name = "glass of bungo juice"
desc = "Exotic! You feel like you are on vacation already."
icon_state = "glass_yellow"
/datum/glass_style/drinking_glass/prunomix
required_drink_type = /datum/reagent/consumable/prunomix
name = "glass of pruno mixture"
desc = "Fruit, sugar, yeast, and water pulped together into a pungent slurry."
icon_state = "glass_orange"
/datum/glass_style/drinking_glass/aloejuice
required_drink_type = /datum/reagent/consumable/aloejuice
name = "glass of aloe juice"
desc = "A healthy and refreshing juice."
icon_state = "glass_yellow"
/datum/glass_style/drinking_glass/toechtauese_juice
required_drink_type = /datum/reagent/consumable/toechtauese_juice
name = "glass of töchtaüse juice"
desc = "Raw, unadulterated töchtaüse juice. One swig will fill you with regrets."
icon_state = "toechtauese_syrup"
/datum/glass_style/drinking_glass/toechtauese_syrup
required_drink_type = /datum/reagent/consumable/toechtauese_syrup
name = "glass of töchtaüse syrup"
desc = "Not for drinking on its own."
icon_state = "toechtauese_syrup"
/datum/glass_style/drinking_glass/cucumberjuice
required_drink_type = /datum/reagent/consumable/cucumberjuice
name = "glass of cucumber juice"
desc = "A glass of cucumber juice."
icon_state = "glass_cucumber"
// Effectively misc
@@ -161,7 +148,6 @@
required_drink_type = /datum/reagent/consumable/menthol
name = "glass of menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
icon_state = "glass_green"
/datum/glass_style/drinking_glass/grenadine
required_drink_type = /datum/reagent/consumable/grenadine
@@ -2,7 +2,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/bilk
name = "glass of bilk"
desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
icon_state = "glass_brown"
/datum/glass_style/drinking_glass/threemileisland
required_drink_type = /datum/reagent/consumable/ethanol/threemileisland
@@ -400,7 +399,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/bacchus_blessing
name = "Bacchus' Blessing"
desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
icon_state = "glass_brown2"
/datum/glass_style/drinking_glass/atomicbomb
required_drink_type = /datum/reagent/consumable/ethanol/atomicbomb
@@ -434,7 +432,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/eggnog
name = "eggnog"
desc = "For enjoying the most wonderful time of the year."
icon_state = "glass_yellow"
drink_type = FRUIT
/datum/glass_style/has_foodtype/juicebox/eggnog
@@ -461,25 +458,21 @@
required_drink_type = /datum/reagent/consumable/ethanol/triple_sec
name = "Triple Sec"
desc = "A glass of straight Triple Sec."
icon_state = "glass_orange"
/datum/glass_style/drinking_glass/creme_de_menthe
required_drink_type = /datum/reagent/consumable/ethanol/creme_de_menthe
name = "Creme de Menthe"
desc = "You can almost feel the first breath of spring just looking at it."
icon_state = "glass_green"
/datum/glass_style/drinking_glass/creme_de_cacao
required_drink_type = /datum/reagent/consumable/ethanol/creme_de_cacao
name = "Creme de Cacao"
desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
icon_state = "glass_brown"
/datum/glass_style/drinking_glass/creme_de_coconut
required_drink_type = /datum/reagent/consumable/ethanol/creme_de_coconut
name = "Creme de Coconut"
desc = "An unintimidating glass of coconut liqueur."
icon_state = "glass_white"
/datum/glass_style/drinking_glass/quadruple_sec
required_drink_type = /datum/reagent/consumable/ethanol/quadruple_sec
@@ -787,7 +780,6 @@
/datum/glass_style/drinking_glass/mushi_kombucha
required_drink_type = /datum/reagent/consumable/ethanol/mushi_kombucha
name = "glass of mushi kombucha"
icon_state = "glass_orange"
/datum/glass_style/drinking_glass/triumphal_arch
required_drink_type = /datum/reagent/consumable/ethanol/triumphal_arch
@@ -17,7 +17,6 @@
required_drink_type = /datum/reagent/blood
name = "glass of tomato juice"
desc = "Are you sure this is tomato juice?"
icon_state = "glass_red"
// FEED ME
/datum/reagent/blood/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB