diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 92c9bf320b..b5f4906162 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -75,6 +75,7 @@ #define REAGENT_ORGANIC_PROCESS (1<<8) //Can be processed by organic carbons - will otherwise slowly dissipate #define REAGENT_ROBOTIC_PROCESS (1<<9) //Can be processed by robotic carbons - will otherwise slowly dissipate +#define REAGENT_ALL_PROCESS REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS //expand this if you for some reason add more process flags #define INVALID_REAGENT_DISSIPATION 1 //How much of a reagent is removed per reagent tick if invalid processing-flag wise diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 820ce872af..e79cfcf23d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -17,7 +17,7 @@ /datum/reagent/medicine/leporazine name = "Leporazine" description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 8.4 color = "#82b8aa" value = REAGENT_VALUE_COMMON @@ -33,7 +33,7 @@ name = "Adminordrazine" description = "It's magic. We don't have to explain it." color = "#ffffff" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS can_synth = FALSE taste_description = "badmins" value = REAGENT_VALUE_GLORIOUS @@ -105,7 +105,7 @@ name = "Synaptizine" description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations." color = "#FF00FF" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 4 /datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M) @@ -124,7 +124,7 @@ name = "Diphen-Synaptizine" description = "Reduces drowsiness, hallucinations, and Histamine from body." color = "#EC536D" // rgb: 236, 83, 109 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 5.2 value = REAGENT_VALUE_COMMON @@ -144,7 +144,7 @@ name = "Inacusiate" description = "Instantly restores all hearing to the patient, but does not cure deafness." color = "#6600FF" // rgb: 100, 165, 255 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 2 value = 10 @@ -157,7 +157,7 @@ description = "A chemical mixture with almost magical healing powers. Its main limitation is that the patient's body temperature must be under 270K for it to metabolise correctly." color = "#0000C8" taste_description = "sludge" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 11 value = REAGENT_VALUE_COMMON @@ -189,7 +189,7 @@ color = "#0000C8" taste_description = "muscle" metabolization_rate = 1.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 13 value = REAGENT_VALUE_COMMON @@ -206,7 +206,7 @@ description = "A mixture of cryoxadone and slime jelly, that apparently inverses the requirement for its activation." color = "#f7832a" taste_description = "spicy jelly" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 12 value = REAGENT_VALUE_UNCOMMON @@ -240,7 +240,7 @@ description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage." reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 30 taste_description = "fish" pH = 12.2 @@ -274,7 +274,7 @@ description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with. Also reduces infection in serious burns." color = "#f2f2f2" metabolization_rate = 0.1 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 8.1 //Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects. @@ -404,7 +404,7 @@ reagent_state = LIQUID color = "#DCDCDC" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 60 taste_description = "sweetness and salt" var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick @@ -538,7 +538,7 @@ reagent_state = LIQUID color = "#000000" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "ash" pH = 5 @@ -590,7 +590,7 @@ reagent_state = LIQUID color = "#19C832" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "acid" pH = 1.5 @@ -610,7 +610,7 @@ reagent_state = LIQUID color = "#14FF3C" metabolization_rate = 2 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 12 //It's a reducing agent /datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M) @@ -624,7 +624,7 @@ reagent_state = LIQUID color = "#003153" // RGB 0, 49, 83 metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 8.9 value = REAGENT_VALUE_COMMON //uncraftable @@ -639,7 +639,7 @@ reagent_state = LIQUID color = "#E6FFF0" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 1 //One of the best buffers, NEVERMIND! value = REAGENT_VALUE_UNCOMMON var/healtoxinlover = FALSE @@ -693,7 +693,7 @@ reagent_state = LIQUID color = "#00FFFF" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 2 /datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/M) @@ -710,7 +710,7 @@ reagent_state = LIQUID color = "#FF6464" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 11 /datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M) @@ -889,7 +889,7 @@ reagent_state = LIQUID color = "#FFFFFF" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "dull toxin" pH = 10 @@ -920,7 +920,7 @@ reagent_state = LIQUID color = "#000000" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 35 pH = 12 value = REAGENT_VALUE_UNCOMMON @@ -951,7 +951,7 @@ reagent_state = LIQUID color = "#D2FFFA" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 30 pH = 10.2 @@ -987,7 +987,7 @@ reagent_state = LIQUID color = "#A0E85E" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "magnets" pH = 0 value = REAGENT_VALUE_RARE @@ -1053,7 +1053,7 @@ description = "Efficiently restores brain damage." color = "#DCDCFF" pH = 10.4 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/C) C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2*REM) @@ -1065,7 +1065,7 @@ name = "Neurine" description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas." color = "#EEFF8F" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/medicine/neurine/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(!(method == INJECT)) @@ -1095,7 +1095,7 @@ color = "#5096C8" taste_description = "acid" pH = 2 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/M) M.jitteriness = 0 @@ -1131,7 +1131,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 60 pH = 8.7 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_RARE /datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L) @@ -1170,7 +1170,7 @@ reagent_state = LIQUID color = "#FFFFF0" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS pH = 6.7 /datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M) @@ -1203,7 +1203,7 @@ description = "Restores oxygen loss. Overdose causes it instead." reagent_state = LIQUID color = "#13d2f0" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 30 pH = 9.7 @@ -1267,7 +1267,7 @@ reagent_state = LIQUID pH = 8.5 color = "#5dc1f0" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M) if(M.losebreath >= 5) @@ -1321,7 +1321,7 @@ reagent_state = SOLID color = "#555555" pH = 11 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_EXCEPTIONAL /datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/M) @@ -1343,7 +1343,7 @@ reagent_state = SOLID color = "#555555" pH = 11 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_VERY_RARE /datum/reagent/medicine/lesser_syndicate_nanites/on_mob_life(mob/living/carbon/M) @@ -1478,7 +1478,7 @@ color = "#C1151D" overdose_threshold = 30 value = REAGENT_VALUE_VERY_RARE - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) ..() @@ -1512,7 +1512,7 @@ description = "Drastically increases movement speed." color = "#AE151D" metabolization_rate = 2.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L) ..() @@ -1528,7 +1528,7 @@ name = "Corazone" description = "A medication used to treat pain, fever, and inflammation, along with heart attacks." color = "#F5F5F5" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS self_consuming = TRUE pH = 12.5 @@ -1628,7 +1628,7 @@ reagent_state = LIQUID color = "#07E79E" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 30 pH = 9.12 value = REAGENT_VALUE_COMMON @@ -1664,7 +1664,7 @@ reagent_state = SOLID color = "#FFFFD0" metabolization_rate = 1.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_UNCOMMON /datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/M) @@ -1678,7 +1678,7 @@ reagent_state = SOLID color = "#9423FF" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 50 taste_description = "numbing bitterness" value = REAGENT_VALUE_RARE @@ -1708,7 +1708,7 @@ taste_mult = 4 can_synth = FALSE overdose_threshold = 30 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_UNCOMMON // while it's 'rare', it can be milked from the wisdom cow /datum/reagent/medicine/liquid_wisdom/on_mob_life(mob/living/carbon/C) //slightly stronger mannitol, from the wisdom cow @@ -1726,7 +1726,7 @@ reagent_state = LIQUID color = "#bb2424" metabolization_rate = 0.25 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 20 /// How much base clotting we do per bleeding wound, multiplied by the below number for each bleeding wound var/clot_rate = 0.25 @@ -1781,7 +1781,7 @@ reagent_state = LIQUID color = "#D7C9C6" metabolization_rate = 0.2 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 30 /datum/reagent/medicine/system_cleaner/on_mob_life(mob/living/carbon/M) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c50449850f..5e7a2ccdf9 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1,7 +1,7 @@ /datum/reagent/blood data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_HUMAN, "blood_type"= null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null) name = "Blood" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_UNCOMMON // $$$ blood ""donations"" $$$ color = BLOOD_COLOR_HUMAN // rgb: 200, 0, 0 description = "Blood from some creature." @@ -224,7 +224,7 @@ /datum/reagent/vaccine //data must contain virus type name = "Vaccine" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "#C81040" // rgb: 200, 16, 64 taste_description = "slime" @@ -245,7 +245,7 @@ description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen." color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha) taste_description = "water" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 150 //Imagine drinking a gallon of water var/cooling_temperature = 2 glass_icon_state = "glass_clear" @@ -342,7 +342,7 @@ name = "Holy Water" description = "Water blessed by some deity." color = "#E0E8EF" // rgb: 224, 232, 239 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS glass_icon_state = "glass_clear" glass_name = "glass of holy water" glass_desc = "A glass of holy water." @@ -478,7 +478,7 @@ name = "Hell Water" description = "YOUR FLESH! IT BURNS!" taste_description = "burning" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_VERY_RARE /datum/reagent/hellwater/on_mob_life(mob/living/carbon/M) @@ -538,7 +538,7 @@ /datum/reagent/lube name = "Space Lube" description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "#009CA8" // rgb: 0, 156, 168 taste_description = "cherry" // by popular demand var/lube_kind = TURF_WET_LUBE ///What kind of slipperiness gets added to turfs. @@ -650,7 +650,7 @@ description = "A humanizing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 metabolization_rate = INFINITY //So it instantly removes all of itself - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "slime" value = REAGENT_VALUE_RARE var/datum/species/race = /datum/species/human @@ -815,7 +815,7 @@ /datum/reagent/slime_toxin name = "Slime Mutation Toxin" description = "A toxin that turns organic material into slime." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "#5EFF3B" //RGB: 94, 255, 59 taste_description = "slime" metabolization_rate = 0.2 @@ -855,7 +855,7 @@ description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change." color = "#5EFF3B" //RGB: 94, 255, 59 metabolization_rate = INFINITY - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "slime" value = REAGENT_VALUE_RARE @@ -882,7 +882,7 @@ name = "Gluttony's Blessing" description = "An advanced corruptive toxin produced by something terrible." color = "#5EFF3B" //RGB: 94, 255, 59 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS can_synth = FALSE taste_description = "decay" value = REAGENT_VALUE_GLORIOUS @@ -1096,7 +1096,7 @@ /datum/reagent/radium name = "Radium" description = "Radium is an alkaline earth metal. It is extremely radioactive." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = SOLID color = "#C7C7C7" // rgb: 199,199,199 taste_description = "the colour blue and regret" @@ -1123,7 +1123,7 @@ /datum/reagent/space_cleaner/sterilizine name = "Sterilizine" description = "Sterilizes wounds in preparation for surgery." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "#e6f1f5" // rgb: 200, 165, 220 taste_description = "bitterness" pH = 10.5 @@ -1150,7 +1150,7 @@ reagent_state = SOLID taste_description = "iron" pH = 6 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS overdose_threshold = 30 color = "#c2391d" material = /datum/material/iron @@ -1203,7 +1203,7 @@ /datum/reagent/uranium name ="Uranium" description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = SOLID color = "#B8B8C0" // rgb: 184, 184, 192 taste_description = "the inside of a reactor" @@ -1233,7 +1233,7 @@ /datum/reagent/bluespace name = "Bluespace Dust" description = "A dust composed of microscopic bluespace crystals, with minor space-warping properties." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = SOLID color = "#0000CC" taste_description = "fizzling blue" @@ -1260,7 +1260,7 @@ /datum/reagent/telecrystal name = "Telecrystal Dust" description = "A blood-red dust comprised of something that was much more useful when it was intact." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS //Sure? + chemical_flags = REAGENT_ALL_PROCESS //Sure? reagent_state = SOLID color = "#660000" // rgb: 102, 0, 0. taste_description = "contraband" @@ -1285,7 +1285,7 @@ name = "Welding fuel" description = "Required for welders. Flamable." color = "#660000" // rgb: 102, 0, 0 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "gross metal" glass_icon_state = "dr_gibb_glass" glass_name = "glass of welder fuel" @@ -1374,7 +1374,7 @@ name = "EZ Clean" description = "A powerful, acidic cleaner sold by Waffle Co. Affects organic matter while leaving other objects unaffected." metabolization_rate = 1.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "acid" pH = 2 value = REAGENT_VALUE_RARE @@ -1577,7 +1577,7 @@ description = "An unstable experimental gas that greatly increases the energy of those that inhale it" reagent_state = GAS metabolization_rate = 1.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "E1A116" taste_description = "sourness" value = REAGENT_VALUE_EXCEPTIONAL @@ -1846,7 +1846,7 @@ /datum/reagent/colorful_reagent name = "Colorful Reagent" description = "Thoroughly sample the rainbow." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = LIQUID color = "#FFFF00" var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700") @@ -2137,7 +2137,7 @@ color = "#123524" // RGB (18, 53, 36) metabolization_rate = INFINITY can_synth = FALSE - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "brains" pH = 0.5 value = REAGENT_VALUE_GLORIOUS @@ -2153,7 +2153,7 @@ name = "Magillitis" description = "An experimental serum which causes rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas." reagent_state = LIQUID - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "#00f041" value = REAGENT_VALUE_EXCEPTIONAL @@ -2167,7 +2167,7 @@ description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant color = "#ff0000"//strong red. rgb 255, 0, 0 var/current_size = RESIZE_DEFAULT_SIZE - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_COMMON taste_description = "bitterness" // apparently what viagra tastes like @@ -2256,7 +2256,7 @@ color = "#FAFF00" taste_description = "acrid cinnamon" metabolization_rate = 0.2 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS //Sorry robot lings, but you still get this. + chemical_flags = REAGENT_ALL_PROCESS //Sorry robot lings, but you still get this. value = REAGENT_VALUE_UNCOMMON /datum/reagent/bz_metabolites/on_mob_metabolize(mob/living/L) @@ -2344,7 +2344,7 @@ can_synth = FALSE var/datum/dna/original_dna var/reagent_ticks = 0 - chemical_flags = REAGENT_INVISIBLE | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_INVISIBLE | REAGENT_ALL_PROCESS value = REAGENT_VALUE_GLORIOUS /datum/reagent/changeling_string/on_mob_metabolize(mob/living/carbon/C) @@ -2401,7 +2401,7 @@ description = "A powerful preservation agent, utilizing the preservative effects of formaldehyde with significantly less of the histamine." reagent_state = LIQUID color = "#f7685e" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS metabolization_rate = REAGENTS_METABOLISM * 0.25 @@ -2453,7 +2453,7 @@ color = "#050096" // rgb: 5, 0, 150 taste_mult = 0 // oderless and tasteless metabolization_rate = 0.1 * REAGENTS_METABOLISM //20 times as long, so it's actually viable to use - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS var/time_multiplier = 1 MINUTES //1 minute per unit of gravitum on objects. Seems overpowered, but the whole thing is very niche /datum/reagent/gravitum/reaction_obj(obj/O, volume) @@ -2533,7 +2533,7 @@ reagent_state = LIQUID color = "#D2FFFA" metabolization_rate = 0.75 * REAGENTS_METABOLISM // 5u (WOUND_DETERMINATION_CRITICAL) will last for ~17 ticks - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /// Whether we've had at least WOUND_DETERMINATION_SEVERE (2.5u) of determination at any given time. No damage slowdown immunity or indication we're having a second wind if it's just a single moderate wound var/significant = FALSE self_consuming = TRUE @@ -2567,7 +2567,7 @@ name = "Eldritch Essence" description = "Strange liquid that defies the laws of physics" taste_description = "Ag'hsj'saje'sh" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS color = "#1f8016" /datum/reagent/eldritch/on_mob_life(mob/living/carbon/M) @@ -2652,7 +2652,7 @@ description = "A unknown red liquid, linked to healing of most moral wounds." color = "#c10000" metabolization_rate = REAGENTS_METABOLISM * 2.5 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/red_ichor/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-50) @@ -2670,7 +2670,7 @@ description = "A unknown green liquid, linked to healing of most internal wounds." color = "#158c00" metabolization_rate = REAGENTS_METABOLISM * 2.5 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/green_ichor/on_mob_life(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -100) @@ -2688,7 +2688,7 @@ description = "A unknown blue liquid, linked to healing the mind." color = "#0914e0" metabolization_rate = REAGENTS_METABOLISM * 2.5 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS /datum/reagent/blue_ichor/on_mob_life(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -100) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 9d44b7ccb2..94b83bdeca 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -2,7 +2,7 @@ /datum/reagent/thermite name = "Thermite" description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = SOLID color = "#550000" taste_description = "sweet tasting metal" @@ -45,7 +45,7 @@ reagent_state = LIQUID color = "#FFC8C8" metabolization_rate = 4 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "burning" value = REAGENT_VALUE_COMMON @@ -148,7 +148,7 @@ /datum/reagent/phlogiston name = "Phlogiston" description = "Catches you on fire and makes you ignite." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = LIQUID color = "#FA00AF" taste_description = "burning" @@ -171,7 +171,7 @@ /datum/reagent/napalm name = "Napalm" description = "Very flammable." - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS reagent_state = LIQUID color = "#FA00AF" taste_description = "burning" @@ -201,7 +201,7 @@ color = "#0000DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM taste_description = "bitterness" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS value = REAGENT_VALUE_COMMON /datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube @@ -220,7 +220,7 @@ description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly heats all other reagents in the container." color = "#64FAC8" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "bitterness" value = REAGENT_VALUE_COMMON @@ -236,7 +236,7 @@ reagent_state = LIQUID color = "#20324D" //RGB: 32, 50, 77 metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS taste_description = "charged metal" var/shock_timer = 0 value = REAGENT_VALUE_VERY_RARE diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 2809c31a05..c0199ea47d 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -35,7 +35,7 @@ name = "Unstable mutagen" description = "Might cause unpredictable mutations. Keep away from children." color = "#00FF00" - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS toxpwr = 0 taste_description = "slime" taste_mult = 0.9 @@ -449,7 +449,7 @@ reagent_state = LIQUID color = "#787878" metabolization_rate = 0.125 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS toxpwr = 0 value = REAGENT_VALUE_VERY_RARE @@ -497,7 +497,7 @@ reagent_state = LIQUID color = "#B4004B" metabolization_rate = 0.5 * REAGENTS_METABOLISM - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_ALL_PROCESS toxpwr = 1 /datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/M) @@ -872,7 +872,7 @@ description = "A strong mineral acid with the molecular formula H2SO4." color = "#00FF32" toxpwr = 1 - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS //Ever injected acid into a robot? + chemical_flags = REAGENT_ALL_PROCESS //Ever injected acid into a robot? var/acidpwr = 10 //the amount of protection removed from the armour taste_description = "acid" self_consuming = TRUE diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm index 42baffda25..2a6e5ed05f 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm @@ -142,7 +142,7 @@ Creating a chem with a low purity will make you permanently fall in love with so var/creatorName var/mob/living/creator pH = 10 - chemical_flags = REAGENT_ONMOBMERGE | REAGENT_DONOTSPLIT | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS //Procs on_mob_add when merging into a human + chemical_flags = REAGENT_ONMOBMERGE | REAGENT_DONOTSPLIT | REAGENT_ALL_PROCESS //Procs on_mob_add when merging into a human can_synth = FALSE value = REAGENT_VALUE_EXCEPTIONAL diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm index 9ac52e4a8f..d15d3b360a 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm @@ -336,7 +336,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING var/startHunger can_synth = TRUE taste_description = "a weird chemical fleshy flavour" - chemical_flags = REAGENT_SNEAKYNAME | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_SNEAKYNAME | REAGENT_ALL_PROCESS value = REAGENT_VALUE_RARE /datum/reagent/impure/SDZF/on_mob_life(mob/living/carbon/M) //If you're bad at fermichem, turns your clone into a zombie instead. diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index dff09b1840..42591a24bf 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -9,7 +9,7 @@ impure_chem = /datum/reagent/impure/fermiTox // What chemical is metabolised with an inpure reaction inverse_chem_val = 0.25 // If the impurity is below 0.5, replace ALL of the chem with inverse_chemupon metabolising inverse_chem = /datum/reagent/impure/fermiTox - chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS //Lets just default to robots being able to process these funky chems. + chemical_flags = REAGENT_ALL_PROCESS //Lets just default to robots being able to process these funky chems. //This should process fermichems to find out how pure they are and what effect to do. @@ -37,7 +37,7 @@ taste_description = "like jerky, whiskey and an off aftertaste of a crypt." metabolization_rate = 0.2 overdose_threshold = 25 - chemical_flags = REAGENT_DONOTSPLIT | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_DONOTSPLIT | REAGENT_ALL_PROCESS pH = 4 can_synth = TRUE @@ -85,7 +85,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM inverse_chem_val = 0 var/obj/item/organ/tongue/nT - chemical_flags = REAGENT_DONOTSPLIT | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_DONOTSPLIT | REAGENT_ALL_PROCESS pH = 5 var/obj/item/organ/tongue/T can_synth = TRUE @@ -241,7 +241,7 @@ name = "Electromagnetic crystals" description = "Causes items upon the patient to sometimes short out, as well as causing a shock in the patient, if the residual charge between the crystals builds up to sufficient quantities" metabolization_rate = 0.5 - chemical_flags = REAGENT_INVISIBLE | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_INVISIBLE | REAGENT_ALL_PROCESS //Increases shock events. /datum/reagent/fermi/nanite_b_goneTox/on_mob_life(mob/living/carbon/C)//Damages the taker if their purity is low. Extended use of impure chemicals will make the original die. (thus can't be spammed unless you've very good) @@ -304,7 +304,7 @@ /datum/reagent/fermi/fermiTest name = "Fermis Test Reagent" description = "You should be really careful with this...! Also, how did you get this?" - chemical_flags = REAGENT_FORCEONNEW | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_FORCEONNEW | REAGENT_ALL_PROCESS can_synth = FALSE /datum/reagent/fermi/fermiTest/on_new(datum/reagents/holder) @@ -339,7 +339,7 @@ description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another." color = "#fbc314" pH = 0 - chemical_flags = REAGENT_FORCEONNEW | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_FORCEONNEW | REAGENT_ALL_PROCESS can_synth = TRUE var/strength = 1.5 @@ -377,7 +377,7 @@ description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another." color = "#3853a4" pH = 14 - chemical_flags = REAGENT_FORCEONNEW | REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS + chemical_flags = REAGENT_FORCEONNEW | REAGENT_ALL_PROCESS can_synth = TRUE var/strength = 1.5