diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index 348ca65f073..3dfc173651b 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -71,8 +71,8 @@ datum/reagent/salglu_solution datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(prob(33)) - M.adjustBruteLoss(-1*REM) - M.adjustFireLoss(-1*REM) + M.adjustBruteLoss(-2*REM) + M.adjustFireLoss(-2*REM) ..() return @@ -234,7 +234,8 @@ datum/reagent/pen_acid/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(M.radiation > 0) M.radiation -= 7 - M.adjustToxLoss(-4*REM) + if(prob(70)) + M.adjustToxLoss(-4*REM) if(prob(33)) M.adjustBruteLoss(1*REM) if(M.radiation < 0) @@ -486,19 +487,16 @@ datum/reagent/morphine/addiction_act_stage4(var/mob/living/M as mob) datum/reagent/oculine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - cycle_amount++ - if(M.eye_blind > 0 && cycle_amount > 20) - if(prob(30)) - M.eye_blind = 0 - else if(prob(80)) - M.eye_blind = 0 - M.eye_blurry = 1 - if(M.eye_blurry > 0) - if(prob(80)) - M.eye_blurry = 0 + M.eye_blurry = max(M.eye_blurry-5 , 0) + M.eye_blind = max(M.eye_blind-5 , 0) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] + if(istype(E)) + if(E.damage > 0) + E.damage -= 1 ..() return - /datum/chemical_reaction/oculine name = "Oculine" id = "oculine" diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm index 3a627e16b87..a061f2c3ffe 100644 --- a/code/modules/reagents/newchem/newchem_procs.dm +++ b/code/modules/reagents/newchem/newchem_procs.dm @@ -5,7 +5,7 @@ datum/reagent var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick. var/current_cycle = 0 datum/reagents - var/chem_temp = 150 + var/chem_temp = 300 var/addiction_tick = 1 var/list/datum/reagent/addiction_list = new/list() diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index 0c9901e71d7..e8b26c70533 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -103,9 +103,9 @@ datum/reagent/neurotoxin2 datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob) cycle_count++ - if(M.brainloss + M.toxloss <= 60) + if(M.brainloss < 60) M.adjustBrainLoss(1*REM) - M.adjustToxLoss(1*REM) + M.adjustToxLoss(1*REM) if(cycle_count == 17) M.sleeping += 10 // buffed so it works ..() @@ -249,7 +249,7 @@ datum/reagent/pancuronium datum/reagent/pancuronium/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(current_cycle >= 10) - M.SetParalysis(3) + M.Weaken(3) if(prob(7)) M.losebreath += rand(3,5) ..()