From 2bd0f9c14dca50b4486387bae5faa4b98d14e39b Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 7 Dec 2024 00:12:42 +0100 Subject: [PATCH] other.dm --- code/__defines/chemistry.dm | 2 +- code/__defines/materials.dm | 5 + code/__defines/reagents.dm | 107 +++++++++--- code/game/gamemodes/newobjective.dm | 4 +- code/game/machinery/bioprinter.dm | 4 +- code/game/machinery/cloning.dm | 4 +- code/game/objects/items/contraband.dm | 2 +- .../game/objects/items/weapons/clown_items.dm | 2 +- .../items/weapons/grenades/chem_grenade.dm | 6 +- .../objects/items/weapons/material/thrown.dm | 2 +- .../objects/items/weapons/storage/bible.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/modules/detectivework/tools/luminol.dm | 2 +- .../entrepreneur/entrepreneur_items.dm | 2 +- code/modules/fishing/fishing_rod.dm | 2 +- code/modules/food/food/drinks/bottle.dm | 2 +- code/modules/food/food/snacks.dm | 12 +- code/modules/food/food/snacks_vr.dm | 4 +- code/modules/food/glass/bottle.dm | 6 +- code/modules/hydroponics/backtank.dm | 2 +- code/modules/hydroponics/grown.dm | 6 +- code/modules/hydroponics/seedtypes/berries.dm | 2 +- code/modules/hydroponics/seedtypes/grass.dm | 2 +- .../hydroponics/seedtypes/mushrooms.dm | 4 +- .../modules/hydroponics/seedtypes/tomatoes.dm | 2 +- .../hydroponics/spreading/spreading.dm | 2 +- code/modules/hydroponics/trays/tray.dm | 10 +- .../materials/organic/animal_products.dm | 2 +- .../materials/materials/supermatter.dm | 4 +- .../sheets/organic/animal_products.dm | 22 +-- code/modules/mob/living/bot/farmbot.dm | 2 +- .../silicon/robot/robot_modules/station.dm | 4 +- .../fusion/fuel_assembly/fuel_compressor.dm | 2 +- code/modules/power/fusion/fusion_reactions.dm | 24 +-- code/modules/random_map/automata/diona.dm | 2 +- .../dispenser/cartridge_presets_vr.dm | 6 +- .../dispenser/dispenser_presets_vr.dm | 2 +- .../machinery/dispenser/reagent_tank.dm | 2 +- code/modules/reagents/machinery/grinder.dm | 12 +- code/modules/reagents/machinery/pump.dm | 2 +- .../reactions/distilling/distilling.dm | 16 +- .../reagents/reactions/instant/drinks.dm | 20 +-- .../reagents/reactions/instant/drinks_vr.dm | 4 +- .../reagents/reactions/instant/instant.dm | 156 +++++++++--------- .../reagents/reactions/instant/instant_vr.dm | 8 +- .../reagents/reactions/instant/virology.dm | 2 +- .../reagents/reagent_containers/glass_vr.dm | 2 +- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/spray.dm | 4 +- .../reagents/reagent_containers/spray_vr.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- code/modules/reagents/reagents/other.dm | 144 ++++++++-------- code/modules/xenoarcheaology/effect_master.dm | 8 +- code/modules/xenoarcheaology/finds/special.dm | 2 +- .../xenoarcheaology/tools/coolant_tank.dm | 2 +- .../tools/geosample_scanner.dm | 2 +- code/modules/xenobio/items/extracts.dm | 6 +- code/modules/xenobio2/_xeno_setup_vr.dm | 28 ++-- code/modules/xenobio2/mob/slime/slime.dm | 10 +- 59 files changed, 385 insertions(+), 323 deletions(-) diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index 519609f0e9..5a8667f18c 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -49,7 +49,7 @@ #define ANTIBIO_SUPER 3 // Chemistry lists. -var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate. +var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate. var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", REAGENT_ID_BLISS, "stoxin", REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate. var/list/heartstopper = list("potassium_chlorophoride", "zombiepowder") // This stops the heart. var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm index 66d64b7cae..b71372f5a5 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -37,10 +37,13 @@ #define MAT_GRAPHITE "graphite" #define MAT_LEATHER "leather" #define MAT_CHITIN "chitin" +#define MAT_ALIENCHITIN "alien chitin" +#define MAT_ALIENCLAW "alien claw" #define MAT_CLOTH "cloth" #define MAT_FUR "fur" #define MAT_SYNCLOTH "syncloth" #define MAT_FIBERS "fibers" +#define MAT_WOOL "wool" #define MAT_COPPER "copper" #define MAT_QUARTZ "quartz" #define MAT_TIN "tin" @@ -61,6 +64,8 @@ #define MAT_CULT "cult" #define MAT_ALIENALLOY "alienalloy" #define MAT_COMPOSITE "composite" +#define MAT_BIOMASS "biomass" +#define MAT_WEEDEXTRACT "weed extract" #define DEFAULT_TABLE_MATERIAL MAT_PLASTIC diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm index 547e65aa34..bf48611cf0 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/reagents.dm @@ -253,33 +253,80 @@ #define REAGENT_ID_SILVER "silver" #define REAGENT_PLATINUM "Platinum" #define REAGENT_ID_PLATINUM "platinum" - - - - - - - -#define REAGENT_SLIMEJELLY "Slimejelly" -#define REAGENT_ID_SLIMEJELLY "slimejelly" - - -#define REAGENT_ID_SILICATE "silicate" +#define REAGENT_URANIUM "Uranium" #define REAGENT_ID_URANIUM "uranium" -#define REAGENT_ID_PLATINUM "platinum" -#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate" +#define REAGENT_DEUTERIUM "Deuterium" +#define REAGENT_ID_DEUTERIUM "deuterium" +#define REAGENT_TRITIUM "Tritium" +#define REAGENT_ID_TRITIUM "tritium" +#define REAGENT_LITHIUM6 "Lithium-6" +#define REAGENT_ID_LITHIUM6 "lithium6" +#define REAGENT_HELIUM3 "Helium-3" +#define REAGENT_ID_HELIUM3 "helium3" +#define REAGENT_BORON11 "Boron-11" +#define REAGENT_ID_BORON11 "boron11" +#define REAGENT_SUPERMATTER "Supermatter" +#define REAGENT_ID_SUPERMATTER "supermatter" +#define REAGENT_ADRENALINE "Adrenaline" +#define REAGENT_ID_ADRENALINE "adrenaline" +#define REAGENT_HOLYWATER "Holy Water" +#define REAGENT_ID_HOLYWATER "holywater" +#define REAGENT_AMMONIA "Ammonia" +#define REAGENT_ID_AMMONIA "ammonia" +#define REAGENT_DIETHYLAMINE "Diethylamine" +#define REAGENT_ID_DIETHYLAMINE "diethylamine" +#define REAGENT_FLUOROSURFACTANT "Fluorosurfactant" +#define REAGENT_ID_FLUOROSURFACTANT "fluorosurfactant" +#define REAGENT_FOAMINGAGENT "Foaming agent" +#define REAGENT_ID_FOAMINGAGENT "foaming_agent" +#define REAGENT_THERMITE "Thermite" +#define REAGENT_ID_THERMITE "thermite" +#define REAGENT_CLEANER "Space cleaner" +#define REAGENT_ID_CLEANER "cleaner" +#define REAGENT_LUBE "Space Lube" +#define REAGENT_ID_LUBE "lube" +#define REAGENT_SILICATE "Silicate" +#define REAGENT_ID_SILICATE "silicate" +#define REAGENT_GLYCEROL "Glycerol" +#define REAGENT_ID_GLYCEROL "glycerol" +#define REAGENT_NITROGLYCERIN "Nitroglycerin" +#define REAGENT_ID_NITROGLYCERIN "nitroglycerin" +#define REAGENT_COOLANT "Coolant" +#define REAGENT_ID_COOLANT "coolant" +#define REAGENT_GLUE "Ultra Glue" +#define REAGENT_ID_GLUE "glue" +#define REAGENT_WOODPULP "Wood Pulp" +#define REAGENT_ID_WOODPULP "woodpulp" +#define REAGENT_LUMINOL "Luminol" +#define REAGENT_ID_LUMINOL "luminol" +#define REAGENT_BIOMASS "Biomass" +#define REAGENT_ID_BIOMASS "biomass" +#define REAGENT_MINERALIZEDFLUID "Mineral-Rich Fluid" +#define REAGENT_ID_MINERALIZEDFLUID "mineralizedfluid" +#define REAGENT_DEFECTIVENANITES "Defective Nanites" +#define REAGENT_ID_DEFECTIVENANITES "defective_nanites" +#define REAGENT_FISHBAIT "Fish Bait" +#define REAGENT_ID_FISHBAIT "fishbait" +#define REAGENT_LIQUIDCARPET "Liquid Carpet" +#define REAGENT_ID_LIQUIDCARPET "liquidcarpet" +#define REAGENT_LIQUIDCARPETB "Liquid Black Carpet" +#define REAGENT_ID_LIQUIDCARPETB "liquidcarpetb" +#define REAGENT_LIQUIDCARPETBLU "Liquid Blue Carpet" +#define REAGENT_ID_LIQUIDCARPETBLU "liquidcarpetblu" +#define REAGENT_LIQUIDCARPETTUR "Liquid Turquoise Carpet" +#define REAGENT_ID_LIQUIDCARPETTUR "liquidcarpettur" +#define REAGENT_LIQUIDCARPETSBLU "Liquid Silver Blue Carpet" +#define REAGENT_ID_LIQUIDCARPETSBLU "liquidcarpetsblu" +#define REAGENT_LIQUIDCARPETC "Liquid Clown Carpet" +#define REAGENT_ID_LIQUIDCARPETC "liquidcarpetc" +#define REAGENT_LIQUIDCARPETP "Liquid Purple Carpet" +#define REAGENT_ID_LIQUIDCARPETP "liquidcarpetp" +#define REAGENT_LIQUIDCARPETO "Liquid Orange Carpet" +#define REAGENT_ID_LIQUIDCARPETO "liquidcarpeto" +#define REAGENT_ESSENTIALOIL "Essential Oils" +#define REAGENT_ID_ESSENTIALOIL "essential_oil" -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ // Admin chems #define REAGENT_ADMINORDRAZINE "Adminordrazine" @@ -473,7 +520,17 @@ -Files left: food_drinks.dm, medicine.dm, other.dm, toxins.dm + +#define REAGENT_SLIMEJELLY "Slimejelly" +#define REAGENT_ID_SLIMEJELLY "slimejelly" + + +#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate" + + + + +Files left: food_drinks.dm, medicine.dm, toxins.dm includes: .dm excludes: reagents.dm,ores.dm,materials.dm,mre.dm diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 3857664671..670f7dd0c3 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1143,7 +1143,7 @@ datum var/target_name New(var/text,var/joba) ..() - var/list/items = list("Sulphuric acid", REAGENT_PACID, "Space Lube", "Unstable mutagen",\ + var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, "Unstable mutagen",\ "Leporazine", "Cryptobiolin", "Lexorin ",\ "Kelotane", "Dexalin", "Tricordrazine") target_name = pick(items) @@ -1152,7 +1152,7 @@ datum steal_target = /datum/reagent/acid if(REAGENT_PACID) steal_target = /datum/reagent/pacid - if("Space Lube") + if(REAGENT_LUBE) steal_target = /datum/reagent/lube if("Unstable mutagen") steal_target = /datum/reagent/mutagen diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index 8750514b60..6fda6f6ae7 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -158,7 +158,7 @@ if(!can_print(choice, possible_list[choice][2])) return - container.reagents.remove_reagent("biomass", possible_list[choice][2]) + container.reagents.remove_reagent(REAGENT_ID_BIOMASS, possible_list[choice][2]) update_use_power(USE_POWER_ACTIVE) printing = 1 @@ -204,7 +204,7 @@ var/biomass_count = 0 if(container && container.reagents) for(var/datum/reagent/R in container.reagents.reagent_list) - if(R.id == "biomass") + if(R.id == REAGENT_ID_BIOMASS) biomass_count += R.volume return biomass_count diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 735d87c210..30a0d81465 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -350,7 +350,7 @@ if(LAZYLEN(containers)) for(var/obj/item/reagent_containers/glass/G in containers) for(var/datum/reagent/R in G.reagents.reagent_list) - if(R.id == "biomass") + if(R.id == REAGENT_ID_BIOMASS) biomass_count += R.volume return biomass_count @@ -362,7 +362,7 @@ for(var/obj/item/reagent_containers/glass/G in containers) if(to_remove < amount) //If we have what we need, we can stop. Checked every time we switch beakers for(var/datum/reagent/R in G.reagents.reagent_list) - if(R.id == "biomass") // Finds Biomass + if(R.id == REAGENT_ID_BIOMASS) // Finds Biomass var/need_remove = max(0, amount - to_remove) //Figures out how much biomass is in this container if(R.volume >= need_remove) //If we have more than enough in this beaker, only take what we need R.remove_self(need_remove) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 50c8b45e8a..d423ab76a4 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -17,7 +17,7 @@ /obj/item/reagent_containers/glass/beaker/vial/random flags = 0 - var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list("cleaner" = 15) = 1) + var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list(REAGENT_ID_CLEANER = 15) = 1) /obj/item/reagent_containers/glass/beaker/vial/random/toxin random_reagent_list = list( diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index eb4a1d05a2..88a7a33271 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -23,7 +23,7 @@ wet() /obj/item/soap/proc/wet() - reagents.add_reagent("cleaner", 5) + reagents.add_reagent(REAGENT_ID_CLEANER, 5) /obj/item/soap/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index c626f8f0d3..e8e7bdfa79 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -214,7 +214,7 @@ var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30) - B2.reagents.add_reagent("foaming_agent", 10) + B2.reagents.add_reagent(REAGENT_ID_FOAMINGAGENT, 10) B2.reagents.add_reagent(REAGENT_ID_PACID, 10) detonator = new/obj/item/assembly_holder/timer_igniter(src) @@ -282,9 +282,9 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("fluorosurfactant", 40) + B1.reagents.add_reagent(REAGENT_ID_FLUOROSURFACTANT, 40) B2.reagents.add_reagent(REAGENT_ID_WATER, 40) - B2.reagents.add_reagent("cleaner", 10) + B2.reagents.add_reagent(REAGENT_ID_CLEANER, 10) detonator = new/obj/item/assembly_holder/timer_igniter(src) diff --git a/code/game/objects/items/weapons/material/thrown.dm b/code/game/objects/items/weapons/material/thrown.dm index 95e08c3445..ede76094e2 100644 --- a/code/game/objects/items/weapons/material/thrown.dm +++ b/code/game/objects/items/weapons/material/thrown.dm @@ -21,4 +21,4 @@ M.adjustToxLoss(rand(20,40)) /obj/item/material/star/ninja - default_material = "uranium" \ No newline at end of file + default_material = MAT_URANIUM diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 627fe4e88c..3c5842992f 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( to_chat(user, span_notice("You bless [A].")) var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER) A.reagents.del_reagent(REAGENT_ID_WATER) - A.reagents.add_reagent("holywater",water2holy) + A.reagents.add_reagent(REAGENT_ID_HOLYWATER,water2holy) /obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob) if (src.use_sound) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index b788f9b20e..08cab852b3 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -281,7 +281,7 @@ //expects an atom containing the reagents used to clean the turf /turf/proc/clean(atom/source, mob/user) - if(source.reagents.has_reagent(REAGENT_ID_WATER, 1) || source.reagents.has_reagent("cleaner", 1)) + if(source.reagents.has_reagent(REAGENT_ID_WATER, 1) || source.reagents.has_reagent(REAGENT_ID_CLEANER, 1)) clean_blood() if(istype(src, /turf/simulated)) var/turf/simulated/T = src diff --git a/code/modules/detectivework/tools/luminol.dm b/code/modules/detectivework/tools/luminol.dm index 560522508d..b2ba49d4cf 100644 --- a/code/modules/detectivework/tools/luminol.dm +++ b/code/modules/detectivework/tools/luminol.dm @@ -10,4 +10,4 @@ /obj/item/reagent_containers/spray/luminol/Initialize() . = ..() - reagents.add_reagent("luminol", 250) \ No newline at end of file + reagents.add_reagent(REAGENT_ID_LUMINOL, 250) diff --git a/code/modules/entrepreneur/entrepreneur_items.dm b/code/modules/entrepreneur/entrepreneur_items.dm index b365089cfb..6ed0fdab16 100644 --- a/code/modules/entrepreneur/entrepreneur_items.dm +++ b/code/modules/entrepreneur/entrepreneur_items.dm @@ -407,7 +407,7 @@ desc = "A small bottle of various plant extracts said to improve upon a person's health as an alternative form of medicine." icon = 'icons/obj/entrepreneur.dmi' icon_state = "oil" - prefill = list("essential_oil" = 60) + prefill = list(REAGENT_ID_ESSENTIALOIL = 60) // Masseuse diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 78646aa794..9910f4e5f9 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -87,7 +87,7 @@ if(istype(Bait, bait_type)) var/foodvolume for(var/datum/reagent/re in Bait.reagents.reagent_list) - if(re.id == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.id == "fishbait") + if(re.id == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.id == REAGENT_ID_FISHBAIT) foodvolume += re.volume toolspeed = initial(toolspeed) * 10*(0.01/(0.2*(foodvolume/Bait.reagents.maximum_volume + 0.5))) //VOREStation edit: gives fishing a universal formula because Polaris' doesn't work here. Min value of 1, max value of 1/3, 0.5 at 1/2 filled with bait reagents. diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 1409d0d17a..e270451a78 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -308,7 +308,7 @@ /obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize() . = ..() - reagents.add_reagent("holywater", 100) + reagents.add_reagent(REAGENT_ID_HOLYWATER, 100) /obj/item/reagent_containers/food/drinks/bottle/vermouth name = "Goldeneye Vermouth" diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 961a1e8c51..4167cdf798 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4640,7 +4640,7 @@ /obj/item/reagent_containers/food/snacks/wormsickly/Initialize() . = ..() - reagents.add_reagent("fishbait", 9) + reagents.add_reagent(REAGENT_ID_FISHBAIT, 9) reagents.add_reagent("protein", 3) /obj/item/reagent_containers/food/snacks/worm @@ -4654,7 +4654,7 @@ /obj/item/reagent_containers/food/snacks/worm/Initialize() . = ..() - reagents.add_reagent("fishbait", 15) + reagents.add_reagent(REAGENT_ID_FISHBAIT, 15) reagents.add_reagent("protein", 5) /obj/item/reagent_containers/food/snacks/wormdeluxe @@ -4668,7 +4668,7 @@ /obj/item/reagent_containers/food/snacks/wormdeluxe/Initialize() . = ..() - reagents.add_reagent("fishbait", 30) + reagents.add_reagent(REAGENT_ID_FISHBAIT, 30) reagents.add_reagent("protein", 10) /obj/item/reagent_containers/food/snacks/siffruit @@ -4749,7 +4749,7 @@ /obj/item/reagent_containers/food/snacks/bageleverything/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_PHORON, 5) - reagents.add_reagent("defective_nanites", 5) + reagents.add_reagent(REAGENT_ID_DEFECTIVENANITES, 5) /obj/item/reagent_containers/food/snacks/bageltwo name = "two bagels" @@ -6827,7 +6827,7 @@ description_fluff = "A form of fermented shark that originated on Earth as far back as the 17th century. Modern Hakarl is made from vat-made fermented shark and is distributed across the galaxy as a delicacy. However, few are able to stand the smell or taste of the meat." filling_color = "#916E36" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("fish" = 2, "salt" = 2, "ammonia" = 1) + nutriment_desc = list("fish" = 2, "salt" = 2, REAGENT_ID_AMMONIA = 1) nutriment_amt = 4 bitesize = 1 @@ -7042,7 +7042,7 @@ /obj/item/reagent_containers/food/snacks/canned/spinach/Initialize() .=..() - reagents.add_reagent("adrenaline", 4) + reagents.add_reagent(REAGENT_ID_ADRENALINE, 4) reagents.add_reagent("hyperzine", 4) reagents.add_reagent(REAGENT_ID_IRON, 4) diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 5bc84036f7..9df2fedfc3 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -772,11 +772,11 @@ icon_state = "donkpocket_ascended" nutriment_amt = 5 nutriment_desc = list("burning fires of radioactive hell" = 20) - heated_reagents = list("supermatter" = 1) + heated_reagents = list(REAGENT_ID_SUPERMATTER = 1) /obj/item/reagent_containers/food/snacks/donkpocket/ascended/Initialize() . = ..() - reagents.add_reagent("uranium", 3) + reagents.add_reagent(REAGENT_ID_URANIUM, 3) reagents.add_reagent("thermite_v", 3) // Altevian Foobs diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index 42f20a2527..2a00397800 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -112,7 +112,7 @@ desc = "A small bottle." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-1" - prefill = list("ammonia" = 60) + prefill = list(REAGENT_ID_AMMONIA = 60) /obj/item/reagent_containers/glass/bottle/eznutrient name = "\improper EZ NUtrient bottle" @@ -140,7 +140,7 @@ desc = "A small bottle." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("diethylamine" = 60) + prefill = list(REAGENT_ID_DIETHYLAMINE = 60) /obj/item/reagent_containers/glass/bottle/pacid name = "polytrinic acid bottle" @@ -175,4 +175,4 @@ desc = "A bottle of raw biomass! Gross!" icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("biomass" = 60) + prefill = list(REAGENT_ID_BIOMASS = 60) diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index bcc84c2614..6ff4308733 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -173,7 +173,7 @@ /obj/item/watertank/janitor/Initialize() . = ..() - reagents.add_reagent("cleaner", 500) + reagents.add_reagent(REAGENT_ID_CLEANER, 500) /obj/item/watertank/janitor/make_noz() return new /obj/item/reagent_containers/spray/mister/janitor(src) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 8f83e0b47d..23deaabc25 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -84,7 +84,7 @@ descriptors |= "bitter" if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) descriptors |= "sweet-sour" - if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium")) + if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent(REAGENT_ID_URANIUM)) descriptors |= "radioactive" if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) descriptors |= "poisonous" @@ -94,7 +94,7 @@ descriptors |= "medicinal" if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent("earthsblood")) descriptors |= "shiny" - if(reagents.has_reagent("lube")) + if(reagents.has_reagent(REAGENT_ID_LUBE)) descriptors |= "slippery" if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID)) descriptors |= "acidic" @@ -196,7 +196,7 @@ if(seed.chems) - if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"])) + if(W.sharp && W.edge && !isnull(seed.chems[REAGENT_ID_WOODPULP])) user.show_message(span_notice("You make planks out of \the [src]!"), 1) playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm index 08fe6eb1b4..1f3f8ee83c 100644 --- a/code/modules/hydroponics/seedtypes/berries.dm +++ b/code/modules/hydroponics/seedtypes/berries.dm @@ -26,7 +26,7 @@ seed_name = "glowberry" display_name = "glowberry bush" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_URANIUM = list(3,5)) /datum/seed/berry/glow/New() ..() diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm index c5cb6a814f..76135a9e1f 100644 --- a/code/modules/hydroponics/seedtypes/grass.dm +++ b/code/modules/hydroponics/seedtypes/grass.dm @@ -25,7 +25,7 @@ display_name = "carpet" kitchen_tag = "carpet" mutants = null - chems = list("liquidcarpet" = list(5,10)) + chems = list(REAGENT_ID_LIQUIDCARPET = list(5,10)) /datum/seed/grass/carpet/New() ..() diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm index 8fe783850a..b1c28c2a74 100644 --- a/code/modules/hydroponics/seedtypes/mushrooms.dm +++ b/code/modules/hydroponics/seedtypes/mushrooms.dm @@ -130,7 +130,7 @@ name = "towercap" seed_name = "tower cap" display_name = "tower caps" - chems = list("woodpulp" = list(10,1)) + chems = list(REAGENT_ID_WOODPULP = list(10,1)) mutants = list("redcap") has_item_product = /obj/item/stack/material/log @@ -146,7 +146,7 @@ name = "redcap" seed_name = "red cap" display_name = "red caps" - chems = list("woodpulp" = list(10,1), "tannin" = list(1,10)) + chems = list(REAGENT_ID_WOODPULP = list(10,1), "tannin" = list(1,10)) mutants = null has_item_product = null diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm index 312c799957..3161361315 100644 --- a/code/modules/hydroponics/seedtypes/tomatoes.dm +++ b/code/modules/hydroponics/seedtypes/tomatoes.dm @@ -53,7 +53,7 @@ seed_name = "blue tomato" display_name = "blue tomato plant" mutants = list("bluespacetomato") - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lube" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LUBE = list(1,5)) /datum/seed/tomato/blue/New() ..() diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index cb1fc39437..0dce8d616d 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -198,7 +198,7 @@ if(growth>2 && growth == max_growth) plane = ABOVE_PLANE set_opacity(1) - if(!isnull(seed.chems["woodpulp"])) + if(!isnull(seed.chems[REAGENT_ID_WOODPULP])) density = TRUE else reset_plane_and_layer() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index e29c122f23..7342661bf2 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -71,8 +71,8 @@ REAGENT_ID_PHOSPHORUS = 0.1, REAGENT_ID_SUGAR = 0.1, "sodawater" = 0.1, - "ammonia" = 1, - "diethylamine" = 2, + REAGENT_ID_AMMONIA = 1, + REAGENT_ID_DIETHYLAMINE = 2, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_ADMINORDRAZINE = 1, "eznutrient" = 1, @@ -91,7 +91,7 @@ ) var/static/list/pestkiller_reagents = list( REAGENT_ID_SUGAR = 2, - "diethylamine" = -2, + REAGENT_ID_DIETHYLAMINE = -2, REAGENT_ID_ADMINORDRAZINE = -5 ) var/static/list/water_reagents = list( @@ -117,8 +117,8 @@ REAGENT_ID_PACID = list( -2, 0, 0 ), "plantbgone" = list( -2, 0, 0.2), "cryoxadone" = list( 3, 0, 0 ), - "ammonia" = list( 0.5, 0, 0 ), - "diethylamine" = list( 1, 0, 0 ), + REAGENT_ID_AMMONIA = list( 0.5, 0, 0 ), + REAGENT_ID_DIETHYLAMINE = list( 1, 0, 0 ), REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ), REAGENT_ID_RADIUM = list( -1.5, 0, 0.2), REAGENT_ID_ADMINORDRAZINE = list( 1, 1, 1 ), diff --git a/code/modules/materials/materials/organic/animal_products.dm b/code/modules/materials/materials/organic/animal_products.dm index 592cc6bc7b..4541f04953 100644 --- a/code/modules/materials/materials/organic/animal_products.dm +++ b/code/modules/materials/materials/organic/animal_products.dm @@ -1,5 +1,5 @@ /datum/material/diona - name = "biomass" + name = MAT_BIOMASS icon_colour = null stack_type = null integrity = 600 diff --git a/code/modules/materials/materials/supermatter.dm b/code/modules/materials/materials/supermatter.dm index 69f479727c..9c27dbedb8 100644 --- a/code/modules/materials/materials/supermatter.dm +++ b/code/modules/materials/materials/supermatter.dm @@ -1,6 +1,6 @@ //R-UST port /datum/material/supermatter - name = "supermatter" + name = MAT_SUPERMATTER icon_colour = "#FFFF00" stack_type = /obj/item/stack/material/supermatter shard_type = SHARD_SHARD @@ -21,4 +21,4 @@ /datum/material/supermatter/generate_recipes() recipes = list( new /datum/stack_recipe("supermatter shard", /obj/machinery/power/supermatter/shard, 30 , one_per_turf = 1, time = 600, on_floor = 1, recycle_material = "[name]") - ) \ No newline at end of file + ) diff --git a/code/modules/materials/sheets/organic/animal_products.dm b/code/modules/materials/sheets/organic/animal_products.dm index ac747ecff5..6940a5cf71 100644 --- a/code/modules/materials/sheets/organic/animal_products.dm +++ b/code/modules/materials/sheets/organic/animal_products.dm @@ -1,5 +1,5 @@ /obj/item/stack/material/chitin - name = "chitin" + name = MAT_CHITIN desc = "The by-product of mob grinding." icon_state = "chitin" default_type = MAT_CHITIN @@ -11,7 +11,7 @@ //don't see anywhere else to put these, maybe together they could be used to make the xenos suit? /obj/item/stack/xenochitin - name = "alien chitin" + name = MAT_ALIENCHITIN desc = "A piece of the hide of a terrible creature." singular_name = "alien chitin piece" icon = 'icons/mob/alien.dmi' @@ -19,13 +19,13 @@ stacktype = "hide-chitin" /obj/item/xenos_claw - name = "alien claw" + name = MAT_ALIENCLAW desc = "The claw of a terrible creature." icon = 'icons/mob/alien.dmi' icon_state = "claw" /obj/item/weed_extract - name = "weed extract" + name = MAT_WEEDEXTRACT desc = "A piece of slimy, purplish weed." icon = 'icons/mob/alien.dmi' icon_state = "weed_extract" @@ -33,10 +33,10 @@ /////FUR AND WOOL MATERIALS///// /datum/material/fur - name = "fur" + name = MAT_FUR icon_colour = "#fff2d3" stack_origin_tech = list(TECH_MATERIAL = 2) - display_name = "fur" + display_name = MAT_FUR icon_base = "sheet-fabric" stack_type = /obj/item/stack/material/fur sheet_collective_name = "pile" @@ -53,8 +53,8 @@ hardness = 5 /datum/material/fur/wool - name = "wool" - display_name = "wool" + name = MAT_WOOL + display_name = MAT_WOOL stack_type = /obj/item/stack/material/fur/wool /datum/material/fur/generate_recipes() @@ -94,7 +94,7 @@ new /datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold/whiteblindfold/craftable, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]") ) /obj/item/stack/material/fur - name = "fur" + name = MAT_FUR icon_state = "sheet-fabric" default_type = MAT_FUR strict_color_stacking = TRUE @@ -106,8 +106,8 @@ apply_colour = TRUE /obj/item/stack/material/fur/wool - name = "wool" - default_type = "wool" + name = MAT_WOOL + default_type = MAT_WOOL /obj/item/clothing/suit/storage/duster/craftable name = "handmade duster" diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index edf17d0995..1920ae6e09 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -223,7 +223,7 @@ if(do_after(src, 30, A)) visible_message(span_notice("[src] fertilizes \the [A].")) - T.reagents.add_reagent("ammonia", 10) + T.reagents.add_reagent(REAGENT_ID_AMMONIA, 10) busy = 0 action = "" diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 7ff7c3c125..b5c0f47cbc 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -519,7 +519,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/borg/sight/janitor(src) var/obj/item/reagent_containers/spray/LS = new /obj/item/reagent_containers/spray(src) src.emag += LS - LS.reagents.add_reagent("lube", 250) + LS.reagents.add_reagent(REAGENT_ID_LUBE, 250) LS.name = "Lube spray" //Starts empty. Can only recharge with recycled material. @@ -568,7 +568,7 @@ var/global/list/robot_modules = list( var/obj/item/reagent_containers/spray/LS = locate() in src.emag if(LS) - LS.reagents.add_reagent("lube", 2 * amount) + LS.reagents.add_reagent(REAGENT_ID_LUBE, 2 * amount) /obj/item/robot_module/robot/clerical name = "service robot module" diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index 31e1b9dfce..218c6719da 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -32,7 +32,7 @@ user.put_in_hands(F) else if(istype(thing, /obj/machinery/power/supermatter)) - var/obj/item/fuel_assembly/F = new(get_turf(src), "supermatter") + var/obj/item/fuel_assembly/F = new(get_turf(src), MAT_SUPERMATTER) visible_message(span_infoplain(span_bold("\The [src]") + " compresses \the [thing] into a new fuel assembly.")) qdel(thing) user.put_in_hands(F) diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm index 5a62f7bc54..3815eff221 100644 --- a/code/modules/power/fusion/fusion_reactions.dm +++ b/code/modules/power/fusion/fusion_reactions.dm @@ -45,33 +45,33 @@ var/list/fusion_reactions // Basic power production reactions. /decl/fusion_reaction/deuterium_deuterium - p_react = "deuterium" - s_react = "deuterium" + p_react = REAGENT_ID_DEUTERIUM + s_react = REAGENT_ID_DEUTERIUM energy_consumption = 1 energy_production = 2 // Advanced production reactions (todo) /decl/fusion_reaction/deuterium_helium - p_react = "deuterium" - s_react = "helium-3" + p_react = REAGENT_ID_DEUTERIUM + s_react = REAGENT_ID_HELIUM3 energy_consumption = 1 energy_production = 5 /decl/fusion_reaction/deuterium_tritium - p_react = "deuterium" - s_react = "tritium" + p_react = REAGENT_ID_DEUTERIUM + s_react = REAGENT_ID_SLIMEJELLY energy_consumption = 1 energy_production = 1 - products = list("helium-3" = 1) + products = list(REAGENT_ID_HELIUM3 = 1) instability = 0.5 /decl/fusion_reaction/deuterium_lithium - p_react = "deuterium" + p_react = REAGENT_ID_DEUTERIUM s_react = REAGENT_ID_LITHIUM energy_consumption = 2 energy_production = 0 radiation = 3 - products = list("tritium"= 1) + products = list(REAGENT_ID_SLIMEJELLY= 1) instability = 1 // Unideal/material production reactions @@ -104,7 +104,7 @@ var/list/fusion_reactions // VERY UNIDEAL REACTIONS. /decl/fusion_reaction/phoron_supermatter - p_react = "supermatter" + p_react = REAGENT_ID_SUPERMATTER s_react = REAGENT_ID_PHORON energy_consumption = 0 energy_production = 5 @@ -131,7 +131,7 @@ var/list/fusion_reactions H.hallucination += rand(100,150) for(var/obj/machinery/fusion_fuel_injector/I in range(world.view, origin)) - if(I.cur_assembly && I.cur_assembly.fuel_type == "supermatter") + if(I.cur_assembly && I.cur_assembly.fuel_type == REAGENT_ID_SUPERMATTER) explosion(get_turf(I), 1, 2, 3) spawn(5) if(I && I.loc) @@ -144,7 +144,7 @@ var/list/fusion_reactions // High end reactions. /decl/fusion_reaction/boron_hydrogen - p_react = "boron" + p_react = REAGENT_ID_BORON11 s_react = REAGENT_ID_HYDROGEN minimum_energy_level = FUSION_HEAT_CAP * 0.5 energy_consumption = 3 diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index b94e4e60f5..2385bba57b 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -1,5 +1,5 @@ /turf/simulated/wall/diona/Initialize(mapload) - ..(mapload, "biomass") + ..(mapload, MAT_BIOMASS) /turf/simulated/wall/diona/attack_generic(var/mob/user, var/damage, var/attack_message) if(istype(user, /mob/living/carbon/alien/diona)) diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index 767e269b87..4114508d5c 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -1,7 +1,7 @@ /obj/item/reagent_containers/chem_disp_cartridge //Xenoflora - ammonia spawn_reagent = "ammonia" - diethylamine spawn_reagent = "diethylamine" + ammonia spawn_reagent = REAGENT_ID_AMMONIA + diethylamine spawn_reagent = REAGENT_ID_DIETHYLAMINE plantbgone spawn_reagent = "plantbgone" mutagen spawn_reagent = "mutagen" @@ -10,7 +10,7 @@ protein spawn_reagent = "protein" //Special Ops - biomass spawn_reagent = "biomass" + biomass spawn_reagent = REAGENT_ID_BIOMASS carthatoline spawn_reagent = "carthatoline" corophizine spawn_reagent = "corophizine" myelamine spawn_reagent = "myelamine" diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm index 81c6d97350..431da2f57b 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm @@ -2,7 +2,7 @@ name = "xenoflora chem dispenser" ui_title = "Xenoflora Chemical Dispenser" dispense_reagents = list( - REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, "ammonia", "diethylamine", "plantbgone", "mutagen", REAGENT_ID_CALCIUM + REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, REAGENT_ID_AMMONIA, REAGENT_ID_DIETHYLAMINE, "plantbgone", "mutagen", REAGENT_ID_CALCIUM ) /obj/machinery/chemical_dispenser/xenoflora/full diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 408ec193d5..4a3fe22e9f 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -166,7 +166,7 @@ /obj/structure/reagent_dispenser/he3/Initialize() ..() - reagents.add_reagent("helium3",1000) + reagents.add_reagent(REAGENT_ID_HELIUM3,1000) /* * Misc diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 4861b42171..399e921d24 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -2,9 +2,9 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by REAGENTS_PER_SHEET (default 20) unless you like decimals. /obj/item/stack/material/plastic = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_OXYGEN,REAGENT_ID_CHLORINE,REAGENT_ID_SULFUR), /obj/item/stack/material/copper = list(REAGENT_ID_COPPER), - /obj/item/stack/material/wood = list(REAGENT_ID_CARBON,"woodpulp",REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), - /obj/item/stack/material/stick = list(REAGENT_ID_CARBON,"woodpulp",REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), - /obj/item/stack/material/log = list(REAGENT_ID_CARBON,"woodpulp",REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), + /obj/item/stack/material/wood = list(REAGENT_ID_CARBON,REAGENT_ID_WOODPULP,REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), + /obj/item/stack/material/stick = list(REAGENT_ID_CARBON,REAGENT_ID_WOODPULP,REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), + /obj/item/stack/material/log = list(REAGENT_ID_CARBON,REAGENT_ID_WOODPULP,REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), /obj/item/stack/material/algae = list(REAGENT_ID_CARBON,REAGENT_ID_NITROGEN,REAGENT_ID_NITROGEN,REAGENT_ID_PHOSPHORUS,REAGENT_ID_PHOSPHORUS), /obj/item/stack/material/graphite = list(REAGENT_ID_CARBON), /obj/item/stack/material/aluminium = list(REAGENT_ID_ALUMINIUM), // The material is aluminium, but the reagent is aluminum... @@ -19,7 +19,7 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by /obj/item/stack/material/durasteel = list(REAGENT_ID_IRON,REAGENT_ID_IRON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PLATINUM), /obj/item/stack/material/wax = list(REAGENT_ID_ETHANOL,"triglyceride"), /obj/item/stack/material/iron = list(REAGENT_ID_IRON), - /obj/item/stack/material/uranium = list("uranium"), + /obj/item/stack/material/uranium = list(REAGENT_ID_URANIUM), /obj/item/stack/material/phoron = list(REAGENT_ID_PHORON), /obj/item/stack/material/gold = list(REAGENT_ID_GOLD), /obj/item/stack/material/silver = list(REAGENT_ID_SILVER), @@ -31,7 +31,7 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by /obj/item/stack/material/sandstone = list(REAGENT_ID_SILICON, REAGENT_ID_OXYGEN), /obj/item/stack/material/glass = list(REAGENT_ID_SILICON), /obj/item/stack/material/glass/phoronglass = list(REAGENT_ID_PLATINUM, REAGENT_ID_SILICON, REAGENT_ID_SILICON, REAGENT_ID_SILICON), //5 platinum, 15 silicon, - /obj/item/stack/material/supermatter = list("supermatter") + /obj/item/stack/material/supermatter = list(REAGENT_ID_SUPERMATTER) ) var/global/list/ore_reagents = list( //have a number of reageents divisible by REAGENTS_PER_ORE (default 20) unless you like decimals. /obj/item/ore/glass = list(REAGENT_ID_SILICON), @@ -41,7 +41,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R /obj/item/ore/silver = list(REAGENT_ID_SILVER), /obj/item/ore/gold = list(REAGENT_ID_GOLD), /obj/item/ore/marble = list(REAGENT_ID_SILICON,REAGENT_ID_ALUMINIUM,REAGENT_ID_ALUMINIUM,REAGENT_ID_SODIUM,REAGENT_ID_CALCIUM), // Some nice variety here - /obj/item/ore/uranium = list("uranium"), + /obj/item/ore/uranium = list(REAGENT_ID_URANIUM), /obj/item/ore/diamond = list(REAGENT_ID_CARBON), /obj/item/ore/osmium = list(REAGENT_ID_PLATINUM), // should contain osmium /obj/item/ore/lead = list(REAGENT_ID_LEAD), diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index 8d179b8721..b9dc010aec 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -185,7 +185,7 @@ /turf/simulated/floor/lava/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("mineralizedfluid", round(volume / 2, 0.1)) + R.add_reagent(REAGENT_ID_MINERALIZEDFLUID, round(volume / 2, 0.1)) /turf/simulated/floor/water/pump_reagents(var/datum/reagents/R, var/volume) diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index 1f372798be..b2c422c78e 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -52,7 +52,7 @@ /decl/chemical_reaction/distilling/biomass name = "Distilling Biomass" id = "distill_biomass" - result = "biomass" + result = REAGENT_ID_BIOMASS required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 0.5) result_amount = 1 // 40 units per sheet, requires actually using the machine, and having blood to spare. @@ -64,7 +64,7 @@ name = "Distilling Inaprovalaze" id = "distill_inaprovalaze" result = "inaprovalaze" - required_reagents = list("inaprovaline" = 2, "foaming_agent" = 1) + required_reagents = list("inaprovaline" = 2, REAGENT_ID_FOAMINGAGENT = 1) result_amount = 2 reaction_rate = HALF_LIFE(10) @@ -75,7 +75,7 @@ name = "Distilling Bicaridaze" id = "distill_bicaridaze" result = "bicaridaze" - required_reagents = list("bicaridine" = 2, "foaming_agent" = 1) + required_reagents = list("bicaridine" = 2, REAGENT_ID_FOAMINGAGENT = 1) result_amount = 2 reaction_rate = HALF_LIFE(10) @@ -86,7 +86,7 @@ name = "Distilling Dermalaze" id = "distill_dermalaze" result = "dermalaze" - required_reagents = list("dermaline" = 2, "foaming_agent" = 1) + required_reagents = list("dermaline" = 2, REAGENT_ID_FOAMINGAGENT = 1) result_amount = 2 reaction_rate = HALF_LIFE(10) @@ -97,7 +97,7 @@ name = "Distilling Spacomycaze" id = "distill_spacomycaze" result = "spacomycaze" - required_reagents = list("paracetamol" = 1, "spaceacillin" = 1, "foaming_agent" = 1) + required_reagents = list("paracetamol" = 1, "spaceacillin" = 1, REAGENT_ID_FOAMINGAGENT = 1) result_amount = 2 reaction_rate = HALF_LIFE(10) @@ -108,7 +108,7 @@ name = "Distilling Tricorlidaze" id = "distill_tricorlidaze" result = "tricorlidaze" - required_reagents = list("tricordrazine" = 1, "sterilizine" = 1, "foaming_agent" = 1) + required_reagents = list("tricordrazine" = 1, "sterilizine" = 1, REAGENT_ID_FOAMINGAGENT = 1) result_amount = 2 reaction_rate = HALF_LIFE(10) @@ -156,7 +156,7 @@ name = "Distilling Brute Juice" id = "distill_brutejuice" result = REAGENT_ID_BERSERKMED - required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1) + required_reagents = list(REAGENT_ID_BIOMASS = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1) result_amount = 3 temp_range = list(T0C + 600, T0C + 700) @@ -174,7 +174,7 @@ name = "Distilling Cryogellatin" id = "distill_cryoslurry" result = REAGENT_ID_CRYOSLURRY - required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, "foaming_agent" = 2) + required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, REAGENT_ID_FOAMINGAGENT = 2) inhibitors = list(REAGENT_ID_WATER = 5) result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index a982f23083..4b392020e5 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -170,7 +170,7 @@ name = "Nuclear Cola" id = "nuka_cola" result = "nuka_cola" - required_reagents = list("uranium" = 1, "cola" = 5) + required_reagents = list(REAGENT_ID_URANIUM = 1, "cola" = 5) result_amount = 5 /decl/chemical_reaction/instant/drinks/moonshine @@ -407,7 +407,7 @@ name = "Atomic Bomb" id = "atomicbomb" result = "atomicbomb" - required_reagents = list("b52" = 10, "uranium" = 1) + required_reagents = list("b52" = 10, REAGENT_ID_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/margarita @@ -428,7 +428,7 @@ name = "Three Mile Island Iced Tea" id = "threemileisland" result = "threemileisland" - required_reagents = list("longislandicedtea" = 10, "uranium" = 1) + required_reagents = list("longislandicedtea" = 10, REAGENT_ID_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/whiskeysoda @@ -456,7 +456,7 @@ name = "Manhattan Project" id = "manhattan_proj" result = "manhattan_proj" - required_reagents = list("manhattan" = 10, "uranium" = 1) + required_reagents = list("manhattan" = 10, REAGENT_ID_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/vodka_tonic @@ -1078,7 +1078,7 @@ name = "Ent's Draught" id = "entdraught" result = "entdraught" - required_reagents = list("tonic" = 1, "holywater" = 1, "honey" = 1) + required_reagents = list("tonic" = 1, REAGENT_ID_HOLYWATER = 1, "honey" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/voxdelight @@ -1239,15 +1239,15 @@ name = "Gods Sake" id = "godsake" result = "godsake" - required_reagents = list("sake" = 2, "holywater" = 1) + required_reagents = list("sake" = 2, REAGENT_ID_HOLYWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/godka //Why you would put this in your body, I don't know. name = "Godka" id = "godka" result = "godka" - required_reagents = list("vodka" = 1, "holywater" = 1, REAGENT_ID_ETHANOL = 1, "carthatoline" = 1) - catalysts = list("enzyme" = 5, "holywater" = 5) + required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, "carthatoline" = 1) + catalysts = list("enzyme" = 5, REAGENT_ID_HOLYWATER = 5) result_amount = 1 /decl/chemical_reaction/instant/drinks/holywine @@ -1255,7 +1255,7 @@ id = "holywine" result = "holywine" required_reagents = list("grapejuice" = 5, REAGENT_ID_GOLD = 5) - catalysts = list("holywater" = 5) + catalysts = list(REAGENT_ID_HOLYWATER = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/holy_mary @@ -1332,7 +1332,7 @@ name = "Nuclear Waste" id = "nuclearwasteuran" result = "nuclearwaste" - required_reagents = list("oilslick" = 2, "uranium" = 1) + required_reagents = list("oilslick" = 2, REAGENT_ID_URANIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/sodaoil diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm index c86da351df..1bb52e585f 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -130,7 +130,7 @@ name = REAGENT_GLOWINGAPPLETINI id = REAGENT_ID_GLOWINGAPPLETINI result = REAGENT_ID_GLOWINGAPPLETINI - required_reagents = list(REAGENT_ID_APPLETINIT = 5, "uranium" = 1) + required_reagents = list(REAGENT_ID_APPLETINIT = 5, REAGENT_ID_URANIUM = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/scsatw @@ -244,5 +244,5 @@ name = REAGENT_MANAGERSUMMONER id = REAGENT_ID_MANAGERSUMMONER result = REAGENT_ID_MANAGERSUMMONER - required_reagents = list("margarita" = 1, "redwine" = 1, "essential_oil" = 1) + required_reagents = list("margarita" = 1, "redwine" = 1, REAGENT_ID_ESSENTIALOIL = 1) result_amount = 3 diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index 78ff290c7c..a80acaac78 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -55,9 +55,9 @@ result_amount = 3 /decl/chemical_reaction/instant/silicate - name = "Silicate" - id = "silicate" - result = "silicate" + name = REAGENT_SILICATE + id = REAGENT_ID_SILICATE + result = REAGENT_ID_SILICATE required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1) result_amount = 3 @@ -76,9 +76,9 @@ result_amount = 1 /decl/chemical_reaction/instant/thermite - name = "Thermite" - id = "thermite" - result = "thermite" + name = REAGENT_THERMITE + id = REAGENT_ID_THERMITE + result = REAGENT_ID_THERMITE required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_IRON = 1, REAGENT_ID_OXYGEN = 1) result_amount = 3 @@ -90,9 +90,9 @@ result_amount = 3 /decl/chemical_reaction/instant/lube - name = "Space Lube" - id = "lube" - result = "lube" + name = REAGENT_LUBE + id = REAGENT_ID_LUBE + result = REAGENT_ID_LUBE required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1) result_amount = 4 @@ -160,7 +160,7 @@ name = "Respirodaxon" id = "respirodaxon" result = "respirodaxon" - required_reagents = list("dexalinp" = 2, "biomass" = 2, REAGENT_ID_PHORON = 1) + required_reagents = list("dexalinp" = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_PHORON = 1) catalysts = list(REAGENT_ID_PHORON = 5) inhibitors = list("dexalin" = 1) result_amount = 2 @@ -169,7 +169,7 @@ name = "Gastirodaxon" id = "gastirodaxon" result = "gastirodaxon" - required_reagents = list("carthatoline" = 1, "biomass" = 2, REAGENT_ID_TUNGSTEN = 2) + required_reagents = list("carthatoline" = 1, REAGENT_ID_BIOMASS = 2, REAGENT_ID_TUNGSTEN = 2) catalysts = list(REAGENT_ID_PHORON = 5) inhibitors = list(REAGENT_ID_LITHIUM = 1) result_amount = 3 @@ -178,7 +178,7 @@ name = "Hepanephrodaxon" id = "hepanephrodaxon" result = "hepanephrodaxon" - required_reagents = list("carthatoline" = 2, "biomass" = 2, REAGENT_ID_LITHIUM = 1) + required_reagents = list("carthatoline" = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_LITHIUM = 1) catalysts = list(REAGENT_ID_PHORON = 5) inhibitors = list(REAGENT_ID_TUNGSTEN = 1) result_amount = 2 @@ -187,7 +187,7 @@ name = "Cordradaxon" id = "cordradaxon" result = "cordradaxon" - required_reagents = list("potassium_chlorophoride" = 1, "biomass" = 2, "bicaridine" = 2) + required_reagents = list("potassium_chlorophoride" = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2) catalysts = list(REAGENT_ID_PHORON = 5) inhibitors = list("clonexadone" = 1) result_amount = 2 @@ -395,7 +395,7 @@ name = "Carpotoxin" id = "carpotoxin" result = "carpotoxin" - required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, "biomass" = 1, "sifsap" = 2) + required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, REAGENT_ID_BIOMASS = 1, "sifsap" = 2) catalysts = list("sifsap" = 10) inhibitors = list(REAGENT_ID_RADIUM = 1) result_amount = 2 @@ -417,44 +417,44 @@ /decl/chemical_reaction/instant/surfactant name = "Foam surfactant" id = "foam surfactant" - result = "fluorosurfactant" + result = REAGENT_ID_FLUOROSURFACTANT required_reagents = list(REAGENT_ID_FLUORINE = 2, REAGENT_ID_CARBON = 2, REAGENT_ID_SACID = 1) result_amount = 5 /decl/chemical_reaction/instant/ammonia - name = "Ammonia" - id = "ammonia" - result = "ammonia" + name = REAGENT_AMMONIA + id = REAGENT_ID_AMMONIA + result = REAGENT_ID_AMMONIA required_reagents = list(REAGENT_ID_HYDROGEN = 3, REAGENT_ID_NITROGEN = 1) inhibitors = list(REAGENT_ID_PHORON = 1) // Messes with lexorin result_amount = 3 /decl/chemical_reaction/instant/diethylamine - name = "Diethylamine" - id = "diethylamine" - result = "diethylamine" - required_reagents = list ("ammonia" = 1, REAGENT_ID_ETHANOL = 1) + name = REAGENT_DIETHYLAMINE + id = REAGENT_ID_DIETHYLAMINE + result = REAGENT_ID_DIETHYLAMINE + required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_ETHANOL = 1) result_amount = 2 /decl/chemical_reaction/instant/left4zed name = "Left4Zed" id = "left4zed" result = "left4zed" - required_reagents = list ("diethylamine" = 2, "mutagen" = 1) + required_reagents = list (REAGENT_ID_DIETHYLAMINE = 2, "mutagen" = 1) result_amount = 3 /decl/chemical_reaction/instant/robustharvest name = "RobustHarvest" id = "robustharvest" result = "robustharvest" - required_reagents = list ("ammonia" = 1, REAGENT_ID_CALCIUM = 1, "neurotoxic_protein" = 1) + required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_CALCIUM = 1, "neurotoxic_protein" = 1) result_amount = 3 /decl/chemical_reaction/instant/space_cleaner - name = "Space cleaner" - id = "cleaner" - result = "cleaner" - required_reagents = list("ammonia" = 1, REAGENT_ID_WATER = 1) + name = REAGENT_CLEANER + id = REAGENT_ID_CLEANER + result = REAGENT_ID_CLEANER + required_reagents = list(REAGENT_ID_AMMONIA = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/plantbgone @@ -466,15 +466,15 @@ /decl/chemical_reaction/instant/foaming_agent name = "Foaming Agent" - id = "foaming_agent" - result = "foaming_agent" + id = REAGENT_ID_FOAMINGAGENT + result = REAGENT_ID_FOAMINGAGENT required_reagents = list(REAGENT_ID_LITHIUM = 1, REAGENT_ID_HYDROGEN = 1) result_amount = 1 /decl/chemical_reaction/instant/glycerol - name = "Glycerol" - id = "glycerol" - result = "glycerol" + name = REAGENT_GLYCEROL + id = REAGENT_ID_GLYCEROL + result = REAGENT_ID_GLYCEROL required_reagents = list("cornoil" = 3, REAGENT_ID_SACID = 1) result_amount = 1 @@ -494,9 +494,9 @@ result_amount = 1 /decl/chemical_reaction/instant/coolant - name = "Coolant" - id = "coolant" - result = "coolant" + name = REAGENT_COOLANT + id = REAGENT_ID_COOLANT + result = REAGENT_ID_COOLANT required_reagents = list(REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_WATER = 1) result_amount = 3 log_is_important = 1 @@ -544,10 +544,10 @@ result_amount = 2 /decl/chemical_reaction/instant/luminol - name = "Luminol" - id = "luminol" - result = "luminol" - required_reagents = list(REAGENT_ID_HYDROGEN = 2, REAGENT_ID_CARBON = 2, "ammonia" = 2) + name = REAGENT_LUMINOL + id = REAGENT_ID_LUMINOL + result = REAGENT_ID_LUMINOL + required_reagents = list(REAGENT_ID_HYDROGEN = 2, REAGENT_ID_CARBON = 2, REAGENT_ID_AMMONIA = 2) result_amount = 6 /* Solidification */ @@ -596,7 +596,7 @@ /decl/chemical_reaction/instant/solidification/uranium name = "Solid Uranium" id = "soliduranium" - required_reagents = list("frostoil" = 5, "uranium" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/uranium @@ -639,7 +639,7 @@ name = "Carpet" id = "redcarpet" result = null - required_reagents = list("liquidcarpet" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 2, "plasticide" = 1) result_amount = 2 var/carpet_type = /obj/item/stack/tile/carpet @@ -650,49 +650,49 @@ /decl/chemical_reaction/instant/carpetify/bcarpet name = "Black Carpet" id = "blackcarpet" - required_reagents = list("liquidcarpetb" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETB = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/bcarpet /decl/chemical_reaction/instant/carpetify/blucarpet name = "Blue Carpet" id = "bluecarpet" - required_reagents = list ("liquidcarpetblu" = 2, "plasticide" = 1) + required_reagents = list (REAGENT_ID_LIQUIDCARPETBLU = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/blucarpet /decl/chemical_reaction/instant/carpetify/turcarpet name = "Turquise Carpet" id = "turcarpet" - required_reagents = list("liquidcarpettur" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETTUR = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/turcarpet /decl/chemical_reaction/instant/carpetify/sblucarpet name = "Silver Blue Carpet" id = "sblucarpet" - required_reagents = list("liquidcarpetsblu" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETSBLU = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/sblucarpet /decl/chemical_reaction/instant/carpetify/clowncarpet name = "Clown Carpet" id = "clowncarpet" - required_reagents = list("liquidcarpetc" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETC = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/gaycarpet /decl/chemical_reaction/instant/carpetify/pcarpet name = "Purple Carpet" id = "Purplecarpet" - required_reagents = list("liquidcarpetp" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETP = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/purcarpet /decl/chemical_reaction/instant/carpetify/ocarpet name = "Orange Carpet" id = "orangecarpet" - required_reagents = list("liquidcarpeto" = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETO = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/oracarpet /decl/chemical_reaction/instant/concrete name = "Concrete" id = "concretereagent" - required_reagents = list(REAGENT_ID_CALCIUM = 2, "silicate" = 2, REAGENT_ID_WATER = 2) + required_reagents = list(REAGENT_ID_CALCIUM = 2, REAGENT_ID_SILICATE = 2, REAGENT_ID_WATER = 2) result_amount = 1 /decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -759,7 +759,7 @@ name = "EMP Pulse" id = "emp_pulse" result = null - required_reagents = list("uranium" = 1, REAGENT_ID_IRON = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense + required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_IRON = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 /decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -774,10 +774,10 @@ return /decl/chemical_reaction/instant/nitroglycerin - name = "Nitroglycerin" - id = "nitroglycerin" - result = "nitroglycerin" - required_reagents = list("glycerol" = 1, REAGENT_ID_PACID = 1, REAGENT_ID_SACID = 1) + name = REAGENT_NITROGLYCERIN + id = REAGENT_ID_NITROGLYCERIN + result = REAGENT_ID_NITROGLYCERIN + required_reagents = list(REAGENT_ID_GLYCEROL = 1, REAGENT_ID_PACID = 1, REAGENT_ID_SACID = 1) result_amount = 2 log_is_important = 1 @@ -838,7 +838,7 @@ name = "Foam" id = "foam" result = null - required_reagents = list("fluorosurfactant" = 1, REAGENT_ID_WATER = 1) + required_reagents = list(REAGENT_ID_FLUOROSURFACTANT = 1, REAGENT_ID_WATER = 1) result_amount = 2 mix_message = "The solution violently bubbles!" @@ -861,7 +861,7 @@ name = "Metal Foam" id = "metalfoam" result = null - required_reagents = list(REAGENT_ID_ALUMINIUM = 3, "foaming_agent" = 1, REAGENT_ID_PACID = 1) + required_reagents = list(REAGENT_ID_ALUMINIUM = 3, REAGENT_ID_FOAMINGAGENT = 1, REAGENT_ID_PACID = 1) result_amount = 5 /decl/chemical_reaction/instant/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -879,7 +879,7 @@ name = "Iron Foam" id = "ironlfoam" result = null - required_reagents = list(REAGENT_ID_IRON = 3, "foaming_agent" = 1, REAGENT_ID_PACID = 1) + required_reagents = list(REAGENT_ID_IRON = 3, REAGENT_ID_FOAMINGAGENT = 1, REAGENT_ID_PACID = 1) result_amount = 5 /decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1132,45 +1132,45 @@ /decl/chemical_reaction/instant/carpetdye name = "Black Carpet Dyeing" id = "carpetdyeblack" - result = "liquidcarpetb" - required_reagents = list("liquidcarpet" = 5, REAGENT_ID_CARBON = 1) + result = REAGENT_ID_LIQUIDCARPETB + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_CARBON = 1) result_amount = 5 /decl/chemical_reaction/instant/carpetdye/blue name = "Blue Carpet Dyeing" id = "carpetdyeblue" - result = "liquidcarpetblu" - required_reagents = list("liquidcarpet" = 5, "frostoil" = 1) + result = REAGENT_ID_LIQUIDCARPETBLU + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "frostoil" = 1) /decl/chemical_reaction/instant/carpetdye/tur name = "Turqouise Carpet Dyeing" id = "carpetdyetur" - result = "liquidcarpettur" - required_reagents = list("liquidcarpet" = 5, REAGENT_ID_WATER = 1) + result = REAGENT_ID_LIQUIDCARPETTUR + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_WATER = 1) /decl/chemical_reaction/instant/carpetdye/sblu name = "Silver Blue Carpet Dyeing" id = "carpetdyesblu" - result = "liquidcarpetsblu" - required_reagents = list("liquidcarpet" = 5, "ice" = 1) + result = REAGENT_ID_LIQUIDCARPETSBLU + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "ice" = 1) /decl/chemical_reaction/instant/carpetdye/clown name = "Clown Carpet Dyeing" id = "carpetdyeclown" - result = "liquidcarpetc" - required_reagents = list("liquidcarpet" = 5, "banana" = 1) + result = REAGENT_ID_LIQUIDCARPETC + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "banana" = 1) /decl/chemical_reaction/instant/carpetdye/purple name = "Purple Carpet Dyeing" id = "carpetdyepurple" - result = "liquidcarpetp" - required_reagents = list("liquidcarpet" = 5, "berryjuice" = 1) + result = REAGENT_ID_LIQUIDCARPETP + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "berryjuice" = 1) /decl/chemical_reaction/instant/carpetdye/orange name = "Orange Carpet Dyeing" id = "carpetdyeorange" - result = "liquidcarpeto" - required_reagents = list("liquidcarpet" = 5, "orangejuice" = 1) + result = REAGENT_ID_LIQUIDCARPETO + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "orangejuice" = 1) //R-UST Port @@ -1183,9 +1183,9 @@ result_amount = 2 /decl/chemical_reaction/instant/deuterium - name = "Deuterium" - id = "deuterium" - result = "deuterium" + name = REAGENT_DEUTERIUM + id = REAGENT_ID_DEUTERIUM + result = REAGENT_ID_DEUTERIUM required_reagents = list("hydrophoron" = 1, REAGENT_ID_WATER = 2) result_amount = 3 @@ -1214,9 +1214,9 @@ // Biomass, for cloning and bioprinters /decl/chemical_reaction/instant/biomass - name = "Biomass" - id = "biomass" - result = "biomass" + name = REAGENT_BIOMASS + id = REAGENT_ID_BIOMASS + result = REAGENT_ID_BIOMASS required_reagents = list("protein" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1) result_amount = 1 // Roughly 20u per phoron sheet diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index 2edf1d4d9c..e2eaca2818 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -14,7 +14,7 @@ id = REAGENT_ID_MACROCILLIN result = REAGENT_ID_MACROCILLIN // POLARISTODO requires_heating = 1 - required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "diethylamine" = 20) + required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_DIETHYLAMINE = 20) result_amount = 1 /decl/chemical_reaction/instant/microcillin @@ -53,7 +53,7 @@ name = REAGENT_AMORPHOROVIR id = REAGENT_ID_AMORPHOROVIR result = REAGENT_ID_AMORPHOROVIR - required_reagents = list("cryptobiolin" = 30, "biomass" = 30, "hyperzine" = 20) + required_reagents = list("cryptobiolin" = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 1 @@ -129,7 +129,7 @@ name = REAGENT_ICKYPAK id = REAGENT_ID_ICKYPAK result = REAGENT_ID_ICKYPAK - required_reagents = list("hyperzine" = 4, "fluorosurfactant" = 1) + required_reagents = list("hyperzine" = 4, REAGENT_ID_FLUOROSURFACTANT = 1) result_amount = 5 /decl/chemical_reaction/instant/unsorbitol @@ -167,7 +167,7 @@ name = REAGENT_LIPOZILASE id = REAGENT_ID_LIPOZILASE result = REAGENT_ID_LIPOZILASE - required_reagents = list("lipozine" = 1, "diethylamine" = 1) + required_reagents = list("lipozine" = 1, REAGENT_ID_DIETHYLAMINE = 1) result_amount = 2 /decl/chemical_reaction/instant/lipostipo diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm index 36783e4f61..fdfc8798f8 100644 --- a/code/modules/reagents/reactions/instant/virology.dm +++ b/code/modules/reagents/reactions/instant/virology.dm @@ -89,7 +89,7 @@ /decl/chemical_reaction/instant/mix_virus/mix_virus_4 name = "Mix Virus 4" id = "mixvirus4" - required_reagents = list("uranium" = 1) + required_reagents = list(REAGENT_ID_URANIUM = 1) level_min = 5 level_max = 6 diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 6ecb0e2443..3510c179ed 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -80,7 +80,7 @@ /obj/item/reagent_containers/glass/beaker/vial/supermatter name = "vial (supermatter)" desc = "A glass vial containing the extremely dangerous results of grinding a shard of supermatter down to a fine powder." - prefill = list("supermatter" = 5) + prefill = list(REAGENT_ID_SUPERMATTER = 5) /obj/item/reagent_containers/glass/beaker/measuring_cup name = "measuring cup" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 4944a18e63..81148ffcc2 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -369,7 +369,7 @@ The injector stores a slurry of highly advanced and specialized nanomachines that \ are unfortunately malfunctioning, making them unsafe to use inside of a living body. \ Because of the Five Points, these nanites cannot self-replicate." - filled_reagents = list("defective_nanites" = 15) + filled_reagents = list(REAGENT_ID_DEFECTIVENANITES = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated name = "contaminated injector" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 193e8c60d8..ea4561c333 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -48,7 +48,7 @@ if(reagents.has_reagent(REAGENT_ID_PACID)) message_admins("[key_name_admin(user)] fired Polyacid from \a [src].") log_game("[key_name(user)] fired Polyacid from \a [src].") - if(reagents.has_reagent("lube")) + if(reagents.has_reagent(REAGENT_ID_LUBE)) message_admins("[key_name_admin(user)] fired Space lube from \a [src].") log_game("[key_name(user)] fired Space lube from \a [src].") return @@ -106,7 +106,7 @@ /obj/item/reagent_containers/spray/cleaner/Initialize() . = ..() - reagents.add_reagent("cleaner", volume) + reagents.add_reagent(REAGENT_ID_CLEANER, volume) /obj/item/reagent_containers/spray/sterilizine name = "sterilizine" diff --git a/code/modules/reagents/reagent_containers/spray_vr.dm b/code/modules/reagents/reagent_containers/spray_vr.dm index c546410a55..71af9173f4 100644 --- a/code/modules/reagents/reagent_containers/spray_vr.dm +++ b/code/modules/reagents/reagent_containers/spray_vr.dm @@ -9,4 +9,4 @@ /obj/item/reagent_containers/spray/windowsealant/New() ..() - reagents.add_reagent("silicate", 80) \ No newline at end of file + reagents.add_reagent(REAGENT_ID_SILICATE, 80) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 667ace2968..2cbd869d08 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -386,7 +386,7 @@ /obj/item/reagent_containers/syringe/steroid/Initialize() ..() - //reagents.add_reagent("adrenaline",5) //VOREStation Edit - No thanks. + //reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks. reagents.add_reagent("hyperzine",10) /obj/item/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo) diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index e673679c1b..c2abcbe9e9 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -256,8 +256,8 @@ color = "#777777" /datum/reagent/uranium - name ="Uranium" - id = "uranium" + name = REAGENT_URANIUM + id = REAGENT_ID_URANIUM description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive." taste_description = "metal" reagent_state = SOLID @@ -279,37 +279,37 @@ return /datum/reagent/hydrogen/deuterium - name = "Deuterium" - id = "deuterium" + name = REAGENT_DEUTERIUM + id = REAGENT_ID_DEUTERIUM description = "A isotope of hydrogen. It has one extra neutron, and shares all chemical characteristics with hydrogen." /datum/reagent/hydrogen/tritium - name = "Tritium" - id = "tritium" + name = REAGENT_TRITIUM + id = REAGENT_ID_SLIMEJELLY description = "A radioactive isotope of hydrogen. It has two extra neutrons, and shares all other chemical characteristics with hydrogen." /datum/reagent/lithium/lithium6 - name = "Lithium-6" - id = "lithium6" + name = REAGENT_LITHIUM6 + id = REAGENT_ID_LITHIUM6 description = "An isotope of lithium. It has 3 neutrons, but shares all chemical characteristics with regular lithium." /datum/reagent/helium/helium3 - name = "Helium-3" - id = "helium3" + name = REAGENT_HELIUM3 + id = REAGENT_ID_HELIUM3 description = "An isotope of helium. It only has one neutron, but shares all chemical characteristics with regular helium." taste_mult = 0 reagent_state = GAS color = "#808080" /datum/reagent/boron/boron11 - name = "Boron-11" - id = "boron11" + name = REAGENT_BORON11 + id = REAGENT_ID_BORON11 description = "An isotope of boron. It has 6 neutrons." taste_description = "metallic" // Apparently noone on the internet knows what boron tastes like. Or at least they won't share /datum/reagent/supermatter - name = "Supermatter" - id = "supermatter" + name = REAGENT_SUPERMATTER + id = REAGENT_ID_SUPERMATTER color = "#fffd6b" reagent_state = SOLID affects_dead = TRUE @@ -332,8 +332,8 @@ /datum/reagent/adrenaline - name = "Adrenaline" - id = "adrenaline" + name = REAGENT_ADRENALINE + id = REAGENT_ID_ADRENALINE description = "Adrenaline is a hormone used as a drug to treat cardiac arrest and other cardiac dysrhythmias resulting in diminished or absent cardiac output." taste_description = "bitterness" reagent_state = LIQUID @@ -348,8 +348,8 @@ M.adjustToxLoss(rand(3)) /datum/reagent/water/holywater - name = "Holy Water" - id = "holywater" + name = REAGENT_HOLYWATER + id = REAGENT_ID_HOLYWATER description = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality." taste_description = "water" color = "#E0E8EF" @@ -371,8 +371,8 @@ return /datum/reagent/ammonia - name = "Ammonia" - id = "ammonia" + name = REAGENT_AMMONIA + id = REAGENT_ID_AMMONIA description = "A caustic substance commonly used in fertilizer or household cleaners." taste_description = "mordant" taste_mult = 2 @@ -380,32 +380,32 @@ color = "#404030" /datum/reagent/diethylamine - name = "Diethylamine" - id = "diethylamine" + name = REAGENT_DIETHYLAMINE + id = REAGENT_ID_DIETHYLAMINE description = "A secondary amine, mildly corrosive." taste_description = REAGENT_ID_IRON reagent_state = LIQUID color = "#604030" /datum/reagent/fluorosurfactant // Foam precursor - name = "Fluorosurfactant" - id = "fluorosurfactant" + name = REAGENT_FLUOROSURFACTANT + id = REAGENT_ID_FLUOROSURFACTANT description = "A perfluoronated sulfonic acid that forms a foam when mixed with water." taste_description = "metal" reagent_state = LIQUID color = "#9E6B38" /datum/reagent/foaming_agent // Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. - name = "Foaming agent" - id = "foaming_agent" + name = REAGENT_FOAMINGAGENT + id = REAGENT_ID_FOAMINGAGENT description = "A agent that yields metallic foam when mixed with light metal and a strong acid." taste_description = "metal" reagent_state = SOLID color = "#664B63" /datum/reagent/thermite - name = "Thermite" - id = "thermite" + name = REAGENT_THERMITE + id = REAGENT_ID_THERMITE description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." taste_description = "sweet tasting metal" reagent_state = SOLID @@ -431,8 +431,8 @@ M.adjustFireLoss(3 * removed) /datum/reagent/space_cleaner - name = "Space cleaner" - id = "cleaner" + name = REAGENT_CLEANER + id = REAGENT_ID_CLEANER description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" taste_description = "sourness" reagent_state = LIQUID @@ -512,8 +512,8 @@ H.visible_message(span_notice("[H]\'s [S.name] is put out.")) /datum/reagent/lube // TODO: spraying on borgs speeds them up - name = "Space Lube" - id = "lube" + name = REAGENT_LUBE + id = REAGENT_ID_LUBE description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." taste_description = "slime" reagent_state = LIQUID @@ -527,8 +527,8 @@ T.wet_floor(2) /datum/reagent/silicate - name = "Silicate" - id = "silicate" + name = REAGENT_SILICATE + id = REAGENT_ID_SILICATE description = "A compound that can be used to reinforce glass." taste_description = "plastic" reagent_state = LIQUID @@ -543,24 +543,24 @@ return /datum/reagent/glycerol - name = "Glycerol" - id = "glycerol" + name = REAGENT_GLYCEROL + id = REAGENT_ID_GLYCEROL description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." taste_description = "sweetness" reagent_state = LIQUID color = "#808080" /datum/reagent/nitroglycerin - name = "Nitroglycerin" - id = "nitroglycerin" + name = REAGENT_NITROGLYCERIN + id = REAGENT_ID_NITROGLYCERIN description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." taste_description = "oil" reagent_state = LIQUID color = "#808080" /datum/reagent/coolant - name = "Coolant" - id = "coolant" + name = REAGENT_COOLANT + id = REAGENT_ID_COOLANT description = "Industrial cooling substance." taste_description = "sourness" taste_mult = 1.1 @@ -586,23 +586,23 @@ ..() /datum/reagent/ultraglue - name = "Ultra Glue" - id = "glue" + name = REAGENT_GLUE + id = REAGENT_ID_GLUE description = "An extremely powerful bonding agent." taste_description = "a special education class" color = "#FFFFCC" /datum/reagent/woodpulp - name = "Wood Pulp" - id = "woodpulp" + name = REAGENT_WOODPULP + id = REAGENT_ID_WOODPULP description = "A mass of wood fibers." taste_description = "wood" reagent_state = LIQUID color = "#B97A57" /datum/reagent/luminol - name = "Luminol" - id = "luminol" + name = REAGENT_LUMINOL + id = REAGENT_ID_LUMINOL description = "A compound that interacts with blood on the molecular level." taste_description = "metal" reagent_state = LIQUID @@ -617,16 +617,16 @@ L.reveal_blood() /datum/reagent/nutriment/biomass - name = "Biomass" - id = "biomass" + name = REAGENT_BIOMASS + id = REAGENT_ID_BIOMASS description = "A slurry of compounds that contains the basic requirements for life." taste_description = "salty meat" reagent_state = LIQUID color = "#DF9FBF" /datum/reagent/mineralfluid - name = "Mineral-Rich Fluid" - id = "mineralizedfluid" + name = REAGENT_MINERALIZEDFLUID + id = REAGENT_ID_MINERALIZEDFLUID description = "A warm, mineral-rich fluid." taste_description = "salt" reagent_state = LIQUID @@ -634,8 +634,8 @@ // The opposite to healing nanites, exists to make unidentified hypos implied to have nanites not be 100% safe. /datum/reagent/defective_nanites - name = "Defective Nanites" - id = "defective_nanites" + name = REAGENT_DEFECTIVENANITES + id = REAGENT_ID_DEFECTIVENANITES description = "Miniature medical robots that are malfunctioning and cause bodily harm. Fortunately, they cannot self-replicate." taste_description = "metal" reagent_state = SOLID @@ -650,8 +650,8 @@ M.adjustCloneLoss(2 * removed) /datum/reagent/nutriment/fishbait - name = "Fish Bait" - id = "fishbait" + name = REAGENT_FISHBAIT + id = REAGENT_ID_FISHBAIT description = "A natural slurry that particularily appeals to fish." taste_description = "slimy dirt" reagent_state = LIQUID @@ -659,72 +659,72 @@ nutriment_factor = 15 /datum/reagent/carpet - name = "Liquid Carpet" - id = "liquidcarpet" + name = REAGENT_LIQUIDCARPET + id = REAGENT_ID_LIQUIDCARPET description = "Liquified carpet fibers, ready for dyeing." reagent_state = LIQUID color = "#b51d05" taste_description = "carpet" /datum/reagent/carpet/black - name = "Liquid Black Carpet" - id = "liquidcarpetb" + name = REAGENT_LIQUIDCARPETB + id = REAGENT_ID_LIQUIDCARPETB description = "Black Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#000000" taste_description = "rare and ashy carpet" /datum/reagent/carpet/blue - name = "Liquid Blue Carpet" - id = "liquidcarpetblu" + name = REAGENT_LIQUIDCARPETBLU + id = REAGENT_ID_LIQUIDCARPETBLU description = "Blue Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#3f4aee" taste_description = "commanding carpet" /datum/reagent/carpet/turquoise - name = "Liquid Turquoise Carpet" - id = "liquidcarpettur" + name = REAGENT_LIQUIDCARPETTUR + id = REAGENT_ID_LIQUIDCARPETTUR description = "Turquoise Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#0592b5" taste_description = "water-logged carpet" /datum/reagent/carpet/sblue - name = "Liquid Silver Blue Carpet" - id = "liquidcarpetsblu" + name = REAGENT_LIQUIDCARPETSBLU + id = REAGENT_ID_LIQUIDCARPETSBLU description = "Silver Blue Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#0011ff" taste_description = "sterile and medicinal carpet" /datum/reagent/carpet/clown - name = "Liquid Clown Carpet" - id = "liquidcarpetc" + name = REAGENT_LIQUIDCARPETC + id = REAGENT_ID_LIQUIDCARPETC description = "Clown Carpet Fibers.... No clowns were harmed in the making of this." reagent_state = LIQUID color = "#e925be" taste_description = "clown shoes and banana peels" /datum/reagent/carpet/purple - name = "Liquid Purple Carpet" - id = "liquidcarpetp" + name = REAGENT_LIQUIDCARPETP + id = REAGENT_ID_LIQUIDCARPETP description = "Purple Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#a614d3" taste_description = "bleeding edge carpet research" /datum/reagent/carpet/orange - name = "Liquid Orange Carpet" - id = "liquidcarpeto" + name = REAGENT_LIQUIDCARPETO + id = REAGENT_ID_LIQUIDCARPETO description = "Orange Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#f16e16" taste_description = "extremely overengineered carpet" /datum/reagent/essential_oil - name = "Essential Oils" - id = "essential_oil" + name = REAGENT_ESSENTIALOIL + id = REAGENT_ID_ESSENTIALOIL description = "A slurry of compounds that contains the basic requirements for life." taste_description = "a mixture of thick, sweet, salty, salty and spicy flavours that all blend together to not be very nice at all" reagent_state = LIQUID diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index 1bfed91ff7..7bfd9f9965 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -299,10 +299,10 @@ if(W.reagents.has_reagent(REAGENT_ID_HYDROGEN, 1) || W.reagents.has_reagent(REAGENT_ID_WATER, 1)) if(my_effect.trigger == TRIGGER_WATER) my_effect.ToggleActivate() - else if(W.reagents.has_reagent(REAGENT_ID_SACID, 1) || W.reagents.has_reagent(REAGENT_ID_PACID, 1) || W.reagents.has_reagent("diethylamine", 1)) + else if(W.reagents.has_reagent(REAGENT_ID_SACID, 1) || W.reagents.has_reagent(REAGENT_ID_PACID, 1) || W.reagents.has_reagent(REAGENT_ID_DIETHYLAMINE, 1)) if(my_effect.trigger == TRIGGER_ACID) my_effect.ToggleActivate() - else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent("thermite", 1)) + else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent(REAGENT_ID_THERMITE, 1)) if(my_effect.trigger == TRIGGER_VOLATILE) my_effect.ToggleActivate() else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1)) @@ -328,8 +328,8 @@ var/datum/reagent/Touching = args[2] var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER) - var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, "diethylamine") - var/list/volatile = list(REAGENT_ID_PHORON,"thermite") + var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, REAGENT_ID_DIETHYLAMINE) + var/list/volatile = list(REAGENT_ID_PHORON,REAGENT_ID_THERMITE) var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin") for(var/datum/artifact_effect/my_effect in my_effects) diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index 0a4a8689a7..9c2385e43c 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/glass/replenishing/Initialize() . = ..() START_PROCESSING(SSobj, src) - spawning_id = pick(REAGENT_ID_BLOOD,"holywater","lube","stoxin",REAGENT_ID_ETHANOL,"ice","glycerol",REAGENT_ID_FUEL,"cleaner") + spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,"stoxin",REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER) /obj/item/reagent_containers/glass/replenishing/process() reagents.add_reagent(spawning_id, 0.3) diff --git a/code/modules/xenoarcheaology/tools/coolant_tank.dm b/code/modules/xenoarcheaology/tools/coolant_tank.dm index 2975cf0749..acb776a657 100644 --- a/code/modules/xenoarcheaology/tools/coolant_tank.dm +++ b/code/modules/xenoarcheaology/tools/coolant_tank.dm @@ -7,7 +7,7 @@ /obj/structure/reagent_dispensers/coolanttank/Initialize() . = ..() - reagents.add_reagent("coolant", 1000) + reagents.add_reagent(REAGENT_ID_COOLANT, 1000) /obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index f01b9b5a3f..47a6678e48 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -56,7 +56,7 @@ coolant_reagents_purity["dermaline"] = 0.7 coolant_reagents_purity["hyperzine"] = 0.8 coolant_reagents_purity["cryoxadone"] = 0.9 - coolant_reagents_purity["coolant"] = 1 + coolant_reagents_purity[REAGENT_ID_COOLANT] = 1 coolant_reagents_purity[REAGENT_ID_ADMINORDRAZINE] = 2 /obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob) diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index a564f0205a..9c06e5db82 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -178,8 +178,8 @@ /decl/chemical_reaction/instant/metamorphic/uranium name = "Morph into Uranium" id = "morph_uranium" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "uranium" = REAGENTS_PER_SHEET) - result = "uranium" + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET) + result = REAGENT_ID_URANIUM /decl/chemical_reaction/instant/metamorphic/phoron @@ -605,7 +605,7 @@ /decl/chemical_reaction/instant/slime/green_uranium name = "Slime Uranium" id = "m_uranium" - result = "uranium" + result = REAGENT_ID_URANIUM required_reagents = list(REAGENT_ID_PHORON = 5) result_amount = 5 required = /obj/item/slime_extract/green diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm index 532ef7dd6c..f093290d5e 100644 --- a/code/modules/xenobio2/_xeno_setup_vr.dm +++ b/code/modules/xenobio2/_xeno_setup_vr.dm @@ -38,22 +38,22 @@ xenoChemList += "plantbgone" xenoChemList += "serotrotium" xenoChemList += REAGENT_ID_NICOTINE - xenoChemList += "uranium" + xenoChemList += REAGENT_ID_URANIUM xenoChemList += REAGENT_ID_SILVER xenoChemList += REAGENT_ID_GOLD - xenoChemList += "adrenaline" - xenoChemList += "holywater" - xenoChemList += "ammonia" - xenoChemList += "diethylamine" - xenoChemList += "fluorosurfactant" - xenoChemList += "foaming_agent" - xenoChemList += "thermite" - xenoChemList += "cleaner" - xenoChemList += "lube" - xenoChemList += "silicate" - xenoChemList += "glycerol" - xenoChemList += "coolant" - xenoChemList += "luminol" + xenoChemList += REAGENT_ID_ADRENALINE + xenoChemList += REAGENT_ID_HOLYWATER + xenoChemList += REAGENT_ID_AMMONIA + xenoChemList += REAGENT_ID_DIETHYLAMINE + xenoChemList += REAGENT_ID_FLUOROSURFACTANT + xenoChemList += REAGENT_ID_FOAMINGAGENT + xenoChemList += REAGENT_ID_THERMITE + xenoChemList += REAGENT_ID_CLEANER + xenoChemList += REAGENT_ID_LUBE + xenoChemList += REAGENT_ID_SILICATE + xenoChemList += REAGENT_ID_GLYCEROL + xenoChemList += REAGENT_ID_COOLANT + xenoChemList += REAGENT_ID_LUMINOL xenoChemList += REAGENT_ID_NUTRIMENT xenoChemList += "cornoil" xenoChemList += "lipozine" diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index 989fb3b306..4831b54136 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -54,10 +54,10 @@ Slime definitions, Life and New live here. REAGENT_ID_SACID = list(XENO_CHEM_TOXIC = 1), REAGENT_ID_PACID = list(XENO_CHEM_TOXIC = 2), REAGENT_ID_CHLORINE = list(XENO_CHEM_TOXIC = 0.5), - "ammonia" = list(XENO_CHEM_TOXIC = 0.5), + REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5), "sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), "beer" = list(XENO_CHEM_NUTRI = 0.6), - "diethylamine" = list(XENO_CHEM_NUTRI = 0.9), + REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9), REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2), "eznutrient" = list(XENO_CHEM_NUTRI = 0.8), "cryoxadone" = list(XENO_CHEM_TOXIC = 0.4), @@ -75,9 +75,9 @@ Slime definitions, Life and New live here. "amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3), "mutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5), REAGENT_ID_GOLD = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3), - "uranium" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2), - "glycerol" = list(XENO_CHEM_NUTRI = 0.6), - "woodpulp" = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7), + REAGENT_ID_URANIUM = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2), + REAGENT_ID_GLYCEROL = list(XENO_CHEM_NUTRI = 0.6), + REAGENT_ID_WOODPULP = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7), "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) ) /mob/living/simple_mob/xeno/slime/New()