From 78fcb77ef8ed3ffb1bb74bddd29076ed6b4a77f0 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:20:22 -0700 Subject: [PATCH 1/8] Create bug_blood.dm Signed-off-by: Exo-212 <145711719+Exo-212@users.noreply.github.com> --- .../modular_medical/reagents/bug_blood.dm | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 modular_doppler/modular_medical/reagents/bug_blood.dm diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm new file mode 100644 index 0000000000000..6764b7df54eb5 --- /dev/null +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -0,0 +1,84 @@ +// Reagent used as blood by Insect- or Snail-people. +// Precursor chems and recipes listed here for ease of use/reference. +/datum/reagent/bug_blood + name = "Hemolymph" + description = "A blood analog found in invertebrate species. Transports oxygen by binding it to copper, as opposed to the more common iron." + taste_description = "viscous copper" + taste_mult = 5 + color = "#82fac6" //rgb 130,250,198 + reagent_state = LIQUID + ph = 7.4 + +/datum/chemical_reaction/bug_blood + results = list(datum/reagent/bug_blood + required_reagents = list(/datum/reagent/imidazole = 6, /datum/reagent/copper = 2, /datum/reagent/oxygen = 1) + mix_message = "The solution thickens and turns a buggy-blue" + //fermichem + is_cold_recipe = FALSE + required_temp = 293 + optimal_temp = 300 + overheat_temp = 365 + optimal_ph_min = 6.5 + optimal_ph_max = 7.4 + determin_ph_range = 1 + temp_exponent_factor = 2 + ph_exponent_factor = 1 + thermic_constant = 1 + H_ion_release = 0.1 + rate_up_lim = 10 + purity_min = 0 + reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_UNIQUE + +/datum/reagent/imidazole + name = "Imidazole" + description = "A white water-soluble organic compound." + taste_description = "mildly alkaline" + taste_mult = 2.5 + ph = 14 + reagent_state = SOLID + + +/datum/chemical_reaction/imidazole + results = list(datum/reagent/imidazole = 0.5) + required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/ammonia = 5, /datum/reagent/glyoxal = 1) + mix_message = "The solution clouds and becomes white" + //fermichem + is_cold_recipe = FALSE + required_temp = 362 + optimal_temp = 420 + overheat_temp = 529 + optimal_ph_min = 10 + optimal_ph_max = 14 + determin_ph_range = 2 + temp_exponent_factor = 1 + ph_exponent_factor = 1.5 + thermic_constant = 0.8 + H_ion_release = 2 + rate_up_lim = 10 + purity_min = 0 + reaction_tags = REACTION_TAG_CHEMICAL + +/datum/reagent/glyoxal + name = "Glyoxal" + description = "A yellow organic compound." + taste_description = "acidic salt" + taste_mult = 4 + ph = 4.5 + reagent_state = LIQUID + +/datum/chemical_reaction/glyoxal + results = list(datum/reagent/glyoxal = 2) + required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/nitracid = 1) + required_catalysts = list(/datum/reagent/oxygen = 10) + //fermichem + is_cold_recipe = FALSE + required_temp = 270 + optimal_temp = 324 + overheat_temp = 558 + optimal_ph_min = 3 + optimal_ph_max = 8 + determin_ph_range = 2 + temp_exponent_factor = 1.4 + thermic_constant = 50 + rate_up_lim = 30 + reaction_tags = REACTION_TAG_CHEMICAL From cc96ba471375af505b32ddfc8cb48a24c502fa27 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:32:53 +0000 Subject: [PATCH 2/8] tick the boxee --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 44ba38ac36df0..0677d12dcdb6a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6819,6 +6819,7 @@ #include "modular_doppler\modular_mapping\code\ruins\icemoon.dm" #include "modular_doppler\modular_medical\code\carbon_update_icons.dm" #include "modular_doppler\modular_medical\medical_designs\medical_designs.dm" +#include "modular_doppler\modular_medical\reagents\bug_blood.dm" #include "modular_doppler\modular_medical\reagents\medicine.dm" #include "modular_doppler\modular_medical\reagents\reagents.dm" #include "modular_doppler\modular_medical\reagents\synth_blood.dm" From 44486055e503878d147f5506632d0b4bde1217f7 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:09:22 +0000 Subject: [PATCH 3/8] Missed closure --- .../modular_medical/reagents/bug_blood.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm index 6764b7df54eb5..8593ce083ada1 100644 --- a/modular_doppler/modular_medical/reagents/bug_blood.dm +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -8,9 +8,10 @@ color = "#82fac6" //rgb 130,250,198 reagent_state = LIQUID ph = 7.4 + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/chemical_reaction/bug_blood - results = list(datum/reagent/bug_blood + results = list(datum/reagent/bug_blood = 2) required_reagents = list(/datum/reagent/imidazole = 6, /datum/reagent/copper = 2, /datum/reagent/oxygen = 1) mix_message = "The solution thickens and turns a buggy-blue" //fermichem @@ -28,7 +29,7 @@ rate_up_lim = 10 purity_min = 0 reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_UNIQUE - + /datum/reagent/imidazole name = "Imidazole" description = "A white water-soluble organic compound." @@ -36,14 +37,14 @@ taste_mult = 2.5 ph = 14 reagent_state = SOLID - + /datum/chemical_reaction/imidazole results = list(datum/reagent/imidazole = 0.5) required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/ammonia = 5, /datum/reagent/glyoxal = 1) mix_message = "The solution clouds and becomes white" //fermichem - is_cold_recipe = FALSE + is_cold_recipe = FALSE required_temp = 362 optimal_temp = 420 overheat_temp = 529 @@ -57,7 +58,7 @@ rate_up_lim = 10 purity_min = 0 reaction_tags = REACTION_TAG_CHEMICAL - + /datum/reagent/glyoxal name = "Glyoxal" description = "A yellow organic compound." @@ -65,6 +66,7 @@ taste_mult = 4 ph = 4.5 reagent_state = LIQUID + chemical /datum/chemical_reaction/glyoxal results = list(datum/reagent/glyoxal = 2) From f7d59e57073e05ffe71eb37dff13cddfd51252d5 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:13:42 +0000 Subject: [PATCH 4/8] typos my beloathed --- modular_doppler/modular_medical/reagents/bug_blood.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm index 8593ce083ada1..ea87cfb35d412 100644 --- a/modular_doppler/modular_medical/reagents/bug_blood.dm +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -10,8 +10,9 @@ ph = 7.4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + /datum/chemical_reaction/bug_blood - results = list(datum/reagent/bug_blood = 2) + results = list(/datum/reagent/bug_blood = 2) required_reagents = list(/datum/reagent/imidazole = 6, /datum/reagent/copper = 2, /datum/reagent/oxygen = 1) mix_message = "The solution thickens and turns a buggy-blue" //fermichem @@ -30,6 +31,7 @@ purity_min = 0 reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_UNIQUE + /datum/reagent/imidazole name = "Imidazole" description = "A white water-soluble organic compound." @@ -40,7 +42,7 @@ /datum/chemical_reaction/imidazole - results = list(datum/reagent/imidazole = 0.5) + results = list(/datum/reagent/imidazole = 0.5) required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/ammonia = 5, /datum/reagent/glyoxal = 1) mix_message = "The solution clouds and becomes white" //fermichem @@ -69,7 +71,7 @@ chemical /datum/chemical_reaction/glyoxal - results = list(datum/reagent/glyoxal = 2) + results = list(/datum/reagent/glyoxal = 2) required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/nitracid = 1) required_catalysts = list(/datum/reagent/oxygen = 10) //fermichem From f508a9bca98b89f9828e98e82dc184529220f9dd Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:19:58 +0000 Subject: [PATCH 5/8] begin, the indentation wars, they have --- modular_doppler/modular_medical/reagents/bug_blood.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm index ea87cfb35d412..112e6c4b553ca 100644 --- a/modular_doppler/modular_medical/reagents/bug_blood.dm +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -15,7 +15,7 @@ results = list(/datum/reagent/bug_blood = 2) required_reagents = list(/datum/reagent/imidazole = 6, /datum/reagent/copper = 2, /datum/reagent/oxygen = 1) mix_message = "The solution thickens and turns a buggy-blue" - //fermichem +//fermichem is_cold_recipe = FALSE required_temp = 293 optimal_temp = 300 @@ -45,7 +45,7 @@ results = list(/datum/reagent/imidazole = 0.5) required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/ammonia = 5, /datum/reagent/glyoxal = 1) mix_message = "The solution clouds and becomes white" - //fermichem +//fermichem is_cold_recipe = FALSE required_temp = 362 optimal_temp = 420 @@ -74,7 +74,7 @@ results = list(/datum/reagent/glyoxal = 2) required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/nitracid = 1) required_catalysts = list(/datum/reagent/oxygen = 10) - //fermichem +//fermichem is_cold_recipe = FALSE required_temp = 270 optimal_temp = 324 From 3fb911c2e080d320d923f0818c87ea86a08add7b Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:25:47 +0000 Subject: [PATCH 6/8] correctly add acid subtype to nitracid --- modular_doppler/modular_medical/reagents/bug_blood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm index 112e6c4b553ca..ceab852d9e6c0 100644 --- a/modular_doppler/modular_medical/reagents/bug_blood.dm +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -72,7 +72,7 @@ /datum/chemical_reaction/glyoxal results = list(/datum/reagent/glyoxal = 2) - required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/nitracid = 1) + required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/acid/nitracid = 1) required_catalysts = list(/datum/reagent/oxygen = 10) //fermichem is_cold_recipe = FALSE From 85a34c631a77875b852431d53b5ae7100f0aad41 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:30:01 +0000 Subject: [PATCH 7/8] such battles as these, in space, they are --- modular_doppler/modular_medical/reagents/bug_blood.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm index ceab852d9e6c0..0727545bf0c3a 100644 --- a/modular_doppler/modular_medical/reagents/bug_blood.dm +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -8,14 +8,14 @@ color = "#82fac6" //rgb 130,250,198 reagent_state = LIQUID ph = 7.4 - chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/chemical_reaction/bug_blood results = list(/datum/reagent/bug_blood = 2) required_reagents = list(/datum/reagent/imidazole = 6, /datum/reagent/copper = 2, /datum/reagent/oxygen = 1) mix_message = "The solution thickens and turns a buggy-blue" -//fermichem + //fermichem is_cold_recipe = FALSE required_temp = 293 optimal_temp = 300 @@ -45,7 +45,7 @@ results = list(/datum/reagent/imidazole = 0.5) required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/ammonia = 5, /datum/reagent/glyoxal = 1) mix_message = "The solution clouds and becomes white" -//fermichem + //fermichem is_cold_recipe = FALSE required_temp = 362 optimal_temp = 420 @@ -68,13 +68,13 @@ taste_mult = 4 ph = 4.5 reagent_state = LIQUID - chemical + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/chemical_reaction/glyoxal results = list(/datum/reagent/glyoxal = 2) required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/acid/nitracid = 1) required_catalysts = list(/datum/reagent/oxygen = 10) -//fermichem + //fermichem is_cold_recipe = FALSE required_temp = 270 optimal_temp = 324 From 01134f6b4fb474dbd664e5b9218d2b919f30c3f2 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Tue, 8 Oct 2024 00:10:09 +0000 Subject: [PATCH 8/8] adds colors to imidazole(white) and glyoxal(yellow) --- modular_doppler/modular_medical/reagents/bug_blood.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modular_doppler/modular_medical/reagents/bug_blood.dm b/modular_doppler/modular_medical/reagents/bug_blood.dm index 0727545bf0c3a..80b16f0a8a639 100644 --- a/modular_doppler/modular_medical/reagents/bug_blood.dm +++ b/modular_doppler/modular_medical/reagents/bug_blood.dm @@ -37,6 +37,7 @@ description = "A white water-soluble organic compound." taste_description = "mildly alkaline" taste_mult = 2.5 + color = "#FFFFFF" ph = 14 reagent_state = SOLID @@ -66,6 +67,7 @@ description = "A yellow organic compound." taste_description = "acidic salt" taste_mult = 4 + color = "#FFFF00" ph = 4.5 reagent_state = LIQUID chemical_flags = REAGENT_CAN_BE_SYNTHESIZED