From a41f15d17a06f731710fdfcae2af8a4815bd2316 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Tue, 18 Aug 2015 18:33:58 +0200
Subject: [PATCH] Coffee fix, changeling revive fix

---
 code/game/gamemodes/changeling/powers/revive.dm | 1 +
 code/modules/reagents/Chemistry-Reagents.dm     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 3fc888f8cac..8e4313b92b0 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -28,6 +28,7 @@
 	user.germ_level = 0
 	user.next_pain_time = 0
 	user.traumatic_shock = 0
+	user.timeofdeath = 0
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		H.restore_blood()
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 6aa10fd29bb..615eefbcf5a 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2231,9 +2231,9 @@ datum
 				adj_drowsy = -3
 				adj_sleepy = -2
 				adj_temp = 25
+				overdose_threshold = 45
 
 				on_mob_life(var/mob/living/M as mob)
-					M.Jitter(5)
 					if(adj_temp > 0 && holder.has_reagent("frostoil"))
 						holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
 					if(prob(50))
@@ -2242,6 +2242,13 @@ datum
 						M.AdjustWeakened(-1)
 					..()
 					return
+					
+				overdose_process(var/mob/living/M as mob)
+					if(volume > 45)
+						M.Jitter(5)
+						
+					..()
+					return
 
 				icecoffee
 					name = "Iced Coffee"