diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 07b50ebcad..bd3ba0f989 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -393,6 +393,9 @@ /datum/reagent/toxin/oilslide price_tag = 5 +/datum/reagent/ethanol/sitonmyface + price_tag = 4 + // The Cheap Shit // /datum/reagent/ethanol/hooch diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 386a60d750..6485f55159 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -615,7 +615,7 @@ name = "peanut" seed_name = "peanut" display_name = "peanut vines" - chems = list("nutriment" = list(1,10)) + chems = list("nutriment" = list(1,10),"nutbutter" = list(1,10)) /datum/seed/peanuts/New() ..() 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 8955e687d7..1db90fdd80 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -705,6 +705,16 @@ glass_name = "watermelon juice" glass_desc = "Delicious juice made from watermelon." +/datum/reagent/drink/juice/nutbutter + name = "Peanut paste" + id = "nutbutter" + description = "Raw extracts from peanuts, got a creamy nutty flavour." + taste_description = "peanut extract" + color = "#853333" + + glass_name = "Peanut paste" + glass_desc = "Raw extracts from peanuts, got a creamy nutty flavour." + // Everything else /datum/reagent/drink/milk @@ -3259,4 +3269,14 @@ glass_name = "oilslide" glass_desc = "Tasty, if you're a synth, not so much for organics." - \ No newline at end of file + +/datum/reagent/ethanol/sitonmyface + name = "Sit on my face" + id = "sitonmyface" + description = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" + taste_description = "creamy coffee and alcohol, and nuts" + color = "#896750" + strength = 15 + + glass_name = "Sit on my face" + glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 65d6b0e2ef..124acb1d3f 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2328,6 +2328,13 @@ required_reagents = list("moonshine" = 1, "lube" = 1, "fuel" = 1) result_amount = 3 +/datum/chemical_reaction/drinks/sitonmyface + name = "Sit on my face" + id = "sitonmyface" + result = "sitonmyface" + required_reagents = list("kahlua" = 1, "irish_cream" = 1, "nutbutter" = 1) + result_amount = 3 + //R-UST Port /datum/chemical_reaction/hyrdophoron name = "Hydrophoron" diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm index a17005e87d..0a29539e46 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm @@ -562,4 +562,7 @@ Drinks Data glass_icon_state = "flapper" /datum/reagent/toxin/oilslide - glass_icon_state = "oilslide" \ No newline at end of file + glass_icon_state = "oilslide" + +/datum/reagent/ethanol/sitonmyface + glass_icon_state = "sitonmyface" \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e49b7c0713..359ebbdf6b 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ