From 4d40c32f70c9d795867a036ecfcba5e7659a60e4 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sun, 17 Jul 2016 07:07:58 -0400
Subject: [PATCH] more tweaks and optimizations

---
 code/modules/reagents/Chemistry-Holder.dm          |  2 --
 code/modules/reagents/newchem/drugs.dm             |  8 ++++++++
 code/modules/reagents/newchem/medicine.dm          |  4 ++++
 code/modules/reagents/newchem/newchem_procs.dm     | 14 --------------
 .../oldchem/reagents/drink/reagents_drink_cold.dm  |  4 ++++
 .../oldchem/reagents/reagents_flammable.dm         |  4 ++++
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 92dc474ca7e..40bb5fb43bc 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -341,8 +341,6 @@ var/const/INGEST = 2
 			qdel(A)
 			update_total()
 			my_atom.on_reagent_change()
-			check_gofast(my_atom)
-			check_goreallyfast(my_atom)
 			return 0
 
 
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index e06ab4fea1b..37cdef2b103 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -251,6 +251,10 @@
 		M.adjustBrainLoss(1.0)
 	..()
 
+/datum/reagent/methamphetamine/reagent_deleted(mob/living/M)
+	M.status_flags &= ~GOTTAGOREALLYFAST
+	..()
+
 /datum/reagent/methamphetamine/overdose_process(mob/living/M, severity)
 	var/effect = ..()
 	if(severity == 1)
@@ -620,6 +624,10 @@
 		M.emote(pick("twitch", "shiver"))
 	..()
 
+/datum/reagent/lube/ultra/reagent_deleted(mob/living/M)
+	M.status_flags &= ~GOTTAGOREALLYFAST
+	..()
+
 /datum/reagent/lube/ultra/overdose_process(mob/living/M, severity)
 	if(prob(20))
 		M.emote("ping")
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 1804e307929..5d4fb8ef6bc 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -804,6 +804,10 @@
 	M.adjustStaminaLoss(-5*REM)
 	..()
 
+/datum/reagent/medicine/stimulative_agent/reagent_deleted(mob/living/M)
+	M.status_flags &= ~GOTTAGOFAST
+	..()
+
 /datum/reagent/medicine/stimulative_agent/overdose_process(mob/living/M, severity)
 	if(prob(33))
 		M.adjustStaminaLoss(2.5*REM)
diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm
index 0d8d7261d8c..e9ffc9a7c5f 100644
--- a/code/modules/reagents/newchem/newchem_procs.dm
+++ b/code/modules/reagents/newchem/newchem_procs.dm
@@ -97,20 +97,6 @@
 		R.on_tick()
 	return
 
-/datum/reagents/proc/check_gofast(mob/M)
-	if(istype(M, /mob))
-		if(M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")||M.reagents.has_reagent("stimulative_agent"))
-			return 1
-		else
-			M.status_flags &= ~GOTTAGOFAST
-
-/datum/reagents/proc/check_goreallyfast(mob/M)
-	if(istype(M, /mob))
-		if(M.reagents.has_reagent("methamphetamine"))
-			return 1
-		else
-			M.status_flags &= ~GOTTAGOREALLYFAST
-
 // Called every time reagent containers process.
 /datum/reagent/proc/on_tick(data)
 	return
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm
index a5ab4c0d1fd..fe54ed97246 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm
@@ -54,6 +54,10 @@
 	M.status_flags |= GOTTAGOFAST
 	..()
 
+/datum/reagent/drink/cold/nuka_cola/reagent_deleted(mob/living/M)
+	M.status_flags &= ~GOTTAGOFAST
+	..()
+
 /datum/reagent/drink/cold/spacemountainwind
 	name = "Space Mountain Wind"
 	id = "spacemountainwind"
diff --git a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
index f0d48f4afab..cf425957f8c 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
@@ -35,6 +35,10 @@
 		M.adjustBruteLoss(2)
 	..()
 
+/datum/reagent/fuel/unholywater/reagent_deleted(mob/living/M)
+	M.status_flags &= ~GOTTAGOFAST
+	..()
+
 /datum/reagent/plasma
 	name = "Plasma"
 	id = "plasma"