From cec7fa287311ba98de868a83c229ececf125b0c2 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Wed, 6 Aug 2014 13:57:01 +0100 Subject: [PATCH] Drinks Fix - Creme de yvette is now in the bar vending machine - Removed runtime errors - Tall Black Russian recipe changed to 1 blackrussian, 1 cola. --- code/game/machinery/vending.dm | 3 ++- code/modules/reagents/Chemistry-Reagents.dm | 2 +- code/modules/reagents/Chemistry-Recipes.dm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 372bd51b..e04f507a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -649,7 +649,8 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/chartreusegreen = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreuseyellow =5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cremewhite = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/brandy = 4, - /obj/item/weapon/reagent_containers/food/drinks/bottle/guinnes = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/drambuie = 4) + /obj/item/weapon/reagent_containers/food/drinks/bottle/guinnes = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/drambuie = 4, + /obj/item/weapon/reagent_containers/food/drinks/bottle/cremeyvette = 5) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10) vend_delay = 15 product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 72c6439c..fb5311fc 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -3913,7 +3913,7 @@ datum name = "Guinness" id = "guinnes" description = "Special Guinnes drink" - color = "" // dunno + color = "#2E6671" // dunno -- god dammit -_- boozepwr = 3 ethanol/drambuie diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 6385d925..6be58256 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1961,7 +1961,7 @@ datum name = "Tall Black Russian" id = "tallrussian" result = "tallrussian" - required_reagents = list("vodka" = 1, "kahlua" = 1, "cola" = 1) + required_reagents = list("blackrussian" = 1, "cola" = 1) result_amount = 3