Drink titles and soda vendor consistency (#34178)

* Made capitalisation of proper names consistent. * Roy Rogers is presumably a proper name. * Second pass at distinguishing proper names only. * Two nitpicking/minor changes * Fixed some overlooked can brand names. Matched case with descriptions. * Switched generic sodas with brands for SodaInventory * Removed commonly available branded cans * Matched case consistency used elsewhere. Minor SPAG corrections. * Added "nothing" and some missing alcohol bottles to RandomSpawner * Added distinct ad and bye chatter to Dr. Gibb machines. * Revert "Added distinct ad and bye chatter to Dr. Gibb machines." This reverts commit f90b8a470556de05aca81255db8b6b03596ae944. * Revert "Removed commonly available branded cans" This reverts commit 43b82168dac1f73b187b7677f34ecdd33b6bb81a. * Revert "Switched generic sodas with brands for SodaInventory" This reverts commit f1790f0ce61ef135c79068de6a741e8bb50d85d3. * Lowercased DrinkGlass suffix. Moved alcoholic drinks from drinks to alcohol. * Renamed energy drink to Red Bool. Corrected and added some jug descriptions. * Added reagent names for all bottles except poison-wine * Revision of title case for cocktails * SPAG and fixed the only brand reagen with unbranded name. * Possibly controversial, shortened some bran names to better fit the UI. * Fixed some inconsistencies in naming * Matched brand localisation change * Two name style edits * Fixed Smite bottle name * Minor, punctuation * Blank line to end of file * Upgraded descriptive names to title case * Banana Mama * reverts change, moved to another PR to avoid conflict. * Removed caffeine reference. * Minor, corrected some more inconsistencies * Removed Bottle of Nothing from random spawner.
2025-01-09 20:24:31 +00:00
parent 66810ef257
commit 36cbd07c07
7 changed files with 133 additions and 106 deletions
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -7,7 +7,7 @@ reagent-desc-ale = A dark alchoholic beverage made by malted barley and yeast.
 reagent-name-beer = beer
 reagent-desc-beer = An alcoholic beverage made from malted grains, hops, yeast, and water.

-reagent-name-blue-curacao = blue curacao
+reagent-name-blue-curacao = blue Curaçao
 reagent-desc-blue-curacao = Exotically blue, fruity drink, distilled from oranges.

 reagent-name-cognac = cognac
@@ -28,7 +28,7 @@ reagent-desc-coffeeliqueur = Liquor flavoured with cold brewed coffee and spices
 reagent-name-melon-liquor = melon liquor
 reagent-desc-melon-liquor = A relatively sweet and fruity 46 proof liquor.

-reagent-name-n-t-cahors = NeoTheology Cahors Wine
+reagent-name-n-t-cahors = NeoTheology Cahors wine
 reagent-desc-n-t-cahors = Fortified dessert wine made from cabernet sauvignon, saperavi and other grapes.

 reagent-name-poison-wine = poison wine
@@ -53,7 +53,7 @@ reagent-name-whiskey = whiskey
 reagent-desc-whiskey = A type of distilled alcoholic beverage made from fermented grain mash.

 reagent-name-wine = wine
-reagent-desc-wine = An premium alchoholic beverage made from distilled grape juice.
+reagent-desc-wine = A premium alcoholic beverage made from distilled grape juice.

 reagent-name-champagne = champagne
 reagent-desc-champagne = A premium sparkling wine
@@ -70,43 +70,43 @@ reagent-desc-aloe = So very, very, very good.
 reagent-name-amasec = amasec
 reagent-desc-amasec = Official drink of the Gun Club!

-reagent-name-andalusia = andalusia
+reagent-name-andalusia = Andalusia
 reagent-desc-andalusia = A nice, strangely named drink.

 reagent-name-antifreeze = antifreeze
 reagent-desc-antifreeze = Ultimate refreshment.

-reagent-name-atomic-bomb = atomic bomb
+reagent-name-atomic-bomb = Atomic Bomb
 reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good.

-reagent-name-b52 = b-52
+reagent-name-b52 = B-52
 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed.

-reagent-name-blue-hawaiian = blue hawaiian
+reagent-name-blue-hawaiian = Blue Hawaiian
 reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye?

-reagent-name-bahama-mama = bahama mama
+reagent-name-bahama-mama = Bahama Mama
 reagent-desc-bahama-mama = Tropical cocktail.

-reagent-name-banana-honk = banana honk
+reagent-name-banana-honk = Banana Honk
 reagent-desc-banana-honk = A drink from Clown Heaven.

 reagent-name-barefoot = barefoot
 reagent-desc-barefoot = Barefoot and pregnant.

-reagent-name-beepsky-smash = beepsky smash
+reagent-name-beepsky-smash = Beepsky smash
 reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW.

-reagent-name-black-russian = black russian
+reagent-name-black-russian = Black Russian
 reagent-desc-black-russian = For the lactose-intolerant. Still as classy as a White Russian.

-reagent-name-bloody-mary = bloody mary
+reagent-name-bloody-mary = Bloody Mary
 reagent-desc-bloody-mary = A strange yet pleasurable mixture made of vodka, tomato, and lime juice.

 reagent-name-booger = booger
 reagent-desc-booger = Ewww...

-reagent-name-brave-bull = brave bull
+reagent-name-brave-bull = Brave Bull
 reagent-desc-brave-bull = It's just as effective as Dutch-Courage!

 reagent-name-coconut-rum = coconut rum
@@ -115,22 +115,22 @@ reagent-desc-coconut-rum = Rum with coconut for that tropical feel.
 reagent-name-cosmopolitan = cosmopolitan
 reagent-desc-cosmopolitan = Even in the worst situations, nothing beats a fresh cosmopolitan.

-reagent-name-cuba-libre = cuba libre
+reagent-name-cuba-libre = Cuba libre
 reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion.

-reagent-name-demons-blood = demons blood
+reagent-name-demons-blood = Demon's Blood
 reagent-desc-demons-blood = AHHHH!!!!

-reagent-name-devils-kiss = devils kiss
+reagent-name-devils-kiss = Devil's Kiss
 reagent-desc-devils-kiss = Creepy time!

-reagent-name-doctors-delight = the doctor's delight
+reagent-name-doctors-delight = The Doctor's Delight
 reagent-desc-doctors-delight = A gulp a day keeps the MediBot away. That's probably for the best.

 reagent-name-driest-martini = driest martini
 reagent-desc-driest-martini = Only for the experienced. You think you see sand floating in the glass.

-reagent-name-erika-surprise = erika surprise
+reagent-name-erika-surprise = Erika surprise
 reagent-desc-erika-surprise = The surprise is, it's green!

 reagent-name-gargle-blaster = Pan-Galactic Gargle Blaster
@@ -142,13 +142,13 @@ reagent-desc-gin-fizz = Refreshingly lemony, deliciously dry.
 reagent-name-gin-tonic = gin and tonic
 reagent-desc-gin-tonic = An all time classic, mild cocktail.

-reagent-name-gildlager = gildlager
+reagent-name-gildlager = Gildlager
 reagent-desc-gildlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.

 reagent-name-grog = grog
 reagent-desc-grog = Watered-down rum, pirate approved!

-reagent-name-hippies-delight = hippies delight
+reagent-name-hippies-delight = Hippie's Delight
 reagent-desc-hippies-delight = You just don't get it maaaan.

 reagent-name-hooch = hooch
@@ -157,40 +157,43 @@ reagent-desc-hooch = Either someone's failure at cocktail making or attempt in a
 reagent-name-iced-beer = iced beer
 reagent-desc-iced-beer = A beer which is so cold the air around it freezes.

-reagent-name-irish-slammer = irish slammer
+reagent-name-irish-slammer = Irish slammer
 reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout.

-reagent-name-irish-cream = irish cream
+reagent-name-irish-cream = Irish cream
 reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish.

-reagent-name-irish-coffee = irish coffee
+reagent-name-irish-coffee = Irish coffee
 reagent-desc-irish-coffee = Coffee served with irish cream. Regular cream just isn't the same!

-reagent-name-kira-special = kira special
+reagent-name-kira-special = Kira special
 reagent-desc-kira-special = Long live the guy who everyone had mistaken for a girl. Baka!

-reagent-name-long-island-iced-tea = long island iced tea
+reagent-name-long-island-iced-tea = Long Island iced tea
 reagent-desc-long-island-iced-tea = The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only.

-reagent-name-manhattan = manhattan
+reagent-name-manhattan = Manhattan
 reagent-desc-manhattan = The Detective's undercover drink of choice. He never could stomach gin...

-reagent-name-manhattan-project = manhattan project
+reagent-name-manhattan-project = Manhattan Project
 reagent-desc-manhattan-project = A scientist's drink of choice, for pondering ways to blow up the ship.

-reagent-name-manly-dorf = manly dorf
+reagent-name-manly-dorf = Manly Dorf
 reagent-desc-manly-dorf = Beer and Ale, brought together in a delicious mix. Intended for stout dwarves only.

 reagent-name-margarita = margarita
 reagent-desc-margarita = On the rocks with salt on the rim. Arriba~!

+reagent-name-the-martinez = The Martinez
+reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk.
+
 reagent-name-martini = classic martini
 reagent-desc-martini = Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious.

 reagent-name-mead = mead
 reagent-desc-mead = A Viking's drink, though a cheap one.

-reagent-name-mojito = mojito
+reagent-name-mojito = Mojito
 reagent-desc-mojito = If it's good enough for Spesscuba, it's good enough for you.

 reagent-name-moonshine = moonshine
@@ -202,16 +205,16 @@ reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death
 reagent-name-painkiller = painkiller
 reagent-desc-painkiller = A cure for what ails you.

-reagent-name-patron = patron
+reagent-name-patron = Patrón
 reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women in the club scene.

-reagent-name-pina-colada = piña colada
+reagent-name-pina-colada = Piña Colada
 reagent-desc-pina-colada = For getting lost in the rain.

 reagent-name-red-mead = red mead
 reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color.

-reagent-name-rewriter = rewriter
+reagent-name-rewriter = Rewriter
 reagent-desc-rewriter = The secret of the sanctuary of the Librarian...

 reagent-name-sbiten = sbiten
@@ -220,7 +223,7 @@ reagent-desc-sbiten = A spicy Vodka! Might be a little hot for the little guys!
 reagent-name-screwdriver-cocktail = screwdriver
 reagent-desc-screwdriver-cocktail = Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious.

-reagent-name-cogchamp = cogchamp
+reagent-name-cogchamp = Cogchamp
 reagent-desc-cogchamp = Not even Ratvar's Four Generals could withstand this! Qevax Jryy!

 reagent-name-silencer = silencer
@@ -229,11 +232,11 @@ reagent-desc-silencer = A drink from Mime Heaven.
 reagent-name-singulo = singulo
 reagent-desc-singulo = A blue-space beverage!

-reagent-name-snow-white = snow white
+reagent-name-snow-white = Snow White
 reagent-desc-snow-white = A cold refreshment.

 reagent-name-sui-dream = sui dream
-reagent-desc-sui-dream = 'Comprised of: White soda, blue curacao, melon liquor.'
+reagent-desc-sui-dream = 'Comprised of: White soda, blue Curaçao, melon liquor.'

 reagent-name-syndicate-bomb = syndicate bomb
 reagent-desc-syndicate-bomb = Somebody set us up the bomb!
@@ -241,7 +244,7 @@ reagent-desc-syndicate-bomb = Somebody set us up the bomb!
 reagent-name-tequila-sunrise = tequila sunrise
 reagent-desc-tequila-sunrise = Tequila and orange juice. Much like a Screwdriver, only Mexican.

-reagent-name-three-mile-island = three mile island iced tea
+reagent-name-three-mile-island = Three Mile Island iced tea
 reagent-desc-three-mile-island = "Made for a woman, strong enough for a man."

 reagent-name-toxins-special = toxins special
@@ -259,16 +262,19 @@ reagent-desc-whiskey-cola = Whiskey, mixed with cola. Surprisingly refreshing.
 reagent-name-whiskey-soda = whiskey soda
 reagent-desc-whiskey-soda = For the more refined griffon.

-reagent-name-white-russian = white russian
+reagent-name-white-gilgamesh = White Gilgamesh
+reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood.
+
+reagent-name-white-russian = White Russian
 reagent-desc-white-russian = That's just, like, your opinion, man...

 reagent-name-vodka-red-bool = vodka red bool
 reagent-desc-vodka-red-bool = Because heart failure and liver failure go hand in hand.

-reagent-name-xeno-basher = xeno basher
+reagent-name-xeno-basher = Xeno Basher
 reagent-desc-xeno-basher = The perfect drink before an expedition.

-reagent-name-irish-bool = irish bool
+reagent-name-irish-bool = Irish bool
 reagent-desc-irish-bool = Like a bool in a Ireland shop.

 reagent-name-budget-insuls = budget insuls
@@ -280,5 +286,5 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als
 reagent-name-rubberneck = rubberneck
 reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet.

-reagent-name-zombiecocktail = zombie
-reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
+reagent-name-zombiecocktail = Zombie
+reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -34,7 +34,7 @@ reagent-desc-iced-tea = No relation to a certain rap artist/actor.
 reagent-name-lemonade = lemonade
 reagent-desc-lemonade = Drink using lemon juice, water, and a sweetener such as cane sugar or honey.

-reagent-name-arnold-palmer = arnold palmer
+reagent-name-arnold-palmer = Arnold Palmer
 reagent-desc-arnold-palmer = Now watch this drive.

 reagent-name-milk = milk
@@ -91,11 +91,5 @@ reagent-desc-pilk = A sickening mixture of milk and cola.
 reagent-name-posca = posca
 reagent-desc-posca = Poor warriors' drink from a forgotten era.

-reagent-name-the-martinez = The Martinez
-reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk.
-
-reagent-name-white-gilgamesh = white gilgamesh
-reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood.
-
 reagent-name-mopwata = mopwata
 reagent-desc-mopwata = Dirty, stagnant mop water.
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
@@ -1,16 +1,16 @@
-reagent-name-cola = cola
-reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free.
+reagent-name-cola = Space Cola
+reagent-desc-cola = A sweet, carbonated soft drink.

-reagent-name-shirley-temple = shirley temple
+reagent-name-shirley-temple = Shirley Temple
 reagent-desc-shirley-temple = A favorite amongst younger members of the crew.

-reagent-name-changeling-sting = changeling sting
+reagent-name-changeling-sting = Changeling Sting
 reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation...

 reagent-name-dr-gibb = Dr. Gibb
 reagent-desc-dr-gibb = A delicious blend of 42 different flavours.

-reagent-name-energy-drink = Energy Drink
+reagent-name-energy-drink = Red Bool
 reagent-desc-energy-drink = A dose of energy! Nanotrasen is not responsible if you grow avian appendages.

 reagent-name-grape-soda = grape soda
@@ -19,34 +19,34 @@ reagent-desc-grape-soda = It's Graaaaaape!
 reagent-name-ice-cream = ice cream
 reagent-desc-ice-cream = It was either this or the microwave, and nobody wants ice cream soup!

-reagent-name-lemon-lime = lemon-lime
-reagent-desc-lemon-lime = tangy lime and lemon soda
+reagent-name-lemon-lime = Smite
+reagent-desc-lemon-lime = Tangy lime and lemon soda.

-reagent-name-lemon-lime-cranberry = lemon-lime-cranberry
+reagent-name-lemon-lime-cranberry = Smite Cranberry
 reagent-desc-lemon-lime-cranberry = Tart cranberry, Christmas, and a hint of lemon and lime.

-reagent-name-pwr-game = Pwr Game
+reagent-name-pwr-game = PWR Game
 reagent-desc-pwr-game = The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to.

 reagent-name-root-beer = root beer
-reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparilla. Goes well with ice cream.
+reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsaparilla. Goes well with ice cream.

 reagent-name-root-beer-float = root beer float
 reagent-desc-root-beer-float = Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks.

-reagent-name-sol-dry = sol dry
+reagent-name-sol-dry = Sol Dry
 reagent-desc-sol-dry = Sweet ginger soda from outer space!

-reagent-name-roy-rogers = roy rogers
+reagent-name-roy-rogers = Roy Rogers
 reagent-desc-roy-rogers = Solid proof that there IS something known as too sweet.

-reagent-name-space-mountain-wind = Space Mountain Wind
-reagent-desc-space-mountain-wind = Blows right through you like a space wind.
+reagent-name-space-mountain-wind = Space Solar Wind
+reagent-desc-space-mountain-wind = Blows right through you like a solar wind.

 reagent-name-space-up = Space-Up
 reagent-desc-space-up = Tastes like a hull breach in your mouth.

-reagent-name-starkist = starkist
+reagent-name-starkist = Starkist
 reagent-desc-starkist = A sweet, orange flavored soft drink.

 reagent-name-fourteen-loko = Fourteen Loko
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -24,13 +24,16 @@
      - DrinkMelonLiquorBottleFull
      - DrinkPatronBottleFull
      - DrinkRumBottleFull
+      - DrinkSakeBottleFull
      - DrinkTequilaBottleFull
      - DrinkVermouthBottleFull
      - DrinkVodkaBottleFull
      - DrinkWhiskeyBottleFull
      - DrinkWineBottleFull
      - DrinkBeerBottleFull
+      - DrinkBeerGrowler
      - DrinkAleBottleFull
+      - DrinkAleBottleFullGrowler
      - DrinkChampagneBottleFull
    chance: 0.8
    offset: 0.0
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1999,7 +1999,7 @@
 - type: entity
  parent: DrinkGlass
  id: DrinkTheMartinez
-  suffix: The Martinez
+  suffix: the martinez
  components:
    - type: SolutionContainerManager
      solutions:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -137,6 +137,8 @@
        reagents:
        - ReagentId: Absinthe
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-absinthe
  - type: Sprite
    sprite: Objects/Consumable/Drinks/absinthebottle.rsi
  - type: Sealable
@@ -144,7 +146,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkBlueCuracaoBottleFull
-  name: Miss Blue Curacao
+  name: Miss Blue Curaçao
  description: A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic.
  components:
  - type: SolutionContainerManager
@@ -153,6 +155,8 @@
        reagents:
        - ReagentId: BlueCuracao
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-blue-curacao
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alco-bottle.rsi
    layers:
@@ -177,6 +181,8 @@
        reagents:
        - ReagentId: Nothing
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-nothing
  - type: Sprite
    sprite: Objects/Consumable/Drinks/bottleofnothing.rsi
  - type: Sealable
@@ -193,6 +199,8 @@
        reagents:
        - ReagentId: Champagne
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-champagne
  - type: Sprite
    sprite: Objects/Consumable/Drinks/champagnebottle.rsi
  - type: Openable
@@ -202,7 +210,7 @@
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkCognacBottleFull
  name: cognac bottle
-  description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time.
+  description: A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -219,8 +227,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkColaBottleFull
-  name: space cola bottle
-  description: Cola. In space.
+  name: Space Cola bottle
+  description: Cola. In spaaace!
  components:
  - type: SolutionContainerManager
    solutions:
@@ -237,7 +245,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkGrenadineBottleFull
-  name: briar rose grenadine syrup bottle
+  name: Briar Rose grenadine syrup bottle
  description: Sweet and tangy, a bar syrup used to add color or flavor to drinks.
  components:
  - type: SolutionContainerManager
@@ -246,6 +254,8 @@
        reagents:
        - ReagentId: Grenadine
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-grenadine
  # intended use is to spike drinks so starts open
  - type: Openable
    opened: true
@@ -275,7 +285,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkGildlagerBottleFull
-  name: gildlager bottle
+  name: Gildlager bottle
  description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
  components:
  - type: SolutionContainerManager
@@ -284,6 +294,8 @@
        reagents:
        - ReagentId: Gildlager
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-gildlager
  - type: Sprite
    sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi
  - type: Sealable
@@ -309,8 +321,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkMelonLiquorBottleFull
-  name: emeraldine melon liquor
-  description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light.
+  name: Emeraldine melon liquor
+  description: A bottle of 46 proof Emeraldine melon liquor. Sweet and light.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -318,6 +330,8 @@
        reagents:
        - ReagentId: MelonLiquor
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-melon-liquor
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alco-bottle.rsi
    layers:
@@ -333,8 +347,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkPatronBottleFull
-  name: wrapp artiste patron bottle
-  description: Silver laced tequilla, served in space night clubs across the galaxy.
+  name: Wrapp Artiste Patrón bottle
+  description: Silver laced tequila, served in space night clubs across the galaxy.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -342,13 +356,15 @@
        reagents:
        - ReagentId: Patron
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-patron
  - type: Sprite
    sprite: Objects/Consumable/Drinks/patronbottle.rsi

 - type: entity
  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
  id: DrinkPoisonWinebottleFull
-  name: warlock's velvet bottle
+  name: Warlock's Velvet bottle
  description: What a delightful packaging for a surely high quality wine! The vintage must be amazing!
  components:
  - type: SolutionContainerManager
@@ -368,7 +384,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkRumBottleFull
-  name: captain pete's Cuban spiced rum
+  name: Captain Pete's Cuban spiced rum
  description: This isn't just rum, oh no. It's practically GRIFF in a bottle.
  components:
  - type: SolutionContainerManager
@@ -386,8 +402,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkSpaceMountainWindBottleFull
-  name: space mountain wind bottle
-  description: Blows right through you like a space wind.
+  name: Space Solar Wind bottle
+  description: Blows right through you like a solar wind.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -405,7 +421,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkSpaceUpBottleFull
-  name: space-up bottle
+  name: Space-Up bottle
  description: Tastes like a hull breach in your mouth.
  components:
  - type: SolutionContainerManager
@@ -424,7 +440,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkTequilaBottleFull
-  name: caccavo guaranteed quality tequila bottle
+  name: Caccavo Guaranteed Quality tequila bottle
  description: Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!
  components:
  - type: SolutionContainerManager
@@ -442,7 +458,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkVermouthBottleFull
-  name: goldeneye vermouth bottle
+  name: Goldeneye vermouth bottle
  description: Sweet, sweet dryness!
  components:
  - type: SolutionContainerManager
@@ -478,7 +494,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkWhiskeyBottleFull
-  name: uncle git's special reserve
+  name: Uncle Git's Special Reserve
  description: A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES.
  components:
  - type: SolutionContainerManager
@@ -496,7 +512,7 @@
 - type: entity
  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
  id: DrinkWineBottleFull
-  name: doublebearded bearded special wine bottle
+  name: Doublebearded Bearded Special wine bottle
  description: A faint aura of unease and asspainery surrounds the bottle.
  components:
  - type: SolutionContainerManager
@@ -520,7 +536,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkBeerBottleFull
-  name: beer  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
+  name: beer bottle # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
  description: An alcoholic beverage made from malted grains, hops, yeast, and water.
  components:
  - type: Item
@@ -532,6 +548,8 @@
        reagents:
        - ReagentId: Beer
          Quantity: 50
+  - type: Label
+    currentLabel: reagent-name-beer
  - type: Sprite
    sprite: Objects/Consumable/Drinks/beer.rsi
  - type: Openable
@@ -544,7 +562,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull
-  name: Beer Growler  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
+  name: beer growler  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
  description: An alcoholic beverage made from malted grains, hops, yeast, and water. XL growler bottle.
  components:
  - type: SolutionContainerManager
@@ -568,7 +586,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkAleBottleFull
-  name: Magm-Ale
+  name: Magm-Ale bottle
  description: A true dorf's drink of choice.
  components:
  - type: Item
@@ -580,6 +598,8 @@
        reagents:
        - ReagentId: Ale
          Quantity: 50
+  - type: Label
+    currentLabel: reagent-name-ale
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alebottle.rsi
  - type: Openable
@@ -588,7 +608,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkAleBottleFullGrowler
-  name: Magm-Ale Growler
+  name: Magm-Ale growler
  description: A true dorf's drink of choice. XL growler bottle.
  components:
  - type: SolutionContainerManager
@@ -620,6 +640,8 @@
        reagents:
        - ReagentId: Water
          Quantity: 30
+  - type: Label
+    currentLabel: reagent-name-water
  - type: Drink
  - type: Sprite
    sprite: Objects/Consumable/Drinks/waterbottle.rsi
@@ -763,11 +785,13 @@
        - ReagentId: Sugar
          Quantity: 300
  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-sugar

 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkLemonLimeJug
-  name: lemon lime jug
+  name: Smite jug
  description: A dual citrus sensation.
  components:
  - type: SolutionContainerManager
@@ -887,7 +911,7 @@
  parent: DrinkBottlePlasticBaseFull
  id: DrinkIcedTeaJug
  name: iced tea jug
-  description: For when the regular tea is too hot for you boohoo.
+  description: For when the regular tea is too hot for you. Boohoo.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -903,8 +927,8 @@
 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkDrGibbJug
-  name: dr gibb. jug
-  description: Yeah I don't know either...
+  name: Dr. Gibb jug
+  description: 42 different flavours... in a jug!
  components:
  - type: SolutionContainerManager
    solutions:
@@ -954,8 +978,8 @@
 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkEnergyDrinkJug
-  name: red bool jug
-  description: A jug of Red Bool, with enough caffine to kill a whole station.
+  name: Red Bool jug
+  description: A jug of Red Bool, with enough caffeine to kill a whole station.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -966,7 +990,7 @@
          Quantity: 100
  - type: Drink
  - type: Label
-    currentLabel: red bool
+    currentLabel: reagent-name-energy-drink

 - type: entity
  parent: DrinkBottlePlasticBaseFull
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -71,8 +71,8 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkColaCan
-  name: space cola
-  description: A refreshing beverage.
+  name: Space Cola can
+  description: A sweet, carbonated soft drink.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -262,8 +262,8 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkSpaceMountainWindCan
-  name: space mountain wind can
-  description: Blows right through you like a space wind.
+  name: Space Solar Wind can
+  description: Blows right through you like a solar wind.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -280,7 +280,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkSpaceUpCan
-  name: space-up can
+  name: Space-Up can
  description: Tastes like a hull breach in your mouth.
  components:
  - type: SolutionContainerManager
@@ -298,7 +298,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkSolDryCan
-  name: sol dry
+  name: Sol Dry can
  description: Sweet ginger soda from outer space!
  components:
  - type: SolutionContainerManager
@@ -316,7 +316,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkStarkistCan
-  name: starkist can
+  name: Starkist can
  description: The taste of a star in liquid form. And, a bit of tuna...?
  components:
  - type: SolutionContainerManager
@@ -369,7 +369,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkChangelingStingCan
-  name: changeling sting can
+  name: Changeling Sting can
  description: You take a tiny sip and feel a burning sensation...
  components:
  - type: SolutionContainerManager
@@ -407,7 +407,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkNukieCan
-  name: blood-red brew can
+  name: Blood-red Brew can
  description: A home-brewed drink made from the crazed minds at the Syndicate. Not recommended by doctors.
  components:
  - type: SolutionContainerManager
@@ -433,7 +433,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkEnergyDrinkCan
-  name: red bool energy drink
+  name: Red Bool can
  description: A can of Red Bool, with enough caffeine to kill a horse.
  components:
  - type: SolutionContainerManager
@@ -505,7 +505,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkShamblersJuiceCan
-  name: shamblers juice can
+  name: Shambler's Juice can
  description: ~Shake me up some of that Shambler's Juice!~
  components:
  - type: SolutionContainerManager
@@ -524,7 +524,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkPwrGameCan
-  name: pwr game can
+  name: PWR Game can
  description: The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to.
  components:
  - type: SolutionContainerManager