From e0972e83256a2d76c739da941ff06777ecab1147 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:12:35 +0100 Subject: [PATCH] virology --- code/__defines/reagents.dm | 17 ++++++ code/game/machinery/pandemic.dm | 4 +- .../reagents/reactions/instant/virology.dm | 60 +++++++++---------- code/modules/reagents/reagents/virology.dm | 28 ++++----- 4 files changed, 63 insertions(+), 46 deletions(-) diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm index 6d3efe468ee..98c42616351 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/reagents.dm @@ -149,6 +149,23 @@ #define REAGENT_ID_LEAD "lead" +// Virology +#define REAGENT_VACCINE "Vaccine" +#define REAGENT_ID_VACCINE "vaccine" +#define REAGENT_MUTAGENVIRUSFOOD "Mutagenic agar" +#define REAGENT_ID_MUTAGENVIRUSFOOD "mutagenvirusfood" +#define REAGENT_SUGARVIRUSFOOD "Sucrose agar" +#define REAGENT_ID_SUGARVIRUSFOOD "sugarvirusfood" +#define REAGENT_ADRANOLVIRUSFOOD "Virus rations" +#define REAGENT_ID_ADRANOLVIRUSFOOD "adranolvirusfood" +#define REAGENT_PHORONVIRUSFOOD "Phoronic virus food" +#define REAGENT_ID_PHORONVIRUSFOOD "phoronvirusfood" +#define REAGENT_WEAKPHORONVIRUSFOOD "Weakened phoronic virus food" +#define REAGENT_ID_WEAKPHORONVIRUSFOOD "weakphoronvirusfood" +#define REAGENT_SIZEVIRUSFOOD "Sizeoxadone virus food" +#define REAGENT_ID_SIZEVIRUSFOOD "sizevirusfood" + + // Food and Drinks #define REAGENT_MEATCOLONY "A colony of meat cells" #define REAGENT_ID_MEATCOLONY "meatcolony" diff --git a/code/game/machinery/pandemic.dm b/code/game/machinery/pandemic.dm index 24ab4e1f6ef..ea490d10ca7 100644 --- a/code/game/machinery/pandemic.dm +++ b/code/game/machinery/pandemic.dm @@ -146,8 +146,8 @@ atom_say("Unable to synthesize requested antibody.") return - var/obj/item/reagent_containers/glass/bottle/B = create_culture(vaccine_name, "vaccine", 200) - B.reagents.add_reagent("vaccine", 15, list(vaccine_type)) + var/obj/item/reagent_containers/glass/bottle/B = create_culture(vaccine_name, REAGENT_ID_VACCINE, 200) + B.reagents.add_reagent(REAGENT_ID_VACCINE, 15, list(vaccine_type)) if("eject_beaker") eject_beaker() update_tgui_static_data(ui.user) diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm index cf7db638930..f5abd26dab7 100644 --- a/code/modules/reagents/reactions/instant/virology.dm +++ b/code/modules/reagents/reactions/instant/virology.dm @@ -1,50 +1,50 @@ /decl/chemical_reaction/instant/virus_food_mutagen - name = "mutagenic agar" - id = "mutagenvirusfood" - result = "mutagenvirusfood" + name = REAGENT_MUTAGENVIRUSFOOD + id = REAGENT_ID_MUTAGENVIRUSFOOD + result = REAGENT_ID_MUTAGENVIRUSFOOD required_reagents = list("mutagen" = 1, "virusfood" = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_adranol - name = "virus rations" - id = "adranolvirusfood" - result = "adranolvirusfood" + name = REAGENT_ADRANOLVIRUSFOOD + id = REAGENT_ID_ADRANOLVIRUSFOOD + result = REAGENT_ID_ADRANOLVIRUSFOOD required_reagents = list("adranol" = 1, "virusfood" = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_phoron - name = "phoronic virus food" - id = "phoronvirusfood" - result = "phoronvirusfood" + name = REAGENT_ADRANOLVIRUSFOOD + id = REAGENT_ID_PHORONVIRUSFOOD + result = REAGENT_ID_PHORONVIRUSFOOD required_reagents = list(REAGENT_ID_PHORON = 1, "virusfood" = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_phoron_adranol - name = "weakened phoronic virus food" - id = "weakphoronvirusfood" - result = "weakphoronvirusfood" - required_reagents = list("adranol" = 1, "phoronvirusfood" = 1) + name = REAGENT_WEAKPHORONVIRUSFOOD + id = REAGENT_ID_WEAKPHORONVIRUSFOOD + result = REAGENT_ID_WEAKPHORONVIRUSFOOD + required_reagents = list("adranol" = 1, REAGENT_ID_PHORONVIRUSFOOD = 1) result_amount = 2 /decl/chemical_reaction/instant/virus_food_mutagen_sugar - name = "sucrose agar" - id = "sugarvirusfood" - result = "sugarvirusfood" - required_reagents = list(REAGENT_ID_SUGAR = 1, "mutagenvirusfood" = 1) + name = REAGENT_SUGARVIRUSFOOD + id = REAGENT_ID_SUGARVIRUSFOOD + result = REAGENT_ID_SUGARVIRUSFOOD + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1) result_amount = 2 /decl/chemical_reaction/instant/virus_food_mutagen_inaprovaline - name = "sucrose agar" + name = REAGENT_SUGARVIRUSFOOD id = "inaprovalinevirusfood" - result = "sugarvirusfood" - required_reagents = list("inaprovaline" = 1, "mutagenvirusfood" = 1) + result = REAGENT_ID_SUGARVIRUSFOOD + required_reagents = list("inaprovaline" = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1) result_amount = 2 /decl/chemical_reaction/instant/virus_food_size - name = "sizeoxadone virus food" + name = REAGENT_SIZEVIRUSFOOD id = "sizeoxadonevirusfood" - result = "sizevirusfood" - required_reagents = list("sizeoxadone" = 1, "phoronvirusfood" = 1) + result = REAGENT_ID_SIZEVIRUSFOOD + required_reagents = list("sizeoxadone" = 1, REAGENT_ID_PHORONVIRUSFOOD = 1) result_amount = 2 /decl/chemical_reaction/instant/mix_virus @@ -96,42 +96,42 @@ /decl/chemical_reaction/instant/mix_virus/mix_virus_5 name = "Mix Virus 5" id = "mixvirus5" - required_reagents = list("mutagenvirusfood" = 1) + required_reagents = list(REAGENT_ID_MUTAGENVIRUSFOOD = 1) level_min = 3 level_max = 3 /decl/chemical_reaction/instant/mix_virus/mix_virus_6 name = "Mix Virus 6" id = "mixvirus6" - required_reagents = list("sugarvirusfood" = 1) + required_reagents = list(REAGENT_ID_SUGARVIRUSFOOD = 1) level_min = 4 level_max = 4 /decl/chemical_reaction/instant/mix_virus/mix_virus_7 name = "Mix Virus 7" id = "mixvirus7" - required_reagents = list("weakphoronvirusfood" = 1) + required_reagents = list(REAGENT_ID_WEAKPHORONVIRUSFOOD = 1) level_min = 5 level_max = 5 /decl/chemical_reaction/instant/mix_virus/mix_virus_8 name = "Mix Virus 8" id = "mixvirus8" - required_reagents = list("phoronvirusfood" = 1) + required_reagents = list(REAGENT_ID_PHORONVIRUSFOOD = 1) level_min = 6 level_max = 6 /decl/chemical_reaction/instant/mix_virus/mix_virus_9 name = "Mix Virus 9" id = "mixvirus9" - required_reagents = list("adranolvirusfood" = 1) + required_reagents = list(REAGENT_ID_ADRANOLVIRUSFOOD = 1) level_min = 1 level_max = 1 /decl/chemical_reaction/instant/mix_virus/picky/size name = "Mix Virus Size" id = "mixvirussize" - required_reagents = list("sizevirusfood" = 1) + required_reagents = list(REAGENT_ID_SIZEVIRUSFOOD = 1) symptoms = list( /datum/symptom/macrophage, /datum/symptom/size, @@ -156,6 +156,6 @@ name = "Antibodies" id = "antibodiesmix" result = REAGENT_ID_ANTIBODIES - required_reagents = list("vaccine") + required_reagents = list(REAGENT_ID_VACCINE) catalysts = list("inaprovaline" = 0.1) result_amount = 0.5 diff --git a/code/modules/reagents/reagents/virology.dm b/code/modules/reagents/reagents/virology.dm index 95badd98511..9a582bec194 100644 --- a/code/modules/reagents/reagents/virology.dm +++ b/code/modules/reagents/reagents/virology.dm @@ -1,6 +1,6 @@ /datum/reagent/vaccine - name = "Vaccine" - id = "vaccine" + name = REAGENT_VACCINE + id = REAGENT_ID_VACCINE color = "#C81040" taste_description = "antibodies" @@ -18,37 +18,37 @@ data |= newdatalist.Copy() /datum/reagent/mutagen/mutagenvirusfood - name = "Mutagenic agar" - id = "mutagenvirusfood" + name = REAGENT_MUTAGENVIRUSFOOD + id = REAGENT_ID_MUTAGENVIRUSFOOD description = "Mutates viruses when mixed in blood. This one seems rather alright." color = "#A3C00F" /datum/reagent/mutagen/mutagenvirusfood/sugar - name = "Sucrose agar" - id = "sugarvirusfood" + name = REAGENT_SUGARVIRUSFOOD + id = REAGENT_ID_SUGARVIRUSFOOD color = "#41B0C0" taste_mult = 1.5 /datum/reagent/medicine/adranol/adranolvirusfood - name = "Virus rations" - id = "adranolvirusfood" + name = REAGENT_ADRANOLVIRUSFOOD + id = REAGENT_ID_ADRANOLVIRUSFOOD description = "Mutates viruses when mixed in blood. This one seems rather weak." color = "#D18AA5" /datum/reagent/toxin/phoron/phoronvirusfood - name = "Phoronic virus food" - id = "phoronvirusfood" + name = REAGENT_ADRANOLVIRUSFOOD + id = REAGENT_ID_PHORONVIRUSFOOD description = "Mutates viruses when mixed in blood. This one seems to be the strongest." color = "#A69DA9" /datum/reagent/toxin/phoron/phoronvirusfood/weak - name = "Weakened phoronic virus food" - id = "weakphoronvirusfood" + name = REAGENT_WEAKPHORONVIRUSFOOD + id = REAGENT_ID_WEAKPHORONVIRUSFOOD description = "Mutates viruses when mixed in blood. This one seems to have been weakened, but still strong." color = "#CEC3C6" /datum/reagent/toxin/phoron/phoronvirusfood/sizevirusfood - name = "Sizeoxadone virus food" - id = "sizevirusfood" + name = REAGENT_SIZEVIRUSFOOD + id = REAGENT_ID_SIZEVIRUSFOOD description = "Mutates virus when mixed in blood. This is a strange size mix..." color = "#88AFDD"