From bd16e0fbaaa2745e2e2358b79c2ddf5f35bfb571 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Fri, 24 Apr 2015 16:21:33 -0400
Subject: [PATCH] [Goonchem] No Mix Messages

---
 code/modules/reagents/Chemistry-Holder.dm  | 3 ++-
 code/modules/reagents/Chemistry-Recipes.dm | 1 +
 code/modules/reagents/newchem/other.dm     | 1 +
 code/modules/reagents/newchem/pyro.dm      | 2 +-
 code/modules/reagents/newchem/toxins.dm    | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index b2e80728a35..5c05909becd 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -334,7 +334,8 @@ datum
 
 								var/list/seen = viewers(4, get_turf(my_atom))
 								for(var/mob/M in seen)
-									M << "\blue \icon[my_atom] [C.mix_message]"
+									if(!C.no_message)
+										M << "\blue \icon[my_atom] [C.mix_message]"
 
 							/*	if(istype(my_atom, /obj/item/slime_core))
 									var/obj/item/slime_core/ME = my_atom
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 7910dfe3c8b..69a29e603e2 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -17,6 +17,7 @@ datum
 		var/required_temp = 0
 		var/mix_message = "The solution begins to bubble."
 		var/mix_sound = 'sound/effects/bubbles.ogg'
+		var/no_message = 0
 
 
 		proc
diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm
index 05e6f4fa64c..7e8b2b195bf 100644
--- a/code/modules/reagents/newchem/other.dm
+++ b/code/modules/reagents/newchem/other.dm
@@ -102,6 +102,7 @@ datum/reagent/acetone
 	result_amount = 0.5
 	required_temp = 480
 	mix_sound = null
+	no_message = 1
 
 datum/reagent/colorful_reagent
 	name = "Colorful Reagent"
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 680fd098655..2b795a0e54e 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -175,7 +175,7 @@
 	required_reagents = list("blackpowder" = 1)
 	result_amount = 1
 	required_temp = 474
-	mix_message = "sparks start flying about."
+	no_message = 1
 	mix_sound = null
 
 datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index c170c199cc1..b2779e42e4c 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -143,6 +143,7 @@ datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
 	result_amount = 1
 	required_temp = 674
 	mix_sound = null
+	no_message = 1
 
 datum/reagent/cyanide
 	name = "Cyanide"