From be5b9878bf24edd18a8be5b833db919783b33818 Mon Sep 17 00:00:00 2001
From: Code-Cygnet <54194215+Code-Cygnet@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:51:26 -0500
Subject: [PATCH] Update drinks_recipes.dm

Edited to resolve conflict.
---
 .../food_and_drinks/recipes/drinks_recipes.dm | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 18f4a14c..a7aecdc8 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -801,3 +801,24 @@
 	id = "red_queen"
 	results = list("red_queen" = 10)
 	required_reagents = list("tea" = 6, "mercury" = 2, "blackpepper" = 1, "growthserum" = 1)
+
+/datum/chemical_reaction/gunfire
+	name = "Gunfire"
+	id = "gunfire"
+	results = list("gunfire" = 4)
+	required_reagents = list("rum" = 1, "tea" = 3)
+	mix_message = "A loud popping begins to fill the air as the drink is mixed."
+
+/datum/chemical_reaction/hellfire
+	name = "Hellfire"
+	id = "hellfire"
+	results = list("hellfire" = 5)
+	required_reagents = list("rum" = 1, "beer" = 1, "ice" = 1, "capsaicin" = 1, "limejuice" = 1)
+	mix_message = "The liquid begins to churn as it changes to an amber orange and catches on fire."
+
+/datum/chemical_reaction/sins_delight
+	name = "Sins Delight"
+	id = "sins_delight"
+	results = list("sins_delight" = 5)
+	required_reagents = list("demonsblood" = 2, "triple_sec" = 1, "martini" = 1, "changelingsting" = 1)
+	mix_message = "The liquid starts swirling, before forming a pink cloud that dissipates in the air."