mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Merge pull request #1782 from Markolie/coffee
Coffee jitter fix, changeling revive fix
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user