diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 391405714c..11ba56c6e5 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -130,7 +130,7 @@ gender = PLURAL singular_name = "ointment" icon_state = "ointment" - heal_burn = 1 + heal_burn = 3 origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/ointment.ogg') @@ -170,7 +170,9 @@ singular_name = "advanced trauma kit" desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" - heal_brute = 3 + heal_brute = 6 //VOREStation Edit + amount = 20 //VOREStation Edit + max_amount = 20 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') @@ -233,7 +235,7 @@ singular_name = "advanced burn kit" desc = "An advanced treatment kit for severe burns." icon_state = "burnkit" - heal_burn = 3 + heal_burn = 12 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/ointment.ogg') diff --git a/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm b/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm index 83456629a1..21fe6fb9cf 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm @@ -104,14 +104,14 @@ interface_name = "mounted chem injector" interface_desc = "Dispenses loaded chemicals via an arm-mounted injector." - var/max_reagent_volume = 10 //Regen to this volume + var/max_reagent_volume = 20 //Regen to this volume var/chems_to_use = 5 //Per injection charges = list( - list("inaprovaline", "inaprovaline", 0, 10), - list("tricordrazine", "tricordrazine", 0, 10), - list("tramadol", "tramadol", 0, 10), - list("dexalin plus", "dexalinp", 0, 10) + list("inaprovaline", "inaprovaline", 0, 20), + list("dylovene", "dylovene", 0, 20), + list("paracetamol", "paracetamol", 0, 20), + list("dexalin", "dexalin", 0, 20) ) /obj/item/rig_module/rescue_pharm/process() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 9de15b6915..e6a786e8e2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -67,7 +67,7 @@ chem_effective = 0.5 M.adjustBruteLoss(2 * removed) //Mends burns, but has negative effects with a Promethean's skeletal structure. if(alien != IS_DIONA) - M.heal_organ_damage(0, 6 * removed * chem_effective) + M.heal_organ_damage(0, 4 * removed * chem_effective) //VOREStation edit /datum/reagent/dermaline name = "Dermaline" @@ -85,7 +85,7 @@ if(alien == IS_SLIME) chem_effective = 0.75 if(alien != IS_DIONA) - M.heal_organ_damage(0, 12 * removed * chem_effective) + M.heal_organ_damage(0, 8 * removed * chem_effective) //VOREStation edit /datum/reagent/dylovene name = "Dylovene" @@ -141,20 +141,21 @@ color = "#0080FF" overdose = REAGENTS_OVERDOSE scannable = 1 + metabolism = 0.2 //VOREStation Edit /datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_VOX) - M.adjustToxLoss(removed * 6) + M.adjustToxLoss(removed * 30) //VOREStation Edit else if(alien == IS_SLIME && dose >= 15) M.add_chemical_effect(CE_PAINKILLER, 15) if(prob(15)) to_chat(M, "You have a moment of clarity as you collapse.") - M.adjustBrainLoss(-5 * removed) + M.adjustBrainLoss(-25 * removed) //VOREStation Edit M.Weaken(6) else if(alien != IS_DIONA) - M.adjustOxyLoss(-15 * removed) + M.adjustOxyLoss(-150 * removed) //VOREStation Edit - holder.remove_reagent("lexorin", 2 * removed) + holder.remove_reagent("lexorin", 10 * removed) //VOREStation Edit /datum/reagent/dexalinp name = "Dexalin Plus" @@ -399,7 +400,7 @@ M.Weaken(5) if(dose >= 10 && M.paralysis < 40) M.AdjustParalysis(1) //Messing with the core with a simple chemical probably isn't the best idea. - M.adjustBrainLoss(-30 * removed * chem_effective) + M.adjustBrainLoss(-8 * removed * chem_effective) //VOREStation Edit M.add_chemical_effect(CE_PAINKILLER, 10 * chem_effective) /datum/reagent/imidazoline diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm index e57d7ae582..831a1713f7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm @@ -62,15 +62,20 @@ /datum/reagent/vermicetol name = "Vermicetol" id = "vermicetol" - description = "A potent chemical that treats burn damage at an exceptional rate and lasts a while." + description = "A potent chemical that treats all damage at an exceptional rate and lasts a while." taste_description = "sparkles" reagent_state = SOLID color = "#964e06" - overdose = 10 + overdose = 15 scannable = 1 - metabolism = 0.02 + metabolism = 0.05 mrate_static = TRUE /datum/reagent/vermicetol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien != IS_DIONA) - M.heal_organ_damage(0, 110 * removed) //Not as potent as Kelotane, but lasts LONG. + var/chem_effective = 1 + if(alien == IS_SLIME) + chem_effective = 0.5 + M.heal_organ_damage(60 * removed, 60 * removed * chem_effective) + M.adjustOxyLoss(-120 * removed * chem_effective) + M.adjustToxLoss(-60 * removed * chem_effective) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 68cc9d6921..3632922d1b 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -333,8 +333,8 @@ /obj/item/weapon/reagent_containers/syringe/inaprovaline/New() ..() reagents.add_reagent("inaprovaline", 15) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/antitoxin name = "Syringe (anti-toxin)" @@ -343,8 +343,8 @@ /obj/item/weapon/reagent_containers/syringe/antitoxin/New() ..() reagents.add_reagent("anti_toxin", 15) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/antiviral name = "Syringe (spaceacillin)" @@ -353,8 +353,8 @@ /obj/item/weapon/reagent_containers/syringe/antiviral/New() ..() reagents.add_reagent("spaceacillin", 15) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/drugs name = "Syringe (drugs)" @@ -365,8 +365,8 @@ reagents.add_reagent("space_drugs", 5) reagents.add_reagent("mindbreaker", 5) reagents.add_reagent("cryptobiolin", 5) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral/New() ..() diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm index b3c9688919..e940f23454 100644 --- a/code/modules/reagents/reagent_containers/syringes_vr.dm +++ b/code/modules/reagents/reagent_containers/syringes_vr.dm @@ -43,7 +43,11 @@ //Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though, //This gives the last one a 30% chance of infection. - if(prob(dirtiness+(targets.len-1)*10)) + var/infect_chance = dirtiness //Start with dirtiness + if(infect_chance <= 10 && (hash in targets)) //Extra fast uses on target is free + infect_chance = 0 + infect_chance += (targets.len-1)*10 //Extra 10% per extra target + if(prob(infect_chance)) log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].") infect_limb(eo)