Soda can name fixes and drink refluff (#15736)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -2002,15 +2002,15 @@
 	glass_center_of_mass = list("x"=16, "y"=12)
 
 /singleton/reagent/drink/brownstar
-	name = "Brown Star"
-	description = "It's not what it sounds like..."
+	name = "Orange Starshine"
+	description = "A citrusy orange soda."
 	color = "#9F3400"
 	taste_description = "orange and cola soda"
 	carbonated = TRUE
 
 	glass_icon_state = "brownstar"
-	glass_name = "glass of Brown Star"
-	glass_desc = "It's not what it sounds like..."
+	glass_name = "glass of Orange Starshine"
+	glass_desc = "A citrusy orange soda."
 
 /singleton/reagent/drink/mintsyrup
 	name = "Mint Syrup"
@@ -2629,7 +2629,7 @@
 	glass_center_of_mass = list("x"=16, "y"=12)
 
 /singleton/reagent/alcohol/thirteenloko
-	name = "Thirteen Loko"
+	name = "Getmore Energy"
 	description = "A potent mixture of caffeine and alcohol."
 	color = "#ffb928"
 	strength = 10
@@ -2639,8 +2639,8 @@
 	carbonated = TRUE
 
 	glass_icon_state = "thirteen_loko_glass"
-	glass_name = "glass of Thirteen Loko"
-	glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
+	glass_name = "glass of Getmore Energy"
+	glass_desc = "This is a glass of Getmore Energy, a potent mixture of caffeine and alcohol."
 
 /singleton/reagent/alcohol/thirteenloko/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
 	..()
@@ -3813,19 +3813,19 @@
 
 // Snowflake drinks
 /singleton/reagent/drink/dr_gibb_diet
-	name = "Diet Dr. Gibb"
+	name = "Getmore Root-Cola"
 	description = "A delicious blend of 42 different flavours, one of which is water."
 	color = "#93230b"
 	taste_description = "watered down liquid sunshine"
 	carbonated = TRUE
 
 	glass_icon_state = "dr_gibb_glass"
-	glass_name = "glass of Diet Dr. Gibb"
-	glass_desc = "Regular Dr.Gibb is probably healthier than this cocktail of artificial flavors."
+	glass_name = "glass of Diet Getmore Root Cola"
+	glass_desc = "Regular Root Cola is probably healthier than this cocktail of artificial flavors."
 
 /singleton/reagent/alcohol/drdaniels
 	name = "Dr. Daniels"
-	description = "A limited edition tallboy of Dr. Gibb's Infusions."
+	description = "A limited edition tallboy of Getmore Root Cola's Infusions."
 	color = "#35240f"
 	caffeine = 0.2
 	overdose = 80
@@ -3836,7 +3836,7 @@
 
 	glass_icon_state = "drdaniels"
 	glass_name = "glass of Dr. Daniels"
-	glass_desc = "A tall glass of honey, whiskey, and diet Dr. Gibb. The perfect blend of throat-soothing liquid."
+	glass_desc = "A tall glass of honey, whiskey, and diet Getmore Root Cola. The perfect blend of throat-soothing liquid."
 
 //aurora unique drinks
 
@@ -5229,15 +5229,15 @@
 	glass_desc = "Prepared just like in Silversun."
 
 /singleton/reagent/drink/gibbfloats
-	name = "Gibb Floats"
-	description = "A floating soda of icecream and Dr. Gibb."
+	name = "Root-Cola Floats"
+	description = "A floating soda of icecream and Getmore Root-Cola."
 	color = "#93230b"
 	taste_description = "cherry soda and icecream"
 	carbonated = TRUE
 
 	glass_icon_state = "gibbfloats"
-	glass_name = "glass of gibb floats"
-	glass_desc = "A floating soda of icecream and Dr. Gibb."
+	glass_name = "glass of root-cola floats"
+	glass_desc = "A floating soda of icecream and Getmore Root-Cola."
 
 /singleton/reagent/drink/diet_cola
 	name = "Diet Cola"

code/modules/reagents/reagent_containers/food/cans.dm

@@ -245,47 +245,47 @@
 //DRINKS
 
 /obj/item/reagent_containers/food/drinks/cans/cola
-	name = "space cola"
-	desc = "Cola. in space."
+	name = "comet cola can"
+	desc = "Getmore's most popular line of soda. A generic cola, otherwise."
 	icon_state = "cola"
 	center_of_mass = list("x"=16, "y"=10)
 	reagents_to_add = list(/singleton/reagent/drink/space_cola = 30)
 
 /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
-	name = "\improper Space Mountain Wind"
-	desc = "Blows right through you like a space wind."
+	name = "stellar jolt can"
+	desc = "For those who have a need for caffeine stronger than would be sensible."
 	icon_state = "space_mountain_wind"
 	center_of_mass = list("x"=16, "y"=10)
 
 	reagents_to_add = list(/singleton/reagent/drink/spacemountainwind = 30)
 
 /obj/item/reagent_containers/food/drinks/cans/thirteenloko
-	name = "thirteen loko"
-	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly."
+	name = "getmore energy can"
+	desc = "An extremely ill-advised combination of excessive caffeine and alcohol. Getmore's most controversial product to date!"
 	icon_state = "thirteen_loko"
 	center_of_mass = list("x"=16, "y"=10)
 
 	reagents_to_add = list(/singleton/reagent/alcohol/thirteenloko = 30)
 
 /obj/item/reagent_containers/food/drinks/cans/dr_gibb
-	name = "\improper Dr. Gibb"
-	desc = "A delicious mixture of 42 different flavors."
+	name = "getmore root-cola can"
+	desc = "A canned mixture of Comet Cola and Getmore Root Beer. More popular than one would expect."
 	icon_state = "dr_gibb"
 	center_of_mass = list("x"=16, "y"=10)
 
 	reagents_to_add = list(/singleton/reagent/drink/dr_gibb = 30)
 
 /obj/item/reagent_containers/food/drinks/cans/starkist
-	name = "\improper Star-kist"
-	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
+	name = "orange starshine can"
+	desc = "A sugary-sweet citrus soda."
 	icon_state = "starkist"
 	center_of_mass = list("x"=16, "y"=10)
 
 	reagents_to_add = list(/singleton/reagent/drink/brownstar = 30)
 
 /obj/item/reagent_containers/food/drinks/cans/space_up
-	name = "\improper Space-Up"
-	desc = "Tastes like a hull breach in your mouth."
+	name = "vacuum fizz can"
+	desc = "Vacuum Fizz. It helps keep your cool."
 	icon_state = "space-up"
 	center_of_mass = list("x"=16, "y"=10)
 
@@ -293,7 +293,7 @@
 
 /obj/item/reagent_containers/food/drinks/cans/lemon_lime
 	name = "\improper Lemon-Lime"
-	desc = "You wanted ORANGE. It gave you Lemon Lime."
+	desc = "Generic lemon-lime soda."
 	icon_state = "lemon-lime"
 	center_of_mass = list("x"=16, "y"=10)
 
@@ -340,8 +340,8 @@
 	reagents_to_add = list(/singleton/reagent/kois/clean = 10, /singleton/reagent/toxin/phoron = 5)
 
 /obj/item/reagent_containers/food/drinks/cans/root_beer
-	name = "\improper RnD Root Beer"
-	desc = "A classic Earth drink from the United Americas province."
+	name = "getmore root beer can"
+	desc = "A classic Earth drink, made from various roots."
 	icon_state = "root_beer"
 	center_of_mass = list("x"=16, "y"=10)
 
@@ -452,8 +452,8 @@
 	reagents_to_add = list(/singleton/reagent/drink/hrozamal_soda = 30)
 
 /obj/item/reagent_containers/food/drinks/cans/diet_cola
-	name = "Diet Cola"
-	desc = "Space Cola! Now in diet!"
+	name = "diet cola can"
+	desc = "Comet Cola! Now in diet!"
 	icon_state = "diet_cola"
 	center_of_mass = list("x"=16, "y"=10)
 	reagents_to_add = list(/singleton/reagent/drink/diet_cola = 30)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -525,7 +525,7 @@
 
 /obj/item/reagent_containers/food/snacks/chips
 	name = "chips"
-	desc = "Commander Riker's What-The-Crisps."
+	desc = "Getmore potato chips. Not actually chips, these are instead flash-fried wafers of potato paste. Delicious!"
 	icon_state = "chips"
 	trash = /obj/item/trash/chips
 	filling_color = "#E8C31E"
@@ -535,7 +535,7 @@
 
 /obj/item/reagent_containers/food/snacks/cookie
 	name = "cookie"
-	desc = "COOKIE!!!"
+	desc = "A cookie."
 	icon_state = "COOKIE!!!"
 	filling_color = "#DBC94F"
 	reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/sugar = 3)