From db044210cb43f782a5c88622f45d927274f17aec Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Thu, 28 May 2026 04:49:17 -0700 Subject: [PATCH 1/2] Add chemical jug with increased capacity and reagent definitions --- .../medical_reagents/medicine_reagents.dm | 2 +- .../icons/obj/chemical/chem_jug.dmi | Bin 0 -> 1381 bytes .../chemistry/code/reagent_containers/jug.dm | 88 ++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 modular_pentest/master_files/icons/obj/chemical/chem_jug.dmi create mode 100644 modular_pentest/modules/chemistry/code/reagent_containers/jug.dm 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/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 0000000000000000000000000000000000000000..9d26e116b2024a73336d210e351fb6d4e7687b9f GIT binary patch literal 1381 zcmV-r1)BPaP)005u}0{{R3yb+fl00015P)t-s0002h z)z#|i>TPXpFtYL;jNGiOtpET2G&D5CPfzwoN2M+&jG9NaUvtn>N>W-Xz0h7xAS?EV zqJ0-1r7|mMbGS!+wI(iNik9OTK4o^V=`XBQ7+5PifFDZ*Bkpc$}3~!EVAZ3_Ukr5y5@hU{@{^2=y?2p$duHcuMNZ zNr3)60ge+=eTZaR?&#xq9 zlc9zy>mhc3Wmu`kA*WjUQcce$!Ylp_v@= zz_#!#7+6oKJ}ybH6eOFd#}akMqI*YK>%(dPJQ;Tv5lw__gQhrhDic}wyfl%w1mO`|C@{Lgn)?eb#u8otL|ZyCLO&zy96=4vb|anl-2{o(b~ttIc7AV`Ax!|P|;#E|yPEr|NV>vwOsAtdPS53k?8 z;cY-fa6d3A_-DW)_}(KVcsLXek6>9=4nnZ5YdOK9parW63x3oeR&e%DaW816xPR{N z1WWs;6&(E(+gn_}iwYjP33>&~Dz2b2^b3|%Y{3HDVmQHf;adzQ82uS6=x6ZuDULM3 zgTpIWI>rT)hi{Vk1(Szwl4rr>;hSVs@E!?4vOm0jX5Ml8&rY7rE(rSL>+c?!*$?-Z zzP_R;ilQtYZhj|SXXkg)b!L7iU1#Ta(sg!zCtYXfchYrsekWZI$?s78I51lO9Qc0! zko*qSk6&LWhexn!&JK?t)juS^L-ph7L<^qJv>?@g$WHv>4yxY^j@4ViZib(p{{09? z`iI10`##?D3ikKdCpg?h2Skmw(h-=Vs>#TNf9b`TTv_7BPLQ2qX!WUPMwP4eyj?EFr;&d%?o z>-_vqx~?dSqA0(f*!iF4gPIR&KFF#^&;LU5!M_8O@?e72Jv_25^56SPy{lDDxfv7)w|1WoaAbWpt?0WS4 zPxC=VQ4~d4JSd-w4LpA^GWh(#$jos5pe)ko53+&zTx?)I7n@A@{6RKG&>rn4bp9Zl zO!$CAHdfFck64SGT*k%;+QZ-K1q-$lG(U?Kbn{!Vpq=271qF}yW7AKtUhFd{eEuLC n>GKEKNS{B*NAo#F`9Jvwi)G(R50umQ00000NkvXXu0mjf+O?;J literal 0 HcmV?d00001 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..51091f203be --- /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 Sulphuric Acid Crate" + desc = "Contains a jug filled with 200u of sulphuric 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 (sulphuric 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) From 279814f4b259e8b96a42010da1b6d9f83588e5fb Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Thu, 28 May 2026 04:55:26 -0700 Subject: [PATCH 2/2] Fix spelling of "sulphuric" to "sulfuric" in reagent names and descriptions --- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 +- .../modules/chemistry/code/reagent_containers/jug.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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/modules/chemistry/code/reagent_containers/jug.dm b/modular_pentest/modules/chemistry/code/reagent_containers/jug.dm index 51091f203be..bd4585636d1 100644 --- a/modular_pentest/modules/chemistry/code/reagent_containers/jug.dm +++ b/modular_pentest/modules/chemistry/code/reagent_containers/jug.dm @@ -75,14 +75,14 @@ list_reagents = list(/datum/reagent/plantnutriment/liquidearthquake = 200) /datum/supply_pack/chemistry/sulf_acid - name = "Bulk Sulphuric Acid Crate" - desc = "Contains a jug filled with 200u of sulphuric 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 (sulphuric 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)