diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 28a504c1645..a8d0dc93bff 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -14,6 +14,10 @@ var/health_deficiency = (100 - health + staminaloss) + if(reagents) + for(var/datum/reagent/R in reagents.reagent_list) + if(R.shock_reduction) + health_deficiency -= R.shock_reduction if(health_deficiency >= 40) tally += (health_deficiency / 25) diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index e0cf917bdf4..4745a026fbf 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -278,7 +278,7 @@ datum/reagent/sal_acid description = "This is a is a standard salicylate pain reliever and fever reducer." reagent_state = LIQUID color = "#B3B3B3" - shock_reduction = 40 + shock_reduction = 25 overdose_threshold = 25 datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob) @@ -444,7 +444,7 @@ datum/reagent/morphine color = "#C8A5DC" overdose_threshold = 30 addiction_threshold = 25 - shock_reduction = 60 + shock_reduction = 50 datum/reagent/morphine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom