From b84f31ac5ce83eefb92034b7b948ada93eaa2ea8 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 12 Dec 2015 16:51:37 -0500 Subject: [PATCH] painkiller tweak --- code/modules/reagents/newchem/medicine.dm | 8 ++++++++ code/modules/reagents/oldchem/reagents/reagents_med.dm | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index ee73ef2112f..baca9e66195 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -285,6 +285,10 @@ datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(prob(55)) M.adjustBruteLoss(-2*REM) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.traumatic_shock < 100) + H.shock_stage = 0 ..() return @@ -458,6 +462,10 @@ datum/reagent/morphine/on_mob_life(var/mob/living/M as mob) if(36 to INFINITY) M.Paralyse(10) M.drowsyness = max(M.drowsyness, 15) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.traumatic_shock < 100) + H.shock_stage = 0 ..() return diff --git a/code/modules/reagents/oldchem/reagents/reagents_med.dm b/code/modules/reagents/oldchem/reagents/reagents_med.dm index 3b351be18e6..58bf9e6adda 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_med.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_med.dm @@ -9,6 +9,10 @@ /datum/reagent/hydrocodone/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.traumatic_shock < 100) + H.shock_stage = 0 ..() return