Bar related tweaks (#33505)

* does everything

* beer flavor revert and linter fix

* Update Resources/Locale/en-US/flavors/flavor-profiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* fix misspelling

* fix yet another misspelling

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* english has weird spellings huh

* im starting to feel ashamed of myself

* this is shameful

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 0ba65217ef86d04bd8864ac0a21c73dd6fd967c8..c305f521a8bcce17f0c3fc057f557f9f636e0534 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -213,7 +213,6 @@ flavor-complex-vodka = like fermented grain
 flavor-complex-tequila = like fermented death
 flavor-complex-sake = like sweet, alcoholic rice
 flavor-complex-rum = like fermented sugar
-flavor-complex-coconut-rum = like nutty fermented sugar
 flavor-complex-coffee-liquor = like strong, bitter coffee
 flavor-complex-whiskey = like molasses
 flavor-complex-shitty-wine = like grape rinds
@@ -224,12 +223,13 @@ flavor-complex-milk = like milk
 flavor-complex-tea = like tea
 flavor-complex-ice = like ice
 flavor-complex-mopwata = like stagnant, dirty water
+flavor-complex-gin = like fermented grain with juniper berries
 
 ## Cocktails
 flavor-complex-arnold-palmer = like a hole-in-one
 flavor-complex-blue-hawaiian = like the tropics
 flavor-complex-cosmopolitan = sweet and tangy
-flavor-complex-painkiller = like spiked pineapple juice
+flavor-complex-painkiller = like a tropical vacation
 flavor-complex-pina-colada = like tropical sun
 flavor-complex-long-island = suspiciously like iced tea
 flavor-complex-three-mile-island = like tea brewed in nuclear runoff
@@ -250,10 +250,10 @@ flavor-complex-banana-honk = like a banana milkshake
 flavor-complex-atomic-bomb = like a nuclear wasteland
 flavor-complex-atomic-cola = like hoarding bottle caps
 flavor-complex-cuba-libre = like spiked cola
-flavor-complex-gin-tonic = like spiked lemon-lime soda
+flavor-complex-gin-tonic = refreshingly bitter
 flavor-complex-screwdriver = like spiked orange juice
 flavor-complex-vodka-red-bool = like a heart attack
-flavor-complex-irish-bool = caffine and Ireland
+flavor-complex-irish-bool = like caffeine and Ireland
 flavor-complex-xeno-basher = like killing bugs
 flavor-complex-budget-insuls-drink = like door hacking
 flavor-complex-watermelon-wakeup = like a sweet wakeup call
@@ -263,6 +263,42 @@ flavor-complex-themartinez = like violets and lemon vodka
 flavor-complex-cogchamp = like brass
 flavor-complex-white-gilgamesh = like lightly carbonated cream
 flavor-complex-antifreeze = warm
+flavor-complex-absinthe = like anise
+flavor-complex-blue-curacao = like orange flowers
+flavor-complex-acidspit = like French battery acid
+flavor-complex-allies-cocktail = like medicinal tincture
+flavor-complex-aloe = like morning dew
+flavor-complex-amasec = like space marine sweat
+flavor-complex-andalusia = like sour molasses
+flavor-complex-b52 = like an Irish pub
+flavor-complex-bahama-mama = like sunbathing in the Caribbean
+flavor-complex-barefoot = like a cassis milkshake
+flavor-complex-booger = like snot
+flavor-complex-brave-bull = like being ran over by a truck
+flavor-complex-demons-blood = like the seventh circle of Hell
+flavor-complex-devils-kiss = like cannibalism
+flavor-complex-driest-martini = like a drunk mimic
+flavor-complex-erika-surprise = like the bartender made a mistake
+flavor-complex-gin-fizz = refreshing and lemony
+flavor-complex-gildlager = like the Tzar's gold
+flavor-complex-grog = like a sea shanty
+flavor-complex-hippies-delight = like your blood pressure is dropping
+flavor-complex-hooch = like it would be delicious if you were a diesel engine
+flavor-complex-manhattan = like looking out the window of a 5 star hotel
+flavor-complex-manhattan-project = like I am become Death, the destroyer of worlds
+flavor-complex-margarita = like a very bad hangover
+flavor-complex-martini = like a spy movie
+flavor-complex-mojito = like going into the shade after being in the hot sun
+flavor-complex-neurotoxin = like an underground testing facility
+flavor-complex-patron = like being serenaded by mariachi
+flavor-complex-red-mead = like a viking battle
+flavor-complex-sbiten = like fire
+flavor-complex-snowwhite = like sour and bitter hops
+flavor-complex-sui-dream = like a picture of the Alps
+flavor-complex-toxins-special = like space exploration
+flavor-complex-vodka-martini = like a spy movie from Russia
+flavor-complex-vodka-tonic = refreshingly bitter
+flavor-complex-coconut-rum = like nutty fermented sugar
 
 ### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though
 flavor-complex-pilk = like sweet milk

diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index e24c7a03d6c1a8caf378eb5578c1c55d7ed63a9b..31e233625a318221ea992af839416f463e24d059 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -63,6 +63,7 @@
       whitelist:
         components:
         - FitsInDispenser
+      priority: 9
   - type: ItemSlots
   - type: ContainerContainer
     containers:

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index a351e942e83879f0662b9c9d1720d882bb941382..2e31b12f2fbcf90e9c32781709b31f2be736681e 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -909,6 +909,186 @@
   flavorType: Complex
   description: flavor-complex-pilk
 
+- type: flavor
+  id: absinthe
+  flavorType: Complex
+  description: flavor-complex-absinthe
+
+- type: flavor
+  id: bluecuracao
+  flavorType: Complex
+  description: flavor-complex-blue-curacao
+
+- type: flavor
+  id: gin
+  flavorType: Complex
+  description: flavor-complex-gin
+
+- type: flavor
+  id: acidspit
+  flavorType: Complex
+  description: flavor-complex-acidspit
+
+- type: flavor
+  id: alliescocktail
+  flavorType: Complex
+  description: flavor-complex-allies-cocktail
+
+- type: flavor
+  id: aloe
+  flavorType: Complex
+  description: flavor-complex-aloe
+
+- type: flavor
+  id: amasec
+  flavorType: Complex
+  description: flavor-complex-amasec
+
+- type: flavor
+  id: andalusia
+  flavorType: Complex
+  description: flavor-complex-andalusia
+
+- type: flavor
+  id: b52
+  flavorType: Complex
+  description: flavor-complex-b52
+
+- type: flavor
+  id: bahamamama
+  flavorType: Complex
+  description: flavor-complex-bahama-mama
+
+- type: flavor
+  id: barefoot
+  flavorType: Complex
+  description: flavor-complex-barefoot
+
+- type: flavor
+  id: booger
+  flavorType: Complex
+  description: flavor-complex-booger
+
+- type: flavor
+  id: bravebull
+  flavorType: Complex
+  description: flavor-complex-brave-bull
+
+- type: flavor
+  id: demonsblood
+  flavorType: Complex
+  description: flavor-complex-demons-blood
+
+- type: flavor
+  id: devilskiss
+  flavorType: Complex
+  description: flavor-complex-devils-kiss
+
+- type: flavor
+  id: driestmartini
+  flavorType: Complex
+  description: flavor-complex-driest-martini
+
+- type: flavor
+  id: erikasurprise
+  flavorType: Complex
+  description: flavor-complex-erika-surprise
+
+- type: flavor
+  id: ginfizz
+  flavorType: Complex
+  description: flavor-complex-gin-fizz
+
+- type: flavor
+  id: gildlager
+  flavorType: Complex
+  description: flavor-complex-gildlager
+
+- type: flavor
+  id: grog
+  flavorType: Complex
+  description: flavor-complex-grog
+
+- type: flavor
+  id: hippiesdelight
+  flavorType: Complex
+  description: flavor-complex-hippies-delight
+
+- type: flavor
+  id: hooch
+  flavorType: Complex
+  description: flavor-complex-hooch
+
+- type: flavor
+  id: manhattan
+  flavorType: Complex
+  description: flavor-complex-manhattan
+
+- type: flavor
+  id: manhattanproject
+  flavorType: Complex
+  description: flavor-complex-manhattan-project
+
+- type: flavor
+  id: margarita
+  flavorType: Complex
+  description: flavor-complex-margarita
+
+- type: flavor
+  id: martini
+  flavorType: Complex
+  description: flavor-complex-martini
+
+- type: flavor
+  id: mojito
+  flavorType: Complex
+  description: flavor-complex-mojito
+
+- type: flavor
+  id: neurotoxin
+  flavorType: Complex
+  description: flavor-complex-neurotoxin
+
+- type: flavor
+  id: patron
+  flavorType: Complex
+  description: flavor-complex-patron
+
+- type: flavor
+  id: redmead
+  flavorType: Complex
+  description: flavor-complex-red-mead
+
+- type: flavor
+  id: sbiten
+  flavorType: Complex
+  description: flavor-complex-sbiten
+
+- type: flavor
+  id: snowwhite
+  flavorType: Complex
+  description: flavor-complex-snowwhite
+
+- type: flavor
+  id: suidream
+  flavorType: Complex
+  description: flavor-complex-sui-dream
+
+- type: flavor
+  id: toxinsspecial
+  flavorType: Complex
+  description: flavor-complex-toxins-special
+
+- type: flavor
+  id: vodkamartini
+  flavorType: Complex
+  description: flavor-complex-vodka-martini
+
+- type: flavor
+  id: vodkatonic
+  flavorType: Complex
+  description: flavor-complex-vodka-tonic
+
 - type: flavor
   id: medicine
   flavorType: Complex

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 602d6296b3d361757a358761d28074c4061db56b..7478161a54fd6f74827d7d7215f011aa9d638db8 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -7,7 +7,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-absinthe
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: absinthe
   color: "#33EE00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
@@ -63,8 +63,8 @@
   name: reagent-name-blue-curacao
   parent: BaseAlcohol
   desc: reagent-desc-blue-curacao
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: bluecuracao
   color: "#0099FF"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/thin_glass.rsi
@@ -210,7 +210,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-gin
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: gin
   color: "#664300"
   recognizable: true
   metamorphicSprite:
@@ -248,7 +248,7 @@
   name: reagent-name-melon-liquor
   parent: BaseAlcohol
   desc: reagent-desc-melon-liquor
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-sweet
   flavor: watermelon
   color: "#00FF33"
   metamorphicSprite:
@@ -363,7 +363,7 @@
   name: reagent-name-vermouth
   parent: BaseAlcohol
   desc: reagent-desc-vermouth
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-aromatic
   flavor: vermouth
   color: "#91FF91"
   metamorphicSprite:
@@ -470,7 +470,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-acid-spit
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: acidspit
   color: "#365000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/acidspitglass.rsi
@@ -485,7 +485,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-allies-cocktail
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: alliescocktail
   color: "#00664d"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/alliescocktail.rsi
@@ -499,8 +499,8 @@
   name: reagent-name-aloe
   parent: BaseAlcohol
   desc: reagent-desc-aloe
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: aloe
   color: "#192c00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/aloe.rsi
@@ -515,7 +515,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-amasec
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: amasec
   color: "#124da7"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/amasecglass.rsi
@@ -530,7 +530,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-andalusia
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: andalusia
   color: "#665700"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/andalusia.rsi
@@ -594,7 +594,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-b52
   physicalDesc: reagent-physical-desc-bubbly
-  flavor: alcohol
+  flavor: b52
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/b52glass.rsi
@@ -616,8 +616,8 @@
   name: reagent-name-bahama-mama
   parent: BaseAlcohol
   desc: reagent-desc-bahama-mama
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: bahamamama
   color: "#FF7F3B"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bahama_mama.rsi
@@ -631,7 +631,7 @@
   name: reagent-name-banana-honk
   parent: BaseAlcohol
   desc: reagent-desc-banana-honk
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-creamy
   flavor: bananahonk
   color: "#ffff91"
   metamorphicSprite:
@@ -646,8 +646,8 @@
   name: reagent-name-barefoot
   parent: BaseAlcohol
   desc: reagent-desc-barefoot
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-creamy
+  flavor: barefoot
   color: "#ff66cc"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/b&p.rsi
@@ -723,8 +723,8 @@
   name: reagent-name-booger
   parent: BaseAlcohol
   desc: reagent-desc-booger
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-slimy
+  flavor: booger
   color: "#99ff00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/booger.rsi
@@ -739,7 +739,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-brave-bull
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: bravebull
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
@@ -761,8 +761,8 @@
   name: reagent-name-coconut-rum
   parent: BaseAlcohol
   desc: reagent-desc-coconut-rum
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: rum
+  physicalDesc: reagent-physical-desc-milky
+  flavor: coconutrum
   color: "#cccbc8"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/coconutrum.rsi
@@ -825,8 +825,8 @@
   name: reagent-name-demons-blood
   parent: BaseAlcohol
   desc: reagent-desc-demons-blood
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-ferrous
+  flavor: demonsblood
   color: "#a70000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/demonsblood.rsi
@@ -841,8 +841,8 @@
   name: reagent-name-devils-kiss
   parent: BaseAlcohol
   desc: reagent-desc-devils-kiss
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-ferrous
+  flavor: devilskiss
   color: "#ff0033"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/devilskiss.rsi
@@ -856,7 +856,7 @@
   name: reagent-name-doctors-delight
   parent: BaseDrink
   desc: reagent-desc-doctors-delight
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-soothing
   flavor: medicine
   color: "#FF8CFF"
   metamorphicSprite:
@@ -889,7 +889,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-driest-martini
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: driestmartini
   color: "#2E6671"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
@@ -911,8 +911,8 @@
   name: reagent-name-erika-surprise
   parent: BaseAlcohol
   desc: reagent-desc-erika-surprise
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-cloudy
+  flavor: erikasurprise
   color: "#67bc50"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/beerstein.rsi
@@ -950,8 +950,8 @@
   name: reagent-name-gin-fizz
   parent: BaseAlcohol
   desc: reagent-desc-gin-fizz
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: ginfizz
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
@@ -974,7 +974,7 @@
   name: reagent-name-gin-tonic
   parent: BaseAlcohol
   desc: reagent-desc-gin-tonic
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-fizzy
   flavor: gintonic
   color: "#004166"
   metamorphicSprite:
@@ -999,7 +999,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-gildlager
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: gildlager
   color: "#FFFF91"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
@@ -1022,7 +1022,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-grog
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: grog
   color: "#e3e77b"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/beerstein.rsi
@@ -1037,7 +1037,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-hippies-delight
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: hippiesdelight
   color: "#6eaa0c"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
@@ -1052,7 +1052,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-hooch
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: hooch
   color: "#664e00"
 
 - type: reagent
@@ -1169,7 +1169,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-manhattan
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: manhattan
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/manhattanglass.rsi
@@ -1183,8 +1183,8 @@
   name: reagent-name-manhattan-project
   parent: BaseAlcohol
   desc: reagent-desc-manhattan-project
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-overpowering
+  flavor: manhattanproject
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
@@ -1215,7 +1215,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-margarita
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: margarita
   color: "#8CFF8C"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/margaritaglass.rsi
@@ -1230,7 +1230,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-martini
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: martini
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
@@ -1268,8 +1268,8 @@
   name: reagent-name-mojito
   parent: BaseAlcohol
   desc: reagent-desc-mojito
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-refreshing
+  flavor: mojito
   color: "#3ea99888"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/mojito.rsi
@@ -1284,7 +1284,7 @@
   name: reagent-name-moonshine
   parent: BaseAlcohol
   desc: reagent-desc-moonshine
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-pungent
   flavor: moonshine
   color: "#d1d7d155"
   metamorphicSprite:
@@ -1307,8 +1307,8 @@
   name: reagent-name-neurotoxin
   parent: BaseAlcohol
   desc: reagent-desc-neurotoxin
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-pungent
+  flavor: neurotoxin
   color: "#2E2E61"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
@@ -1357,7 +1357,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-patron
   physicalDesc: reagent-physical-desc-metallic
-  flavor: alcohol
+  flavor: patron
   color: "#585840"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/patronglass.rsi
@@ -1379,8 +1379,8 @@
   name: reagent-name-red-mead
   parent: BaseAlcohol
   desc: reagent-desc-red-mead
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-ferrous
+  flavor: redmead
   color: "#bc5550"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/beerstein.rsi
@@ -1396,7 +1396,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-pina-colada
   physicalDesc: reagent-physical-desc-tropical
-  flavor: alcohol
+  flavor: pinacolada
   color: "#e8dba4"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/pinacolada.rsi
@@ -1408,7 +1408,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-sbiten
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: sbiten
   color: "#004166"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/sbitenglass.rsi
@@ -1422,7 +1422,7 @@
   name: reagent-name-screwdriver-cocktail
   parent: BaseAlcohol
   desc: reagent-desc-screwdriver-cocktail
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-citric
   flavor: screwdriver
   color: "#A68310"
   metamorphicSprite:
@@ -1510,7 +1510,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-snow-white
   physicalDesc: reagent-physical-desc-bubbly
-  flavor: alcohol
+  flavor: snowwhite
   color: "#FFFFFF"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/snowwhite.rsi
@@ -1525,8 +1525,8 @@
   name: reagent-name-sui-dream
   parent: BaseAlcohol
   desc: reagent-desc-sui-dream
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: suidream
   color: "#00A86B"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/sdreamglass.rsi
@@ -1557,7 +1557,7 @@
   name: reagent-name-tequila-sunrise
   parent: BaseAlcohol
   desc: reagent-desc-tequila-sunrise
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-citric
   flavor: tequilasunrise
   color: "#FFE48C"
   metamorphicSprite:
@@ -1622,8 +1622,8 @@
   name: reagent-name-toxins-special
   parent: BaseAlcohol
   desc: reagent-desc-toxins-special
-  physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  physicalDesc: reagent-physical-desc-pungent
+  flavor: toxinsspecial
   color: "#665c00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
@@ -1638,7 +1638,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-vodka-martini
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: vodkamartini
   color: "#004666"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
@@ -1661,7 +1661,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-vodka-tonic
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: vodkatonic
   color: "#0064C8"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/gintonicglass.rsi # they look the same
@@ -1708,7 +1708,7 @@
   name: reagent-name-whiskey-soda
   parent: BaseAlcohol
   desc: reagent-desc-whiskey-soda
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-fizzy
   flavor: whiskeycola
   color: "#533600"
   metamorphicSprite:
@@ -1773,7 +1773,7 @@
   name: reagent-name-vodka-red-bool
   parent: BaseAlcohol
   desc: reagent-desc-vodka-red-bool
-  physicalDesc: reagent-physical-desc-strong-smelling
+  physicalDesc: reagent-physical-desc-bubbly
   flavor: vodkaredbool
   color: "#c4c27655"
   metamorphicSprite:

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 64668b10895759a9d851b88881704aa6e916c21a..1c69be50455625b3d7f3dce1ae17791eb642411b 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -98,9 +98,9 @@
     Tequila:
       amount: 1
     VodkaRedBool:
-      amount: 2
+      amount: 3
   products:
-    BudgetInsulsDrink: 3
+    BudgetInsulsDrink: 4
 
 - type: reaction
   id: BlueHawaiian
@@ -1111,11 +1111,11 @@
   id: WhiteRussian
   reactants:
     BlackRussian:
-      amount: 2
+      amount: 1
     Cream:
       amount: 1
   products:
-    WhiteRussian: 3
+    WhiteRussian: 2
 
 - type: reaction
   id: WhiskeySoda