diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm index 09e84767c81..5241c1e658c 100644 --- a/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm @@ -610,7 +610,7 @@ if(show_message) to_chat(carbies, span_danger("You feel your burns and bruises healing! It stings like hell!")) SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) - if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/synthflesh) + reac_volume >= 100)) + if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/synthflesh) + reac_volume >= 40)) carbies.cure_husk("burn") carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or something ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index c4d68f26a38..055ad4c91f3 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -835,7 +835,7 @@ /datum/reagent/toxin/acid - name = "Sulphuric acid" + name = "Sulfuric acid" //Pentest Fix because shiptest cant spell. description = "A strong mineral acid with the molecular formula H2SO4." color = "#00FF32" toxpwr = 1 diff --git a/modular_pentest/master_files/icons/obj/chemical/chem_jug.dmi b/modular_pentest/master_files/icons/obj/chemical/chem_jug.dmi new file mode 100644 index 00000000000..9d26e116b20 Binary files /dev/null and b/modular_pentest/master_files/icons/obj/chemical/chem_jug.dmi differ diff --git a/modular_pentest/modules/chemistry/code/reagent_containers/jug.dm b/modular_pentest/modules/chemistry/code/reagent_containers/jug.dm new file mode 100644 index 00000000000..bd4585636d1 --- /dev/null +++ b/modular_pentest/modules/chemistry/code/reagent_containers/jug.dm @@ -0,0 +1,88 @@ +/obj/item/reagent_containers/glass/chem_jug + volume = 200 // PENTEST CHANGE - Increased from 150 to 200 to match jug dispenser capacity + possible_transfer_amounts = list(25,50,75,100,200) + +/obj/item/reagent_containers/glass/chem_jug/aluminium + list_reagents = list(/datum/reagent/aluminium = 200) + +/obj/item/reagent_containers/glass/chem_jug/bromine + list_reagents = list(/datum/reagent/bromine = 200) + +/obj/item/reagent_containers/glass/chem_jug/carbon + list_reagents = list(/datum/reagent/carbon = 200) + +/obj/item/reagent_containers/glass/chem_jug/chlorine + list_reagents = list(/datum/reagent/chlorine = 200) + +/obj/item/reagent_containers/glass/chem_jug/copper + list_reagents = list(/datum/reagent/copper = 200) + +/obj/item/reagent_containers/glass/chem_jug/fluorine + list_reagents = list(/datum/reagent/fluorine = 200) + +/obj/item/reagent_containers/glass/chem_jug/hydrogen + list_reagents = list(/datum/reagent/hydrogen = 200) + +/obj/item/reagent_containers/glass/chem_jug/iodine + list_reagents = list(/datum/reagent/iodine = 200) + +/obj/item/reagent_containers/glass/chem_jug/lithium + list_reagents = list(/datum/reagent/lithium = 200) + +/obj/item/reagent_containers/glass/chem_jug/mercury + list_reagents = list(/datum/reagent/mercury = 200) + +/obj/item/reagent_containers/glass/chem_jug/nitrogen + list_reagents = list(/datum/reagent/nitrogen = 200) + +/obj/item/reagent_containers/glass/chem_jug/oxygen + list_reagents = list(/datum/reagent/oxygen = 200) + +/obj/item/reagent_containers/glass/chem_jug/phosphorus + list_reagents = list(/datum/reagent/phosphorus = 200) + +/obj/item/reagent_containers/glass/chem_jug/potassium + list_reagents = list(/datum/reagent/potassium = 200) + +/obj/item/reagent_containers/glass/chem_jug/radium + list_reagents = list(/datum/reagent/uranium/radium = 200) + +/obj/item/reagent_containers/glass/chem_jug/sodium + list_reagents = list(/datum/reagent/sodium = 200) + +/obj/item/reagent_containers/glass/chem_jug/sulfur + list_reagents = list(/datum/reagent/sulfur = 200) + +/obj/item/reagent_containers/glass/chem_jug/thermite // not giving this its own "elemental" jug sprite. + list_reagents = list(/datum/reagent/thermite = 200) + +/obj/item/reagent_containers/glass/chem_jug/hexacrete + list_reagents = list(/datum/reagent/concrete/hexacrete = 200) + +/obj/item/reagent_containers/glass/chem_jug/eznutriment + list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 200) + +/obj/item/reagent_containers/glass/chem_jug/left4zednutriment + list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 200) + +/obj/item/reagent_containers/glass/chem_jug/robustharvestnutriment + list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 200) + +/obj/item/reagent_containers/glass/chem_jug/endurogrow + list_reagents = list(/datum/reagent/plantnutriment/endurogrow = 200) + +/obj/item/reagent_containers/glass/chem_jug/liquidearthquake + list_reagents = list(/datum/reagent/plantnutriment/liquidearthquake = 200) + +/datum/supply_pack/chemistry/sulf_acid + name = "Bulk Sulfuric Acid Crate" + desc = "Contains a jug filled with 200u of sulfuric acid." + cost = 100 + contains = list(/obj/item/reagent_containers/glass/chem_jug/sulf_acid) + crate_name = "bulk sulpheric acid crate" + +/obj/item/reagent_containers/glass/chem_jug/sulf_acid + name = "chemical jug (sulfuric acid)" + icon = 'modular_pentest/master_files/icons/obj/chemical/chem_jug.dmi' + icon_state = "chem_jug_sulf_acid" + list_reagents = list(/datum/reagent/toxin/acid = 200)