From 9286036a3db43a0c7e625b58a04c2e9c268f3e18 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Fri, 20 Aug 2021 11:06:05 +1000 Subject: [PATCH] Updates wine reagent id to redwine. --- code/_helpers/names.dm | 2 +- code/modules/food/recipes_microwave.dm | 4 ++-- code/modules/reagents/reactions/instant/drinks.dm | 12 ++++++------ code/modules/reagents/reagent_containers/borghypo.dm | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/_helpers/names.dm b/code/_helpers/names.dm index 20f7b2b31d..e85a607417 100644 --- a/code/_helpers/names.dm +++ b/code/_helpers/names.dm @@ -172,7 +172,7 @@ var/syndicate_code_response//Code response for traitors. var/safety[] = list(1,2,3)//Tells the proc which options to remove later on. var/nouns[] = list("love","hate","anger","peace","pride","sympathy","bravery","loyalty","honesty","integrity","compassion","charity","success","courage","deceit","skill","beauty","brilliance","pain","misery","beliefs","dreams","justice","truth","faith","liberty","knowledge","thought","information","culture","trust","dedication","progress","education","hospitality","leisure","trouble","friendships", "relaxation") - var/drinks[] = list("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequilla sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine") + var/drinks[] = list("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequilla sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","redwine","moonshine") var/locations[] = teleportlocs.len ? teleportlocs : drinks//if null, defaults to drinks instead. var/names[] = list() diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index ff69fab758..10f79394e2 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -334,7 +334,7 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple /datum/recipe/twobread - reagents = list("wine" = 5) + reagents = list("redwine" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/slice/bread, /obj/item/weapon/reagent_containers/food/snacks/slice/bread, @@ -785,7 +785,7 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/chilicheesefries /datum/recipe/risotto - reagents = list("wine" = 5, "rice" = 10, "spacespice" = 1) + reagents = list("redwine" = 5, "rice" = 10, "spacespice" = 1) fruit = list("mushroom" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here result = /obj/item/weapon/reagent_containers/food/snacks/risotto diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 5630500d63..2102c2881e 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -399,7 +399,7 @@ name = "Singulo" id = "singulo" result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5) + required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/alliescocktail @@ -505,14 +505,14 @@ name = "Acid Spit" id = "acidspit" result = "acidspit" - required_reagents = list("sacid" = 1, "wine" = 5) + required_reagents = list("sacid" = 1, "redwine" = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/amasec name = "Amasec" id = "amasec" result = "amasec" - required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5) + required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/changelingsting @@ -661,7 +661,7 @@ name = "Melon Spritzer" id = "melonspritzer" result = "melonspritzer" - required_reagents = list("watermelonjuice" = 2, "wine" = 2, "applejuice" = 1, "limejuice" = 1) + required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/fauxfizz @@ -915,7 +915,7 @@ name = "Wine brandy" id = "winebrandy" result = "winebrandy" - required_reagents = list("wine" = 10) + required_reagents = list("redwine" = 10) catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe result_amount = 5 @@ -937,7 +937,7 @@ name = "Vesper" id = "vesper" result = "vesper" - required_reagents = list("gin" = 3, "vodka" = 1, "wine" = 1) + required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/rotgut diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index 813a79431d..96bb210600 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -155,6 +155,7 @@ "milk", "mint", "orangejuice", + "redwine", "rum", "sake", "sodawater", @@ -172,8 +173,7 @@ "vodka", "water", "watermelonjuice", - "whiskey", - "wine") + "whiskey") /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) return