From 5398ec84bf98b45b1309d97d1cb9af514eba45ef Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:26:07 +0100 Subject: [PATCH] few more --- code/__defines/reagents.dm | 26 ++++++++++++++++++- .../mecha/equipment/tools/extinguisher.dm | 2 +- .../objects/items/devices/advnifrepair.dm | 2 +- .../objects/items/weapons/extinguisher.dm | 2 +- .../blob2/overmind/types/cryogenic_goo.dm | 2 +- code/modules/food/drinkingglass/extras.dm | 4 +-- code/modules/food/drinkingglass/shaker_vr.dm | 2 +- code/modules/food/food/snacks/meat.dm | 2 +- code/modules/food/food/snacks_vr.dm | 4 +-- code/modules/food/food/superfoods.dm | 2 +- .../simple_mob/subtypes/vore/solargrub.dm | 2 +- .../machinery/dispenser/reagent_tank.dm | 2 +- code/modules/reagents/machinery/pump.dm | 2 +- .../reactions/distilling/distilling.dm | 4 +-- .../reagents/reactions/instant/drinks_vr.dm | 2 +- .../reagents/reactions/instant/instant_vr.dm | 14 +++++----- code/modules/reagents/reagents/modifiers.dm | 12 ++++----- code/modules/reagents/reagents/other_vr.dm | 20 +++++++------- code/modules/xenobio/items/extracts_vr.dm | 2 +- maps/offmap_vr/om_ships/aro2.dm | 2 +- maps/offmap_vr/om_ships/aro3.dm | 2 +- maps/offmap_vr/om_ships/lunaship.dm | 2 +- 22 files changed, 69 insertions(+), 45 deletions(-) diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm index 98c42616351..5fcf7d9fe80 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/reagents.dm @@ -86,7 +86,7 @@ #define XENO_CHEM_HEAL "heal" -// Drugs and Chemical reactions +// VR reagents #define REAGENT_SIZEOXADONE "Sizeoxadone" #define REAGENT_ID_SIZEOXADONE "sizeoxadone" #define REAGENT_MACROCILLIN "Macrocillin" @@ -138,6 +138,15 @@ #define REAGENT_ID_QERRQUEM "qerr_quem" +// Modifiers +#define REAGENT_BERSERKMED "brute juice" +#define REAGENT_ID_BERSERKMED "berserkmed" +#define REAGENT_CRYOSLURRY "cryogenic slurry" +#define REAGENT_ID_CRYOSLURRY "cryoslurry" +#define REAGENT_VATSTABILIZER "clone growth inhibitor" +#define REAGENT_ID_VATSTABILIZER "vatstabilizer" + + // Toxins #define REAGENT_PACID "Polytrinic acid" #define REAGENT_ID_PACID "pacid" @@ -166,6 +175,19 @@ #define REAGENT_ID_SIZEVIRUSFOOD "sizevirusfood" +// Misc reagents +#define REAGENT_ADVMUTATIONTOXIN "Advanced Mutation Toxin" +#define REAGENT_ID_ADVMUTATIONTOXIN "advmutationtoxin" +#define REAGENT_NIFREPAIRNANITES "Programmed Nanomachines" +#define REAGENT_ID_NIFREPAIRNANITES "nifrepairnanites" +#define REAGENT_FIREFOAM "Firefighting Foam" +#define REAGENT_ID_FIREFOAM "firefoam" +#define REAGENT_LIQUIDPROTEAN "Liquid protean" +#define REAGENT_ID_LIQUIDPROTEAN "liquid_protean" +#define REAGENT_SHOCKCHEM "200 V" +#define REAGENT_ID_SHOCKCHEM "shockchem" + + // Food and Drinks #define REAGENT_MEATCOLONY "A colony of meat cells" #define REAGENT_ID_MEATCOLONY "meatcolony" @@ -352,6 +374,8 @@ + +Files left: food_drinks.dm, medicine.dm, medicine_vr.dm, other.dm, toxins.dm includes: .dm excludes: reagents.dm,ores.dm,materials.dm,mre.dm diff --git a/code/game/mecha/equipment/tools/extinguisher.dm b/code/game/mecha/equipment/tools/extinguisher.dm index ad133bab2f8..508e7a221f6 100644 --- a/code/game/mecha/equipment/tools/extinguisher.dm +++ b/code/game/mecha/equipment/tools/extinguisher.dm @@ -15,7 +15,7 @@ . = ..() reagents = new/datum/reagents(max_water) reagents.my_atom = src - reagents.add_reagent("firefoam", max_water) //VOREStation Edit + reagents.add_reagent(REAGENT_ID_FIREFOAM, max_water) //VOREStation Edit /obj/item/mecha_parts/mecha_equipment/tool/extinguisher/action(atom/target) //copypasted from extinguisher. TODO: Rewrite from scratch. if(!action_checks(target) || get_dist(chassis, target)>3) return diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm index aa0ea8aac4d..2265d43fddf 100644 --- a/code/game/objects/items/devices/advnifrepair.dm +++ b/code/game/objects/items/devices/advnifrepair.dm @@ -27,7 +27,7 @@ var/obj/item/stack/nanopaste/np = W if((supply.get_free_space() >= efficiency) && np.use(1)) to_chat(user, span_notice("You convert some nanopaste into programmed nanites inside \the [src].")) - supply.add_reagent(id = "nifrepairnanites", amount = efficiency) + supply.add_reagent(id = REAGENT_ID_NIFREPAIRNANITES, amount = efficiency) update_icon() else if(supply.get_free_space() < efficiency) to_chat(user, span_warning("\The [src] is too full. Empty it into a container first.")) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 80f3e194048..352b367a30d 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -52,7 +52,7 @@ /obj/item/extinguisher/Initialize() create_reagents(max_water) - reagents.add_reagent("firefoam", max_water) + reagents.add_reagent(REAGENT_ID_FIREFOAM, max_water) if(rand_overlays) var/choice = rand(1,rand_overlays) add_overlay("[item_state]O[choice]") diff --git a/code/modules/blob2/overmind/types/cryogenic_goo.dm b/code/modules/blob2/overmind/types/cryogenic_goo.dm index a4cf0adfd6f..56d831db4df 100644 --- a/code/modules/blob2/overmind/types/cryogenic_goo.dm +++ b/code/modules/blob2/overmind/types/cryogenic_goo.dm @@ -46,7 +46,7 @@ env.add_thermal_energy(-10 * 1000) /datum/blob_type/cryogenic_goo/on_chunk_tick(obj/item/blobcore_chunk/B) - B.reagents.add_reagent("cryoslurry", 0.5) + B.reagents.add_reagent(REAGENT_ID_CRYOSLURRY, 0.5) var/turf/simulated/T = get_turf(B) if(!istype(T)) diff --git a/code/modules/food/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm index 2394143a13c..501b00fe765 100644 --- a/code/modules/food/drinkingglass/extras.dm +++ b/code/modules/food/drinkingglass/extras.dm @@ -75,7 +75,7 @@ if(ismob(target) && proximity_flag) // Clicked protean blob if(istype(target, /mob/living/simple_mob/protean_blob)) - sipp_mob(target, user, "liquid_protean") + sipp_mob(target, user, REAGENT_ID_LIQUIDPROTEAN) return // Clicked humanoid else if(ishuman(target)) @@ -83,7 +83,7 @@ var/speciesname = H.species?.name switch(speciesname) if(SPECIES_PROTEAN) - sipp_mob(target, user, "liquid_protean") + sipp_mob(target, user, REAGENT_ID_LIQUIDPROTEAN) return if(SPECIES_PROMETHEAN) sipp_mob(target, user, REAGENT_ID_NUTRIMENT) diff --git a/code/modules/food/drinkingglass/shaker_vr.dm b/code/modules/food/drinkingglass/shaker_vr.dm index 0bdbe75d863..4d2782a877d 100644 --- a/code/modules/food/drinkingglass/shaker_vr.dm +++ b/code/modules/food/drinkingglass/shaker_vr.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/Initialize() . = ..() cut_overlays() - reagents.add_reagent("liquid_protean", 50) + reagents.add_reagent(REAGENT_ID_LIQUIDPROTEAN, 50) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 50) /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon() diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index 8cecbf1977c..0c7792e2799 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -155,7 +155,7 @@ /obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize() . = ..() reagents.add_reagent("protein", 1) - reagents.add_reagent("shockchem", 6) + reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) bitesize = 6 /obj/item/reagent_containers/food/snacks/meat/worm diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 5e1fea294b3..5bc84036f7b 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -193,7 +193,7 @@ /obj/item/reagent_containers/food/snacks/pillbug/Initialize() . = ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("shockchem", 6) + reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) bitesize = 6 /obj/item/reagent_containers/food/snacks/pillbugempty @@ -235,7 +235,7 @@ /obj/item/reagent_containers/food/snacks/makaroni/Initialize() . = ..() reagents.add_reagent("protein", 1) - reagents.add_reagent("shockchem", 6) + reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) bitesize = 7 /obj/item/reagent_containers/food/snacks/lobster diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index 9d6edf9e897..d83a64551c1 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -191,7 +191,7 @@ desc = "An odd slice, despite the grease and cherries oozing off the top, it smells delicious." nutriment_desc = list("The desire to consume" = 10) // You won't even taste the poison. reagents.add_reagent("neurotoxic_protein", 2) - reagents.add_reagent("shockchem", 2) + reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 2) reagents.add_reagent("amatoxin", 2) reagents.add_reagent("carpotoxin", 2) reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index db9606c346e..61bf3aa6f88 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -44,7 +44,7 @@ List of things solar grubs should be able to do: say_list_type = /datum/say_list/solargrub var/poison_per_bite = 5 //grubs cause a shock when they bite someone - var/poison_type = "shockchem" + var/poison_type = REAGENT_ID_SHOCKCHEM var/poison_chance = 50 var/datum/powernet/PN // Our powernet var/obj/structure/cable/attached // the attached cable diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 3ad75cc46c4..408ec193d5c 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -155,7 +155,7 @@ /obj/structure/reagent_dispensers/foam/Initialize() . = ..() - reagents.add_reagent("firefoam",1000) + reagents.add_reagent(REAGENT_ID_FIREFOAM,1000) //Helium3 /obj/structure/reagent_dispensers/he3 diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index a233d624aa9..8d179b8721a 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -210,4 +210,4 @@ /turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) + R.add_reagent(REAGENT_ID_VATSTABILIZER, round(volume / 2, 0.1)) diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index 7e77348a874..1f372798be6 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -155,7 +155,7 @@ /decl/chemical_reaction/distilling/berserkjuice name = "Distilling Brute Juice" id = "distill_brutejuice" - result = "berserkmed" + result = REAGENT_ID_BERSERKMED required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1) result_amount = 3 @@ -173,7 +173,7 @@ /decl/chemical_reaction/distilling/cryogel name = "Distilling Cryogellatin" id = "distill_cryoslurry" - result = "cryoslurry" + result = REAGENT_ID_CRYOSLURRY required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, "foaming_agent" = 2) inhibitors = list(REAGENT_ID_WATER = 5) result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm index cc221db1c8d..c86da351dfa 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -4,7 +4,7 @@ name = "Grub protein drink" id = REAGENT_ID_GRUBSHAKE result = REAGENT_ID_GRUBSHAKE - required_reagents = list("shockchem" = 5, REAGENT_ID_WATER = 25) + required_reagents = list(REAGENT_ID_SHOCKCHEM = 5, REAGENT_ID_WATER = 25) result_amount = 30 /decl/chemical_reaction/instant/drinks/deathbell diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index f9e1fdfbffe..3e3e7eb9cc9 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -106,9 +106,9 @@ required_reagents = list("cola" = 1, "mint" = 1) /decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them - name = "Firefighting Foam" + name = REAGENT_FIREFOAM id = "firefighting foam" - result = "firefoam" + result = REAGENT_ID_FIREFOAM required_reagents = list(REAGENT_ID_WATER = 1) catalysts = list(REAGENT_ID_FLUORINE = 10) result_amount = 1 @@ -116,9 +116,9 @@ /decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously. name = "Firefighting Foam EZ" id = "firefighting foam ez" - result = "firefoam" + result = REAGENT_ID_FIREFOAM required_reagents = list(REAGENT_ID_WATER = 1) - catalysts = list("firefoam" = 5) + catalysts = list(REAGENT_ID_FIREFOAM = 5) inhibitors = list(REAGENT_ID_FLUORINE = 0.01) result_amount = 1 @@ -152,7 +152,7 @@ name = "Vermicetol" id = "vermicetol" result = "vermicetol" - required_reagents = list("bicaridine" = 2, "shockchem" = 1, REAGENT_ID_PHORON = 0.1) + required_reagents = list("bicaridine" = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 3 @@ -202,8 +202,8 @@ //SLIME-RELATED BELOW HERE/////// /////////////////////////////// /decl/chemical_reaction/instant/slimeify - name = "Advanced Mutation Toxin" + name = REAGENT_ADVMUTATIONTOXIN id = "advmutationtoxin2" - result = "advmutationtoxin" + result = REAGENT_ID_ADVMUTATIONTOXIN required_reagents = list(REAGENT_ID_PHORON = 15, "slimejelly" = 15, "mutationtoxin" = 15) //In case a xenobiologist wants to become a fully fledged slime person. result_amount = 1 diff --git a/code/modules/reagents/reagents/modifiers.dm b/code/modules/reagents/reagents/modifiers.dm index 16ba25db540..5b8f0614cbc 100644 --- a/code/modules/reagents/reagents/modifiers.dm +++ b/code/modules/reagents/reagents/modifiers.dm @@ -3,8 +3,8 @@ */ /datum/reagent/modapplying - name = "brute juice" - id = "berserkmed" + name = REAGENT_BERSERKMED + id = REAGENT_ID_BERSERKMED description = "A liquid that is capable of causing a prolonged state of heightened aggression and durability." taste_description = "metal" reagent_state = LIQUID @@ -21,8 +21,8 @@ M.add_modifier(modifier_to_add, modifier_duration, suppress_failure = TRUE) /datum/reagent/modapplying/cryofluid - name = "cryogenic slurry" - id = "cryoslurry" + name = REAGENT_CRYOSLURRY + id = REAGENT_ID_CRYOSLURRY description = "An incredibly strange liquid that rapidly absorbs thermal energy from materials it contacts." taste_description = "siberian hellscape" color = "#4CDBDB" @@ -61,8 +61,8 @@ return /datum/reagent/modapplying/vatstabilizer - name = "clone growth inhibitor" - id = "vatstabilizer" + name = REAGENT_VATSTABILIZER + id = REAGENT_ID_VATSTABILIZER description = "A compound produced by NanoTrasen using a secret blend of phoron and toxins to stop the rampant growth of a clone beyond intended states." taste_description = "sour glue" color = "#060501" diff --git a/code/modules/reagents/reagents/other_vr.dm b/code/modules/reagents/reagents/other_vr.dm index 287f181056d..7d51aa43156 100644 --- a/code/modules/reagents/reagents/other_vr.dm +++ b/code/modules/reagents/reagents/other_vr.dm @@ -1,6 +1,6 @@ /datum/reagent/advmutationtoxin - name = "Advanced Mutation Toxin" - id = "advmutationtoxin" + name = REAGENT_ADVMUTATIONTOXIN + id = REAGENT_ID_ADVMUTATIONTOXIN description = "A corruptive toxin produced by slimes. Turns the subject of the chemical into a Promethean." reagent_state = LIQUID color = "#13BC5E" @@ -31,8 +31,8 @@ torso.implants += BI /datum/reagent/nif_repair_nanites - name = "Programmed Nanomachines" - id = "nifrepairnanites" + name = REAGENT_NIFREPAIRNANITES + id = REAGENT_ID_NIFREPAIRNANITES description = "A thick grey slurry of NIF repair nanomachines." taste_description = "metallic" reagent_state = LIQUID @@ -50,8 +50,8 @@ nif.repair(removed) /datum/reagent/firefighting_foam - name = "Firefighting Foam" - id = "firefoam" + name = REAGENT_FIREFOAM + id = REAGENT_ID_FIREFOAM description = "A historical fire suppressant. Originally believed to simply displace oxygen to starve fires, it actually interferes with the combustion reaction itself. Vastly superior to the cheap water-based extinguishers found on most NT vessels." reagent_state = LIQUID color = "#A6FAFF" @@ -95,8 +95,8 @@ M.ExtinguishMob() /datum/reagent/liquid_protean - name = "Liquid protean" - id = "liquid_protean" + name = REAGENT_LIQUIDPROTEAN + id = REAGENT_ID_LIQUIDPROTEAN description = "This seems to be a small portion of a Protean creature, still slightly wiggling." taste_description = "wiggly peanutbutter" reagent_state = LIQUID @@ -124,8 +124,8 @@ //Special toxins for solargrubs /datum/reagent/grubshock - name = "200 V" //in other words a painful shock - id = "shockchem" + name = REAGENT_SHOCKCHEM //in other words a painful shock + id = REAGENT_ID_SHOCKCHEM description = "A liquid that quickly dissapates to deliver a painful shock." reagent_state = LIQUID color = "#E4EC2F" diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 9c6a53d8ac4..96d8356f03c 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -1408,7 +1408,7 @@ /decl/chemical_reaction/instant/slime/ruby_brute_juice name = "Slime Brute Juice" id = "m_ruby_brute_juice" - result = "berserkmed" + result = REAGENT_ID_BERSERKMED required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/ruby diff --git a/maps/offmap_vr/om_ships/aro2.dm b/maps/offmap_vr/om_ships/aro2.dm index 9b50527bda3..ffd6acc4b05 100644 --- a/maps/offmap_vr/om_ships/aro2.dm +++ b/maps/offmap_vr/om_ships/aro2.dm @@ -50,7 +50,7 @@ description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" outdoors = OUTDOORS_NO - reagent_type = "liquid_protean" + reagent_type = REAGENT_ID_LIQUIDPROTEAN // The 'ship' /obj/effect/overmap/visitable/ship/aro2 diff --git a/maps/offmap_vr/om_ships/aro3.dm b/maps/offmap_vr/om_ships/aro3.dm index 3cb4bfdc4fc..c423ed2b82d 100644 --- a/maps/offmap_vr/om_ships/aro3.dm +++ b/maps/offmap_vr/om_ships/aro3.dm @@ -74,7 +74,7 @@ description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" outdoors = OUTDOORS_NO - reagent_type = "liquid_protean" + reagent_type = REAGENT_ID_LIQUIDPROTEAN // The 'ship' /obj/effect/overmap/visitable/ship/aro3 diff --git a/maps/offmap_vr/om_ships/lunaship.dm b/maps/offmap_vr/om_ships/lunaship.dm index c5cd9428555..623ca32f487 100644 --- a/maps/offmap_vr/om_ships/lunaship.dm +++ b/maps/offmap_vr/om_ships/lunaship.dm @@ -81,7 +81,7 @@ description_info = "Surfluid is a protean's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" outdoors = OUTDOORS_NO - reagent_type = "liquid_protean" + reagent_type = REAGENT_ID_LIQUIDPROTEAN // The 'ship' /obj/effect/overmap/visitable/ship/lunaship