From 81070b8adab444e35ff804efb4bad54f6b6dbcd8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Jun 2020 06:25:40 -0400 Subject: [PATCH] New fermi chem Zeolites! (#12428) * Zeolites! * No loner hs debug numbers... --- .../reagents/reagent_containers/bottle.dm | 9 ++++++-- .../reagents/chemistry/reagents/healing.dm | 22 +++++++++++++++++++ .../reagents/chemistry/recipes/fermi.dm | 20 +++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index cc1cd21bac..ad8d722b61 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -8,7 +8,6 @@ possible_transfer_amounts = list(5,10,15,25,30) volume = 30 - /obj/item/reagent_containers/glass/bottle/Initialize() . = ..() if(!icon_state) @@ -40,7 +39,6 @@ . += filling - /obj/item/reagent_containers/glass/bottle/epinephrine name = "epinephrine bottle" desc = "A small bottle. Contains epinephrine - used to stabilize patients." @@ -228,6 +226,13 @@ desc = "A small bottle of atropine." list_reagents = list(/datum/reagent/medicine/atropine = 30) +/obj/item/reagent_containers/glass/bottle/zeolites + name = "Zeolites bottle" + desc = "A small bottle of lab made Zeolite, which removes radiation from people quickly as well as contamination on items." + list_reagents = list(/datum/reagent/fermi/zeolites = 30) + +// Viro bottles + /obj/item/reagent_containers/glass/bottle/romerol name = "romerol bottle" desc = "A small bottle of Romerol. The REAL zombie powder." diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index 48c9ffb7e6..ca6bb302da 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -197,3 +197,25 @@ M.stat = DEAD M.visible_message("The synthetic tissue degrades off [M]'s wounds as they collapse to the floor.") //NEEDS ON_MOB_DEAD() + +/datum/reagent/fermi/zeolites + name = "Artificial Zeolites" + description = "Lab made Zeolite, used to clear radiation form people and items alike! Splashing just a small amounts(5u) onto any item can clear away large amouts of contamination." + pH = 8 + color = "#FFDADA" + metabolization_rate = 8 * REAGENTS_METABOLISM //Lastes not long in body but heals a lot! + value = REAGENT_VALUE_COMMON + +/datum/reagent/fermi/zeolites/on_mob_life(mob/living/carbon/M) + var/datum/component/radioactive/contamination = M.GetComponent(/datum/component/radioactive) + if(M.radiation > 0) + M.radiation -= min(M.radiation, 60) + if(contamination.strength > 0) + contamination.strength -= min(contamination.strength, 100) + ..() + +/datum/reagent/fermi/zeolites/reaction_obj(obj/O, reac_volume) + var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive) + if(contamination && reac_volume >= 5) + qdel(contamination) + return diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 144ac82afd..b2c80e4a16 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -588,3 +588,23 @@ HIonRelease = 0.1 RateUpLim = 2 FermiChem = TRUE + +/datum/chemical_reaction/fermi/zeolites + name = "Zeolites" + id = /datum/reagent/fermi/zeolites + results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot! + required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/aluminium = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1) + //FermiChem vars: + OptimalTempMin = 300 + OptimalTempMax = 900 + ExplodeTemp = 1000 //check to see overflow doesn't happen! + OptimalpHMin = 4.0 + OptimalpHMax = 6.0 + ReactpHLim = 4 + //CatalystFact = 0 + CurveSharpT = 4 + CurveSharppH = 0 + ThermicConstant = 0 + HIonRelease = 0.01 + RateUpLim = 15 + FermiChem = TRUE \ No newline at end of file