From 6924f9c31b9df90822a8b718af22cb68ee6a2ef0 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:27:24 -0700 Subject: [PATCH 01/12] Create synth_blood.dm Signed-off-by: Exo-212 <145711719+Exo-212@users.noreply.github.com> --- .../modular_medical/reagents/synth_blood.dm | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 modular_doppler/modular_medical/reagents/synth_blood.dm diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm new file mode 100644 index 0000000000000..2b01c832ad0dc --- /dev/null +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -0,0 +1,81 @@ +// Reagent(s) to be used by synthetics and or androids when they are implemented as a selectable species. +//I'm putting the recipes and precursor chems here for ease of use. +/datum/reagent/synth_blood + name = "Synthetic Thermal Solution" + description = "A non-reactive liquid commonly utilized by humanoid synthetics to insulate their internal systems and conduct heat away from internal components." + taste_description = "thick water" + taste_mult = 1 + color = "#A9FBFB" + reagent_state = LIQUID + +/datum/glass_style/drinking_glass/synth_blood + required_drink_type = /datum/reagent/synth_blood + name = "glass of water" + desc = "Doesn't really move around like water - oddly thick." + +/datum/chemical_reaction/synth_blood + results = list(datum/reagent/synth_blood = 1) + required_reagents = list(datum/reagent/toxin/acid/hyflo_acid = 1, /datum/reagent/fuel/oil = 1, /datum/reagent/stable_plasma = 1) + mix_message = "The solution becomes clear and stabilizes." + mix_sound = 'sound/effects/bubbles/bubbles.ogg' + //fermichem + is_cold_recipe = FALSE + required_temp = 216 + optimal_temp = 438 + overheat_temp = 540 + optimal_ph_min = 6 + optimal_ph_max = 8 + determin_ph_range = 2 + temp_exponent_factor = 1 + ph_exponent_factor = 1 + thermic_constant = 1.2 + H_ion_release = 0.1 + rate_up_lim = 35 + purity_min = 0 + reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_UNIQUE + + + +/datum/reagent/toxin/acid/hyflo_acid + name = "Hydroflouric Acid" + description = "A highly corrosive solution of hydrogen and flourine." + taste_description = "acid" + taste_mult = 10 + reagent_state = LIQUID + ph = 1.0 + creation_purity = REAGENT_STANDARD_PURITY + purity = REAGENT_STANDARD_PURITY + mass = 10 + color = "#AAAAAA77" + toxpwr = 1 + acidpwr = 10.0 + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) + return UPDATE_MOB_HEALTH + + +/datum/chemical_reaction/hyflo_acid + results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) + required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/flourine = 1) + required_catalyists = list(/datum/reagent/water = 5) + mix_message = "The mixture bubbles briefly." + //fermichem + is_cold_recipe = FALSE + required_temp = 190 + optimal_temp = 280 + overheat_temp = 292 + optimal_ph_min = 0 + optimal_ph_max = 2 + determin_ph_range = 5 + temp_exponent_factor = 1 + ph_exponent_factor = 10 + thermic_constant = -200 + H_ion_release = -20 + rate_up_lim = 25 + purity/min = 0 + reaction_flags = REACTION_PH_VOL_CONSTANT + reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DAMAGING | REACTION_TAG_CHEMICAL + From 443d11eabc169986b548a3d523f875a39e0f6c0b Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Wed, 2 Oct 2024 17:06:29 -0700 Subject: [PATCH 02/12] Update synth_blood.dm forgor to flag STS as can be synnthesized Signed-off-by: Exo-212 <145711719+Exo-212@users.noreply.github.com> --- modular_doppler/modular_medical/reagents/synth_blood.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index 2b01c832ad0dc..2b1708957eb2f 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -7,6 +7,7 @@ taste_mult = 1 color = "#A9FBFB" reagent_state = LIQUID + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/glass_style/drinking_glass/synth_blood required_drink_type = /datum/reagent/synth_blood From 03eb2da4f207ae6bafa8bcfef70ef3911ff31195 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 00:52:24 +0000 Subject: [PATCH 03/12] ticked the boxe --- modular_doppler/modular_medical/reagents/synth_blood.dm | 8 ++++---- tgstation.dme | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index 2b1708957eb2f..79c6980be50eb 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -8,7 +8,7 @@ color = "#A9FBFB" reagent_state = LIQUID chemical_flags = REAGENT_CAN_BE_SYNTHESIZED - + /datum/glass_style/drinking_glass/synth_blood required_drink_type = /datum/reagent/synth_blood name = "glass of water" @@ -51,12 +51,12 @@ toxpwr = 1 acidpwr = 10.0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED - + /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) return UPDATE_MOB_HEALTH - + /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) @@ -79,4 +79,4 @@ purity/min = 0 reaction_flags = REACTION_PH_VOL_CONSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DAMAGING | REACTION_TAG_CHEMICAL - + diff --git a/tgstation.dme b/tgstation.dme index 40b9d41ffd116..8947135178c0d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6820,6 +6820,7 @@ #include "modular_doppler\modular_medical\medical_designs\medical_designs.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" #include "modular_doppler\modular_medical\wounds\_wounds.dm" #include "modular_doppler\modular_medical\wounds\bleed.dm" #include "modular_doppler\modular_medical\wounds\medical.dm" From 43de9abb8ead33b88e7b36c744435ccd98344e88 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 01:06:12 +0000 Subject: [PATCH 04/12] Should probably spell 'fluorine' correctly --- modular_doppler/modular_medical/reagents/synth_blood.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index 79c6980be50eb..2c024bd8b9d0b 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -38,8 +38,8 @@ /datum/reagent/toxin/acid/hyflo_acid - name = "Hydroflouric Acid" - description = "A highly corrosive solution of hydrogen and flourine." + name = "Hydrofluoric Acid" + description = "A highly corrosive solution of hydrogen and fluorine." taste_description = "acid" taste_mult = 10 reagent_state = LIQUID @@ -55,12 +55,12 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) - required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/flourine = 1) + required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1) required_catalyists = list(/datum/reagent/water = 5) mix_message = "The mixture bubbles briefly." //fermichem From e5664dd5629044f783011c0386070c412c22b7e9 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 01:15:52 +0000 Subject: [PATCH 05/12] inability to spell --- modular_doppler/modular_medical/reagents/synth_blood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index 2c024bd8b9d0b..ddda48af35cbd 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -61,7 +61,7 @@ /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1) - required_catalyists = list(/datum/reagent/water = 5) + required_catalysts = list(/datum/reagent/water = 5) mix_message = "The mixture bubbles briefly." //fermichem is_cold_recipe = FALSE From eda51b259b1500545717dac80cdc505d001c68ef Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 01:21:33 +0000 Subject: [PATCH 06/12] indentation shuffle! --- modular_doppler/modular_medical/reagents/synth_blood.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index ddda48af35cbd..ae0b296af88a4 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -7,7 +7,7 @@ taste_mult = 1 color = "#A9FBFB" reagent_state = LIQUID - chemical_flags = REAGENT_CAN_BE_SYNTHESIZED +chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/glass_style/drinking_glass/synth_blood required_drink_type = /datum/reagent/synth_blood @@ -55,7 +55,7 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid @@ -76,7 +76,7 @@ thermic_constant = -200 H_ion_release = -20 rate_up_lim = 25 - purity/min = 0 + purity_min = 0 reaction_flags = REACTION_PH_VOL_CONSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DAMAGING | REACTION_TAG_CHEMICAL From f76f3c3f67e20e6904bcd7444f5f9d4e4d4636b8 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 01:40:18 +0000 Subject: [PATCH 07/12] if the lord can lead you to proofreading, you can be lead to do it --- modular_doppler/modular_medical/reagents/synth_blood.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index ae0b296af88a4..527388218ae9c 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -7,7 +7,7 @@ taste_mult = 1 color = "#A9FBFB" reagent_state = LIQUID -chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/glass_style/drinking_glass/synth_blood required_drink_type = /datum/reagent/synth_blood @@ -15,8 +15,8 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED desc = "Doesn't really move around like water - oddly thick." /datum/chemical_reaction/synth_blood - results = list(datum/reagent/synth_blood = 1) - required_reagents = list(datum/reagent/toxin/acid/hyflo_acid = 1, /datum/reagent/fuel/oil = 1, /datum/reagent/stable_plasma = 1) + results = list(/datum/reagent/synth_blood = 1) + required_reagents = list(/datum/reagent/toxin/acid/hyflo_acid = 1, /datum/reagent/fuel/oil = 1, /datum/reagent/stable_plasma = 1) mix_message = "The solution becomes clear and stabilizes." mix_sound = 'sound/effects/bubbles/bubbles.ogg' //fermichem From 1dc0561c5ceb8608a8073e29deec267c3becf213 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 01:49:16 +0000 Subject: [PATCH 08/12] surely there will be correction indentations... soon(?) --- modular_doppler/modular_medical/reagents/synth_blood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index 527388218ae9c..290bb302327f3 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -55,7 +55,7 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid From 2ce61e4937eeee58d4d93f27d9d2313028690dd2 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 02:16:23 +0000 Subject: [PATCH 09/12] indent here(?) --- modular_doppler/modular_medical/reagents/synth_blood.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index 290bb302327f3..a3dc2b5b8c91e 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -36,7 +36,6 @@ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_UNIQUE - /datum/reagent/toxin/acid/hyflo_acid name = "Hydrofluoric Acid" description = "A highly corrosive solution of hydrogen and fluorine." @@ -55,8 +54,7 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH - + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) From 6dde7c09be317041650896c7a3ad03ef8544596c Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 02:30:21 +0000 Subject: [PATCH 10/12] umga smash brute force *clang clang clang* --- modular_doppler/modular_medical/reagents/synth_blood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index a3dc2b5b8c91e..f2dd5a4531a1e 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -54,7 +54,7 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) From b17edb1c09bd446e0ee9a656813e59f3edafe092 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 02:35:00 +0000 Subject: [PATCH 11/12] mmmmm monkey --- modular_doppler/modular_medical/reagents/synth_blood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index f2dd5a4531a1e..ac4a033c9a784 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -54,7 +54,7 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2) From 08cabf4fb9173fae2404c06831fbc852128fcdb4 Mon Sep 17 00:00:00 2001 From: Exo-212 <145711719+Exo-212@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:35:39 +0000 Subject: [PATCH 12/12] indent here!!!! --- modular_doppler/modular_medical/reagents/synth_blood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_medical/reagents/synth_blood.dm b/modular_doppler/modular_medical/reagents/synth_blood.dm index ac4a033c9a784..87324678777fe 100644 --- a/modular_doppler/modular_medical/reagents/synth_blood.dm +++ b/modular_doppler/modular_medical/reagents/synth_blood.dm @@ -54,7 +54,7 @@ /datum/reagent/toxin/acid/hyflo_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) - return UPDATE_MOB_HEALTH + return UPDATE_MOB_HEALTH /datum/chemical_reaction/hyflo_acid results = list(/datum/reagent/toxin/acid/hyflo_acid = 2)