Merge pull request #1782 from Markolie/coffee

Coffee jitter fix, changeling revive fix
This commit is contained in:
Fox-McCloud
2015-08-18 20:19:11 -04:00
2 changed files with 9 additions and 1 deletions
+8 -1
View File
@@ -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"