diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index 954102b732..ad150f1b4f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -168,6 +168,7 @@ reagent_state = LIQUID color = "#C8A5DC" affects_dead = 1 //This can even heal dead people. + metabolism = 0.1 mrate_static = TRUE //Just in case glass_name = "liquid gold" @@ -180,8 +181,8 @@ M.setCloneLoss(0) M.setOxyLoss(0) M.radiation = 0 - M.heal_organ_damage(5,5) - M.adjustToxLoss(-5) + M.heal_organ_damage(20,20) + M.adjustToxLoss(-20) M.hallucination = 0 M.setBrainLoss(0) M.disabilities = 0 @@ -198,6 +199,28 @@ M.SetConfused(0) M.sleeping = 0 M.jitteriness = 0 + M.radiation = 0 + M.ExtinguishMob() + M.fire_stacks = 0 + if(M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) + else if(M.bodytemperature < 311) + M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/wound_heal = 5 + for(var/obj/item/organ/external/O in H.bad_external_organs) + if(O.status & ORGAN_BROKEN) + O.mend_fracture() //Only works if the bone won't rebreak, as usual + for(var/datum/wound/W in O.wounds) + if(W.bleeding()) + W.damage = max(W.damage - wound_heal, 0) + if(W.damage <= 0) + O.wounds -= W + if(W.internal) + W.damage = max(W.damage - wound_heal, 0) + if(W.damage <= 0) + O.wounds -= W /datum/reagent/gold name = "Gold" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index e9dcda659c..2023ee38fb 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -122,11 +122,11 @@ /obj/item/weapon/reagent_containers/pill/adminordrazine name = "Adminordrazine pill" desc = "It's magic. We don't have to explain it." //it's space magic you don't need the quantity - icon_state = "pill16" + icon_state = "pill15" /obj/item/weapon/reagent_containers/pill/adminordrazine/Initialize() . = ..() - reagents.add_reagent("adminordrazine", 50) + reagents.add_reagent("adminordrazine", 5) /obj/item/weapon/reagent_containers/pill/stox name = "Sleeping pill"