diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 89d49cfe0c24..dbf779355091 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -53,36 +53,39 @@ /datum/reagent/oxygen, /datum/reagent/phosphorus, /datum/reagent/potassium, - /datum/reagent/uranium/radium, /datum/reagent/silicon, /datum/reagent/silver, /datum/reagent/sodium, + /datum/reagent/iron, + /datum/reagent/water, + /datum/reagent/oil, + /datum/reagent/uranium/radium, /datum/reagent/stable_plasma, - /datum/reagent/consumable/sugar, - /datum/reagent/sulfur, - /datum/reagent/toxin/acid + /datum/reagent/sulfur ) var/list/t2_upgrade_reagents = list( - /datum/reagent/iron, - /datum/reagent/water, - /datum/reagent/fuel + /datum/reagent/consumable/sugar, + /datum/reagent/fuel, + /datum/reagent/toxin/acid ) var/list/t3_upgrade_reagents = list( + /datum/reagent/acetone, /datum/reagent/ammonia, /datum/reagent/ash, - /datum/reagent/oil ) var/list/t4_upgrade_reagents = list( - /datum/reagent/acetone, + /datum/reagent/gold, /datum/reagent/diethylamine, - /datum/reagent/saltpetre + /datum/reagent/saltpetre, + /datum/reagent/medicine/charcoal ) var/list/emagged_reagents = list( /datum/reagent/toxin/carpotoxin, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/morphine, /datum/reagent/drug/space_drugs, - /datum/reagent/toxin + /datum/reagent/toxin, + /datum/reagent/uranium ) var/list/saved_recipes = list() diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 1512ce1b6cc5..e40e8cb9ec4c 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2119,6 +2119,13 @@ if(method == INGEST || method == TOUCH || method == INJECT) L.ForceContractDisease(new /datum/disease/plague(), FALSE, TRUE) +/datum/reagent/sulfur_trioxide + name = "Sulfur Trioxide" + description = "A super-oxygenated sulfur compound." + color = "#ebf0ff" + taste_description = "metallic rotten eggs" + reagent_state = SOLID + /datum/reagent/adrenaline name = "Adrenaline" description = "Powerful chemical that termporarily makes the user immune to slowdowns" diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index a86d0bdd68fd..0ab1ebd4d9ca 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -12,7 +12,7 @@ var/mob_react = TRUE //Determines if a chemical reaction can occur inside a mob var/required_temp = 0 - var/is_cold_recipe = 0 // Set to 1 if you want the recipe to only react when it's BELOW the required temp. + var/is_cold_recipe = FALSE // Set to TRUE if you want the recipe to only react when it's BELOW the required temp. var/mix_message = "The solution begins to bubble." //The message shown to nearby people upon mixing, if applicable var/mix_sound = 'sound/effects/bubbles.ogg' //The sound played upon mixing, if applicable diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index afd6d79ecffa..f935cfe4cc6e 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -395,9 +395,8 @@ results = list(/datum/reagent/medicine/radscrub = 3) required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/space_cleaner = 1, /datum/reagent/medicine/c2/seiver = 1) required_temp = 200 - is_cold_recipe = 1 + is_cold_recipe = TRUE /datum/chemical_reaction/medicine/seraka_destroy //seraka extract is destroyed by sodium hydroxide results = list(/datum/reagent/consumable/sugar = 1) required_reagents = list(/datum/reagent/medicine/coagulant/seraka_extract = 1, /datum/reagent/lye = 1) - diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index dfe09ce4f9e3..1075d1afc499 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -783,3 +783,61 @@ var/location = get_turf(holder.my_atom) for(var/i in 1 to created_volume) new /obj/item/stack/sheet/ashresin(location) + +/datum/chemical_reaction/sulfur_trioxide + name = /datum/reagent/sulfur_trioxide + id = /datum/reagent/sulfur_trioxide + results = list(/datum/reagent/sulfur_trioxide = 4) + required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/oxygen = 3) + required_catalysts = list(/datum/reagent/hydrogen = 1) + +/datum/chemical_reaction/sulfuric_acid + name = /datum/reagent/toxin/acid + id = /datum/reagent/toxin/acid + results = list(/datum/reagent/toxin/acid = 2) + required_reagents = list(/datum/reagent/sulfur_trioxide = 1, /datum/reagent/water = 1) + +/datum/chemical_reaction/sugar + name = /datum/reagent/consumable/sugar + id = /datum/reagent/consumable/sugar + results = list(/datum/reagent/consumable/sugar = 3) + required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/fuel = 1) + +/datum/chemical_reaction/welding_fuel + name = /datum/reagent/fuel + id = /datum/reagent/fuel + results = list(/datum/reagent/fuel = 4) + required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/toxin/acid = 3) + required_temp = 180 + is_cold_recipe = TRUE + +/datum/chemical_reaction/stableplasma + name = /datum/reagent/stable_plasma + id = /datum/reagent/stable_plasma + results = list(/datum/reagent/stable_plasma = 6) + required_reagents = list(/datum/reagent/toxin/plasma = 3, /datum/reagent/hydrogen = 3) + required_catalysts = list(/datum/reagent/consumable/ethanol = 5) + required_temp = 100 + is_cold_recipe = TRUE + +/datum/chemical_reaction/waterformation + name = /datum/reagent/water + id = /datum/reagent/water + results = list(/datum/reagent/water = 3) + required_reagents = list(/datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 2) + required_temp = 380 + +/datum/chemical_reaction/ice + name = /datum/reagent/consumable/ice + id = /datum/reagent/consumable/ice + results = list(/datum/reagent/consumable/ice = 3) + required_reagents = list(/datum/reagent/water = 2, /datum/reagent/lye = 1) + required_temp = 200 + is_cold_recipe = TRUE + +/datum/chemical_reaction/water2 + name = "melting_ice" + id = "melting_ice" + results = list(/datum/reagent/water = 1) + required_reagents = list(/datum/reagent/consumable/ice = 1) + required_temp = 400 diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 8fbaf28354b9..d0bc688c5875 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -470,4 +470,4 @@ results = list(/datum/reagent/firefighting_foam = 3) required_reagents = list(/datum/reagent/stabilizing_agent = 1,/datum/reagent/fluorosurfactant = 1,/datum/reagent/carbon = 1) required_temp = 200 - is_cold_recipe = 1 + is_cold_recipe = TRUE