diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index f912f4eeda7f..8a0401876ebe 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -559,7 +559,7 @@ Drinks Data glass_icon_state = "bahama_mama" glass_center_of_mass = list("x"=16, "y"=5) -/datum/reagent/ethanol/bananahonk +/datum/reagent/drink/bananahonk glass_icon_state = "bananahonkglass" glass_center_of_mass = list("x"=16, "y"=8) @@ -713,7 +713,7 @@ Drinks Data glass_icon_state = "screwdriverglass" glass_center_of_mass = list("x"=15, "y"=10) -/datum/reagent/ethanol/silencer +/datum/reagent/drink/silencer glass_icon_state = "silencerglass" glass_center_of_mass = list("x"=16, "y"=9) diff --git a/code/modules/reagents/Drink-Recipes.dm b/code/modules/reagents/Drink-Recipes.dm index 7fc2f463839b..e653242761ac 100644 --- a/code/modules/reagents/Drink-Recipes.dm +++ b/code/modules/reagents/Drink-Recipes.dm @@ -649,15 +649,15 @@ name = "Banana Honk" id = "bananahonk" result = "bananahonk" - required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1, "rum" = 1) - result_amount = 4 + required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1) + result_amount = 3 /datum/chemical_reaction/drinks/silencer name = "Silencer" id = "silencer" result = "silencer" - required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1, "rum" = 1) - result_amount = 4 + required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) + result_amount = 3 /datum/chemical_reaction/drinks/driestmartini name = "Driest Martini" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm index 0fe08c57f0e3..f4669a9cc67b 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2716,14 +2716,13 @@ glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." -/datum/reagent/ethanol/bananahonk +/datum/reagent/drink/bananahonk name = "Banana Mama" id = "bananahonk" description = "A drink from Clown Heaven." taste_description = "bananas and sugar" - nutriment_factor = 1 + nutrition = 1 color = "#FFFF91" - strength = 12 glass_name = "Banana Honk" glass_desc = "A drink from Banana Heaven." @@ -3196,15 +3195,14 @@ glass_name = "Screwdriver" glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." -/datum/reagent/ethanol/silencer +/datum/reagent/drink/silencer name = "Silencer" id = "silencer" description = "A drink from Mime Heaven." taste_description = "a pencil eraser" taste_mult = 1.2 - nutriment_factor = 1 + nutrition = 1 color = "#FFFFFF" - strength = 12 glass_name = "Silencer" glass_desc = "A drink from mime Heaven."