Merge pull request #410 from Shadowfire117/master

Sit on my face and nutbutter!

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."
-	
+	
+/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!"

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"

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"
+	glass_icon_state = "oilslide"
+	
+/datum/reagent/ethanol/sitonmyface
+	glass_icon_state = "sitonmyface"