From 664dfe43a17e2fed13e183e16df2737697d11f74 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Mon, 19 Sep 2022 18:34:08 -0500 Subject: [PATCH 01/11] aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --- .../chemistry/machinery/chem_dispenser.dm | 23 ++++---- .../chemistry/reagents/other_reagents.dm | 9 ++- code/modules/reagents/chemistry/recipes.dm | 2 +- .../reagents/chemistry/recipes/medicine.dm | 2 +- .../reagents/chemistry/recipes/others.dm | 56 +++++++++++++++++++ .../chemistry/recipes/pyrotechnics.dm | 2 +- 6 files changed, 80 insertions(+), 14 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 89d49cfe0c24..f1059c5d1c8c 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 ) 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 d3f393a1dde4..d22b286f12db 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" @@ -2131,4 +2138,4 @@ /datum/reagent/adrenaline/on_mob_delete(mob/living/L) . = ..() - REMOVE_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type) \ No newline at end of file + REMOVE_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type) 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 cb3c405c09ef..98fcd48ab060 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -395,4 +395,4 @@ 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 diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index dfe09ce4f9e3..eef038721f75 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -783,3 +783,59 @@ 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 = 2) + required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/oxygen = 3) + +/datum/chemical_reaction/sulfuric_acid + name = /datum/reagent/toxin/acid + id = /datum/reagent/toxin/acid + results = list(/datum/reagent/toxin/acid = 1) + 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 = 1) + required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 1) + +/datum/chemical_reaction/welding_fuel + name = /datum/reagent/fuel + id = /datum/reagent/fuel + results = list(/datum/reagent/fuel = 1) + required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/toxin/acid = 3) + required_temp = 400 + +/datum/chemical_reaction/stableplasma + name = /datum/reagent/stable_plasma + id = /datum/reagent/stable_plasma + results = list(/datum/reagent/stable_plasma = 5) + 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 = 1) + 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 = 1) + required_reagents = list(/datum/reagent/water = 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 a9b009bb2864..b53bf5cefdc3 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -477,4 +477,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 From 9b32d3f1b79300ffdf5753b1a805ce9ec2d58674 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Mon, 19 Sep 2022 18:56:46 -0500 Subject: [PATCH 02/11] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index eef038721f75..d804797884c6 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -789,6 +789,7 @@ id = /datum/reagent/sulfur_trioxide results = list(/datum/reagent/sulfur_trioxide = 2) 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 @@ -800,7 +801,7 @@ name = /datum/reagent/consumable/sugar id = /datum/reagent/consumable/sugar results = list(/datum/reagent/consumable/sugar = 1) - required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 1) + required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/fuel = 1) /datum/chemical_reaction/welding_fuel name = /datum/reagent/fuel @@ -828,8 +829,8 @@ /datum/chemical_reaction/ice name = /datum/reagent/consumable/ice id = /datum/reagent/consumable/ice - results = list(/datum/reagent/consumable/ice = 1) - required_reagents = list(/datum/reagent/water = 1) + results = list(/datum/reagent/consumable/ice = 2) + required_reagents = list(/datum/reagent/water = 2, /datum/reagent/consumable/ethanol = 1) required_temp = 200 is_cold_recipe = TRUE From 8d0cd9d4318dad134c359690d1f61cad3e69e1c6 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Mon, 19 Sep 2022 19:08:19 -0500 Subject: [PATCH 03/11] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index d804797884c6..88332554b533 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -830,7 +830,7 @@ name = /datum/reagent/consumable/ice id = /datum/reagent/consumable/ice results = list(/datum/reagent/consumable/ice = 2) - required_reagents = list(/datum/reagent/water = 2, /datum/reagent/consumable/ethanol = 1) + required_reagents = list(/datum/reagent/water = 2, /datum/reagent/stable_plasma = 1) required_temp = 200 is_cold_recipe = TRUE From 309527f57c2903eb615ffd6652c5b29c0e2025a7 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Mon, 19 Sep 2022 19:16:11 -0500 Subject: [PATCH 04/11] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 88332554b533..dd7d1c529f09 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -830,7 +830,7 @@ name = /datum/reagent/consumable/ice id = /datum/reagent/consumable/ice results = list(/datum/reagent/consumable/ice = 2) - required_reagents = list(/datum/reagent/water = 2, /datum/reagent/stable_plasma = 1) + required_reagents = list(/datum/reagent/water = 2, /datum/reagent/lye = 1) required_temp = 200 is_cold_recipe = TRUE From 8a12dfa7e5b8ba380e59c7b640a30dcf14d9dffc Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:03:33 -0500 Subject: [PATCH 05/11] Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm Co-authored-by: Theos --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index f1059c5d1c8c..580398b9997c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -77,7 +77,7 @@ /datum/reagent/gold, /datum/reagent/diethylamine, /datum/reagent/saltpetre, - /datum/reagent/medicine/charcoal, + /datum/reagent/medicine/charcoal ) var/list/emagged_reagents = list( /datum/reagent/toxin/carpotoxin, From ff029872ce93a204f5675d768173d0cc3593cd18 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:05:28 -0500 Subject: [PATCH 06/11] Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm Co-authored-by: Theos --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 580398b9997c..ec43f4b5043e 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -66,7 +66,7 @@ var/list/t2_upgrade_reagents = list( /datum/reagent/consumable/sugar, /datum/reagent/fuel, - /datum/reagent/toxin/acid, + /datum/reagent/toxin/acid ) var/list/t3_upgrade_reagents = list( /datum/reagent/acetone, From cc3e404d704138c92e651e2d2ac367ca8fc7077b Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:05:33 -0500 Subject: [PATCH 07/11] Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm Co-authored-by: Theos --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index ec43f4b5043e..9d18ab94f626 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -85,7 +85,7 @@ /datum/reagent/medicine/morphine, /datum/reagent/drug/space_drugs, /datum/reagent/toxin, - /datum/reagent/uranium, + /datum/reagent/uranium ) var/list/saved_recipes = list() From b3313944500782fa5830fd61f31ccb7f2024e97e Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:33:10 -0500 Subject: [PATCH 08/11] Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm Co-authored-by: Theos --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 9d18ab94f626..dbf779355091 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -61,7 +61,7 @@ /datum/reagent/oil, /datum/reagent/uranium/radium, /datum/reagent/stable_plasma, - /datum/reagent/sulfur, + /datum/reagent/sulfur ) var/list/t2_upgrade_reagents = list( /datum/reagent/consumable/sugar, From 1c870cd6b75ea98fccc0a1b7a7eb094ca44db33d Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:33:50 -0500 Subject: [PATCH 09/11] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index dd7d1c529f09..28fa8aabbf3b 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -787,33 +787,33 @@ /datum/chemical_reaction/sulfur_trioxide name = /datum/reagent/sulfur_trioxide id = /datum/reagent/sulfur_trioxide - results = list(/datum/reagent/sulfur_trioxide = 2) + 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 = 1) + 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 = 1) + 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 = 1) + results = list(/datum/reagent/fuel = 4) required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/toxin/acid = 3) required_temp = 400 /datum/chemical_reaction/stableplasma name = /datum/reagent/stable_plasma id = /datum/reagent/stable_plasma - results = list(/datum/reagent/stable_plasma = 5) + 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 @@ -822,7 +822,7 @@ /datum/chemical_reaction/waterformation name = /datum/reagent/water id = /datum/reagent/water - results = list(/datum/reagent/water = 1) + results = list(/datum/reagent/water = 3) required_reagents = list(/datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 2) required_temp = 380 From 0944b66ccca9b95b122dda6eadea14a2042119f7 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:41:10 -0500 Subject: [PATCH 10/11] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 28fa8aabbf3b..c54cc0d2aafd 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -829,7 +829,7 @@ /datum/chemical_reaction/ice name = /datum/reagent/consumable/ice id = /datum/reagent/consumable/ice - results = list(/datum/reagent/consumable/ice = 2) + 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 From 83a13a674683a61620ba04a229e9b809475c794d Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Wed, 21 Sep 2022 20:59:34 -0500 Subject: [PATCH 11/11] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index c54cc0d2aafd..1075d1afc499 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -808,7 +808,8 @@ id = /datum/reagent/fuel results = list(/datum/reagent/fuel = 4) required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/toxin/acid = 3) - required_temp = 400 + required_temp = 180 + is_cold_recipe = TRUE /datum/chemical_reaction/stableplasma name = /datum/reagent/stable_plasma