From a35f993c69da9ba3342d09c18ea6b7dd69d1330d Mon Sep 17 00:00:00 2001
From: Malkevin <akenworthy87@gmail.com>
Date: Tue, 1 Apr 2014 00:50:42 +0100
Subject: [PATCH] Changed the fast move code from a bunch of has_reagents
 checks to a bitflag check.

The reagents turn on the flag per on_mob_life proc run, the flag is turned off if a check for the reagents fails, the check is called when reagents are deleted
---
 code/__DEFINES/combat.dm                               | 1 +
 code/modules/mob/living/carbon/human/human_movement.dm | 6 +-----
 code/modules/reagents/Chemistry-Holder.dm              | 8 ++++++++
 code/modules/reagents/Chemistry-Reagents.dm            | 3 +++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 02a09faf559..9875fd0a84c 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -26,6 +26,7 @@
 #define CANWEAKEN	2
 #define CANPARALYSE	4
 #define CANPUSH		8
+#define GOTTAGOFAST	16
 #define GODMODE		4096
 #define FAKEDEATH	8192	//Replaces stuff like changeling.changeling_fakedeath
 #define DISFIGURED	16384	//I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 3848c605f06..2760cf10c08 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -1,11 +1,7 @@
 /mob/living/carbon/human/movement_delay()
 	if(!has_gravity(src))
 		return -1	//It's hard to be slowed down in space by... anything
-	else if(reagents.has_reagent("hyperzine"))
-		return -1
-	else if(reagents.has_reagent("nuka_cola"))
-		return -1
-	else if(reagents.has_reagent("unholywater"))
+	else if(status_flags & GOTTAGOFAST)
 		return -1
 
 	. = 0
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index a06a525a74c..f8448a63b6e 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -312,11 +312,19 @@ datum
 						del(A)
 						update_total()
 						my_atom.on_reagent_change()
+						check_gofast(my_atom)
 						return 0
 
 
 				return 1
 
+			check_gofast(var/mob/M)
+				if(istype(M, /mob))
+					if(M.reagents.has_reagent("hyperzine")||M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola"))
+						return 1
+					else
+						M.status_flags &= ~GOTTAGOFAST
+
 			update_total()
 				total_volume = 0
 				for(var/datum/reagent/R in reagent_list)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index c81c0143db7..9e8158177e8 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -297,6 +297,7 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				M.adjustBrainLoss(3)
 				if(iscultist(M))
+					M.status_flags |= GOTTAGOFAST
 					M.drowsyness = max(M.drowsyness-5, 0)
 					M.AdjustParalysis(-2)
 					M.AdjustStunned(-2)
@@ -1131,6 +1132,7 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				if(prob(5)) M.emote(pick("twitch","blink_r","shiver"))
+				M.status_flags |= GOTTAGOFAST
 				holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
 	//			..()		//this was causing hyperzine to be consumed twice...
 				return
@@ -2524,6 +2526,7 @@ datum
 				M.dizziness +=5
 				M.drowsyness = 0
 				M.sleeping = max(0,M.sleeping-2)
+				M.status_flags |= GOTTAGOFAST
 				if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
 					M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
 				M.nutrition += 1