From 4735879fc621bf42b505cdf3063d2b8fa71b4d3b Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Wed, 25 May 2016 17:09:18 -0400
Subject: [PATCH] Removes Ghost Chilli Juice and Dragon's Breath (#4495)

---
 code/_globalvars/lists/reagents.dm      |  2 +-
 code/modules/hydroponics/seed_datums.dm |  2 +-
 code/modules/reagents/newchem/drinks.dm | 11 +------
 code/modules/reagents/newchem/food.dm   | 41 -------------------------
 4 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index f6639796b97..8417275d780 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -55,7 +55,7 @@ var/global/list/blocked_chems = list("polonium", "initropidril", "concentrated_i
 							"syndicate_nanites", "ripping_tendrils", "boiling_oil",
 							"envenomed_filaments", "lexorin_jelly", "kinetic",
 							"cryogenic_liquid", "dark_matter", "b_sorium",
-							"reagent", "life")
+							"reagent", "life","dragonsbreath")
 
 //List of chems/mixtures that can't grow in plants (in addition to the global random chem blacklist)
 var/global/list/plant_blocked_chems = list()	//filled in /datum/reagents/New() with chems that have can_grow_in_plants = 0
\ No newline at end of file
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 372e3df9a98..a028fa66727 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -40,7 +40,7 @@
 	seed_name = "ghost pepper"
 	display_name = "ghost pepper plants"
 	mutants = null
-	chems = list("capsaicin" = list(8,2), "condensedcapsaicin" = list(4,4), "ghostchilijuice" = list(4,4), "plantmatter" = list(1,50))
+	chems = list("capsaicin" = list(8,2), "condensedcapsaicin" = list(4,4), "plantmatter" = list(1,50))
 	kitchen_tag = "ghostchili"
 	preset_icon = "ghostchilipepper"
 
diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 01920c617c3..c09b1a06fba 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -67,7 +67,7 @@
 	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
 
-/datum/reagent/ethanol/dragons_breath
+/datum/reagent/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans
 	name = "Dragon's Breath"
 	id = "dragonsbreath"
 	description = "Possessing this stuff probably breaks the Geneva convention."
@@ -108,15 +108,6 @@
 			return
 	..()
 
-/datum/chemical_reaction/dragons_breath
-	name = "Dragon's Breath"
-	id = "dragonsbreath"
-	result = "dragonsbreath"
-	required_reagents = list("whiskey" = 1, "phlogiston" = 1, "pyrosium" = 1, "fuel" = 1, "ghostchilijuice"= 1)
-	result_amount = 1
-	mix_message = "A tiny mushroom cloud erupts from the container. That's not worrying at all!"
-	mix_sound = 'sound/effects/meteorimpact.ogg'
-
 // ROBOT ALCOHOL PAST THIS POINT
 // WOOO!
 
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index e8b5ed3f681..97643169e6f 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -600,45 +600,4 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol
 			var/mob/living/carbon/human/H = M
 			if(!H.heart_attack)
 				H.heart_attack = 1
-	..()
-
-/datum/reagent/ghost_chili_juice
-	name = "Ghost chili juice"
-	id = "ghostchilijuice"
-	description = "Juice from the universe's hottest chilli. Do not consume."
-	reagent_state = LIQUID
-	color = "#FF7F32"
-
-/datum/reagent/ghost_chili_juice/on_mob_life(var/mob/living/M as mob)
-	if(!M) M = holder.my_atom
-	if(M.reagents.has_reagent("milk"))
-		to_chat(M, "<span class='notice'>The milk stops the burning. Ahhh.</span>")
-		M.reagents.del_reagent("milk")
-		M.reagents.del_reagent("ghostchilijuice")
-		return
-	if(prob(8))
-		to_chat(M, "<span class='userdanger'>Oh god! Oh GODD!!</span>")
-	if(prob(50))
-		to_chat(M, "<span class='danger'>Your throat burns furiously!</span>")
-		M.emote(pick("scream","cry","choke","gasp"))
-		M.Stun(1)
-	if(prob(8))
-		to_chat(M, "<span class='danger'>Why!? WHY!?</span>")
-	if(prob(8))
-		to_chat(M, "<span class='danger'>ARGHHHH!</span>")
-	if(prob(33))
-		M.visible_message("<span class='danger'>[M] suddenly and violently vomits!</span>")
-		M.fakevomit(no_text = 1)
-		to_chat(M, "<span class='notice'>Thank goodness. You're not sure how long you could have held out with heat that intense!</span>")
-		M.reagents.del_reagent("ghostchilijuice")
-		return
-	if(prob(10))
-		to_chat(M, "<span class='userdanger'>OH GOD OH GOD PLEASE NO!!</span>")
-		if(M.on_fire)
-			M.adjust_fire_stacks(5)
-		if(prob(50))
-			to_chat(M, "<span class='userdanger'>IT BURNS!!!!</span>")
-			M.visible_message("<span class='danger'>[M] is consumed in flames!</span>")
-			M.dust()
-			return
 	..()
\ No newline at end of file