From 80edcd2c3d0c3b2c4fc1c92d07f9ddcee70566cd Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:26:00 +0100
Subject: [PATCH 01/29] Converts gas, mat and reagent strings to defines
---
.../binary_devices/algae_generator_vr.dm | 4 +-
.../components/omni_devices/_omni_extras.dm | 27 ++--
.../components/trinary_devices/filter.dm | 20 +--
.../components/unary/vent_scrubber.dm | 50 +++----
.../components/unary/vent_scrubber_vr.dm | 2 +-
code/ATMOSPHERICS/pipes/tank.dm | 14 +-
code/ZAS/Fire.dm | 2 +-
code/ZAS/Phoron.dm | 6 +-
code/ZAS/Turf.dm | 12 +-
code/ZAS/Zone.dm | 4 +-
code/__defines/materials.dm | 6 +-
code/__defines/ores.dm | 20 +++
code/__defines/reagents.dm | 112 ++++++++++++++++
code/_onclick/hud/screen_objects.dm | 26 ++--
code/controllers/subsystems/chemistry.dm | 2 +-
code/controllers/subsystems/plants.dm | 8 +-
code/defines/gases.dm | 26 ++--
code/game/gamemodes/objective.dm | 2 +-
.../technomancer/spells/oxygenate.dm | 6 +-
code/game/machinery/air_alarm.dm | 24 ++--
code/game/machinery/airconditioner_vr.dm | 2 +-
code/game/machinery/atmo_control.dm | 20 +--
code/game/machinery/atmoalter/canister.dm | 22 ++--
.../atmoalter/portable_atmospherics.dm | 4 +-
code/game/machinery/atmoalter/pump.dm | 6 +-
code/game/machinery/atmoalter/scrubber.dm | 2 +-
code/game/machinery/cryo.dm | 2 +-
code/game/machinery/doors/airlock.dm | 4 +-
code/game/mecha/equipment/tools/generator.dm | 4 +-
code/game/mecha/mecha.dm | 2 +-
code/game/mecha/mecha_parts.dm | 12 +-
code/game/objects/effects/mines.dm | 4 +-
.../objects/effects/spawners/bombspawner.dm | 6 +-
.../items/devices/communicator/helper.dm | 8 +-
.../objects/items/weapons/cigs_lighters.dm | 4 +-
.../objects/items/weapons/flamethrower.dm | 6 +-
.../items/weapons/grenades/chem_grenade.dm | 2 +-
.../items/weapons/storage/uplink_kits.dm | 2 +-
.../objects/items/weapons/tanks/jetpack.dm | 8 +-
.../objects/items/weapons/tanks/tank_types.dm | 34 ++---
.../items/weapons/tanks/tank_types_vr.dm | 2 +-
.../game/objects/items/weapons/tanks/tanks.dm | 4 +-
code/game/objects/structures/bonfire.dm | 4 +-
.../crates_lockers/closets/coffin.dm | 2 +-
code/game/objects/structures/door_assembly.dm | 4 +-
code/game/objects/structures/droppod.dm | 4 +-
code/game/objects/structures/simple_doors.dm | 18 +--
code/game/objects/structures/transit_tubes.dm | 2 +-
code/game/turfs/flooring/flooring_premade.dm | 2 +-
code/game/turfs/simulated/underwater.dm | 4 +-
code/game/turfs/simulated/wall_types.dm | 40 +++---
code/game/turfs/simulated/water.dm | 8 +-
code/modules/admin/topic.dm | 2 +-
code/modules/admin/verbs/debug.dm | 8 +-
code/modules/blob2/core_chunk.dm | 2 +-
.../client/preference_setup/vore/07_traits.dm | 2 +-
code/modules/clothing/accessories/hands.dm | 18 +--
code/modules/clothing/masks/gasmask.dm | 6 +-
code/modules/detectivework/tools/rag.dm | 4 +-
code/modules/economy/mint.dm | 14 +-
code/modules/economy/money_bag.dm | 12 +-
code/modules/events/atmos_leak.dm | 6 +-
code/modules/events/supply_demand_vr.dm | 2 +-
code/modules/flufftext/Dreaming.dm | 2 +-
code/modules/food/food/snacks.dm | 4 +-
code/modules/food/food/snacks/meat.dm | 2 +-
code/modules/food/glass/bottle_potion.dm | 3 +-
.../event2/events/engineering/gas_leak.dm | 4 +-
code/modules/hydroponics/backtank.dm | 2 +-
code/modules/hydroponics/seed.dm | 4 +-
code/modules/hydroponics/seedtypes/xeno.dm | 4 +-
.../integrated_electronics/passive/power.dm | 2 +-
.../integrated_electronics/subtypes/input.dm | 28 ++--
code/modules/materials/materials/gems.dm | 6 +-
code/modules/materials/sheets/gems.dm | 23 ++--
code/modules/mining/drilling/drill.dm | 80 ++++++------
code/modules/mining/drilling/scanner.dm | 14 +-
.../mining/machinery/machine_processing.dm | 40 +++---
.../mining/machinery/machine_unloading.dm | 42 +++---
code/modules/mining/mine_turfs.dm | 44 +++----
code/modules/mining/ore.dm | 80 ++++++------
code/modules/mining/ore_box.dm | 40 +++---
code/modules/mining/ore_datum.dm | 122 +++++++++---------
.../mob/living/carbon/alien/larva/life.dm | 2 +-
code/modules/mob/living/carbon/human/life.dm | 22 ++--
.../carbon/human/species/outsider/vox.dm | 4 +-
.../living/carbon/human/species/species.dm | 6 +-
.../carbon/human/species/station/alraune.dm | 10 +-
.../carbon/human/species/station/blank_vr.dm | 4 +-
.../carbon/human/species/station/station.dm | 2 +-
.../species/station/traits_vr/negative.dm | 4 +-
.../human/species/xenomorphs/alien_species.dm | 2 +-
code/modules/mob/living/living_defense.dm | 2 +-
.../living/silicon/pai/software_modules.dm | 8 +-
code/modules/mob/living/simple_mob/life.dm | 16 +--
.../animal/giant_spider/phorogenic.dm | 2 +-
.../simple_mob/subtypes/animal/sif/leech.dm | 4 +-
.../subtypes/slime/xenobio/subtypes.dm | 4 +-
code/modules/nifsoft/software/05_health.dm | 4 +-
code/modules/organs/internal/brain.dm | 2 +-
code/modules/organs/subtypes/replicant.dm | 4 +-
code/modules/organs/subtypes/xenos.dm | 4 +-
code/modules/pda/core_apps.dm | 8 +-
code/modules/power/cell.dm | 2 +-
code/modules/power/fusion/core/core_field.dm | 12 +-
.../fusion/fuel_assembly/fuel_assembly.dm | 10 +-
code/modules/power/fusion/fusion_reactions.dm | 22 ++--
code/modules/power/lighting.dm | 2 +-
code/modules/power/port_gen.dm | 2 +-
code/modules/power/singularity/collector.dm | 8 +-
.../particle_accelerator/particle_smasher.dm | 6 +-
code/modules/power/supermatter/supermatter.dm | 6 +-
.../modules/projectiles/guns/magnetic/bore.dm | 2 +-
.../projectiles/guns/magnetic/gasthrower.dm | 8 +-
.../projectiles/guns/magnetic/magnetic.dm | 8 +-
code/modules/random_map/noise/ore.dm | 12 +-
.../machinery/dispenser/cartridge_presets.dm | 4 +-
.../machinery/dispenser/dispenser2_energy.dm | 2 +-
code/modules/reagents/machinery/grinder.dm | 22 ++--
.../reactions/distilling/distilling.dm | 6 +-
.../reagents/reactions/instant/drinks.dm | 6 +-
.../reagents/reactions/instant/drinks_vr.dm | 4 +-
.../reagents/reactions/instant/instant.dm | 104 +++++++--------
.../reagents/reactions/instant/instant_vr.dm | 16 +--
.../reagents/reactions/instant/virology.dm | 4 +-
code/modules/reagents/reagents/core.dm | 8 +-
code/modules/reagents/reagents/dispenser.dm | 8 +-
code/modules/reagents/reagents/toxins.dm | 18 +--
code/modules/resleeving/infocore_records.dm | 2 +-
code/modules/resleeving/machines.dm | 4 +-
code/modules/shuttles/shuttles_web.dm | 16 +--
.../tgui/modules/supermatter_monitor.dm | 10 +-
code/modules/vore/eating/living_vr.dm | 10 +-
code/modules/xenoarcheaology/effect_master.dm | 12 +-
.../modules/xenoarcheaology/effects/gasco2.dm | 4 +-
.../xenoarcheaology/effects/gasnitro.dm | 4 +-
.../modules/xenoarcheaology/effects/gasoxy.dm | 4 +-
.../xenoarcheaology/effects/gasphoron.dm | 4 +-
.../xenoarcheaology/effects/gassleeping.dm | 4 +-
.../xenoarcheaology/finds/finds_defines.dm | 8 +-
code/modules/xenobio/items/extracts.dm | 50 +++----
code/modules/xenobio/items/extracts_vr.dm | 48 +++----
code/modules/xenobio2/_xeno_setup.dm | 4 +-
code/modules/xenobio2/mob/slime/slime.dm | 2 +-
maps/cynosure/overmap/sectors.dm | 4 +-
maps/expedition_vr/aerostat/_aerostat.dm | 114 ++++++++--------
.../aerostat/_aerostat_science_outpost.dm | 40 +++---
maps/groundbase/groundbase_mining.dm | 40 +++---
maps/offmap_vr/common_offmaps.dm | 16 +--
maps/om_adventure/grasscave.dm | 40 +++---
maps/southern_cross/overmap/sectors.dm | 4 +-
maps/submaps/space_rocks/space_rocks.dm | 42 +++---
maps/tether/tether_phoronlock.dm | 10 +-
maps/tether/tether_turfs.dm | 80 ++++++------
vorestation.dme | 2 +
155 files changed, 1183 insertions(+), 1054 deletions(-)
create mode 100644 code/__defines/ores.dm
create mode 100644 code/__defines/reagents.dm
diff --git a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
index 84ba70f55f..fbbc59cd67 100644
--- a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
@@ -30,8 +30,8 @@
var/ui_error = null // For error messages to show up in nano ui.
var/datum/gas_mixture/internal = new()
- var/const/input_gas = "carbon_dioxide"
- var/const/output_gas = "oxygen"
+ var/const/input_gas = GAS_CO2
+ var/const/output_gas = GAS_O2
/obj/machinery/atmospherics/binary/algae_farm/filled
stored_material = list(MAT_ALGAE = 10000, MAT_GRAPHITE = 0)
diff --git a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
index 1a357327fb..9b00134cde 100644
--- a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
@@ -14,7 +14,7 @@
//--------------------------------------------
// Omni port datum
//
-// Used by omni devices to manage connections
+// Used by omni devices to manage connections
// to other atmospheric objects.
//--------------------------------------------
/datum/omni_port
@@ -70,10 +70,10 @@
string = "East"
if(WEST)
string = "West"
-
+
if(!capitalize && string)
string = lowertext(string)
-
+
return string
//returns a direction flag based on the string passed to it
@@ -94,16 +94,15 @@
/proc/mode_to_gasid(var/mode)
switch(mode)
- if(ATM_O2)
- return "oxygen"
- if(ATM_N2)
- return "nitrogen"
- if(ATM_CO2)
- return "carbon_dioxide"
- if(ATM_P)
- return "phoron"
- if(ATM_N2O)
- return "nitrous_oxide"
+ if(ATM_O2)
+ return GAS_O2
+ if(ATM_N2)
+ return GAS_N2
+ if(ATM_CO2)
+ return GAS_CO2
+ if(ATM_P)
+ return GAS_PHORON
+ if(ATM_N2O)
+ return GAS_N2O
else
return null
-
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index f332afee61..dc65660366 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -44,15 +44,15 @@
switch(filter_type)
if(0) //removing hydrocarbons
- filtered_out = list("phoron")
+ filtered_out = list(GAS_PHORON)
if(1) //removing O2
- filtered_out = list("oxygen")
+ filtered_out = list(GAS_O2)
if(2) //removing N2
- filtered_out = list("nitrogen")
+ filtered_out = list(GAS_N2)
if(3) //removing CO2
- filtered_out = list("carbon_dioxide")
+ filtered_out = list(GAS_CO2)
if(4)//removing N2O
- filtered_out = list("nitrous_oxide")
+ filtered_out = list(GAS_N2O)
air1.volume = ATMOS_DEFAULT_VOLUME_FILTER
air2.volume = ATMOS_DEFAULT_VOLUME_FILTER
@@ -205,16 +205,16 @@
filtered_out.Cut() //no need to create new lists unnecessarily
switch(filter_type)
if(0) //removing hydrocarbons
- filtered_out += "phoron"
+ filtered_out += GAS_PHORON
filtered_out += "oxygen_agent_b"
if(1) //removing O2
- filtered_out += "oxygen"
+ filtered_out += GAS_O2
if(2) //removing N2
- filtered_out += "nitrogen"
+ filtered_out += GAS_N2
if(3) //removing CO2
- filtered_out += "carbon_dioxide"
+ filtered_out += GAS_CO2
if(4)//removing N2O
- filtered_out += "nitrous_oxide"
+ filtered_out += GAS_N2O
add_fingerprint(ui.user)
update_icon()
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index 4ab5156968..909ac6658b 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -20,7 +20,7 @@
var/hibernate = 0 //Do we even process?
var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
- var/list/scrubbing_gas = list("carbon_dioxide", "phoron")
+ var/list/scrubbing_gas = list(GAS_CO2, GAS_PHORON)
var/panic = 0 //is this scrubber panicked?
@@ -109,12 +109,12 @@
"power" = use_power,
"scrubbing" = scrubbing,
"panic" = panic,
- "filter_o2" = ("oxygen" in scrubbing_gas),
- "filter_n2" = ("nitrogen" in scrubbing_gas),
- "filter_co2" = ("carbon_dioxide" in scrubbing_gas),
- "filter_phoron" = ("phoron" in scrubbing_gas),
- "filter_n2o" = ("nitrous_oxide" in scrubbing_gas),
- "filter_fuel" = ("volatile_fuel" in scrubbing_gas),
+ "filter_o2" = (GAS_O2 in scrubbing_gas),
+ "filter_n2" = (GAS_N2 in scrubbing_gas),
+ "filter_co2" = (GAS_CO2 in scrubbing_gas),
+ "filter_phoron" = (GAS_PHORON in scrubbing_gas),
+ "filter_n2o" = (GAS_N2O in scrubbing_gas),
+ "filter_fuel" = (GAS_VOLATILE_FUEL in scrubbing_gas),
"sigtype" = "status"
)
if(!initial_loc.air_scrub_names[id_tag])
@@ -216,35 +216,35 @@
var/list/toggle = list()
- if(!isnull(signal.data["o2_scrub"]) && text2num(signal.data["o2_scrub"]) != ("oxygen" in scrubbing_gas))
- toggle += "oxygen"
+ if(!isnull(signal.data["o2_scrub"]) && text2num(signal.data["o2_scrub"]) != (GAS_O2 in scrubbing_gas))
+ toggle += GAS_O2
else if(signal.data["toggle_o2_scrub"])
- toggle += "oxygen"
+ toggle += GAS_O2
- if(!isnull(signal.data["n2_scrub"]) && text2num(signal.data["n2_scrub"]) != ("nitrogen" in scrubbing_gas))
- toggle += "nitrogen"
+ if(!isnull(signal.data["n2_scrub"]) && text2num(signal.data["n2_scrub"]) != (GAS_N2 in scrubbing_gas))
+ toggle += GAS_N2
else if(signal.data["toggle_n2_scrub"])
- toggle += "nitrogen"
+ toggle += GAS_N2
- if(!isnull(signal.data["co2_scrub"]) && text2num(signal.data["co2_scrub"]) != ("carbon_dioxide" in scrubbing_gas))
- toggle += "carbon_dioxide"
+ if(!isnull(signal.data["co2_scrub"]) && text2num(signal.data["co2_scrub"]) != (GAS_CO2 in scrubbing_gas))
+ toggle += GAS_CO2
else if(signal.data["toggle_co2_scrub"])
- toggle += "carbon_dioxide"
+ toggle += GAS_CO2
- if(!isnull(signal.data["tox_scrub"]) && text2num(signal.data["tox_scrub"]) != ("phoron" in scrubbing_gas))
- toggle += "phoron"
+ if(!isnull(signal.data["tox_scrub"]) && text2num(signal.data["tox_scrub"]) != (GAS_PHORON in scrubbing_gas))
+ toggle += GAS_PHORON
else if(signal.data["toggle_tox_scrub"])
- toggle += "phoron"
+ toggle += GAS_PHORON
- if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != ("nitrous_oxide" in scrubbing_gas))
- toggle += "nitrous_oxide"
+ if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != (GAS_N2O in scrubbing_gas))
+ toggle += GAS_N2O
else if(signal.data["toggle_n2o_scrub"])
- toggle += "nitrous_oxide"
+ toggle += GAS_N2O
- if(!isnull(signal.data["fuel_scrub"]) && text2num(signal.data["fuel_scrub"]) != ("volatile_fuel" in scrubbing_gas))
- toggle += "volatile_fuel"
+ if(!isnull(signal.data["fuel_scrub"]) && text2num(signal.data["fuel_scrub"]) != (GAS_VOLATILE_FUEL in scrubbing_gas))
+ toggle += GAS_VOLATILE_FUEL
else if(signal.data["toggle_fuel_scrub"])
- toggle += "volatile_fuel"
+ toggle += GAS_VOLATILE_FUEL
scrubbing_gas ^= toggle
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber_vr.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber_vr.dm
index ee8eda90b3..92869d8811 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber_vr.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber_vr.dm
@@ -1,2 +1,2 @@
/obj/machinery/atmospherics/unary/vent_scrubber
- scrubbing_gas = list("carbon_dioxide", "phoron")
\ No newline at end of file
+ scrubbing_gas = list(GAS_CO2, GAS_PHORON)
diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm
index 34afa7bbe4..5560c5b197 100644
--- a/code/ATMOSPHERICS/pipes/tank.dm
+++ b/code/ATMOSPHERICS/pipes/tank.dm
@@ -79,8 +79,8 @@
air_temporary.volume = volume
air_temporary.temperature = T20C
- air_temporary.adjust_multi("oxygen", (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \
- "nitrogen",(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+ air_temporary.adjust_multi(GAS_O2, (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \
+ GAS_N2,(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
. = ..()
@@ -95,7 +95,7 @@
air_temporary.volume = volume
air_temporary.temperature = T20C
- air_temporary.adjust_gas("oxygen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+ air_temporary.adjust_gas(GAS_O2, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
. = ..()
icon_state = "o2"
@@ -110,7 +110,7 @@
air_temporary.volume = volume
air_temporary.temperature = T20C
- air_temporary.adjust_gas("nitrogen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+ air_temporary.adjust_gas(GAS_N2, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
. = ..()
icon_state = "n2"
@@ -124,7 +124,7 @@
air_temporary.volume = volume
air_temporary.temperature = T20C
- air_temporary.adjust_gas("carbon_dioxide", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+ air_temporary.adjust_gas(GAS_CO2, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
. = ..()
icon_state = "co2"
@@ -139,7 +139,7 @@
air_temporary.volume = volume
air_temporary.temperature = T20C
- air_temporary.adjust_gas("phoron", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+ air_temporary.adjust_gas(GAS_PHORON, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
. = ..()
icon_state = "phoron"
@@ -153,7 +153,7 @@
air_temporary.volume = volume
air_temporary.temperature = T0C
- air_temporary.adjust_gas("nitrous_oxide", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+ air_temporary.adjust_gas(GAS_N2O, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
. = ..()
icon_state = "n2o"
diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm
index 9cbf665f83..907c3583cc 100644
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -301,7 +301,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//remove_by_flag() and adjust_gas() handle the group_multiplier for us.
remove_by_flag(XGM_GAS_OXIDIZER, used_oxidizers)
remove_by_flag(XGM_GAS_FUEL, used_gas_fuel)
- adjust_gas("carbon_dioxide", used_oxidizers)
+ adjust_gas(GAS_CO2, used_oxidizers)
if(zone)
zone.remove_liquidfuel(used_liquid_fuel, !check_combustability())
diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm
index cab64a11f8..c3e3097fb6 100644
--- a/code/ZAS/Phoron.dm
+++ b/code/ZAS/Phoron.dm
@@ -99,7 +99,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
return
//Burn skin if exposed.
- if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron"))
+ if(vsc.plc.SKIN_BURNS && (species.breath_type != GAS_PHORON))
if(!pl_head_protected() || !pl_suit_protected())
burn_skin(0.75)
if(prob(20))
@@ -107,7 +107,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
updatehealth()
//Burn eyes if exposed.
- if(vsc.plc.EYE_BURNS && species.breath_type && (species.breath_type != "phoron")) //VOREStation Edit: those who don't breathe
+ if(vsc.plc.EYE_BURNS && species.breath_type && (species.breath_type != GAS_PHORON)) //VOREStation Edit: those who don't breathe
var/burn_eyes = 1
//Check for protective glasses
@@ -131,7 +131,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
burn_eyes()
//Genetic Corruption
- if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != "phoron"))
+ if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != GAS_PHORON))
if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
randmutb(src)
to_chat(src, span_danger("High levels of toxins cause you to spontaneously mutate!"))
diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm
index a67970c63a..ba155379a3 100644
--- a/code/ZAS/Turf.dm
+++ b/code/ZAS/Turf.dm
@@ -237,7 +237,7 @@
//Create gas mixture to hold data for passing
var/datum/gas_mixture/GM = new
- GM.adjust_multi("oxygen", oxygen, "carbon_dioxide", carbon_dioxide, "nitrogen", nitrogen, "phoron", phoron)
+ GM.adjust_multi(GAS_O2, oxygen, GAS_CO2, carbon_dioxide, GAS_N2, nitrogen, GAS_PHORON, phoron)
GM.temperature = temperature
return GM
@@ -247,10 +247,10 @@
var/sum = oxygen + carbon_dioxide + nitrogen + phoron
if(sum>0)
- GM.gas["oxygen"] = (oxygen/sum)*amount
- GM.gas["carbon_dioxide"] = (carbon_dioxide/sum)*amount
- GM.gas["nitrogen"] = (nitrogen/sum)*amount
- GM.gas["phoron"] = (phoron/sum)*amount
+ GM.gas[GAS_O2] = (oxygen/sum)*amount
+ GM.gas[GAS_CO2] = (carbon_dioxide/sum)*amount
+ GM.gas[GAS_N2] = (nitrogen/sum)*amount
+ GM.gas[GAS_PHORON] = (phoron/sum)*amount
GM.temperature = temperature
GM.update_values()
@@ -293,7 +293,7 @@
/turf/proc/make_air()
air = new/datum/gas_mixture
air.temperature = temperature
- air.adjust_multi("oxygen", oxygen, "carbon_dioxide", carbon_dioxide, "nitrogen", nitrogen, "phoron", phoron)
+ air.adjust_multi(GAS_O2, oxygen, GAS_CO2, carbon_dioxide, GAS_N2, nitrogen, GAS_PHORON, phoron)
air.group_multiplier = 1
air.volume = CELL_VOLUME
diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm
index b6d012afe7..c38b92199e 100644
--- a/code/ZAS/Zone.dm
+++ b/code/ZAS/Zone.dm
@@ -171,8 +171,8 @@ Class Procs:
to_chat(M,name)
for(var/g in air.gas)
to_chat(M, "[gas_data.name[g]]: [air.gas[g]]")
- to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]�K ([air.temperature - T0C]�C)")
- to_chat(M, "O2 per N2: [(air.gas["nitrogen"] ? air.gas["oxygen"]/air.gas["nitrogen"] : "N/A")] Moles: [air.total_moles]")
+ to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)")
+ to_chat(M, "O2 per N2: [(air.gas[GAS_N2] ? air.gas[GAS_O2]/air.gas[GAS_N2] : "N/A")] Moles: [air.total_moles]")
to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])")
//to_chat(M, "Unsimulated: [unsimulated_contents.len]")
//to_chat(M, "Edges: [edges.len]")
diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm
index 0e24246954..66d64b7cae 100644
--- a/code/__defines/materials.dm
+++ b/code/__defines/materials.dm
@@ -57,6 +57,10 @@
#define MAT_CONCRETE "concrete"
#define MAT_PLASTEELREBAR "plasteel rebar"
#define MAT_GRASS "grass"
+#define MAT_RESIN "resin"
+#define MAT_CULT "cult"
+#define MAT_ALIENALLOY "alienalloy"
+#define MAT_COMPOSITE "composite"
#define DEFAULT_TABLE_MATERIAL MAT_PLASTIC
@@ -84,4 +88,4 @@
///if the user won't receive a warning when attacking the container with an unallowed item.
#define MATCONTAINER_SILENT (1<<3)
-#define GET_MATERIAL_REF(arguments...) _GetMaterialRef(list(##arguments))
\ No newline at end of file
+#define GET_MATERIAL_REF(arguments...) _GetMaterialRef(list(##arguments))
diff --git a/code/__defines/ores.dm b/code/__defines/ores.dm
new file mode 100644
index 0000000000..acc85cc518
--- /dev/null
+++ b/code/__defines/ores.dm
@@ -0,0 +1,20 @@
+#define ORE_MARBLE "marble"
+#define ORE_QUARTZ "quartz"
+#define ORE_COPPER "copper"
+#define ORE_TIN "tin"
+#define ORE_BAUXITE "bauxite"
+#define ORE_URANIUM "uranium"
+#define ORE_PLATINUM "platinum"
+#define ORE_HEMATITE "hematite"
+#define ORE_RUTILE "rutile"
+#define ORE_CARBON "carbon"
+#define ORE_DIAMOND "diamond"
+#define ORE_GOLD "gold"
+#define ORE_SILVER "silver"
+#define ORE_PHORON "phoron"
+#define ORE_LEAD "lead"
+#define ORE_VOPAL "void opal"
+#define ORE_VERDANTIUM "verdantium"
+#define ORE_PAINITE "painite"
+#define ORE_MHYDROGEN "mhydrogen"
+#define ORE_SAND "sand"
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
new file mode 100644
index 0000000000..e215eaafc5
--- /dev/null
+++ b/code/__defines/reagents.dm
@@ -0,0 +1,112 @@
+// Gasses
+
+#define GAS_CO2 "carbon_dioxide"
+#define GAS_N2 "nitrogen"
+#define GAS_N2O "nitrous_oxide"
+#define GAS_O2 "oxygen"
+#define GAS_PHORON "phoron"
+#define GAS_VOLATILE_FUEL "volatile_fuel"
+
+// Gas Reagents
+#define REAGENT_CARBON_DIOXIDE "Nitrogen"
+#define REAGENT_NITROGEN "Nitrogen"
+#define REAGENT_ID_NITROGEN "nitrogen"
+#define REAGENT_NITROUS_OXIDE "Nitrous Oxide"
+#define REAGENT_OXYGEN "Oxygen"
+#define REAGENT_ID_OXYGEN "oxygen"
+#define REAGENT_VOLATILE_FUEL "Volatile Fuel"
+
+
+
+
+
+
+
+
+
+
+
+#define REAGENT_ID_HYDROGEN "hydrogen"
+
+// Fluid Reagents
+#define REAGENT_WATER "Water"
+#define REAGENT_ID_WATER "water"
+#define REAGENT_PACID "pacid"
+
+// Solid Reagents
+#define REAGENT_IRON "Iron"
+#define REAGENT_ID_IRON "iron"
+#define REAGENT_COPPER "Copper"
+#define REAGENT_ID_COPPER "copper"
+#define REAGENT_SILVER "Silver"
+#define REAGENT_ID_SILVER "silver"
+#define REAGENT_GOLD "Gold"
+#define REAGENT_ID_GOLD "gold"
+#define REAGENT_SLIMEJELLY "Slimejelly"
+#define REAGENT_ID_SLIMEJELLY "slimejelly"
+
+// Toxins
+#define REAGEMT_PHORON "Phoron"
+#define REAGENT_ID_PHORON "phoron"
+#define REAGENT_LEAD "Lead"
+#define REAGENT_ID_LEAD "lead"
+#define REAGENT_SPIDERTOXIN "Spidertoxin"
+#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
+
+
+#define REAGENT_ID_SILICATE "silicate"
+#define REAGENT_ID_POTASSIUM "potassium"
+#define REAGENT_ID_URANIUM "uranium"
+#define REAGENT_ID_CARBON "carbon"
+#define REAGENT_ID_PLATINUM "platinum"
+#define REAGENT_ID_ALUMINIUM "aluminum"
+#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
+
+todos
+defective_nanites
+
+ var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
+ var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
+ var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
+supermatter
+mydrogen
+silicon
+lithium
+deuterium
+tritium
+helium-3
+boron
+
+ chemreact = list( "nutriment" = list("nutr" = 0.5),
+ "radium" = list("toxic" = 0.3, "mut" = 1),
+ "mutagen" = list("nutr" = 0.4, "mut" = 2),
+ "water" = list("nutr" = -0.1),
+ "milk" = list("nutr" = 0.3),
+ "sacid" = list("toxic" = 1),
+ "pacid" = list("toxic" = 2),
+ "chlorine" = list("toxic" = 0.5),
+ "ammonia" = list("toxic" = 0.5),
+ "sodawater" = list("toxic" = 0.1, "nutr" = -0.1),
+ "beer" = list("nutr" = 0.6),
+ "diethylamine" = list("nutr" = 0.9),
+ "sugar" = list("toxic" = 0.4, "nutr" = 0.2),
+ "eznutrient" = list("nutr" = 0.8),
+ "cryoxadone" = list("toxic" = 0.4),
+ "flourine" = list("toxic" = 0.1),
+ "robustharvest" = list("nutr" = 1.5),
+ "glucose" = list("nutr" = 0.5),
+ "blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45),
+ "fuel" = list("toxic" = 0.4),
+ "toxin" = list("toxic" = 0.5),
+ "carpotoxin" = list("toxic" = 1, "mut" = 1.5),
+ REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03),
+ "virusfood" = list("nutr" = 1.5, "mut" = 0.32),
+ "cyanide" = list("toxic" = 3.5),
+ "slimejelly" = list("nutr" = 0.5),
+ "amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3),
+ "mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5),
+ "gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3),
+ "uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2),
+ "glycerol" = list("nutr" = 0.6),
+ "woodpulp" = list("heal" = 0.1, "nutr" = 0.7),
+ "docilitytoxin" = list("nutr" = 0.3) )
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index cc567b9e2e..d9aac00b57 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -347,7 +347,7 @@
else
var/list/nicename = null
var/list/tankcheck = null
- var/breathes = "oxygen" //default, we'll check later
+ var/breathes = GAS_O2 //default, we'll check later
var/list/contents = list()
var/from = "on"
@@ -376,30 +376,30 @@
continue //in it, so we're going to believe the tank is what it says it is
switch(breathes)
//These tanks we're sure of their contents
- if("nitrogen") //So we're a bit more picky about them.
+ if(GAS_N2) //So we're a bit more picky about them.
- if(t.air_contents.gas["nitrogen"] && !t.air_contents.gas["oxygen"])
- contents.Add(t.air_contents.gas["nitrogen"])
+ if(t.air_contents.gas[GAS_N2] && !t.air_contents.gas[GAS_O2])
+ contents.Add(t.air_contents.gas[GAS_N2])
else
contents.Add(0)
- if ("oxygen")
- if(t.air_contents.gas["oxygen"] && !t.air_contents.gas["phoron"])
- contents.Add(t.air_contents.gas["oxygen"])
+ if (GAS_O2)
+ if(t.air_contents.gas[GAS_O2] && !t.air_contents.gas[GAS_PHORON])
+ contents.Add(t.air_contents.gas[GAS_O2])
else
contents.Add(0)
// No races breath this, but never know about downstream servers.
if ("carbon dioxide")
- if(t.air_contents.gas["carbon_dioxide"] && !t.air_contents.gas["phoron"])
- contents.Add(t.air_contents.gas["carbon_dioxide"])
+ if(t.air_contents.gas[GAS_CO2] && !t.air_contents.gas[GAS_PHORON])
+ contents.Add(t.air_contents.gas[GAS_CO2])
else
contents.Add(0)
// And here's for the Vox
- if ("phoron")
- if(t.air_contents.gas["phoron"] && !t.air_contents.gas["oxygen"])
- contents.Add(t.air_contents.gas["phoron"])
+ if (GAS_PHORON)
+ if(t.air_contents.gas[GAS_PHORON] && !t.air_contents.gas[GAS_O2])
+ contents.Add(t.air_contents.gas[GAS_PHORON])
else
contents.Add(0)
@@ -431,7 +431,7 @@
if(C.internals)
C.internals.icon_state = "internal1"
else
- to_chat(C, span_notice("You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank."))
+ to_chat(C, span_notice("You don't have a[breathes==GAS_O2 ? "n " + GAS_O2 + " : addtext(" ",breathes)] tank."))
if("act_intent")
usr.a_intent_change("right")
if(I_HELP)
diff --git a/code/controllers/subsystems/chemistry.dm b/code/controllers/subsystems/chemistry.dm
index 6f0c5959eb..e31b71dc00 100644
--- a/code/controllers/subsystems/chemistry.dm
+++ b/code/controllers/subsystems/chemistry.dm
@@ -27,7 +27,7 @@ SUBSYSTEM_DEF(chemistry)
//Chemical Reactions - Initialises all /decl/chemical_reaction into a list
// It is filtered into multiple lists within a list.
// For example:
-// chemical_reactions_by_reagent["phoron"] is a list of all reactions relating to phoron
+// chemical_reactions_by_reagent[REAGENT_ID_PHORON] is a list of all reactions relating to phoron
// Note that entries in the list are NOT duplicated. So if a reaction pertains to
// more than one chemical it will still only appear in only one of the sublists.
/datum/controller/subsystem/chemistry/proc/initialize_chemical_reactions()
diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm
index dc3c059bd7..730b8cd05f 100644
--- a/code/controllers/subsystems/plants.dm
+++ b/code/controllers/subsystems/plants.dm
@@ -108,10 +108,10 @@ SUBSYSTEM_DEF(plants)
if(survive_on_station)
if(seed.consume_gasses)
- seed.consume_gasses["phoron"] = null
- seed.consume_gasses["carbon_dioxide"] = null
- if(seed.chems && !isnull(seed.chems["pacid"]))
- seed.chems["pacid"] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
+ seed.consume_gasses[GAS_PHORON] = null
+ seed.consume_gasses[GAS_CO2] = null
+ if(seed.chems && !isnull(seed.chems[REAGENT_PACID]))
+ seed.chems[REAGENT_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
seed.chems -= null // Setting to null does not actually remove the entry, which is weird.
seed.set_trait(TRAIT_IDEAL_HEAT,293)
seed.set_trait(TRAIT_HEAT_TOLERANCE,20)
diff --git a/code/defines/gases.dm b/code/defines/gases.dm
index 6b2a67c243..cb7127fd0f 100644
--- a/code/defines/gases.dm
+++ b/code/defines/gases.dm
@@ -1,26 +1,26 @@
/decl/xgm_gas/oxygen
- id = "oxygen"
- name = "Oxygen"
+ id = GAS_O2
+ name = REAGENT_OXYGEN
specific_heat = 20 // J/(mol*K)
molar_mass = 0.032 // kg/mol
flags = XGM_GAS_OXIDIZER
/decl/xgm_gas/nitrogen
- id = "nitrogen"
- name = "Nitrogen"
+ id = GAS_N2
+ name = REAGENT_NITROGEN
specific_heat = 20 // J/(mol*K)
molar_mass = 0.028 // kg/mol
/decl/xgm_gas/carbon_dioxide
- id = "carbon_dioxide"
- name = "Carbon Dioxide"
+ id = GAS_CO2
+ name = REAGENT_CARBON_DIOXIDE
specific_heat = 30 // J/(mol*K)
molar_mass = 0.044 // kg/mol
/decl/xgm_gas/phoron
- id = "phoron"
- name = "Phoron"
+ id = GAS_PHORON
+ name = REAGENT_ID_PHORON
//Note that this has a significant impact on TTV yield.
//Because it is so high, any leftover phoron soaks up a lot of heat and drops the yield pressure.
@@ -36,19 +36,19 @@
flags = XGM_GAS_FUEL | XGM_GAS_CONTAMINANT | XGM_GAS_FUSION_FUEL //R-UST port, adding XGM_GAS_FUSION_FUEL flag.
/decl/xgm_gas/volatile_fuel
- id = "volatile_fuel"
- name = "Volatile Fuel"
+ id = GAS_VOLATILE_FUEL
+ name = REAGENT_VOLATILE_FUEL
specific_heat = 253 // J/(mol*K) C8H18 gasoline. Isobaric, but good enough.
molar_mass = 0.114 // kg/mol. same.
flags = XGM_GAS_FUEL
/decl/xgm_gas/nitrous_oxide
- id = "nitrous_oxide"
- name = "Nitrous Oxide"
+ id = GAS_N2O
+ name = REAGENT_NITROUS_OXIDE
specific_heat = 40 // J/(mol*K)
molar_mass = 0.044 // kg/mol. N2O
tile_overlay = "nitrous_oxide"
overlay_limit = 1
- flags = XGM_GAS_OXIDIZER
\ No newline at end of file
+ flags = XGM_GAS_OXIDIZER
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index d563959fe5..1e589f6f13 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -501,7 +501,7 @@ var/global/list/all_objectives = list()
for(var/obj/item/I in all_items) //Check for phoron tanks
if(istype(I, steal_target))
- found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:gas["phoron"]) : (I:amount))
+ found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:gas[GAS_PHORON]) : (I:amount))
return found_amount>=target_amount
if("50 coins (in bag)")
diff --git a/code/game/gamemodes/technomancer/spells/oxygenate.dm b/code/game/gamemodes/technomancer/spells/oxygenate.dm
index eafd2cd7bd..fc1aea0936 100644
--- a/code/game/gamemodes/technomancer/spells/oxygenate.dm
+++ b/code/game/gamemodes/technomancer/spells/oxygenate.dm
@@ -27,7 +27,7 @@
else if(isturf(hit_atom))
var/turf/T = hit_atom
if(pay_energy(1500))
- T.assume_gas("oxygen", 200)
- T.assume_gas("nitrogen", 800)
+ T.assume_gas(GAS_O2, 200)
+ T.assume_gas(GAS_N2, 800)
playsound(src, 'sound/effects/spray.ogg', 50, 1, -3)
- adjust_instability(10)
\ No newline at end of file
+ adjust_instability(10)
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index 522a883efe..231cb9ab9f 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -76,7 +76,7 @@
/// red warning minimum value, yellow warning minimum value, yellow warning maximum value, red warning maximum value
/// Use code\defines\gases.dm as reference for id/name. Please keep it consistent
var/list/TLV = list()
- var/list/trace_gas = list("nitrous_oxide", "volatile_fuel") //list of other gases that this air alarm is able to detect
+ var/list/trace_gas = list(GAS_N2O, GAS_VOLATILE_FUEL) //list of other gases that this air alarm is able to detect
var/danger_level = 0
var/pressure_dangerlevel = 0
@@ -108,9 +108,9 @@
/obj/machinery/alarm/server/Initialize(mapload)
. = ..()
req_access = list(access_rd, access_atmospherics, access_engine_equip)
- TLV["oxygen"] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
- TLV["carbon_dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
- TLV["phoron"] = list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
+ TLV[GAS_O2] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
+ TLV[GAS_CO2] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
+ TLV[GAS_PHORON] = list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa
TLV["pressure"] = list(0,ONE_ATMOSPHERE*0.10,ONE_ATMOSPHERE*1.40,ONE_ATMOSPHERE*1.60) /* kpa */
TLV["temperature"] = list(20, 40, 140, 160) // K
@@ -145,10 +145,10 @@
wires = new(src)
// breathable air according to human/Life()
- TLV["oxygen"] = list(16, 19, 135, 140) // Partial pressure, kpa
- TLV["nitrogen"] = list(0, 0, 135, 140) // Partial pressure, kpa
- TLV["carbon_dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
- TLV["phoron"] = list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
+ TLV[GAS_O2] = list(16, 19, 135, 140) // Partial pressure, kpa
+ TLV[GAS_N2] = list(0, 0, 135, 140) // Partial pressure, kpa
+ TLV[GAS_CO2] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
+ TLV[GAS_PHORON] = list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa
TLV["pressure"] = list(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE * 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20) /* kpa */
TLV["temperature"] = list(T0C - 26, T0C, T0C + 40, T0C + 66) // K
@@ -272,11 +272,11 @@
DECLARE_TLV_VALUES
LOAD_TLV_VALUES(TLV["pressure"], environment_pressure)
pressure_dangerlevel = TEST_TLV_VALUES // not local because it's used in process()
- LOAD_TLV_VALUES(TLV["oxygen"], environment.gas["oxygen"]*partial_pressure)
+ LOAD_TLV_VALUES(TLV[GAS_O2], environment.gas[GAS_O2]*partial_pressure)
var/oxygen_dangerlevel = TEST_TLV_VALUES
- LOAD_TLV_VALUES(TLV["carbon_dioxide"], environment.gas["carbon_dioxide"]*partial_pressure)
+ LOAD_TLV_VALUES(TLV[GAS_CO2], environment.gas[GAS_CO2]*partial_pressure)
var/co2_dangerlevel = TEST_TLV_VALUES
- LOAD_TLV_VALUES(TLV["phoron"], environment.gas["phoron"]*partial_pressure)
+ LOAD_TLV_VALUES(TLV[GAS_PHORON], environment.gas[GAS_PHORON]*partial_pressure)
var/phoron_dangerlevel = TEST_TLV_VALUES
LOAD_TLV_VALUES(TLV["temperature"], environment.temperature)
var/temperature_dangerlevel = TEST_TLV_VALUES
@@ -642,7 +642,7 @@
var/list/selected
var/list/thresholds = list()
- var/list/gas_names = list("oxygen", "carbon_dioxide", "phoron", "other") //Gas ids made to match code\defines\gases.dm
+ var/list/gas_names = list(GAS_O2, GAS_CO2, GAS_PHORON, "other") //Gas ids made to match code\defines\gases.dm
for(var/g in gas_names)
thresholds[++thresholds.len] = list("name" = g, "settings" = list())
selected = TLV[g]
diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm
index f527fef6fb..9385e408b2 100644
--- a/code/game/machinery/airconditioner_vr.dm
+++ b/code/game/machinery/airconditioner_vr.dm
@@ -148,7 +148,7 @@
env.merge(removed)
var/turf/T = get_turf(src)
new /obj/effect/decal/cleanable/liquid_fuel(T, 5)
- T.assume_gas("volatile_fuel", 5, T20C)
+ T.assume_gas(GAS_VOLATILE_FUEL, 5, T20C)
T.hotspot_expose(700,400)
var/datum/effect/effect/system/spark_spread/s = new
s.set_up(5, 0, T)
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index ea2cc88009..93ac8ccda8 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -44,18 +44,18 @@
var/total_moles = air_sample.total_moles
if(total_moles > 0)
if(output&4)
- signal.data["oxygen"] = round(100*air_sample.gas["oxygen"]/total_moles,0.1)
+ signal.data[GAS_O2] = round(100*air_sample.gas[GAS_O2]/total_moles,0.1)
if(output&8)
- signal.data["phoron"] = round(100*air_sample.gas["phoron"]/total_moles,0.1)
+ signal.data[GAS_PHORON] = round(100*air_sample.gas[GAS_PHORON]/total_moles,0.1)
if(output&16)
- signal.data["nitrogen"] = round(100*air_sample.gas["nitrogen"]/total_moles,0.1)
+ signal.data[GAS_N2] = round(100*air_sample.gas[GAS_N2]/total_moles,0.1)
if(output&32)
- signal.data["carbon_dioxide"] = round(100*air_sample.gas["carbon_dioxide"]/total_moles,0.1)
+ signal.data[GAS_CO2] = round(100*air_sample.gas[GAS_CO2]/total_moles,0.1)
else
- signal.data["oxygen"] = 0
- signal.data["phoron"] = 0
- signal.data["nitrogen"] = 0
- signal.data["carbon_dioxide"] = 0
+ signal.data[GAS_O2] = 0
+ signal.data[GAS_PHORON] = 0
+ signal.data[GAS_N2] = 0
+ signal.data[GAS_CO2] = 0
signal.data["sigtype"]="status"
radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA)
@@ -399,7 +399,7 @@
/obj/machinery/computer/general_air_control/fuel_injection/tgui_act(action, params)
if(..())
return TRUE
-
+
switch(action)
if("refresh_status")
device_info = null
@@ -452,4 +452,4 @@
)
radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA)
- . = TRUE
\ No newline at end of file
+ . = TRUE
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index c3a323a896..7271b01ff8 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -387,21 +387,21 @@ update_flag
/obj/machinery/portable_atmospherics/canister/phoron/New()
..()
- src.air_contents.adjust_gas("phoron", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
src.update_icon()
return 1
/obj/machinery/portable_atmospherics/canister/oxygen/New()
..()
- src.air_contents.adjust_gas("oxygen", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_O2, MolesForPressure())
src.update_icon()
return 1
/obj/machinery/portable_atmospherics/canister/oxygen/prechilled/New()
..()
- src.air_contents.adjust_gas("oxygen", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_O2, MolesForPressure())
src.air_contents.temperature = 80
src.update_icon()
return 1
@@ -409,14 +409,14 @@ update_flag
/obj/machinery/portable_atmospherics/canister/nitrous_oxide/New()
..()
- air_contents.adjust_gas("nitrous_oxide", MolesForPressure())
+ air_contents.adjust_gas(GAS_N2O, MolesForPressure())
src.update_icon()
return 1
//Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0
/obj/machinery/portable_atmospherics/canister/nitrous_oxide/roomfiller/Initialize()
. = ..()
- air_contents.gas["nitrous_oxide"] = 9*4000
+ air_contents.gas[GAS_N2O] = 9*4000
var/turf/simulated/location = src.loc
if (istype(src.loc))
location.assume_air(air_contents)
@@ -427,13 +427,13 @@ update_flag
..()
- src.air_contents.adjust_gas("nitrogen", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_N2, MolesForPressure())
src.update_icon()
return 1
/obj/machinery/portable_atmospherics/canister/carbon_dioxide/New()
..()
- src.air_contents.adjust_gas("carbon_dioxide", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_CO2, MolesForPressure())
src.update_icon()
return 1
@@ -441,7 +441,7 @@ update_flag
/obj/machinery/portable_atmospherics/canister/air/New()
..()
var/list/air_mix = StandardAirMix()
- src.air_contents.adjust_multi("oxygen", air_mix["oxygen"], "nitrogen", air_mix["nitrogen"])
+ src.air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
src.update_icon()
return 1
@@ -450,19 +450,19 @@ update_flag
// Special types used for engine setup admin verb, they contain double amount of that of normal canister.
/obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup/New()
..()
- src.air_contents.adjust_gas("nitrogen", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_N2, MolesForPressure())
src.update_icon()
return 1
/obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup/New()
..()
- src.air_contents.adjust_gas("carbon_dioxide", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_CO2, MolesForPressure())
src.update_icon()
return 1
/obj/machinery/portable_atmospherics/canister/phoron/engine_setup/New()
..()
- src.air_contents.adjust_gas("phoron", MolesForPressure())
+ src.air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
src.update_icon()
return 1
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index cc17f16d1f..a8a7b0e9e4 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -50,8 +50,8 @@
/obj/machinery/portable_atmospherics/proc/StandardAirMix()
return list(
- "oxygen" = O2STANDARD * MolesForPressure(),
- "nitrogen" = N2STANDARD * MolesForPressure())
+ GAS_O2 = O2STANDARD * MolesForPressure(),
+ GAS_N2 = N2STANDARD * MolesForPressure())
/obj/machinery/portable_atmospherics/proc/MolesForPressure(var/target_pressure = start_pressure)
return (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index 1b9ede4247..8b90344aeb 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -26,7 +26,7 @@
cell = new/obj/item/cell/apc(src)
var/list/air_mix = StandardAirMix()
- src.air_contents.adjust_multi("oxygen", air_mix["oxygen"], "nitrogen", air_mix["nitrogen"])
+ src.air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
/obj/machinery/portable_atmospherics/powered/pump/update_icon()
cut_overlays()
@@ -141,7 +141,7 @@
data["default_pressure"] = round(initial(target_pressure))
data["min_pressure"] = round(pressuremin)
data["max_pressure"] = round(pressuremax)
-
+
data["powerDraw"] = round(last_power_draw)
data["cellCharge"] = cell ? cell.charge : 0
data["cellMaxCharge"] = cell ? cell.maxcharge : 1
@@ -152,7 +152,7 @@
data["holding"]["pressure"] = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0)
else
data["holding"] = null
-
+
return data
/obj/machinery/portable_atmospherics/powered/pump/tgui_act(action, params)
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 0ca93db9b6..71ee18d035 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -18,7 +18,7 @@
var/minrate = 0
var/maxrate = 10 * ONE_ATMOSPHERE
- var/list/scrubbing_gas = list("phoron", "carbon_dioxide", "nitrous_oxide", "volatile_fuel")
+ var/list/scrubbing_gas = list(GAS_PHORON, GAS_CO2, GAS_N2O, GAS_VOLATILE_FUEL)
/obj/machinery/portable_atmospherics/powered/scrubber/New()
..()
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 79603bfaa7..14449730b2 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -218,7 +218,7 @@
if(occupant.bodytemperature < T0C)
occupant.Sleeping(max(5, (1/occupant.bodytemperature)*2000))
occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000))
- if(air_contents.gas["oxygen"] > 2)
+ if(air_contents.gas[GAS_O2] > 2)
if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1)
else
occupant.adjustOxyLoss(-1)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index a5d9ecc4ea..00af173947 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -525,7 +525,7 @@
name = "Phoron Airlock"
desc = "No way this can end badly."
icon = 'icons/obj/doors/Doorphoron.dmi'
- mineral = "phoron"
+ mineral = MAT_PHORON
/obj/machinery/door/airlock/phoron/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
@@ -537,7 +537,7 @@
/obj/machinery/door/airlock/phoron/proc/PhoronBurn(temperature)
for(var/turf/simulated/floor/target_tile in range(2,loc))
- target_tile.assume_gas("phoron", 35, 400+T0C)
+ target_tile.assume_gas(GAS_PHORON, 35, 400+T0C)
spawn (0) target_tile.hotspot_expose(temperature, 400)
for(var/turf/simulated/wall/W in range(3,src))
W.burn((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame
diff --git a/code/game/mecha/equipment/tools/generator.dm b/code/game/mecha/equipment/tools/generator.dm
index fd1d291a5e..c04cd758ae 100644
--- a/code/game/mecha/equipment/tools/generator.dm
+++ b/code/game/mecha/equipment/tools/generator.dm
@@ -114,11 +114,11 @@
return
var/datum/gas_mixture/GM = new
if(prob(10))
- T.assume_gas("phoron", 100, 1500+T0C)
+ T.assume_gas(GAS_PHORON, 100, 1500+T0C)
T.visible_message("The [src] suddenly disgorges a cloud of heated phoron.")
destroy()
else
- T.assume_gas("phoron", 5, istype(T) ? T.air.temperature : T20C)
+ T.assume_gas(GAS_PHORON, 5, istype(T) ? T.air.temperature : T20C)
T.visible_message("The [src] suddenly disgorges a cloud of phoron.")
T.assume_air(GM)
return
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 325288ff2e..2334a47271 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -446,7 +446,7 @@
cabin_air = new
cabin_air.temperature = T20C
cabin_air.volume = 200
- cabin_air.adjust_multi("oxygen", O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature), "nitrogen", N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature))
+ cabin_air.adjust_multi(GAS_O2, O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature), GAS_N2, N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature))
return cabin_air
/obj/mecha/proc/add_radio()
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 3476de004c..259b0d9370 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -211,42 +211,42 @@
name="Phazon Torso"
icon_state = "phazon_harness"
//construction_time = 300
- //construction_cost = list(MAT_STEEL=35000,"glass"=10000,"phoron"=20000)
+ //construction_cost = list(MAT_STEEL=35000,"glass"=10000,MAT_PHORON=20000)
origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6)
/obj/item/mecha_parts/part/phazon_head
name="Phazon Head"
icon_state = "phazon_head"
//construction_time = 200
- //construction_cost = list(MAT_STEEL=15000,"glass"=5000,"phoron"=10000)
+ //construction_cost = list(MAT_STEEL=15000,"glass"=5000,MAT_PHORON=10000)
origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6)
/obj/item/mecha_parts/part/phazon_left_arm
name="Phazon Left Arm"
icon_state = "phazon_l_arm"
//construction_time = 200
- //construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+ //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
/obj/item/mecha_parts/part/phazon_right_arm
name="Phazon Right Arm"
icon_state = "phazon_r_arm"
//construction_time = 200
- //construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+ //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
/obj/item/mecha_parts/part/phazon_left_leg
name="Phazon Left Leg"
icon_state = "phazon_l_leg"
//construction_time = 200
- //construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+ //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
/obj/item/mecha_parts/part/phazon_right_leg
name="Phazon Right Leg"
icon_state = "phazon_r_leg"
//construction_time = 200
- //construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+ //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
///////// Odysseus
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 3447659402..c2bac12e66 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -171,7 +171,7 @@
triggered = TRUE
for (var/turf/simulated/floor/target in range(1,src))
if(!target.blocks_air)
- target.assume_gas("nitrous_oxide", 30)
+ target.assume_gas(GAS_N2O, 30)
visible_message("\The [src.name] detonates!")
spawn(0)
qdel(src)
@@ -185,7 +185,7 @@
triggered = TRUE
for (var/turf/simulated/floor/target in range(1,src))
if(!target.blocks_air)
- target.assume_gas("phoron", 30)
+ target.assume_gas(GAS_PHORON, 30)
target.hotspot_expose(1000, CELL_VOLUME)
visible_message("\The [src.name] detonates!")
spawn(0)
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 08d2ec96c3..e94c2f5323 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -63,14 +63,14 @@
OT.master = V
PT.valve_welded = 1
- PT.air_contents.gas["phoron"] = phoron_amt
- PT.air_contents.gas["carbon_dioxide"] = carbon_amt
+ PT.air_contents.gas[GAS_PHORON] = phoron_amt
+ PT.air_contents.gas[GAS_CO2] = carbon_amt
PT.air_contents.total_moles = phoron_amt + carbon_amt
PT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
PT.air_contents.update_values()
OT.valve_welded = 1
- OT.air_contents.gas["oxygen"] = oxygen_amt
+ OT.air_contents.gas[GAS_O2] = oxygen_amt
OT.air_contents.total_moles = oxygen_amt
OT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
OT.air_contents.update_values()
diff --git a/code/game/objects/items/devices/communicator/helper.dm b/code/game/objects/items/devices/communicator/helper.dm
index 78db27655f..c478bf4c0a 100644
--- a/code/game/objects/items/devices/communicator/helper.dm
+++ b/code/game/objects/items/devices/communicator/helper.dm
@@ -6,10 +6,10 @@
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[GAS_O2]/total_moles
+ var/n2_level = environment.gas[GAS_N2]/total_moles
+ var/co2_level = environment.gas[GAS_CO2]/total_moles
+ var/phoron_level = environment.gas[GAS_PHORON]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
// Label is what the entry is describing
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index e66a32de8a..23d0d1b28c 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -169,9 +169,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
src.lit = 1
playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
damtype = "fire"
- if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
+ if(reagents.get_reagent_amount(REAGENT_ID_PHORON)) // the phoron explodes when exposed to fire
var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0)
+ e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_PHORON) / 2.5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 9d386f3202..20beae7034 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -135,7 +135,7 @@
usr.set_machine(src)
if(href_list["light"])
if(!ptank) return
- if(ptank.air_contents.gas["phoron"] < 1) return
+ if(ptank.air_contents.gas[GAS_PHORON] < 1) return
if(!status) return
lit = !lit
if(lit)
@@ -184,8 +184,8 @@
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100))
//air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is mischievious and I could probably make it work without fucking it up like this, but there you have it. -- TLE
- new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["phoron"],get_dir(loc,target))
- air_transfer.gas["phoron"] = 0
+ new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas[GAS_PHORON],get_dir(loc,target))
+ air_transfer.gas[GAS_PHORON] = 0
target.assume_air(air_transfer)
//Burn it based on transfered gas
//target.hotspot_expose(part4.air_contents.temperature*2,300)
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index efe0c92ae2..dbee592959 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -237,7 +237,7 @@
B1.reagents.add_reagent("aluminum", 15)
B1.reagents.add_reagent("fuel",20)
- B2.reagents.add_reagent("phoron", 15)
+ B2.reagents.add_reagent(REAGENT_ID_PHORON, 15)
B2.reagents.add_reagent("sacid", 15)
B1.reagents.add_reagent("fuel",20)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index d1df404333..91d1031fad 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -213,7 +213,7 @@
pack = new /obj/item/storage/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
- fill_cigarre_package(pack, list("potassium" = 1.5, "nitrogen" = 1.5, "silicon" = 1.5))
+ fill_cigarre_package(pack, list("potassium" = 1.5, REAGENT_ID_NITROGEN = 1.5, "silicon" = 1.5))
// Mindbreaker
fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 7660cb8e67..c95bb502f9 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -92,7 +92,7 @@
/obj/item/tank/jetpack/void/Initialize()
. = ..()
- air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/oxygen
name = "jetpack (oxygen)"
@@ -102,7 +102,7 @@
/obj/item/tank/jetpack/oxygen/Initialize()
. = ..()
- air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/breaker
name = "CSC industrial jetpack"
@@ -112,7 +112,7 @@
/obj/item/tank/jetpack/breaker/Initialize()
. = ..()
- air_contents.adjust_gas("volatile_fuel", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_VOLATILE_FUEL, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/carbondioxide
name = "jetpack (carbon dioxide)"
@@ -123,7 +123,7 @@
/obj/item/tank/jetpack/carbondioxide/Initialize()
. = ..()
- air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_CO2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/rig
name = "jetpack"
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 9157aa3ea1..1bae7b86d0 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -18,11 +18,11 @@
/obj/item/tank/oxygen/Initialize()
. = ..()
- air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/oxygen/examine(mob/user)
. = ..()
- if(loc == user && (air_contents.gas["oxygen"] < 10))
+ if(loc == user && (air_contents.gas[GAS_O2] < 10))
. += span_warning("The meter on \the [src] indicates you are almost out of oxygen!")
/obj/item/tank/oxygen/yellow
@@ -44,8 +44,8 @@
/obj/item/tank/anesthetic/Initialize()
. = ..()
- air_contents.gas["oxygen"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gas["nitrous_oxide"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ air_contents.gas[GAS_O2] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+ air_contents.gas[GAS_N2O] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
air_contents.update_values()
/*
@@ -58,13 +58,13 @@
/obj/item/tank/air/examine(mob/user)
. = ..()
- if(loc == user && (air_contents.gas["oxygen"] < 1))
+ if(loc == user && (air_contents.gas[GAS_O2] < 1))
. += span_warning("The meter on \the [src] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
/obj/item/tank/air/Initialize()
. = ..()
- src.air_contents.adjust_multi("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, "nitrogen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
+ src.air_contents.adjust_multi(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, GAS_N2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
/*
* Phoron
@@ -78,7 +78,7 @@
/obj/item/tank/phoron/Initialize()
. = ..()
- src.air_contents.adjust_gas("phoron", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
+ src.air_contents.adjust_gas(GAS_PHORON, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/phoron/attackby(obj/item/W as obj, mob/user as mob)
..()
@@ -102,7 +102,7 @@
/obj/item/tank/vox/Initialize()
. = ..()
- air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit
+ air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit
/obj/item/tank/phoron/pressurized
name = "fuel can"
@@ -112,7 +112,7 @@
/obj/item/tank/phoron/pressurized/Initialize()
. = ..()
adjust_scale(0.8)
- air_contents.adjust_gas("phoron", (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_PHORON, (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/*
* Emergency Oxygen
@@ -137,11 +137,11 @@
/obj/item/tank/emergency/oxygen/Initialize()
. = ..()
- src.air_contents.adjust_gas("oxygen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ src.air_contents.adjust_gas(GAS_O2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/oxygen/examine(mob/user)
. = ..()
- if(loc == user && (air_contents.gas["oxygen"] < 0.2))
+ if(loc == user && (air_contents.gas[GAS_O2] < 0.2))
. += span_danger("The meter on the [src.name] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
@@ -165,7 +165,7 @@
/obj/item/tank/stasis/oxygen/Initialize()
. = ..()
- src.air_contents.adjust_gas("oxygen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ src.air_contents.adjust_gas(GAS_O2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/nitrogen
name = "emergency nitrogen tank"
@@ -175,7 +175,7 @@
/obj/item/tank/emergency/nitrogen/Initialize()
. = ..()
- src.air_contents.adjust_gas("nitrogen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ src.air_contents.adjust_gas(GAS_N2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/nitrogen/double
name = "double emergency nitrogen tank"
@@ -191,7 +191,7 @@
/obj/item/tank/emergency/phoron/Initialize()
. = ..()
- src.air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ src.air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/phoron/double
name = "double emergency phoron tank"
@@ -210,11 +210,11 @@
/obj/item/tank/nitrogen/Initialize()
. = ..()
- src.air_contents.adjust_gas("nitrogen", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
+ src.air_contents.adjust_gas(GAS_N2, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/nitrogen/examine(mob/user)
. = ..()
- if(loc == user && (air_contents.gas["nitrogen"] < 10))
+ if(loc == user && (air_contents.gas[GAS_N2] < 10))
. += span_danger("The meter on \the [src] indicates you are almost out of nitrogen!")
//playsound(user, 'sound/effects/alert.ogg', 50, 1)
@@ -227,4 +227,4 @@
/obj/item/tank/stasis/nitro_cryo/Initialize()
. = ..()
- src.air_contents.adjust_gas_temp("nitrogen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*TN60C), TN60C)
+ src.air_contents.adjust_gas_temp(GAS_N2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*TN60C), TN60C)
diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
index 3cd36cdb53..76e8599e5d 100644
--- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
@@ -10,7 +10,7 @@
/obj/item/tank/emergency/phoron/double/New()
..()
- air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+ air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
//New icons
/obj/item/tank/oxygen
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 820995c12f..e09f4a1804 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -546,8 +546,8 @@ var/list/global/tank_gauge_cache = list()
oxygen_amt = 4.5
- src.air_contents.gas["phoron"] = phoron_amt
- src.air_contents.gas["oxygen"] = oxygen_amt
+ src.air_contents.gas[GAS_PHORON] = phoron_amt
+ src.air_contents.gas[GAS_O2] = oxygen_amt
src.air_contents.update_values()
src.valve_welded = 1
src.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE-1
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 0f3bbba7b7..cc555532d6 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -150,7 +150,7 @@
/obj/structure/bonfire/proc/check_oxygen()
var/datum/gas_mixture/G = loc.return_air()
- if(G.gas["oxygen"] < 1)
+ if(G.gas[GAS_O2] < 1)
return FALSE
return TRUE
@@ -345,7 +345,7 @@
/obj/structure/fireplace/proc/check_oxygen()
var/datum/gas_mixture/G = loc.return_air()
- if(G.gas["oxygen"] < 1)
+ if(G.gas[GAS_O2] < 1)
return FALSE
return TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index 0fa429bbb5..acb09c9e58 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -149,7 +149,7 @@
return PROJECTILE_CONTINUE // It's a hole in the ground, doesn't usually stop or even care about bullets
/obj/structure/closet/grave/return_air_for_internal_lifeform(var/mob/living/L)
- var/gasid = "carbon_dioxide"
+ var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species && H.species.exhale_type)
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index b6c5e2e946..2acf3afa2c 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -267,7 +267,7 @@
var/material_name = S.get_material_name()
if (S)
if (S.get_amount() >= 1)
- if(material_name == "rglass")
+ if(material_name == MAT_RGLASS)
playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
if(do_after(user, 4 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) && !glass)
@@ -276,7 +276,7 @@
glass = 1
else if(material_name)
// Ugly hack, will suffice for now. Need to fix it upstream as well, may rewrite mineral walls. ~Z
- if(!(material_name in list("gold", "silver", "diamond", "uranium", "phoron", "sandstone")))
+ if(!(material_name in list(MAT_GOLD, MAT_SILVER, MAT_DIAMOND, MAT_URANIUM, MAT_PHORON, MAT_SANDSTONE)))
to_chat(user, "You cannot make an airlock out of that material.")
return
if(S.get_amount() >= 2)
diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm
index 440283abdf..5def6ca518 100644
--- a/code/game/objects/structures/droppod.dm
+++ b/code/game/objects/structures/droppod.dm
@@ -141,5 +141,5 @@
/datum/gas_mixture/pod_air/New()
. = ..()
gas = list(
- "oxygen" = 21,
- "nitrogen" = 79)
+ GAS_O2 = 21,
+ GAS_N2 = 79)
diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm
index c68d08208b..959347e2a6 100644
--- a/code/game/objects/structures/simple_doors.dm
+++ b/code/game/objects/structures/simple_doors.dm
@@ -242,25 +242,25 @@
SSradiation.radiate(src, round(material.radioactivity/3))
/obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "iron")
+ ..(mapload, material_name || MAT_IRON)
/obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "silver")
+ ..(mapload, material_name || MAT_SILVER)
/obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "gold")
+ ..(mapload, material_name || MAT_GOLD)
/obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "uranium")
+ ..(mapload, material_name || MAT_URANIUM)
/obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "sandstone")
+ ..(mapload, material_name || MAT_SANDSTONE)
/obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "phoron")
+ ..(mapload, material_name || MAT_PHORON)
/obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "diamond")
+ ..(mapload, material_name || MAT_DIAMOND)
/obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_WOOD)
@@ -273,10 +273,10 @@
..(mapload, material_name || MAT_SIFWOOD)
/obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "resin")
+ ..(mapload, material_name || MAT_RESIN)
/obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
- ..(mapload, material_name || "cult")
+ ..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/cult/TryToSwitchState(atom/user)
if(isliving(user))
diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm
index 1326ca7f91..2a3e25fee1 100644
--- a/code/game/objects/structures/transit_tubes.dm
+++ b/code/game/objects/structures/transit_tubes.dm
@@ -81,7 +81,7 @@
/obj/structure/transit_tube_pod/New(loc)
..(loc)
- air_contents.adjust_multi("oxygen", MOLES_O2STANDARD * 2, "nitrogen", MOLES_N2STANDARD)
+ air_contents.adjust_multi(GAS_O2, MOLES_O2STANDARD * 2, GAS_N2, MOLES_N2STANDARD)
air_contents.temperature = T20C
// Give auto tubes time to align before trying to start moving
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index de469a64b0..927b382b10 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -341,7 +341,7 @@
/turf/simulated/floor/reinforced/n20/Initialize()
. = ..()
if(!air) make_air()
- air.adjust_gas("nitrous_oxide", ATMOSTANK_NITROUSOXIDE)
+ air.adjust_gas(GAS_N2O, ATMOSTANK_NITROUSOXIDE)
/turf/simulated/floor/cult
name = "engraved floor"
diff --git a/code/game/turfs/simulated/underwater.dm b/code/game/turfs/simulated/underwater.dm
index 3d67afef3f..02dcbd5235 100644
--- a/code/game/turfs/simulated/underwater.dm
+++ b/code/game/turfs/simulated/underwater.dm
@@ -21,11 +21,11 @@
var/datum/gas_mixture/water_breath = new()
var/datum/gas_mixture/above_air = return_air()
var/amount = 300
- water_breath.adjust_gas("oxygen", amount) // Assuming water breathes just extract the oxygen directly from the water.
+ water_breath.adjust_gas(GAS_O2, amount) // Assuming water breathes just extract the oxygen directly from the water.
water_breath.temperature = above_air.temperature
return water_breath
else
- var/gasid = "carbon_dioxide"
+ var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species && H.species.exhale_type)
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index 1443460e30..816b86aa5f 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -47,59 +47,59 @@
icon_state = "cult"
/turf/simulated/wall/iron/Initialize(mapload)
- . = ..(mapload, "iron")
+ . = ..(mapload, MAT_IRON)
/turf/simulated/wall/uranium/Initialize(mapload)
- . = ..(mapload, "uranium")
+ . = ..(mapload, MAT_URANIUM)
/turf/simulated/wall/diamond/Initialize(mapload)
- . = ..(mapload, "diamond")
+ . = ..(mapload, MAT_DIAMOND)
/turf/simulated/wall/gold/Initialize(mapload)
- . = ..(mapload, "gold")
+ . = ..(mapload, MAT_GOLD)
/turf/simulated/wall/silver/Initialize(mapload)
- . = ..(mapload, "silver")
+ . = ..(mapload, MAT_SILVER)
/turf/simulated/wall/lead/Initialize(mapload)
- . = ..(mapload, "lead")
+ . = ..(mapload, MAT_LEAD)
/turf/simulated/wall/r_lead/Initialize(mapload)
- . = ..(mapload, "lead", "lead")
+ . = ..(mapload, MAT_LEAD, MAT_LEAD)
/turf/simulated/wall/phoron/Initialize(mapload)
- . = ..(mapload, "phoron")
+ . = ..(mapload, MAT_PHORON)
/turf/simulated/wall/sandstone/Initialize(mapload)
- . = ..(mapload, "sandstone")
+ . = ..(mapload, MAT_SANDSTONE)
/turf/simulated/wall/ironphoron/Initialize(mapload)
- . = ..(mapload, "iron","phoron")
+ . = ..(mapload, MAT_IRON,MAT_PHORON)
/turf/simulated/wall/golddiamond/Initialize(mapload)
- . = ..(mapload, "gold","diamond")
+ . = ..(mapload, MAT_GOLD,MAT_DIAMOND)
/turf/simulated/wall/silvergold/Initialize(mapload)
- . = ..(mapload, "silver","gold")
+ . = ..(mapload, MAT_SILVER,MAT_GOLD)
/turf/simulated/wall/sandstonediamond/Initialize(mapload)
- . = ..(mapload, "sandstone","diamond")
+ . = ..(mapload, MAT_SANDSTONE,MAT_DIAMOND)
/turf/simulated/wall/snowbrick/Initialize(mapload)
- . = ..(mapload, "packed snow")
+ . = ..(mapload, MAT_SNOWBRICK)
/turf/simulated/wall/resin/Initialize(mapload)
- . = ..(mapload, "resin",null,"resin")
+ . = ..(mapload, MAT_RESIN,null,MAT_RESIN)
/turf/simulated/wall/concrete
icon_state = "brick"
/turf/simulated/wall/concrete/Initialize(mapload)
- . = ..(mapload, "concrete") //3strong
+ . = ..(mapload, MAT_CONCRETE) //3strong
/turf/simulated/wall/r_concrete
icon_state = "rbrick"
/turf/simulated/wall/r_concrete/Initialize(mapload)
- . = ..(mapload, "concrete","plasteel rebar") //3strong
+ . = ..(mapload, MAT_CONCRETE,MAT_PLASTEELREBAR) //3strong
// Kind of wondering if this is going to bite me in the butt.
/turf/simulated/wall/skipjack/Initialize(mapload)
- . = ..(mapload, "alienalloy")
+ . = ..(mapload, MAT_ALIENALLOY)
/turf/simulated/wall/skipjack/attackby()
return
/turf/simulated/wall/titanium/Initialize(mapload)
- . = ..(mapload, "titanium")
+ . = ..(mapload, MAT_TITANIUM)
/turf/simulated/wall/durasteel/Initialize(mapload)
- . = ..(mapload, "durasteel", "durasteel")
+ . = ..(mapload, MAT_DURASTEEL, MAT_DURASTEEL)
/turf/simulated/wall/wood/Initialize(mapload)
. = ..(mapload, MAT_WOOD)
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index d070cfd06c..f84d3311ad 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -59,11 +59,11 @@
var/datum/gas_mixture/water_breath = new()
var/datum/gas_mixture/above_air = return_air()
var/amount = 300
- water_breath.adjust_gas("oxygen", amount) // Assuming water breathes just extract the oxygen directly from the water.
+ water_breath.adjust_gas(GAS_O2, amount) // Assuming water breathes just extract the oxygen directly from the water.
water_breath.temperature = above_air.temperature
return water_breath
else
- var/gasid = "carbon_dioxide"
+ var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species && H.species.exhale_type)
@@ -80,11 +80,11 @@
var/datum/gas_mixture/water_breath = new()
var/datum/gas_mixture/above_air = return_air()
var/amount = 300
- water_breath.adjust_gas("oxygen", amount) // Assuming water breathes just extract the oxygen directly from the water.
+ water_breath.adjust_gas(GAS_O2, amount) // Assuming water breathes just extract the oxygen directly from the water.
water_breath.temperature = above_air.temperature
return water_breath
else
- var/gasid = "carbon_dioxide"
+ var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species && H.species.exhale_type)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 8cd661c468..3e50714e19 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2012,7 +2012,7 @@
if(check_rights(R_ADMIN|R_SERVER|R_EVENT))
if(href_list["vsc"] == "airflow")
vsc.ChangeSettingsDialog(usr,vsc.settings)
- if(href_list["vsc"] == "phoron")
+ if(href_list["vsc"] == GAS_PHORON)
vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
if(href_list["vsc"] == "default")
vsc.SetDefault(usr)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index ba2e7afcb2..6033bfc205 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -489,7 +489,7 @@
if(Rad.anchored)
if(!Rad.P)
var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
- Phoron.air_contents.gas["phoron"] = 70
+ Phoron.air_contents.gas[GAS_PHORON] = 70
Rad.drainratio = 0
Rad.P = Phoron
Phoron.loc = Rad
@@ -528,7 +528,7 @@
var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
- Phoron.air_contents.gas["phoron"] = 29.1154 //This is a full tank if you filled it from a canister
+ Phoron.air_contents.gas[GAS_PHORON] = 29.1154 //This is a full tank if you filled it from a canister
Rad.P = Phoron
Phoron.loc = Rad
@@ -541,7 +541,7 @@
var/obj/machinery/atmospherics/binary/pump/Pump = M
if(Pump.name == "Engine Feed" && response == "Setup Completely")
found_the_pump = 1
- Pump.air2.gas["nitrogen"] = 3750 //The contents of 2 canisters.
+ Pump.air2.gas[GAS_N2] = 3750 //The contents of 2 canisters.
Pump.air2.temperature = 50
Pump.air2.update_values()
Pump.update_use_power(USE_POWER_IDLE)
@@ -569,7 +569,7 @@
if(!found_the_pump && response == "Setup Completely")
to_chat(src, span_red("Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter"))
var/turf/simulated/T = SM.loc
- T.zone.air.gas["nitrogen"] += 450
+ T.zone.air.gas[GAS_N2] += 450
T.zone.air.temperature = 50
T.zone.air.update_values()
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 537f5759ca..ec9c69d2ac 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -122,7 +122,7 @@
name = "Hostile Blob Revival"
id = "blob_revival"
result = null
- required_reagents = list("phoron" = 60)
+ required_reagents = list(REAGENT_ID_PHORON = 60)
result_amount = 1
/decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder)
diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index 6fca677568..1246d62b95 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -2,7 +2,7 @@
#define NEUTRAL_MODE 2
#define NEGATIVE_MODE 3
-var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","silver","gold","slimejelly") //allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs!
+var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_COPPER,REAGENT_ID_PHORON,REAGENT_ID_SILVER,REAGENT_ID_GOLD,REAGENT_ID_SLIMEJELLY) //allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs!
/datum/preferences
var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already.
diff --git a/code/modules/clothing/accessories/hands.dm b/code/modules/clothing/accessories/hands.dm
index 2ac4386e6a..1d121728db 100644
--- a/code/modules/clothing/accessories/hands.dm
+++ b/code/modules/clothing/accessories/hands.dm
@@ -68,31 +68,31 @@
return material
/obj/item/clothing/accessory/bracelet/material/wood/New(var/newloc)
- ..(newloc, "wood")
+ ..(newloc, MAT_WOOD)
/obj/item/clothing/accessory/bracelet/material/plastic/New(var/newloc)
- ..(newloc, "plastic")
+ ..(newloc, MAT_PLASTIC)
/obj/item/clothing/accessory/bracelet/material/iron/New(var/newloc)
- ..(newloc, "iron")
+ ..(newloc, MAT_IRON)
/obj/item/clothing/accessory/bracelet/material/steel/New(var/newloc)
- ..(newloc, "steel")
+ ..(newloc, MAT_STEEL)
/obj/item/clothing/accessory/bracelet/material/silver/New(var/newloc)
- ..(newloc, "silver")
+ ..(newloc, MAT_SILVER)
/obj/item/clothing/accessory/bracelet/material/gold/New(var/newloc)
- ..(newloc, "gold")
+ ..(newloc, MAT_GOLD)
/obj/item/clothing/accessory/bracelet/material/platinum/New(var/newloc)
- ..(newloc, "platinum")
+ ..(newloc, MAT_PLATINUM)
/obj/item/clothing/accessory/bracelet/material/phoron/New(var/newloc)
- ..(newloc, "phoron")
+ ..(newloc, MAT_PHORON)
/obj/item/clothing/accessory/bracelet/material/glass/New(var/newloc)
- ..(newloc, "glass")
+ ..(newloc, MAT_GLASS)
//wristbands
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 59541aebc2..b98e333e38 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -11,7 +11,7 @@
permeability_coefficient = 0.01
siemens_coefficient = 0.9
var/gas_filter_strength = 1 //For gas mask filters
- var/list/filtered_gases = list("phoron", "nitrous_oxide")
+ var/list/filtered_gases = list(GAS_PHORON, GAS_N2O)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 75, rad = 0)
pickup_sound = 'sound/items/pickup/rubber.ogg'
@@ -88,7 +88,7 @@
flags = PHORONGUARD
item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
species_restricted = list(SPECIES_VOX)
- filtered_gases = list("oxygen", "nitrous_oxide")
+ filtered_gases = list(GAS_O2, GAS_N2O)
var/mask_open = FALSE // Controls if the Vox can eat through this mask
actions_types = list(/datum/action/item_action/toggle_feeding_port)
@@ -115,7 +115,7 @@
//body_parts_covered = 0
species_restricted = list(SPECIES_ZADDAT)
flags_inv = HIDEEARS //semi-transparent
- filtered_gases = list("phoron", "nitrogen", "nitrous_oxide")
+ filtered_gases = list(GAS_PHORON, GAS_N2, GAS_N2O)
/obj/item/clothing/mask/gas/syndicate
name = "tactical mask"
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index 52ccc6558c..2ec2692630 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -184,10 +184,10 @@
return
//also copied from matches
- if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
+ if(reagents.get_reagent_amount(REAGENT_ID_PHORON)) // the phoron explodes when exposed to fire
visible_message(span_danger("\The [src] conflagrates violently!"))
var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0)
+ e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_PHORON) / 2.5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
diff --git a/code/modules/economy/mint.dm b/code/modules/economy/mint.dm
index 179228a050..55086056be 100644
--- a/code/modules/economy/mint.dm
+++ b/code/modules/economy/mint.dm
@@ -7,7 +7,7 @@
density = TRUE
anchored = TRUE
var/coinsToProduce = 6 //how many coins do we make per sheet? a sheet is 2000 units whilst a coin is 250, and some material should be lost in the process
- var/list/validMats = list("silver", "gold", "diamond", "iron", "phoron", "uranium") //what's valid stuff to make coins out of?
+ var/list/validMats = list(MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_IRON, MAT_PHORON, MAT_URANIUM) //what's valid stuff to make coins out of?
/obj/machinery/mineral/mint/attackby(obj/item/stack/material/M as obj, mob/user as mob)
if(M.default_type in validMats)
@@ -16,22 +16,22 @@
icon_state = "coinpress1"
if(do_after(user, 2 SECONDS, src))
M.amount--
- if(M.default_type == "silver")
+ if(M.default_type == MAT_SILVER)
while(coinsToProduce-- > 0)
new /obj/item/coin/silver(user.loc)
- else if(M.default_type == "gold")
+ else if(M.default_type == MAT_GOLD)
while(coinsToProduce-- > 0)
new /obj/item/coin/gold(user.loc)
- else if(M.default_type == "diamond")
+ else if(M.default_type == MAT_DIAMOND)
while(coinsToProduce-- > 0)
new /obj/item/coin/diamond(user.loc)
- else if(M.default_type == "iron")
+ else if(M.default_type == MAT_IRON)
while(coinsToProduce-- > 0)
new /obj/item/coin/iron(user.loc)
- else if(M.default_type == "phoron")
+ else if(M.default_type == MAT_PHORON)
while(coinsToProduce-- > 0)
new /obj/item/coin/phoron(user.loc)
- else if(M.default_type == "uranium")
+ else if(M.default_type == MAT_URANIUM)
while(coinsToProduce-- > 0)
new /obj/item/coin/uranium(user.loc)
src.visible_message(span_notice("\The [src] rattles and dispenses several [M.default_type] coins!"))
diff --git a/code/modules/economy/money_bag.dm b/code/modules/economy/money_bag.dm
index 65bfe9cd6f..3bfcb78579 100644
--- a/code/modules/economy/money_bag.dm
+++ b/code/modules/economy/money_bag.dm
@@ -67,17 +67,17 @@
if(href_list["remove"])
var/obj/item/coin/COIN
switch(href_list["remove"])
- if("gold")
+ if(MAT_GOLD)
COIN = locate(/obj/item/coin/gold,src.contents)
- if("silver")
+ if(MAT_SILVER)
COIN = locate(/obj/item/coin/silver,src.contents)
- if("iron")
+ if(MAT_IRON)
COIN = locate(/obj/item/coin/iron,src.contents)
- if("diamond")
+ if(MAT_DIAMOND)
COIN = locate(/obj/item/coin/diamond,src.contents)
- if("phoron")
+ if(MAT_URANIUM)
COIN = locate(/obj/item/coin/phoron,src.contents)
- if("uranium")
+ if(MAT_URANIUM)
COIN = locate(/obj/item/coin/uranium,src.contents)
if(!COIN)
return
diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm
index 7d08a2e196..b9ca0ca20f 100644
--- a/code/modules/events/atmos_leak.dm
+++ b/code/modules/events/atmos_leak.dm
@@ -19,11 +19,11 @@
// Decide which area will be targeted!
/datum/event/atmos_leak/setup()
- var/gas_choices = list("carbon_dioxide", "nitrous_oxide") // Annoying
+ var/gas_choices = list(GAS_CO2, GAS_N2O) // Annoying
if(severity >= EVENT_LEVEL_MODERATE)
- gas_choices += "phoron" // Dangerous
+ gas_choices += GAS_PHORON // Dangerous
// if(severity >= EVENT_LEVEL_MAJOR)
- // gas_choices += "volatile_fuel" // Dangerous and no default atmos setup!
+ // gas_choices += GAS_VOLATILE_FUEL // Dangerous and no default atmos setup!
gas_type = pick(gas_choices)
var/list/area/grand_list_of_areas = get_station_areas(excluded)
diff --git a/code/modules/events/supply_demand_vr.dm b/code/modules/events/supply_demand_vr.dm
index 5520f5502b..ff1b1978a0 100644
--- a/code/modules/events/supply_demand_vr.dm
+++ b/code/modules/events/supply_demand_vr.dm
@@ -315,7 +315,7 @@
var/datum/gas_mixture/mixture = new
mixture.temperature = T20C
var/unpickedTypes = gas_data.gases.Copy()
- unpickedTypes -= "volatile_fuel" // Don't do that one
+ unpickedTypes -= GAS_VOLATILE_FUEL // Don't do that one
for(var/i in 1 to differentTypes)
var/gasId = pick(unpickedTypes)
unpickedTypes -= gasId
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 24a297954f..dd715d4b21 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -3,7 +3,7 @@ var/list/dreams = list(
"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a " + JOB_SECURITY_OFFICER,"the " + JOB_SITE_MANAGER,
"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
- "a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",
+ "a hat","the Luna","a ruined station","a planet",GAS_PHORON,"air","the medical bay","the bridge","blinking lights",
"a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect",
"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
"the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the " + JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 814ce55adc..0a89dd26b8 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -797,7 +797,7 @@
if(4)
reagents.add_reagent("sprinkles", 3)
if(5)
- reagents.add_reagent("phoron", 3)
+ reagents.add_reagent(REAGENT_ID_PHORON, 3)
if(6)
reagents.add_reagent("coco", 3)
if(7)
@@ -4748,7 +4748,7 @@
/obj/item/reagent_containers/food/snacks/bageleverything/Initialize()
. = ..()
- reagents.add_reagent("phoron", 5)
+ reagents.add_reagent(REAGENT_ID_PHORON, 5)
reagents.add_reagent("defective_nanites", 5)
/obj/item/reagent_containers/food/snacks/bageltwo
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index c08b33b886..90f1088534 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -169,7 +169,7 @@
/obj/item/reagent_containers/food/snacks/meat/worm/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
- reagents.add_reagent("phoron", 3)
+ reagents.add_reagent(REAGENT_ID_PHORON, 3)
reagents.add_reagent("myelamine", 3)
src.bitesize = 3
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index d7b8f6b7aa..274db27da7 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -152,5 +152,4 @@
/obj/item/reagent_containers/glass/bottle/potion/phoron
name = "volatile potion"
desc = "A small green bottle containing some volatile purple liquid."
- prefill = list("phoron" = 10)
-
+ prefill = list(REAGENT_ID_PHORON = 10)
diff --git a/code/modules/gamemaster/event2/events/engineering/gas_leak.dm b/code/modules/gamemaster/event2/events/engineering/gas_leak.dm
index b7becd5637..1651f9ab2e 100644
--- a/code/modules/gamemaster/event2/events/engineering/gas_leak.dm
+++ b/code/modules/gamemaster/event2/events/engineering/gas_leak.dm
@@ -15,7 +15,7 @@
/datum/event2/event/gas_leak
- var/potential_gas_choices = list("carbon_dioxide", "nitrous_oxide", "phoron", "volatile_fuel")
+ var/potential_gas_choices = list(GAS_CO2, GAS_N2O, GAS_PHORON, GAS_VOLATILE_FUEL)
var/chosen_gas = null
var/turf/chosen_turf = null
@@ -44,4 +44,4 @@
air_contents.temperature = T20C + rand(-50, 50)
air_contents.gas[chosen_gas] = 10 * MOLES_CELLSTANDARD
chosen_turf.assume_air(air_contents)
- playsound(chosen_turf, 'sound/effects/smoke.ogg', 75, 1)
\ No newline at end of file
+ playsound(chosen_turf, 'sound/effects/smoke.ogg', 75, 1)
diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm
index ff203ec399..ce35eeabc3 100644
--- a/code/modules/hydroponics/backtank.dm
+++ b/code/modules/hydroponics/backtank.dm
@@ -235,7 +235,7 @@
. = ..()
reagents.add_reagent("fuel", 500)
reagents.add_reagent("cryptobiolin", 500)
- reagents.add_reagent("phoron", 500)
+ reagents.add_reagent(REAGENT_ID_PHORON, 500)
reagents.add_reagent("condensedcapsaicin", 500)
/obj/item/watertank/op/make_noz()
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 150e345db6..49d3760380 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -445,12 +445,12 @@
if(prob(5))
consume_gasses = list()
- var/gas = pick("oxygen","nitrogen","phoron","carbon_dioxide")
+ var/gas = pick(GAS_O2,GAS_N2,GAS_PHORON,GAS_CO2)
consume_gasses[gas] = rand(3,9)
if(prob(5))
exude_gasses = list()
- var/gas = pick("oxygen","nitrogen","phoron","carbon_dioxide")
+ var/gas = pick(GAS_O2,GAS_N2,GAS_PHORON,GAS_CO2)
exude_gasses[gas] = rand(3,9)
chems = list()
diff --git a/code/modules/hydroponics/seedtypes/xeno.dm b/code/modules/hydroponics/seedtypes/xeno.dm
index 2b1acd76b0..a3cc708ce6 100644
--- a/code/modules/hydroponics/seedtypes/xeno.dm
+++ b/code/modules/hydroponics/seedtypes/xeno.dm
@@ -4,7 +4,7 @@
seed_name = "alien weed"
display_name = "alien weeds"
force_layer = 3
- chems = list("phoron" = list(1,3))
+ chems = list(REAGENT_ID_PHORON = list(1,3))
/datum/seed/xenomorph/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCTION,1)
set_trait(TRAIT_YIELD,-1)
set_trait(TRAIT_SPREAD,2)
- set_trait(TRAIT_POTENCY,50)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,50)
diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm
index f58209feae..8af9708865 100644
--- a/code/modules/integrated_electronics/passive/power.dm
+++ b/code/modules/integrated_electronics/passive/power.dm
@@ -118,7 +118,7 @@
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2)
var/volume = 60
- var/list/fuel = list("phoron" = 50000, "slimejelly" = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" =8000, "blood" = 5000)
+ var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" = 8000, "blood" = 5000)
/obj/item/integrated_circuit/passive/power/chemical_cell/New()
..()
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index 741b3b48dd..fd008425d3 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -741,10 +741,10 @@
outputs = list(
"pressure" = IC_PINTYPE_NUMBER,
"temperature" = IC_PINTYPE_NUMBER,
- "oxygen" = IC_PINTYPE_NUMBER,
- "nitrogen" = IC_PINTYPE_NUMBER,
+ GAS_O2 = IC_PINTYPE_NUMBER,
+ GAS_N2 = IC_PINTYPE_NUMBER,
"carbon dioxide" = IC_PINTYPE_NUMBER,
- "phoron" = IC_PINTYPE_NUMBER,
+ GAS_PHORON = IC_PINTYPE_NUMBER,
"other" = IC_PINTYPE_NUMBER
)
activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
@@ -762,10 +762,10 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[GAS_O2]/total_moles
+ var/n2_level = environment.gas[GAS_N2]/total_moles
+ var/co2_level = environment.gas[GAS_CO2]/total_moles
+ var/phoron_level = environment.gas[GAS_PHORON]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
set_pin_data(IC_OUTPUT, 1, pressure)
set_pin_data(IC_OUTPUT, 2, round(environment.temperature-T0C,0.1))
@@ -851,7 +851,7 @@
complexity = 3
inputs = list()
outputs = list(
- "oxygen" = IC_PINTYPE_NUMBER
+ GAS_O2 = IC_PINTYPE_NUMBER
)
activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
spawn_flags = IC_SPAWN_RESEARCH
@@ -867,7 +867,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
+ var/o2_level = environment.gas[GAS_O2]/total_moles
set_pin_data(IC_OUTPUT, 1, round(o2_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
@@ -897,7 +897,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
+ var/co2_level = environment.gas[GAS_CO2]/total_moles
set_pin_data(IC_OUTPUT, 1, round(co2_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
@@ -911,7 +911,7 @@
complexity = 3
inputs = list()
outputs = list(
- "nitrogen" = IC_PINTYPE_NUMBER
+ GAS_N2 = IC_PINTYPE_NUMBER
)
activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
spawn_flags = IC_SPAWN_RESEARCH
@@ -927,7 +927,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/n2_level = environment.gas["nitrogen"]/total_moles
+ var/n2_level = environment.gas[GAS_N2]/total_moles
set_pin_data(IC_OUTPUT, 1, round(n2_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
@@ -941,7 +941,7 @@
complexity = 3
inputs = list()
outputs = list(
- "phoron" = IC_PINTYPE_NUMBER
+ GAS_PHORON = IC_PINTYPE_NUMBER
)
activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
spawn_flags = IC_SPAWN_RESEARCH
@@ -957,7 +957,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/phoron_level = environment.gas[GAS_PHORON]/total_moles
set_pin_data(IC_OUTPUT, 1, round(phoron_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
diff --git a/code/modules/materials/materials/gems.dm b/code/modules/materials/materials/gems.dm
index 18db67f493..e5b379dc1b 100644
--- a/code/modules/materials/materials/gems.dm
+++ b/code/modules/materials/materials/gems.dm
@@ -1,5 +1,5 @@
/datum/material/phoron
- name = "phoron"
+ name = MAT_PHORON
stack_type = /obj/item/stack/material/phoron
ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE
icon_base = "stone"
@@ -24,7 +24,7 @@
for(var/turf/simulated/floor/target_tile in range(2,T))
var/phoronToDeduce = (temperature/30) * effect_multiplier
totalPhoron += phoronToDeduce
- target_tile.assume_gas("phoron", phoronToDeduce, 200+T0C)
+ target_tile.assume_gas(GAS_PHORON, phoronToDeduce, 200+T0C)
spawn (0)
target_tile.hotspot_expose(temperature, 400)
return round(totalPhoron/100)
@@ -165,5 +165,3 @@
supply_conversion_value = 13
icon_base = "stone"
table_icon_base = "stone"
-
-
diff --git a/code/modules/materials/sheets/gems.dm b/code/modules/materials/sheets/gems.dm
index 1906da8eab..acec29ca24 100644
--- a/code/modules/materials/sheets/gems.dm
+++ b/code/modules/materials/sheets/gems.dm
@@ -1,39 +1,39 @@
/obj/item/stack/material/phoron
- name = "solid phoron"
+ name = "solid " + MAT_PHORON
icon_state = "sheet-phoron"
- default_type = "phoron"
+ default_type = MAT_PHORON
no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/stack/material/diamond
- name = "diamond"
+ name = MAT_DIAMOND
icon_state = "sheet-diamond"
- default_type = "diamond"
+ default_type = MAT_DIAMOND
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/stack/material/painite
- name = "painite"
+ name = MAT_PAINITE
icon_state = "sheet-gem"
singular_name = "painite gem"
- default_type = "painite"
+ default_type = MAT_PAINITE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/void_opal
- name = "void opal"
+ name = MAT_VOPAL
icon_state = "sheet-void_opal"
singular_name = "void opal"
- default_type = "void opal"
+ default_type = MAT_VOPAL
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/quartz
- name = "quartz"
+ name = MAT_QUARTZ
icon_state = "sheet-gem"
singular_name = "quartz gem"
- default_type = "quartz"
+ default_type = MAT_QUARTZ
apply_colour = 1
no_variants = FALSE
@@ -61,6 +61,3 @@
default_type = MAT_MORPHIUM
no_variants = FALSE
apply_colour = TRUE
-
-
-
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 99245eb39d..1d7f5548ea 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -22,42 +22,42 @@
var/current_capacity = 0
var/list/stored_ore = list(
- "sand" = 0,
- "hematite" = 0,
- "carbon" = 0,
- "raw copper" = 0,
- "raw tin" = 0,
- "void opal" = 0,
- "painite" = 0,
- "quartz" = 0,
- "raw bauxite" = 0,
- "phoron" = 0,
- "silver" = 0,
- "gold" = 0,
- "marble" = 0,
- "uranium" = 0,
- "diamond" = 0,
- "platinum" = 0,
- "lead" = 0,
- "mhydrogen" = 0,
- "verdantium" = 0,
- "rutile" = 0)
+ ORE_SAND = 0,
+ ORE_HEMATITE = 0,
+ ORE_CARBON = 0,
+ ORE_COPPER = 0,
+ ORE_TIN = 0,
+ ORE_VOPAL = 0,
+ ORE_PAINITE = 0,
+ ORE_QUARTZ = 0,
+ ORE_BAUXITE = 0,
+ ORE_PHORON = 0,
+ ORE_SILVER = 0,
+ ORE_GOLD = 0,
+ ORE_MARBLE = 0,
+ ORE_URANIUM = 0,
+ ORE_DIAMOND = 0,
+ ORE_PLATINUM = 0,
+ ORE_LEAD = 0,
+ ORE_MHYDROGEN = 0,
+ ORE_VERDANTIUM = 0,
+ ORE_RUTILE = 0)
var/list/ore_types = list(
- "hematite" = /obj/item/ore/iron,
- "uranium" = /obj/item/ore/uranium,
- "gold" = /obj/item/ore/gold,
- "silver" = /obj/item/ore/silver,
- "diamond" = /obj/item/ore/diamond,
- "phoron" = /obj/item/ore/phoron,
- "platinum" = /obj/item/ore/osmium,
- "mhydrogen" = /obj/item/ore/hydrogen,
- "sand" = /obj/item/ore/glass,
- "carbon" = /obj/item/ore/coal,
- // "copper" = /obj/item/ore/copper,
- // "tin" = /obj/item/ore/tin,
- // "bauxite" = /obj/item/ore/bauxite,
- "rutile" = /obj/item/ore/rutile
+ ORE_HEMATITE = /obj/item/ore/iron,
+ ORE_URANIUM = /obj/item/ore/uranium,
+ ORE_GOLD = /obj/item/ore/gold,
+ ORE_SILVER = /obj/item/ore/silver,
+ ORE_DIAMOND = /obj/item/ore/diamond,
+ ORE_PHORON = /obj/item/ore/phoron,
+ ORE_PLATINUM = /obj/item/ore/osmium,
+ ORE_MHYDROGEN = /obj/item/ore/hydrogen,
+ ORE_SAND = /obj/item/ore/glass,
+ ORE_CARBON = /obj/item/ore/coal,
+ // ORE_COPPER = /obj/item/ore/copper,
+ // ORE_TIN = /obj/item/ore/tin,
+ // ORE_BAUXITE = /obj/item/ore/bauxite,
+ ORE_RUTILE = /obj/item/ore/rutile
)
//Upgrades
@@ -69,16 +69,16 @@
// Found with an advanced laser. exotic_drilling >= 1
var/list/ore_types_uncommon = list(
- MAT_MARBLE = /obj/item/ore/marble,
- //"painite" = /obj/item/ore/painite,
- //"quartz" = /obj/item/ore/quartz,
- MAT_LEAD = /obj/item/ore/lead
+ ORE_MARBLE = /obj/item/ore/marble,
+ //ORE_PAINITE = /obj/item/ore/painite,
+ //ORE_QUARTZ = /obj/item/ore/quartz,
+ ORE_LEAD = /obj/item/ore/lead
)
// Found with an ultra laser. exotic_drilling >= 2
var/list/ore_types_rare = list(
- //"void opal" = /obj/item/ore/void_opal,
- MAT_VERDANTIUM = /obj/item/ore/verdantium
+ //ORE_VOPAL = /obj/item/ore/void_opal,
+ ORE_VERDANTIUM = /obj/item/ore/verdantium
)
//Flags
diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm
index 8504626053..1888c7d8eb 100644
--- a/code/modules/mining/drilling/scanner.dm
+++ b/code/modules/mining/drilling/scanner.dm
@@ -41,13 +41,13 @@
var/ore_type
switch(metal)
- if("sand", "carbon", "marble", /*"quartz"*/) ore_type = "surface minerals"
- if("hematite", /*"tin", "copper", "bauxite",*/ "lead") ore_type = "industrial metals"
- if("gold", "silver", "rutile") ore_type = "precious metals"
- if("diamond", /*"painite"*/) ore_type = "precious gems"
- if("uranium") ore_type = "nuclear fuel"
- if("phoron", "platinum", "mhydrogen") ore_type = "exotic matter"
- if("verdantium", /*"void opal"*/) ore_type = "anomalous matter"
+ if(ORE_SAND, ORE_CARBON, ORE_MARBLE, /*ORE_QUARTZ*/) ore_type = "surface minerals"
+ if(ORE_HEMATITE, /*ORE_TIN, ORE_COPPER, ORE_BAUXITE,*/ ORE_LEAD) ore_type = "industrial metals"
+ if(ORE_GOLD, ORE_SILVER, ORE_RUTILE) ore_type = "precious metals"
+ if(ORE_DIAMOND, /*ORE_PAINITE*/) ore_type = "precious gems"
+ if(ORE_URANIUM) ore_type = "nuclear fuel"
+ if(ORE_PHORON, ORE_PLATINUM, ORE_MHYDROGEN) ore_type = "exotic matter"
+ if(ORE_VERDANTIUM, /*ORE_VOPAL*/) ore_type = "anomalous matter"
if(ore_type) metals[ore_type] += T.resources[metal]
diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm
index df23a27a6e..32e74bc863 100644
--- a/code/modules/mining/machinery/machine_processing.dm
+++ b/code/modules/mining/machinery/machine_processing.dm
@@ -166,26 +166,26 @@
var/points = 0
var/points_mult = 1 //VOREStation Add - multiplier for points generated when ore hits the processors
var/static/list/ore_values = list(
- "sand" = 1,
- "hematite" = 1,
- "carbon" = 1,
- "raw copper" = 1,
- "raw tin" = 1,
- "void opal" = 3,
- "painite" = 3,
- "quartz" = 3,
- "raw bauxite" = 5,
- "phoron" = 15,
- "silver" = 16,
- "gold" = 18,
- "marble" = 20,
- "uranium" = 30,
- "diamond" = 50,
- "platinum" = 40,
- "lead" = 40,
- "mhydrogen" = 40,
- "verdantium" = 60,
- "rutile" = 40) //VOREStation Add
+ ORE_SAND = 1,
+ ORE_HEMATITE = 1,
+ ORE_CARBON = 1,
+ ORE_COPPER = 1,
+ ORE_TIN = 1,
+ ORE_VOPAL = 3,
+ ORE_PAINITE = 3,
+ ORE_QUARTZ= 3,
+ ORE_BAUXITE = 5,
+ ORE_PHORON = 15,
+ ORE_SILVER = 16,
+ ORE_GOLD = 18,
+ ORE_MARBLE = 20,
+ ORE_URANIUM = 30,
+ ORE_DIAMOND = 50,
+ ORE_PLATINUM = 40,
+ ORE_LEAD = 40,
+ ORE_MHYDROGEN = 40,
+ ORE_VERDANTIUM = 60,
+ ORE_RUTILE = 40) //VOREStation Add
/obj/machinery/mineral/processing_unit/Initialize()
. = ..()
diff --git a/code/modules/mining/machinery/machine_unloading.dm b/code/modules/mining/machinery/machine_unloading.dm
index 91fc8f3fde..5894f07cc1 100644
--- a/code/modules/mining/machinery/machine_unloading.dm
+++ b/code/modules/mining/machinery/machine_unloading.dm
@@ -47,45 +47,45 @@
BOX.stored_ore[ore] = 0
//Icon code here. Going from most to least common.
- if(ore == "sand")
+ if(ore == ORE_SAND)
ore_chunk.icon_state = "ore_glass"
- else if(ore == "carbon")
+ else if(ore == ORE_CARBON)
ore_chunk.icon_state = "ore_coal"
- else if(ore == "hematite")
+ else if(ore == ORE_HEMATITE)
ore_chunk.icon_state = "ore_iron"
- else if(ore == "phoron")
+ else if(ore == ORE_PHORON)
ore_chunk.icon_state = "ore_phoron"
- else if(ore == "silver")
+ else if(ore == ORE_SILVER)
ore_chunk.icon_state = "ore_silver"
- else if(ore == "gold")
+ else if(ore == ORE_GOLD)
ore_chunk.icon_state = "ore_gold"
- else if(ore == "uranium")
+ else if(ore == ORE_URANIUM)
ore_chunk.icon_state = "ore_uranium"
- else if(ore == "diamond")
+ else if(ore == ORE_DIAMOND)
ore_chunk.icon_state = "ore_diamond"
- else if(ore == "platinum")
+ else if(ore == ORE_PLATINUM)
ore_chunk.icon_state = "ore_platinum"
- else if(ore == "marble")
+ else if(ore == ORE_MARBLE)
ore_chunk.icon_state = "ore_marble"
- else if(ore == "lead")
+ else if(ore == ORE_LEAD)
ore_chunk.icon_state = "ore_lead"
- else if(ore == "rutile")
+ else if(ore == ORE_RUTILE)
ore_chunk.icon_state = "ore_rutile"
- else if(ore == "quartz")
+ else if(ore == ORE_QUARTZ)
ore_chunk.icon_state = "ore_quartz"
- else if(ore == "mhydrogen")
+ else if(ore == ORE_MHYDROGEN)
ore_chunk.icon_state = "ore_hydrogen"
- else if(ore == "verdantium")
+ else if(ore == ORE_VERDANTIUM)
ore_chunk.icon_state = "ore_verdantium"
- else if(ore == "raw copper")
+ else if(ore == ORE_COPPER)
ore_chunk.icon_state = "ore_copper"
- else if(ore == "raw tin")
+ else if(ore == ORE_TIN)
ore_chunk.icon_state = "ore_tin"
- else if(ore == "void opal")
+ else if(ore == ORE_VOPAL)
ore_chunk.icon_state = "ore_void_opal"
- else if(ore == "raw bauxite")
+ else if(ore == ORE_BAUXITE)
ore_chunk.icon_state = "ore_bauxite"
- else if(ore == "painite")
+ else if(ore == ORE_PAINITE)
ore_chunk.icon_state = "ore_painite"
else
ore_chunk.icon_state = "boulder[rand(1,4)]"
@@ -102,4 +102,4 @@
O.loc = src.output.loc
else
return
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index f679591e2d..b37a717e95 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -45,26 +45,26 @@ var/list/mining_overlay_cache = list()
var/ignore_mapgen
var/static/list/ore_types = list(
- "hematite" = /obj/item/ore/iron,
- "uranium" = /obj/item/ore/uranium,
- "gold" = /obj/item/ore/gold,
- "silver" = /obj/item/ore/silver,
- "diamond" = /obj/item/ore/diamond,
- "phoron" = /obj/item/ore/phoron,
- "platinum" = /obj/item/ore/osmium,
- "mhydrogen" = /obj/item/ore/hydrogen,
- "sand" = /obj/item/ore/glass,
- "carbon" = /obj/item/ore/coal,
- "verdantium" = /obj/item/ore/verdantium,
- "marble" = /obj/item/ore/marble,
- "lead" = /obj/item/ore/lead,
-// "copper" = /obj/item/ore/copper,
-// "tin" = /obj/item/ore/tin,
-// "bauxite" = /obj/item/ore/bauxite,
-// "void opal" = /obj/item/ore/void_opal,
-// "painite" = /obj/item/ore/painite,
-// "quartz" = /obj/item/ore/quartz,
- "rutile" = /obj/item/ore/rutile
+ ORE_HEMATITE = /obj/item/ore/iron,
+ ORE_URANIUM = /obj/item/ore/uranium,
+ ORE_GOLD = /obj/item/ore/gold,
+ ORE_SILVER = /obj/item/ore/silver,
+ ORE_DIAMOND = /obj/item/ore/diamond,
+ ORE_PHORON = /obj/item/ore/phoron,
+ ORE_PLATINUM = /obj/item/ore/osmium,
+ ORE_MHYDROGEN = /obj/item/ore/hydrogen,
+ ORE_SAND = /obj/item/ore/glass,
+ ORE_CARBON = /obj/item/ore/coal,
+ ORE_VERDANTIUM = /obj/item/ore/verdantium,
+ ORE_MARBLE = /obj/item/ore/marble,
+ ORE_LEAD = /obj/item/ore/lead,
+// ORE_COPPER = /obj/item/ore/copper,
+// ORE_TIN = /obj/item/ore/tin,
+// ORE_BAUXITE = /obj/item/ore/bauxite,
+// ORE_VOPAL = /obj/item/ore/void_opal,
+// ORE_PAINITE = /obj/item/ore/painite,
+// ORE_QUARTZ = /obj/item/ore/quartz,
+ ORE_RUTILE = /obj/item/ore/rutile
)
has_resources = 1
@@ -725,10 +725,10 @@ var/list/mining_overlay_cache = list()
var/mineral_name
if(rare_ore)
- mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15, "copper" = 10, "tin" = 5, "bauxite" = 5*/, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5,/* "void opal" = 1,*/ "verdantium" = 2/*, "painite" = 1*/))
+ mineral_name = pickweight(list(ORE_MARBLE = 5,/* ORE_QUARTZ = 15, ORE_COPPER = 10, ORE_TIN = 5, ORE_BAUXITE = 5*/, ORE_URANIUM = 15, ORE_PLATINUM = 20, ORE_HEMATITE = 15, ORE_RUTILE = 20, ORE_CARBON = 15, ORE_DIAMOND = 3, ORE_GOLD = 15, ORE_SILVER = 15, ORE_PHORON = 25, ORE_LEAD = 5,/* ORE_VOPAL = 1,*/ ORE_VERDANTIUM = 2/*, ORE_PAINITE = 1*/))
else
- mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10, "copper" = 20, "tin" = 15, "bauxite" = 15*/, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3,/* "void opal" = 1,*/ "verdantium" = 1/*, "painite" = 1*/))
+ mineral_name = pickweight(list(ORE_MARBLE = 3,/* ORE_QUARTZ = 10, ORE_COPPER = 20, ORE_TIN = 15, ORE_BAUXITE = 15*/, ORE_URANIUM = 10, ORE_PLATINUM = 10, ORE_HEMATITE = 70, ORE_RUTILE = 15, ORE_CARBON = 70, ORE_DIAMOND = 2, ORE_GOLD = 10, ORE_SILVER = 10, ORE_PHORON = 20, ORE_LEAD = 3,/* ORE_VOPAL = 1,*/ ORE_VERDANTIUM = 1/*, ORE_PAINITE = 1*/))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 08a1c5a2da..fd65926aaa 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -11,31 +11,31 @@
name = "pitchblende"
icon_state = "ore_uranium"
origin_tech = list(TECH_MATERIAL = 5)
- material = "uranium"
+ material = ORE_URANIUM
/obj/item/ore/iron
name = "hematite"
icon_state = "ore_iron"
origin_tech = list(TECH_MATERIAL = 1)
- material = "hematite"
+ material = ORE_HEMATITE
/obj/item/ore/coal
name = "raw carbon"
icon_state = "ore_coal"
origin_tech = list(TECH_MATERIAL = 1)
- material = "carbon"
+ material = ORE_CARBON
/obj/item/ore/marble
name = "recrystallized carbonate"
icon_state = "ore_marble"
origin_tech = list(TECH_MATERIAL = 1)
- material = "marble"
+ material = ORE_MARBLE
/obj/item/ore/glass
name = "sand"
icon_state = "ore_glass"
origin_tech = list(TECH_MATERIAL = 1)
- material = "sand"
+ material = ORE_SAND
slot_flags = SLOT_HOLSTER
// POCKET SAND!
@@ -54,40 +54,40 @@
name = "phoron crystals"
icon_state = "ore_phoron"
origin_tech = list(TECH_MATERIAL = 2)
- material = "phoron"
+ material = ORE_PHORON
/obj/item/ore/silver
name = "native silver ore"
icon_state = "ore_silver"
origin_tech = list(TECH_MATERIAL = 3)
- material = "silver"
+ material = ORE_SILVER
/obj/item/ore/gold
name = "native gold ore"
icon_state = "ore_gold"
origin_tech = list(TECH_MATERIAL = 4)
- material = "gold"
+ material = ORE_GOLD
/obj/item/ore/diamond
name = "diamonds"
icon_state = "ore_diamond"
origin_tech = list(TECH_MATERIAL = 6)
- material = "diamond"
+ material = ORE_DIAMOND
/obj/item/ore/osmium
name = "raw platinum"
icon_state = "ore_platinum"
- material = "platinum"
+ material = ORE_PLATINUM
/obj/item/ore/hydrogen
name = "raw hydrogen"
icon_state = "ore_hydrogen"
- material = "mhydrogen"
+ material = ORE_MHYDROGEN
/obj/item/ore/verdantium
name = "verdantite dust"
icon_state = "ore_verdantium"
- material = MAT_VERDANTIUM
+ material = ORE_VERDANTIUM
origin_tech = list(TECH_MATERIAL = 7)
// POCKET ... Crystal dust.
@@ -104,43 +104,43 @@
/obj/item/ore/lead
name = "lead glance"
icon_state = "ore_lead"
- material = MAT_LEAD
+ material = ORE_LEAD
origin_tech = list(TECH_MATERIAL = 3)
/*
/obj/item/ore/copper
name = "raw copper"
icon_state = "ore_copper"
- material = "copper"
+ material = ORE_COPPER
/obj/item/ore/tin
name = "raw tin"
icon_state = "ore_tin"
- material = "tin"
+ material = ORE_TIN
/obj/item/ore/bauxite
name = "raw bauxite"
icon_state = "ore_bauxite"
- material = "bauxite"
+ material = ORE_BAUXITE
*/
/obj/item/ore/rutile
name = "raw rutile"
icon_state = "ore_rutile"
- material = "rutile"
+ material = ORE_RUTILE
/*
/obj/item/ore/void_opal
name = "raw void opal"
icon_state = "ore_void_opal"
- material = "void opal"
+ material = ORE_VOPAL
/obj/item/ore/painite
name = "raw painite"
icon_state = "ore_painite"
- material = "painite"
+ material = ORE_PAINITE
/obj/item/ore/quartz
name = "raw quartz"
icon_state = "ore_quartz"
- material = "quartz"
+ material = ORE_QUARTZ
*/
/obj/item/ore/slag
name = "Slag"
@@ -179,26 +179,26 @@
randpixel = 8
w_class = ITEMSIZE_SMALL
var/list/stored_ore = list(
- "sand" = 0,
- "hematite" = 0,
- "carbon" = 0,
- "raw copper" = 0,
- "raw tin" = 0,
- "void opal" = 0,
- "painite" = 0,
- "quartz" = 0,
- "raw bauxite" = 0,
- "phoron" = 0,
- "silver" = 0,
- "gold" = 0,
- "marble" = 0,
- "uranium" = 0,
- "diamond" = 0,
- "platinum" = 0,
- "lead" = 0,
- "mhydrogen" = 0,
- "verdantium" = 0,
- "rutile" = 0)
+ ORE_SAND = 0,
+ ORE_HEMATITE = 0,
+ ORE_CARBON = 0,
+ ORE_COPPER = 0,
+ ORE_TIN = 0,
+ ORE_VOPAL = 0,
+ ORE_PAINITE = 0,
+ ORE_QUARTZ = 0,
+ ORE_BAUXITE = 0,
+ ORE_PHORON = 0,
+ ORE_SILVER = 0,
+ ORE_GOLD = 0,
+ ORE_MARBLE = 0,
+ ORE_URANIUM = 0,
+ ORE_DIAMOND = 0,
+ ORE_PLATINUM = 0,
+ ORE_LEAD = 0,
+ ORE_MHYDROGEN = 0,
+ ORE_VERDANTIUM = 0,
+ ORE_RUTILE = 0)
/obj/item/ore_chunk/examine(mob/user)
. = ..()
diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm
index 35dac00347..f119a6e8d3 100644
--- a/code/modules/mining/ore_box.dm
+++ b/code/modules/mining/ore_box.dm
@@ -8,26 +8,26 @@
density = TRUE
var/last_update = 0
var/list/stored_ore = list(
- "sand" = 0,
- "hematite" = 0,
- "carbon" = 0,
- "raw copper" = 0,
- "raw tin" = 0,
- "void opal" = 0,
- "painite" = 0,
- "quartz" = 0,
- "raw bauxite" = 0,
- "phoron" = 0,
- "silver" = 0,
- "gold" = 0,
- "marble" = 0,
- "uranium" = 0,
- "diamond" = 0,
- "platinum" = 0,
- "lead" = 0,
- "mhydrogen" = 0,
- "verdantium" = 0,
- "rutile" = 0)
+ ORE_SAND = 0,
+ ORE_HEMATITE = 0,
+ ORE_CARBON = 0,
+ ORE_COPPER = 0,
+ ORE_TIN = 0,
+ ORE_VOPAL = 0,
+ ORE_PAINITE = 0,
+ ORE_QUARTZ = 0,
+ ORE_BAUXITE = 0,
+ ORE_PHORON = 0,
+ ORE_SILVER = 0,
+ ORE_GOLD = 0,
+ ORE_MARBLE = 0,
+ ORE_URANIUM = 0,
+ ORE_DIAMOND = 0,
+ ORE_PLATINUM = 0,
+ ORE_LEAD = 0,
+ ORE_MHYDROGEN = 0,
+ ORE_VERDANTIUM = 0,
+ ORE_RUTILE = 0)
/obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm
index 697abc9c7c..786ff0210e 100644
--- a/code/modules/mining/ore_datum.dm
+++ b/code/modules/mining/ore_datum.dm
@@ -14,8 +14,8 @@
"thousand" = 999,
"million" = 999
)
- var/xarch_source_mineral = "iron"
- var/reagent = "silicate"
+ var/xarch_source_mineral = REAGENT_ID_IRON
+ var/reagent = REAGENT_SILICATE
/ore/New()
. = ..()
@@ -23,9 +23,9 @@
display_name = name
/ore/uranium
- name = "uranium"
+ name = ORE_LEAD
display_name = "pitchblende"
- smelts_to = "uranium"
+ smelts_to = MAT_URANIUM
result_amount = 5
spread_chance = 10
ore = /obj/item/ore/uranium
@@ -34,43 +34,43 @@
"thousand" = 999,
"million" = 704
)
- xarch_source_mineral = "potassium"
- reagent = "uranium"
+ xarch_source_mineral = REAGENT_ID_POTASSIUM
+ reagent = REAGENT_ID_URANIUM
/ore/hematite
- name = "hematite"
+ name = ORE_HEMATITE
display_name = "hematite"
- smelts_to = "iron"
+ smelts_to = MAT_IRON
alloy = 1
result_amount = 5
spread_chance = 25
ore = /obj/item/ore/iron
scan_icon = "mineral_common"
- reagent = "iron"
+ reagent = REAGENT_ID_IRON
/ore/coal
- name = "carbon"
+ name = ORE_CARBON
display_name = "raw carbon"
- smelts_to = "plastic"
- compresses_to = "graphite"
+ smelts_to = MAT_PLASTIC
+ compresses_to = MAT_GRAPHITE
alloy = 1
result_amount = 5
spread_chance = 25
ore = /obj/item/ore/coal
scan_icon = "mineral_common"
- reagent = "carbon"
+ reagent = REAGENT_ID_CARBON
/ore/glass
- name = "sand"
+ name = ORE_SAND
display_name = "sand"
- smelts_to = "glass"
+ smelts_to = MAT_GLASS
alloy = 1
compresses_to = "sandstone"
/ore/phoron
- name = "phoron"
+ name = ORE_PHORON
display_name = "phoron crystals"
- compresses_to = "phoron"
+ compresses_to = MAT_PHORON
//smelts_to = something that explodes violently on the conveyor, huhuhuhu
result_amount = 5
spread_chance = 25
@@ -82,22 +82,22 @@
"billion" = 13,
"billion_lower" = 10
)
- xarch_source_mineral = "phoron"
- reagent = "phoron"
+ xarch_source_mineral = REAGENT_ID_PHORON
+ reagent = REAGENT_ID_PHORON
/ore/silver
- name = "silver"
+ name = ORE_SILVER
display_name = "native silver"
- smelts_to = "silver"
+ smelts_to = MAT_SILVER
result_amount = 5
spread_chance = 10
ore = /obj/item/ore/silver
scan_icon = "mineral_uncommon"
- reagent = "silver"
+ reagent = REAGENT_ID_SILVER
/ore/gold
- smelts_to = "gold"
- name = "gold"
+ name = ORE_GOLD
+ smelts_to = MAT_GOLD
display_name = "native gold"
result_amount = 5
spread_chance = 10
@@ -109,42 +109,42 @@
"billion" = 4,
"billion_lower" = 3
)
- reagent = "gold"
+ reagent = REAGENT_ID_GOLD
/ore/diamond
- name = "diamond"
+ name = ORE_DIAMOND
display_name = "diamond"
alloy = 1
- compresses_to = "diamond"
+ compresses_to = MAT_DIAMOND
result_amount = 5
spread_chance = 10
ore = /obj/item/ore/diamond
scan_icon = "mineral_rare"
- xarch_source_mineral = "nitrogen"
- reagent = "carbon"
+ xarch_source_mineral = REAGENT_ID_NITROGEN
+ reagent = REAGENT_ID_CARBON
/ore/platinum
- name = "platinum"
+ name = ORE_PLATINUM
display_name = "raw platinum"
- smelts_to = "platinum"
- compresses_to = "osmium"
+ smelts_to = MAT_PLATINUM
+ compresses_to = MAT_OSMIUM
alloy = 1
result_amount = 5
spread_chance = 10
ore = /obj/item/ore/osmium
scan_icon = "mineral_rare"
- reagent = "platinum"
+ reagent = REAGENT_ID_PLATINUM
/ore/hydrogen
- name = "mhydrogen"
+ name = ORE_MHYDROGEN
display_name = "metallic hydrogen"
- smelts_to = "tritium"
- compresses_to = "mhydrogen"
+ smelts_to = MAT_TRITIUM
+ compresses_to = MAT_METALHYDROGEN
scan_icon = "mineral_rare"
- reagent = "hydrogen"
+ reagent = REAGENT_ID_HYDROGEN
/ore/verdantium
- name = MAT_VERDANTIUM
+ name = ORE_VERDANTIUM
display_name = "crystalline verdantite"
compresses_to = MAT_VERDANTIUM
result_amount = 2
@@ -157,40 +157,40 @@
)
/ore/marble
- name = MAT_MARBLE
+ name = ORE_MARBLE
display_name = "recrystallized carbonate"
- compresses_to = "marble"
+ compresses_to = MAT_MARBLE
result_amount = 1
spread_chance = 10
ore = /obj/item/ore/marble
scan_icon = "mineral_common"
- reagent = "calciumcarbonate"
+ reagent = REAGENT_ID_CALCIUMCARBONATE
/ore/lead
- name = MAT_LEAD
+ name = ORE_LEAD
display_name = "lead glance"
- smelts_to = "lead"
+ smelts_to = MAT_LEAD
result_amount = 3
spread_chance = 20
ore = /obj/item/ore/lead
scan_icon = "mineral_rare"
- reagent = "lead"
+ reagent = REAGENT_ID_LEAD
/*
/ore/copper
- name = "copper"
+ name = ORE_COPPER
display_name = "copper"
- smelts_to = "copper"
+ smelts_to = MAT_COPPER
alloy = 1
result_amount = 5
spread_chance = 15
ore = /obj/item/ore/copper
scan_icon = "mineral_common"
- reagent = "copper"
+ reagent = REAGENT_ID_COPPER
/ore/tin
- name = "tin"
+ name = ORE_TIN
display_name = "tin"
- smelts_to = "tin"
+ smelts_to = MAT_TIN
alloy = 1
result_amount = 5
spread_chance = 10
@@ -198,28 +198,28 @@
scan_icon = "mineral_common"
/ore/quartz
- name = "quartz"
+ name = ORE_QUARTZ
display_name = "unrefined quartz"
- compresses_to = "quartz"
+ compresses_to = MAT_QUARTZ
result_amount = 5
spread_chance = 5
ore = /obj/item/ore/quartz
scan_icon = "mineral_common"
/ore/bauxite
- name = "bauxite"
+ name = ORE_BAUXITE
display_name = "bauxite"
- smelts_to = "aluminium"
+ smelts_to = MAT_ALUMINIUM
result_amount = 5
spread_chance = 25
ore = /obj/item/ore/bauxite
scan_icon = "mineral_common"
- reagent = "aluminum"
+ reagent = REAGENT_ID_ALUMINIUM
*/
/ore/rutile
- name = "rutile"
+ name = ORE_RUTILE
display_name = "rutile"
- smelts_to = "titanium"
+ smelts_to = MAT_TITANIUM
result_amount = 5
spread_chance = 12
alloy = 1
@@ -227,20 +227,20 @@
scan_icon = "mineral_uncommon"
/*
/ore/painite
- name = "painite"
+ name = ORE_PAINITE
display_name = "rough painite"
- compresses_to = "painite"
+ compresses_to = MAT_PAINITE
result_amount = 5
spread_chance = 3
ore = /obj/item/ore/painite
scan_icon = "mineral_rare"
/ore/void_opal
- name = "void opal"
+ name = ORE_VOPAL
display_name = "rough void opal"
- compresses_to = "void opal"
+ compresses_to = MAT_VOPAL
result_amount = 5
spread_chance = 1
ore = /obj/item/ore/void_opal
scan_icon = "mineral_rare"
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 641e572586..457b94b5e6 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -5,7 +5,7 @@
if(!environment) return
var/turf/T = get_turf(src)
- if(environment.gas["phoron"] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
+ if(environment.gas[GAS_PHORON] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
update_progression()
adjustBruteLoss(-1)
adjustFireLoss(-1)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 7f7b2d7aad..e66793b754 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -609,13 +609,13 @@
if(species.breath_type)
breath_type = species.breath_type
else
- breath_type = "oxygen"
+ breath_type = GAS_O2
inhaling = breath.gas[breath_type]
if(species.poison_type)
poison_type = species.poison_type
else
- poison_type = "phoron"
+ poison_type = GAS_PHORON
poison = breath.gas[poison_type]
if(species.exhale_type)
@@ -640,17 +640,17 @@
failed_inhale = 1
switch(breath_type)
- if("oxygen")
+ if(GAS_O2)
throw_alert("oxy", /obj/screen/alert/not_enough_oxy)
- if("phoron")
+ if(GAS_PHORON)
throw_alert("oxy", /obj/screen/alert/not_enough_tox)
- if("nitrogen")
+ if(GAS_N2)
throw_alert("oxy", /obj/screen/alert/not_enough_nitro)
- if("carbon_dioxide")
+ if(GAS_CO2)
throw_alert("oxy", /obj/screen/alert/not_enough_co2)
- if("volatile_fuel")
+ if(GAS_VOLATILE_FUEL)
throw_alert("oxy", /obj/screen/alert/not_enough_fuel)
- if("nitrous_oxide")
+ if(GAS_N2O)
throw_alert("oxy", /obj/screen/alert/not_enough_n2o)
else
@@ -702,8 +702,8 @@
clear_alert("tox_in_air")
// If there's some other shit in the air lets deal with it here.
- if(breath.gas["nitrous_oxide"])
- var/SA_pp = (breath.gas["nitrous_oxide"] / breath.total_moles) * breath_pressure
+ if(breath.gas[GAS_N2O])
+ var/SA_pp = (breath.gas[GAS_N2O] / breath.total_moles) * breath_pressure
// Enough to make us paralysed for a bit
if(SA_pp > SA_para_min)
@@ -719,7 +719,7 @@
else if(SA_pp > 0.15)
if(prob(20))
spawn(0) emote(pick("giggle", "laugh"))
- breath.adjust_gas("nitrous_oxide", -breath.gas["nitrous_oxide"]/6, update = 0) //update after
+ breath.adjust_gas(GAS_N2O, -breath.gas[GAS_N2O]/6, update = 0) //update after
// Were we able to breathe?
if (failed_inhale || failed_exhale)
diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
index 0ed0cc47c6..20bd51635e 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
@@ -43,8 +43,8 @@
gluttonous = 1
- breath_type = "phoron"
- poison_type = "oxygen"
+ breath_type = GAS_PHORON
+ poison_type = GAS_O2
ideal_air_type = /datum/gas_mixture/belly_air/vox
siemens_coefficient = 0.2
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 863e6cd0a9..128d4d70b8 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -133,9 +133,9 @@
// Environment tolerance/life processes vars.
var/reagent_tag //Used for metabolizing reagents.
- var/breath_type = "oxygen" // Non-oxygen gas breathed, if any.
- var/poison_type = "phoron" // Poisonous air.
- var/exhale_type = "carbon_dioxide" // Exhaled gas type.
+ var/breath_type = GAS_O2 // Non-oxygen gas breathed, if any.
+ var/poison_type = GAS_PHORON // Poisonous air.
+ var/exhale_type = GAS_CO2 // Exhaled gas type.
var/water_breather = FALSE
var/bad_swimmer = FALSE
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index 239f4a4e5a..3123fa8670 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -18,9 +18,9 @@
selects_bodytype = SELECTS_BODYTYPE_CUSTOM //VOREStation edit
body_temperature = T20C
- breath_type = "oxygen"
- poison_type = "phoron"
- exhale_type = "oxygen"
+ breath_type = GAS_O2
+ poison_type = GAS_PHORON
+ exhale_type = GAS_O2
water_breather = TRUE //eh, why not? Aquatic plants are a thing.
// Heat and cold resistances are 20 degrees broader on the level 1 range, level 2 is default, level 3 is much weaker, halfway between L2 and normal L3.
@@ -169,7 +169,7 @@
var/failed_inhale = 0
var/failed_exhale = 0
- inhaling = breath.gas["carbon_dioxide"]
+ inhaling = breath.gas[GAS_CO2]
poison = breath.gas[poison_type]
exhaling = breath.gas[exhale_type]
@@ -193,7 +193,7 @@
H.clear_alert("oxy")
inhaled_gas_used = inhaling/6
- breath.adjust_gas("carbon_dioxide", -inhaled_gas_used, update = 0) //update afterwards
+ breath.adjust_gas(GAS_CO2, -inhaled_gas_used, update = 0) //update afterwards
breath.adjust_gas_temp(exhale_type, inhaled_gas_used, H.bodytemperature, update = 0) //update afterwards
//Now we handle CO2.
diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm
index f9b648393c..29bd68ff32 100644
--- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm
@@ -69,10 +69,10 @@
//Called when spawning to equip them with special things.
/datum/species/custom/equip_survival_gear(var/mob/living/carbon/human/H, var/extendedtank = 0, var/comprehensive = 0)
. = ..()
- if(breath_type != "oxygen")
+ if(breath_type != GAS_O2)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
var/obj/item/tank/tankpath
- if(breath_type == "phoron")
+ if(breath_type == GAS_PHORON)
tankpath = /obj/item/tank/vox
else
tankpath = text2path("/obj/item/tank/" + breath_type)
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index cce23f9361..4c027e07c3 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -430,7 +430,7 @@
warning_low_pressure = 300 // Low pressure warning.
hazard_low_pressure = 220 // Dangerously low pressure.
safe_pressure = 400
- poison_type = "nitrogen" // technically it's a partial pressure thing but IDK if we can emulate that
+ poison_type = GAS_N2 // technically it's a partial pressure thing but IDK if we can emulate that
ideal_air_type = /datum/gas_mixture/belly_air/zaddat
genders = list(FEMALE, PLURAL) //females are polyp-producing, infertile females and males are nigh-identical
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
index ffd9f10b88..f59313f92d 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
@@ -154,12 +154,12 @@
/datum/trait/negative/breathes/phoron
name = "Phoron Breather"
desc = "You breathe phoron instead of oxygen (which is poisonous to you), much like a Vox."
- var_changes = list("breath_type" = "phoron", "poison_type" = "oxygen", "ideal_air_type" = /datum/gas_mixture/belly_air/vox)
+ var_changes = list("breath_type" = GAS_PHORON, "poison_type" = GAS_O2, "ideal_air_type" = /datum/gas_mixture/belly_air/vox)
/datum/trait/negative/breathes/nitrogen
name = "Nitrogen Breather"
desc = "You breathe nitrogen instead of oxygen (which is poisonous to you). Incidentally, phoron isn't poisonous to breathe to you."
- var_changes = list("breath_type" = "nitrogen", "poison_type" = "oxygen", "ideal_air_type" = /datum/gas_mixture/belly_air/nitrogen_breather)
+ var_changes = list("breath_type" = GAS_N2, "poison_type" = GAS_O2, "ideal_air_type" = /datum/gas_mixture/belly_air/nitrogen_breather)
/datum/trait/negative/monolingual
name = "Monolingual"
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
index 1e9143cc15..be96d9a596 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
@@ -114,7 +114,7 @@
var/datum/gas_mixture/environment = T.return_air()
if(!environment) return
- if(environment.gas["phoron"] > 0 || locate(/obj/effect/alien/weeds) in T)
+ if(environment.gas[GAS_PHORON] > 0 || locate(/obj/effect/alien/weeds) in T)
if(!regenerate(H))
var/obj/item/organ/internal/xenos/plasmavessel/P = H.internal_organs_by_name[O_PLASMA]
P.stored_plasma += weeds_plasma_rate
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index c46b4c8826..15f5d08ea2 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -442,7 +442,7 @@
return 1
var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
- if(G.gas["oxygen"] < 1)
+ if(G.gas[GAS_O2] < 1)
ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
return 1
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 68881bea4d..3928b0b324 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -340,10 +340,10 @@
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[GAS_O2]/total_moles
+ var/n2_level = environment.gas[GAS_N2]/total_moles
+ var/co2_level = environment.gas[GAS_CO2]/total_moles
+ var/phoron_level = environment.gas[GAS_PHORON]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
// entry is what the element is describing
diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm
index 584ed60869..299f506425 100644
--- a/code/modules/mob/living/simple_mob/life.dm
+++ b/code/modules/mob/living/simple_mob/life.dm
@@ -118,37 +118,37 @@
if( abs(Environment.temperature - bodytemperature) > temperature_range ) //VOREStation Edit: heating adjustments
bodytemperature += ((Environment.temperature - bodytemperature) / 5)
- if(min_oxy && Environment.gas["oxygen"] < min_oxy)
+ if(min_oxy && Environment.gas[GAS_O2] < min_oxy)
atmos_unsuitable = 1
throw_alert("oxy", /obj/screen/alert/not_enough_oxy)
- else if(max_oxy && Environment.gas["oxygen"] > max_oxy)
+ else if(max_oxy && Environment.gas[GAS_O2] > max_oxy)
atmos_unsuitable = 1
throw_alert("oxy", /obj/screen/alert/too_much_oxy)
else
clear_alert("oxy")
- if(min_tox && Environment.gas["phoron"] < min_tox)
+ if(min_tox && Environment.gas[GAS_PHORON] < min_tox)
atmos_unsuitable = 2
throw_alert("tox_in_air", /obj/screen/alert/not_enough_tox)
- else if(max_tox && Environment.gas["phoron"] > max_tox)
+ else if(max_tox && Environment.gas[GAS_PHORON] > max_tox)
atmos_unsuitable = 2
throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
else
clear_alert("tox_in_air")
- if(min_n2 && Environment.gas["nitrogen"] < min_n2)
+ if(min_n2 && Environment.gas[GAS_N2] < min_n2)
atmos_unsuitable = 1
throw_alert("n2o", /obj/screen/alert/not_enough_nitro)
- else if(max_n2 && Environment.gas["nitrogen"] > max_n2)
+ else if(max_n2 && Environment.gas[GAS_N2] > max_n2)
atmos_unsuitable = 1
throw_alert("n2o", /obj/screen/alert/too_much_nitro)
else
clear_alert("n2o")
- if(min_co2 && Environment.gas["carbon_dioxide"] < min_co2)
+ if(min_co2 && Environment.gas[GAS_CO2] < min_co2)
atmos_unsuitable = 1
throw_alert("co2", /obj/screen/alert/not_enough_co2)
- else if(max_co2 && Environment.gas["carbon_dioxide"] > max_co2)
+ else if(max_co2 && Environment.gas[GAS_CO2] > max_co2)
atmos_unsuitable = 1
throw_alert("co2", /obj/screen/alert/too_much_co2)
else
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm
index e67402e0a3..4c464b8d41 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm
@@ -43,7 +43,7 @@
poison_chance = 30
poison_per_bite = 0.5
- poison_type = "phoron"
+ poison_type = REAGENT_ID_PHORON
tame_items = list(
/obj/item/tank/phoron = 20,
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index 83aba9a001..029b3986ce 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -49,8 +49,8 @@
var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
var/infest_target = BP_TORSO // The currently chosen bodypart to infest.
var/mob/living/carbon/host // Our humble host.
- var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine","iron","phoron","condensedcapsaicin_v","frostoil")
- var/randomized_reagent = "iron" // The reagent chosen at random to be produced, if there's no one piloting the worm.
+ var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
+ var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
var/feeding_delay = 30 SECONDS // How long do we have to wait to bite our host's organs?
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
index f8ee94e227..dfa5a6967a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -173,7 +173,7 @@
color = "#660088"
slime_color = "dark purple"
coretype = /obj/item/slime_extract/dark_purple
- reagent_injected = "phoron"
+ reagent_injected = REAGENT_ID_PHORON
description_info = "This slime applies phoron to enemies it attacks. A biosuit or other thick armor can protect from the toxic attack. \
If hit with a burning attack, it will erupt in flames."
@@ -190,7 +190,7 @@
/mob/living/simple_mob/slime/xenobio/dark_purple/proc/ignite()
visible_message(span_critical("\The [src] erupts in an inferno!"))
for(var/turf/simulated/target_turf in view(2, src))
- target_turf.assume_gas("phoron", 30, 1500+T0C)
+ target_turf.assume_gas(GAS_PHORON, 30, 1500+T0C)
spawn(0)
target_turf.hotspot_expose(1500+T0C, 400)
qdel(src)
diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm
index 10bb3b0db7..1d0e6410eb 100644
--- a/code/modules/nifsoft/software/05_health.dm
+++ b/code/modules/nifsoft/software/05_health.dm
@@ -123,7 +123,7 @@
else if(mode == 1)
mode = 2
nif.notify("Medichines unable to repair all damage. Perform manual repairs.",TRUE)
-
+
if(mode == 2 && HP_percent < -0.4) //lets inform someone who might be able to help us that we got toasted and roasted
nif.notify("User Status: CRITICAL. Notifying medical!",TRUE)
mode = 3 //this does nothing except stop it from repeating over and over and over and over and over and over and over
@@ -186,7 +186,7 @@
/datum/nifsoft/spare_breath/proc/resp_breath()
if(!active) return null
var/datum/gas_mixture/breath = new(BREATH_VOLUME)
- breath.adjust_gas("oxygen", BREATH_MOLES)
+ breath.adjust_gas(GAS_O2, BREATH_MOLES)
breath.temperature = T20C
return breath
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index b044c91043..539f4cb93f 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -284,7 +284,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
name = "Promethean Revival"
id = "prom_revival"
result = null
- required_reagents = list("phoron" = 40)
+ required_reagents = list(REAGENT_ID_PHORON = 40)
result_amount = 1
/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder)
diff --git a/code/modules/organs/subtypes/replicant.dm b/code/modules/organs/subtypes/replicant.dm
index 2aaa4c6fd2..5a5464204f 100644
--- a/code/modules/organs/subtypes/replicant.dm
+++ b/code/modules/organs/subtypes/replicant.dm
@@ -59,10 +59,10 @@
var/modifier = 1 - 0.5 * is_bruised()
- if(owner.bloodstr.has_reagent("phoron"))
+ if(owner.bloodstr.has_reagent(REAGENT_ID_PHORON))
adjust_plasma(round(4 * modifier))
- if(owner.ingested.has_reagent("phoron"))
+ if(owner.ingested.has_reagent(REAGENT_ID_PHORON))
adjust_plasma(round(2 * modifier))
adjust_plasma(2) //Make it a decent amount so people can actually build stuff without stealing all of medbays phoron
diff --git a/code/modules/organs/subtypes/xenos.dm b/code/modules/organs/subtypes/xenos.dm
index 1c4cfa6907..632dedc83f 100644
--- a/code/modules/organs/subtypes/xenos.dm
+++ b/code/modules/organs/subtypes/xenos.dm
@@ -39,10 +39,10 @@
var/modifier = 1 - 0.5 * is_bruised()
- if(owner.bloodstr.has_reagent("phoron"))
+ if(owner.bloodstr.has_reagent(REAGENT_ID_PHORON))
adjust_plasma(round(4 * modifier))
- if(owner.ingested.has_reagent("phoron"))
+ if(owner.ingested.has_reagent(REAGENT_ID_PHORON))
adjust_plasma(round(2 * modifier))
adjust_plasma(1)
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index adde826178..9c45b8c929 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -229,10 +229,10 @@
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[GAS_O2]/total_moles
+ var/n2_level = environment.gas[GAS_N2]/total_moles
+ var/co2_level = environment.gas[GAS_CO2]/total_moles
+ var/phoron_level = environment.gas[GAS_PHORON]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
// entry is what the element is describing
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 5379ab7f42..cdab67762a 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -160,7 +160,7 @@
to_chat(user, "You inject the solution into the power cell.")
- if(S.reagents.has_reagent("phoron", 5))
+ if(S.reagents.has_reagent(REAGENT_ID_PHORON, 5))
rigged = 1
diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm
index 03dd6ced8d..5e0b518d6d 100644
--- a/code/modules/power/fusion/core/core_field.dm
+++ b/code/modules/power/fusion/core/core_field.dm
@@ -303,8 +303,8 @@
var/turf/T = get_turf(src)
if(istype(T))
var/datum/gas_mixture/plasma = new
- plasma.adjust_gas("oxygen", (size*100), 0)
- plasma.adjust_gas("phoron", (size*100), 0)
+ plasma.adjust_gas(GAS_O2, (size*100), 0)
+ plasma.adjust_gas(GAS_PHORON, (size*100), 0)
plasma.temperature = (plasma_temperature/2)
plasma.update_values()
T.assume_air(plasma)
@@ -639,8 +639,8 @@
var/turf/TT = get_turf(pick(turfs_in_range))
if(istype(TT))
var/datum/gas_mixture/plasma = new
- plasma.adjust_gas("oxygen", (size*100), 0)
- plasma.adjust_gas("phoron", (size*100), 0)
+ plasma.adjust_gas(GAS_O2, (size*100), 0)
+ plasma.adjust_gas(GAS_PHORON, (size*100), 0)
plasma.temperature = (plasma_temperature/2)
plasma.update_values()
TT.assume_air(plasma)
@@ -655,8 +655,8 @@
var/turf/TT = get_turf(owned_core)
if(istype(TT))
var/datum/gas_mixture/plasma = new
- plasma.adjust_gas("oxygen", (size*100), 0)
- plasma.adjust_gas("phoron", (size*100), 0)
+ plasma.adjust_gas(GAS_O2, (size*100), 0)
+ plasma.adjust_gas(GAS_PHORON, (size*100), 0)
plasma.temperature = (plasma_temperature/2)
plasma.update_values()
TT.assume_air(plasma)
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
index 2bc4712ab3..a5fef7ee7c 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
@@ -7,7 +7,7 @@
var/percent_depleted = 1
var/list/rod_quantities = list()
- var/fuel_type = "composite"
+ var/fuel_type = MAT_COMPOSITE
var/fuel_colour
var/radioactivity = 0
var/const/initial_amount = 3000000
@@ -54,13 +54,13 @@
// Mapper shorthand.
/obj/item/fuel_assembly/deuterium/New(var/newloc)
- ..(newloc, "deuterium")
+ ..(newloc, MAT_DEUTERIUM)
/obj/item/fuel_assembly/tritium/New(var/newloc)
- ..(newloc, "tritium")
+ ..(newloc, MAT_TRITIUM)
/obj/item/fuel_assembly/phoron/New(var/newloc)
- ..(newloc, "phoron")
+ ..(newloc, MAT_PHORON)
/obj/item/fuel_assembly/supermatter/New(var/newloc)
- ..(newloc, "supermatter")
+ ..(newloc, MAT_SUPERMATTER)
diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm
index 54d72b11e8..4835c788ba 100644
--- a/code/modules/power/fusion/fusion_reactions.dm
+++ b/code/modules/power/fusion/fusion_reactions.dm
@@ -76,8 +76,8 @@ var/list/fusion_reactions
// Unideal/material production reactions
/decl/fusion_reaction/oxygen_oxygen
- p_react = "oxygen"
- s_react = "oxygen"
+ p_react = REAGENT_ID_OXYGEN
+ s_react = REAGENT_ID_OXYGEN
energy_consumption = 10
energy_production = 0
instability = 5
@@ -85,17 +85,17 @@ var/list/fusion_reactions
products = list("silicon"= 1)
/decl/fusion_reaction/iron_iron
- p_react = "iron"
- s_react = "iron"
- products = list("silver" = 1, "gold" = 1, "platinum" = 1) // Not realistic but w/e
+ p_react = REAGENT_ID_IRON
+ s_react = REAGENT_ID_IRON
+ products = list(REAGENT_ID_SILVER = 1, REAGENT_ID_GOLD = 1, REAGENT_ID_PLATINUM = 1) // Not realistic but w/e
energy_consumption = 10
energy_production = 0
instability = 2
minimum_reaction_temperature = 10000
/decl/fusion_reaction/phoron_hydrogen
- p_react = "hydrogen"
- s_react = "phoron"
+ p_react = REAGENT_ID_HYDROGEN
+ s_react = REAGENT_ID_PHORON
energy_consumption = 10
energy_production = 0
instability = 5
@@ -105,7 +105,7 @@ var/list/fusion_reactions
// VERY UNIDEAL REACTIONS.
/decl/fusion_reaction/phoron_supermatter
p_react = "supermatter"
- s_react = "phoron"
+ s_react = REAGENT_ID_PHORON
energy_consumption = 0
energy_production = 5
radiation = 20
@@ -145,7 +145,7 @@ var/list/fusion_reactions
// High end reactions.
/decl/fusion_reaction/boron_hydrogen
p_react = "boron"
- s_react = "hydrogen"
+ s_react = REAGENT_ID_HYDROGEN
minimum_energy_level = FUSION_HEAT_CAP * 0.5
energy_consumption = 3
energy_production = 15
@@ -153,8 +153,8 @@ var/list/fusion_reactions
instability = 3
/decl/fusion_reaction/hydrogen_hydrogen
- p_react = "hydrogen"
- s_react = "hydrogen"
+ p_react = REAGENT_ID_HYDROGEN
+ s_react = REAGENT_ID_HYDROGEN
minimum_energy_level = FUSION_HEAT_CAP * 0.75
energy_consumption = 0
energy_production = 20
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 61e3fbdf3b..a6d595e623 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -1141,7 +1141,7 @@ var/global/list/light_type_cache = list()
to_chat(user, "You inject the solution into the [src].")
- if(S.reagents.has_reagent("phoron", 5))
+ if(S.reagents.has_reagent(REAGENT_ID_PHORON, 5))
log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index f3b1620626..71211f9be7 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -254,7 +254,7 @@
var/phoron = (sheets+sheet_left)*20
var/datum/gas_mixture/environment = loc.return_air()
if (environment)
- environment.adjust_gas_temp("phoron", phoron/10, temperature + T0C)
+ environment.adjust_gas_temp(GAS_PHORON, phoron/10, temperature + T0C)
sheets = 0
sheet_left = 0
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 5d82f46c5d..00e97216dc 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -37,11 +37,11 @@ var/global/list/rad_collectors = list()
receive_pulse(rads * 5) //Maths is hard
if(P)
- if(P.air_contents.gas["phoron"] == 0)
+ if(P.air_contents.gas[GAS_PHORON] == 0)
investigate_log("out of fuel.","singulo")
eject()
else
- P.air_contents.adjust_gas("phoron", -0.001*drainratio)
+ P.air_contents.adjust_gas(GAS_PHORON, -0.001*drainratio)
return
@@ -51,7 +51,7 @@ var/global/list/rad_collectors = list()
toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
"You turn the [src.name] [active? "on":"off"].")
- investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas["phoron"]/0.29)]%":"It is empty"].","singulo")
+ investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"It is empty"].","singulo")
return
else
to_chat(user, span_red("The controls are locked!"))
@@ -130,7 +130,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
if(P && active)
var/power_produced = 0
- power_produced = P.air_contents.gas["phoron"]*pulse_strength*20
+ power_produced = P.air_contents.gas[GAS_PHORON]*pulse_strength*20
add_avail(power_produced)
last_power_new = power_produced
return
diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
index 15930bfd14..15fb77c197 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
@@ -362,7 +362,7 @@
probability = 50
/datum/particle_smasher_recipe/phoron_valhollide
- reagents = list("phoron" = 10, "pacid" = 10)
+ reagents = list(REAGENT_ID_PHORON = 10, "pacid" = 10)
result = /obj/item/stack/material/valhollide
required_material = /obj/item/stack/material/phoron
@@ -375,7 +375,7 @@
probability = 10
/datum/particle_smasher_recipe/valhollide_supermatter
- reagents = list("phoron" = 300)
+ reagents = list(REAGENT_ID_PHORON = 300)
result = /obj/item/stack/material/supermatter
required_material = /obj/item/stack/material/valhollide
@@ -404,7 +404,7 @@
/datum/particle_smasher_recipe/donkpockets_ascend
items = list(/obj/item/reagent_containers/food/snacks/donkpocket)
- reagents = list("phoron" = 120)
+ reagents = list(REAGENT_ID_PHORON = 120)
recipe_type = PS_RESULT_ITEM
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index dfa8b43560..a7365cfa96 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -344,7 +344,7 @@
damage = max( damage + min( ( (removed.temperature - CRITICAL_TEMPERATURE) / 150 ), damage_inc_limit ) , 0 )
//Ok, 100% oxygen atmosphere = best reaction
//Maxes out at 100% oxygen pressure
- oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles, 1), 0)
+ oxygen = max(min((removed.gas[GAS_O2] - (removed.gas[GAS_N2] * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles, 1), 0)
//calculate power gain for oxygen reaction
var/temp_factor
@@ -368,8 +368,8 @@
//Release reaction gasses
var/heat_capacity = removed.heat_capacity()
- removed.adjust_multi("phoron", max(device_energy / PHORON_RELEASE_MODIFIER, 0), \
- "oxygen", max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0))
+ removed.adjust_multi(GAS_PHORON, max(device_energy / PHORON_RELEASE_MODIFIER, 0), \
+ GAS_O2, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0))
var/thermal_power = THERMAL_RELEASE_MODIFIER * device_energy
if (debug)
diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm
index 7a451b5aad..167f4ea772 100644
--- a/code/modules/projectiles/guns/magnetic/bore.dm
+++ b/code/modules/projectiles/guns/magnetic/bore.dm
@@ -240,7 +240,7 @@
mat_storage = max(mat_storage - fuel_used, 0)
var/turf/T = get_turf(src)
if(T)
- T.assume_gas("carbon_dioxide", fuel_used * 0.01, T0C+200)
+ T.assume_gas(GAS_CO2, fuel_used * 0.01, T0C+200)
/obj/item/gun/magnetic/matfed/phoronbore/proc/toggle_generator(mob/living/user)
if(!generator_state && !mat_storage)
diff --git a/code/modules/projectiles/guns/magnetic/gasthrower.dm b/code/modules/projectiles/guns/magnetic/gasthrower.dm
index a12e7387a3..723e68058b 100644
--- a/code/modules/projectiles/guns/magnetic/gasthrower.dm
+++ b/code/modules/projectiles/guns/magnetic/gasthrower.dm
@@ -34,10 +34,10 @@
var/turf/T = get_turf(src)
- var/phoron_amt = Tank.air_contents.gas["phoron"]
- var/co2_amt = Tank.air_contents.gas["carbon_dioxide"]
- var/oxy_amt = Tank.air_contents.gas["oxygen"]
- var/n2o_amt = Tank.air_contents.gas["nitrous_oxide"]
+ var/phoron_amt = Tank.air_contents.gas[GAS_PHORON]
+ var/co2_amt = Tank.air_contents.gas[GAS_CO2]
+ var/oxy_amt = Tank.air_contents.gas[GAS_O2]
+ var/n2o_amt = Tank.air_contents.gas[GAS_N2O]
if(isnull(co2_amt))
co2_amt = 0
diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm
index 993cc740fa..ebbe668a77 100644
--- a/code/modules/projectiles/guns/magnetic/magnetic.dm
+++ b/code/modules/projectiles/guns/magnetic/magnetic.dm
@@ -271,13 +271,13 @@
if(loaded) //Safety.
if(istype(loaded, /obj/item/fuel_assembly))
var/obj/item/fuel_assembly/rod = loaded
- if(rod.fuel_type == "composite" || rod.fuel_type == "deuterium") //Safety check for rods spawned in without a fueltype.
+ if(rod.fuel_type == MAT_COMPOSITE || rod.fuel_type == MAT_DEUTERIUM) //Safety check for rods spawned in without a fueltype.
projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod
- else if(rod.fuel_type == "tritium")
+ else if(rod.fuel_type == MAT_TRITIUM)
projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/tritium
- else if(rod.fuel_type == "phoron")
+ else if(rod.fuel_type == MAT_PHORON)
projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/phoron
- else if(rod.fuel_type == "supermatter")
+ else if(rod.fuel_type == MAT_SUPERMATTER)
projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/supermatter
visible_message(span_danger("The barrel of \the [src] glows a blinding white!"))
spawn(5)
diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm
index 8466dd0688..4fe1b65b94 100644
--- a/code/modules/random_map/noise/ore.dm
+++ b/code/modules/random_map/noise/ore.dm
@@ -59,7 +59,7 @@
T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources["marble"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
T.resources["diamond"] = 0
- T.resources["phoron"] = 0
+ T.resources[ORE_PHORON] = 0
T.resources["platinum"] = 0
T.resources["mhydrogen"] = 0
T.resources["verdantium"] = 0
@@ -67,7 +67,7 @@
//T.resources["copper"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
//T.resources["tin"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
//T.resources["bauxite"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["rutile"] = 0
+ T.resources[ORE_RUTILE] = 0
//T.resources["void opal"] = 0
//T.resources["quartz"] = 0
//T.resources["painite"] = 0
@@ -75,7 +75,7 @@
T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["phoron"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_PHORON] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["platinum"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
@@ -86,7 +86,7 @@
//T.resources["copper"] = 0
//T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
//T.resources["bauxite"] = 0
- T.resources["rutile"] = 0
+ T.resources[ORE_RUTILE] = 0
//T.resources["void opal"] = 0
//T.resources["quartz"] = 0
//T.resources["painite"] = 0
@@ -94,7 +94,7 @@
T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_PHORON] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
T.resources["platinum"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
@@ -105,7 +105,7 @@
//T.resources["copper"] = 0
//T.resources["tin"] = 0
//T.resources["bauxite"] = 0
- T.resources["rutile"] = 0
+ T.resources[ORE_RUTILE] = 0
//T.resources["void opal"] = 0
//T.resources["quartz"] = 0
//T.resources["painite"] = 0
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index 9dfc3ac0d9..9f5be5b0b1 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -18,9 +18,9 @@
/obj/item/reagent_containers/chem_disp_cartridge/carbon
spawn_reagent = "carbon"
/obj/item/reagent_containers/chem_disp_cartridge/nitrogen
- spawn_reagent = "nitrogen"
+ spawn_reagent = REAGENT_ID_NITROGEN
/obj/item/reagent_containers/chem_disp_cartridge/oxygen
- spawn_reagent = "oxygen"
+ spawn_reagent = REAGENT_ID_OXYGEN
/obj/item/reagent_containers/chem_disp_cartridge/fluorine
spawn_reagent = "fluorine"
/obj/item/reagent_containers/chem_disp_cartridge/sodium
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index dfb16c3391..37e1100f8d 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -29,7 +29,7 @@
/obj/machinery/chemical_dispenser
dispense_reagents = list(
- "hydrogen", "lithium", "carbon", "nitrogen", "oxygen", "fluorine", "sodium",
+ "hydrogen", "lithium", "carbon", REAGENT_ID_NITROGEN, REAGENT_ID_OXYGEN, "fluorine", "sodium",
"aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron",
"copper", "mercury", "radium", "water", "ethanol", "sugar", "sacid", "tungsten",
"calcium"
diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm
index 80a85443b8..61559ad6db 100644
--- a/code/modules/reagents/machinery/grinder.dm
+++ b/code/modules/reagents/machinery/grinder.dm
@@ -1,11 +1,11 @@
// Don't need a new list for every grinder in the game
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("carbon","carbon","oxygen","chlorine","sulfur"),
+ /obj/item/stack/material/plastic = list("carbon","carbon",REAGENT_ID_OXYGEN,"chlorine","sulfur"),
/obj/item/stack/material/copper = list("copper"),
- /obj/item/stack/material/wood = list("carbon","woodpulp","nitrogen","potassium","sodium"),
- /obj/item/stack/material/stick = list("carbon","woodpulp","nitrogen","potassium","sodium"),
- /obj/item/stack/material/log = list("carbon","woodpulp","nitrogen","potassium","sodium"),
- /obj/item/stack/material/algae = list("carbon","nitrogen","nitrogen","phosphorus","phosphorus"),
+ /obj/item/stack/material/wood = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
+ /obj/item/stack/material/stick = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
+ /obj/item/stack/material/log = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
+ /obj/item/stack/material/algae = list("carbon",REAGENT_ID_NITROGEN,REAGENT_ID_NITROGEN,"phosphorus","phosphorus"),
/obj/item/stack/material/graphite = list("carbon"),
/obj/item/stack/material/aluminium = list("aluminum"), // The material is aluminium, but the reagent is aluminum...
/obj/item/stack/material/glass/reinforced = list("silicon","silicon","silicon","iron","carbon"),
@@ -14,13 +14,13 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
/obj/item/stack/material/fiber = list("carbon","carbon","carbon","protein","sodium"),
/obj/item/stack/material/fur = list("carbon","carbon","carbon","sulfur","sodium"),
/obj/item/stack/material/deuterium = list("hydrogen"),
- /obj/item/stack/material/glass/phoronrglass = list("silicon","silicon","silicon","phoron","phoron"),
+ /obj/item/stack/material/glass/phoronrglass = list("silicon","silicon","silicon",REAGENT_ID_PHORON,REAGENT_ID_PHORON),
/obj/item/stack/material/diamond = list("carbon"),
/obj/item/stack/material/durasteel = list("iron","iron","carbon","carbon","platinum"),
/obj/item/stack/material/wax = list("ethanol","triglyceride"),
/obj/item/stack/material/iron = list("iron"),
/obj/item/stack/material/uranium = list("uranium"),
- /obj/item/stack/material/phoron = list("phoron"),
+ /obj/item/stack/material/phoron = list(REAGENT_ID_PHORON),
/obj/item/stack/material/gold = list("gold"),
/obj/item/stack/material/silver = list("silver"),
/obj/item/stack/material/platinum = list("platinum"),
@@ -28,7 +28,7 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
/obj/item/stack/material/steel = list("iron", "carbon"),
/obj/item/stack/material/plasteel = list("iron", "iron", "carbon", "carbon", "platinum"), //8 iron, 8 carbon, 4 platinum,
/obj/item/stack/material/snow = list("water"),
- /obj/item/stack/material/sandstone = list("silicon", "oxygen"),
+ /obj/item/stack/material/sandstone = list("silicon", REAGENT_ID_OXYGEN),
/obj/item/stack/material/glass = list("silicon"),
/obj/item/stack/material/glass/phoronglass = list("platinum", "silicon", "silicon", "silicon"), //5 platinum, 15 silicon,
/obj/item/stack/material/supermatter = list("supermatter")
@@ -37,7 +37,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
/obj/item/ore/glass = list("silicon"),
/obj/item/ore/iron = list("iron"),
/obj/item/ore/coal = list("carbon"),
- /obj/item/ore/phoron = list("phoron"),
+ /obj/item/ore/phoron = list(REAGENT_ID_PHORON),
/obj/item/ore/silver = list("silver"),
/obj/item/ore/gold = list("gold"),
/obj/item/ore/marble = list("silicon","aluminum","aluminum","sodium","calcium"), // Some nice variety here
@@ -46,8 +46,8 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
/obj/item/ore/osmium = list("platinum"), // should contain osmium
/obj/item/ore/lead = list("lead"),
/obj/item/ore/hydrogen = list("hydrogen"),
- /obj/item/ore/verdantium = list("radium","phoron","nitrogen","phosphorus","sodium"), // Some fun stuff to be useful with
- /obj/item/ore/rutile = list("tungsten","oxygen") // Should be titanium
+ /obj/item/ore/verdantium = list("radium",REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,"phosphorus","sodium"), // Some fun stuff to be useful with
+ /obj/item/ore/rutile = list("tungsten",REAGENT_ID_OXYGEN) // Should be titanium
)
/obj/machinery/reagentgrinder
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index e23a77cddd..043e88067f 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -53,7 +53,7 @@
name = "Distilling Biomass"
id = "distill_biomass"
result = "biomass"
- required_reagents = list("blood" = 1, "sugar" = 1, "phoron" = 0.5)
+ required_reagents = list("blood" = 1, "sugar" = 1, REAGENT_ID_PHORON = 0.5)
result_amount = 1 // 40 units per sheet, requires actually using the machine, and having blood to spare.
temp_range = list(T20C + 80, T20C + 130)
@@ -156,7 +156,7 @@
name = "Distilling Brute Juice"
id = "distill_brutejuice"
result = "berserkmed"
- required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, "phoron" = 1)
+ required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1)
result_amount = 3
temp_range = list(T0C + 600, T0C + 700)
@@ -209,7 +209,7 @@
required_reagents = list("lichpowder" = 1, "cryoxadone" = 1, "carthatoline" = 1)
result_amount = 2
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
reaction_rate = HALF_LIFE(20)
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 75e15d188c..2dae89f233 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -267,7 +267,7 @@
name = "Toxins Special"
id = "phoronspecial"
result = "phoronspecial"
- required_reagents = list("rum" = 2, "vermouth" = 2, "phoron" = 2)
+ required_reagents = list("rum" = 2, "vermouth" = 2, REAGENT_ID_PHORON = 2)
result_amount = 6
/decl/chemical_reaction/instant/drinks/beepsky_smash
@@ -1001,7 +1001,7 @@
name = "Vox's Delight"
id = "voxdelight"
result = "voxdelight"
- required_reagents = list("phoron" = 3, "fuel" = 1, "water" = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 3, "fuel" = 1, "water" = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/screamingviking
@@ -1029,7 +1029,7 @@
name = "Robustin"
id = "robustin"
result = "robustin"
- required_reagents = list("antifreeze" = 1, "phoron" = 1, "fuel" = 1, "vodka" = 1)
+ required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, "fuel" = 1, "vodka" = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/virginsip
diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm
index 2fcedd4e53..b14549d3b1 100644
--- a/code/modules/reagents/reactions/instant/drinks_vr.dm
+++ b/code/modules/reagents/reactions/instant/drinks_vr.dm
@@ -46,7 +46,7 @@
name = "Unsweetened Tea"
id = "unsweettea"
result = "unsweettea"
- required_reagents = list("sweettea" = 3, "phoron" = 1)
+ required_reagents = list("sweettea" = 3, REAGENT_ID_PHORON = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/galacticpanic
@@ -152,7 +152,7 @@
name = "Redspace Flush"
id = "redspaceflush"
result = "redspaceflush"
- required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, "phoron" =1)
+ required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, REAGENT_ID_PHORON =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/graveyard
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index b0ed2c37cd..3664755e4d 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -7,36 +7,36 @@
name = "Inaprovaline"
id = "inaprovaline"
result = "inaprovaline"
- required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, "carbon" = 1, "sugar" = 1)
result_amount = 3
/decl/chemical_reaction/instant/dylovene
name = "Dylovene"
id = "anti_toxin"
result = "anti_toxin"
- required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1)
+ required_reagents = list("silicon" = 1, "potassium" = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/carthatoline
name = "Carthatoline"
id = "carthatoline"
result = "carthatoline"
- required_reagents = list("anti_toxin" = 1, "carbon" = 2, "phoron" = 0.1)
- catalysts = list("phoron" = 1)
+ required_reagents = list("anti_toxin" = 1, "carbon" = 2, REAGENT_ID_PHORON = 0.1)
+ catalysts = list(REAGENT_ID_PHORON = 1)
result_amount = 2
/decl/chemical_reaction/instant/paracetamol
name = "Paracetamol"
id = "paracetamol"
result = "paracetamol"
- required_reagents = list("inaprovaline" = 1, "nitrogen" = 1, "water" = 1)
+ required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, "water" = 1)
result_amount = 2
/decl/chemical_reaction/instant/tramadol
name = "Tramadol"
id = "tramadol"
result = "tramadol"
- required_reagents = list("paracetamol" = 1, "ethanol" = 1, "oxygen" = 1)
+ required_reagents = list("paracetamol" = 1, "ethanol" = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/oxycodone
@@ -44,7 +44,7 @@
id = "oxycodone"
result = "oxycodone"
required_reagents = list("ethanol" = 1, "tramadol" = 1)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
/decl/chemical_reaction/instant/sterilizine
@@ -58,7 +58,7 @@
name = "Silicate"
id = "silicate"
result = "silicate"
- required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
+ required_reagents = list("aluminum" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/mutagen
@@ -69,17 +69,17 @@
result_amount = 3
/decl/chemical_reaction/instant/water
- name = "Water"
- id = "water"
- result = "water"
- required_reagents = list("oxygen" = 1, "hydrogen" = 2)
+ name = REAGENT_WATER
+ id = REAGENT_ID_WATER
+ result = REAGENT_ID_WATER
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, "hydrogen" = 2)
result_amount = 1
/decl/chemical_reaction/instant/thermite
name = "Thermite"
id = "thermite"
result = "thermite"
- required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
+ required_reagents = list("aluminum" = 1, "iron" = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/bliss
@@ -93,7 +93,7 @@
name = "Space Lube"
id = "lube"
result = "lube"
- required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+ required_reagents = list("water" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 4
/decl/chemical_reaction/instant/pacid
@@ -128,7 +128,7 @@
name = "Impedrezene"
id = "impedrezene"
result = "impedrezene"
- required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
+ required_reagents = list("mercury" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1)
result_amount = 2
/decl/chemical_reaction/instant/kelotane
@@ -144,15 +144,15 @@
id = "peridaxon"
result = "peridaxon"
required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/osteodaxon
name = "Osteodaxon"
id = "osteodaxon"
result = "osteodaxon"
- required_reagents = list("bicaridine" = 2, "phoron" = 0.1, "carpotoxin" = 1)
- catalysts = list("phoron" = 5)
+ required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, "carpotoxin" = 1)
+ catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("clonexadone" = 1) // Messes with cryox
result_amount = 2
@@ -160,8 +160,8 @@
name = "Respirodaxon"
id = "respirodaxon"
result = "respirodaxon"
- required_reagents = list("dexalinp" = 2, "biomass" = 2, "phoron" = 1)
- catalysts = list("phoron" = 5)
+ required_reagents = list("dexalinp" = 2, "biomass" = 2, REAGENT_ID_PHORON = 1)
+ catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("dexalin" = 1)
result_amount = 2
@@ -170,7 +170,7 @@
id = "gastirodaxon"
result = "gastirodaxon"
required_reagents = list("carthatoline" = 1, "biomass" = 2, "tungsten" = 2)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("lithium" = 1)
result_amount = 3
@@ -179,7 +179,7 @@
id = "hepanephrodaxon"
result = "hepanephrodaxon"
required_reagents = list("carthatoline" = 2, "biomass" = 2, "lithium" = 1)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("tungsten" = 1)
result_amount = 2
@@ -188,7 +188,7 @@
id = "cordradaxon"
result = "cordradaxon"
required_reagents = list("potassium_chlorophoride" = 1, "biomass" = 2, "bicaridine" = 2)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("clonexadone" = 1)
result_amount = 2
@@ -204,14 +204,14 @@
id = "leporazine"
result = "leporazine"
required_reagents = list("silicon" = 1, "copper" = 1)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
result = "cryptobiolin"
- required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
+ required_reagents = list("potassium" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1)
result_amount = 3
/decl/chemical_reaction/instant/tricordrazine
@@ -225,15 +225,15 @@
name = "Alkysine"
id = "alkysine"
result = "alkysine"
- required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1)
+ required_reagents = list("chlorine" = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1)
result_amount = 2
/decl/chemical_reaction/instant/dexalin
name = "Dexalin"
id = "dexalin"
result = "dexalin"
- required_reagents = list("oxygen" = 2, "phoron" = 0.1)
- catalysts = list("phoron" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 2, REAGENT_ID_PHORON = 0.1)
+ catalysts = list(REAGENT_ID_PHORON = 1)
inhibitors = list("water" = 1) // Messes with cryox
result_amount = 1
@@ -241,7 +241,7 @@
name = "Dermaline"
id = "dermaline"
result = "dermaline"
- required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, "phosphorus" = 1, "kelotane" = 1)
result_amount = 3
/decl/chemical_reaction/instant/dexalinp
@@ -292,15 +292,15 @@
name = "Cryoxadone"
id = "cryoxadone"
result = "cryoxadone"
- required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1)
+ required_reagents = list("dexalin" = 1, "water" = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/clonexadone
name = "Clonexadone"
id = "clonexadone"
result = "clonexadone"
- required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1)
- catalysts = list("phoron" = 5)
+ required_reagents = list("cryoxadone" = 1, "sodium" = 1, REAGENT_ID_PHORON = 0.1)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/mortiferin
@@ -309,7 +309,7 @@
result = "mortiferin"
required_reagents = list("cryptobiolin" = 1, "clonexadone" = 1, "corophizine" = 1)
result_amount = 2
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
/decl/chemical_reaction/instant/spaceacillin
name = "Spaceacillin"
@@ -322,8 +322,8 @@
name = "Corophizine"
id = "corophizine"
result = "corophizine"
- required_reagents = list("spaceacillin" = 1, "carbon" = 1, "phoron" = 0.1)
- catalysts = list("phoron" = 5)
+ required_reagents = list("spaceacillin" = 1, "carbon" = 1, REAGENT_ID_PHORON = 0.1)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/immunosuprizine
@@ -331,7 +331,7 @@
id = "immunosuprizine"
result = "immunosuprizine"
required_reagents = list("corophizine" = 1, "tungsten" = 1, "sacid" = 1)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/imidazoline
@@ -345,14 +345,14 @@
name = "Ethylredoxrazine"
id = "ethylredoxrazine"
result = "ethylredoxrazine"
- required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, "carbon" = 1)
result_amount = 3
/decl/chemical_reaction/instant/calciumcarbonate
name = "Calcium Carbonate"
id = "calciumcarbonate"
result = "calciumcarbonate"
- required_reagents = list("oxygen" = 3, "calcium" = 1, "carbon" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 3, "calcium" = 1, "carbon" = 1)
result_amount = 2
/decl/chemical_reaction/instant/soporific
@@ -381,7 +381,7 @@
name = "Potassium Chlorophoride"
id = "potassium_chlorophoride"
result = "potassium_chlorophoride"
- required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1)
+ required_reagents = list("potassium_chloride" = 1, REAGENT_ID_PHORON = 1, "chloralhydrate" = 1)
result_amount = 4
/decl/chemical_reaction/instant/zombiepowder
@@ -425,8 +425,8 @@
name = "Ammonia"
id = "ammonia"
result = "ammonia"
- required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
- inhibitors = list("phoron" = 1) // Messes with lexorin
+ required_reagents = list("hydrogen" = 3, REAGENT_ID_NITROGEN = 1)
+ inhibitors = list(REAGENT_ID_PHORON = 1) // Messes with lexorin
result_amount = 3
/decl/chemical_reaction/instant/diethylamine
@@ -490,14 +490,14 @@
id = "condensedcapsaicin"
result = "condensedcapsaicin"
required_reagents = list("capsaicin" = 2)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
/decl/chemical_reaction/instant/coolant
name = "Coolant"
id = "coolant"
result = "coolant"
- required_reagents = list("tungsten" = 1, "oxygen" = 1, "water" = 1)
+ required_reagents = list("tungsten" = 1, REAGENT_ID_OXYGEN = 1, "water" = 1)
result_amount = 3
log_is_important = 1
@@ -512,7 +512,7 @@
name = "Lexorin"
id = "lexorin"
result = "lexorin"
- required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 1, "hydrogen" = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/methylphenidate
@@ -533,7 +533,7 @@
name = "Paroxetine"
id = "paroxetine"
result = "paroxetine"
- required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1)
+ required_reagents = list("mindbreaker" = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
result_amount = 3
/decl/chemical_reaction/instant/neurotoxin
@@ -568,7 +568,7 @@
/decl/chemical_reaction/instant/solidification/phoron
name = "Solid Phoron"
id = "solidphoron"
- required_reagents = list("frostoil" = 5, "phoron" = REAGENTS_PER_SHEET)
+ required_reagents = list("frostoil" = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/phoron
@@ -802,13 +802,13 @@
name = "Napalm"
id = "napalm"
result = null
- required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 )
+ required_reagents = list("aluminum" = 1, REAGENT_ID_PHORON = 1, "sacid" = 1 )
result_amount = 1
/decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/location = get_turf(holder.my_atom.loc)
for(var/turf/simulated/floor/target_tile in range(0,location))
- target_tile.assume_gas("volatile_fuel", created_volume, 400+T0C)
+ target_tile.assume_gas(GAS_VOLATILE_FUEL, created_volume, 400+T0C)
spawn (0) target_tile.hotspot_expose(700, 400)
holder.del_reagent("napalm")
return
@@ -1178,8 +1178,8 @@
name = "Hydrophoron"
id = "hydrophoron"
result = "hydrophoron"
- required_reagents = list("hydrogen" = 1, "phoron" = 1)
- inhibitors = list("nitrogen" = 1) //So it doesn't mess with lexorin
+ required_reagents = list("hydrogen" = 1, REAGENT_ID_PHORON = 1)
+ inhibitors = list(REAGENT_ID_NITROGEN = 1) //So it doesn't mess with lexorin
result_amount = 2
/decl/chemical_reaction/instant/deuterium
@@ -1209,7 +1209,7 @@
id = "malish-qualem"
result = "malish-qualem"
required_reagents = list("immunosuprizine" = 1, "qerr_quem" = 1, "inaprovaline" = 1)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
// Biomass, for cloning and bioprinters
@@ -1217,7 +1217,7 @@
name = "Biomass"
id = "biomass"
result = "biomass"
- required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1)
+ required_reagents = list("protein" = 1, "sugar" = 1, REAGENT_ID_PHORON = 1)
result_amount = 1 // Roughly 20u per phoron sheet
// Neutralization.
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index ae1b3974c5..6461ce909f 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -5,8 +5,8 @@
name = "sizeoxadone"
id = "sizeoxadone"
result = "sizeoxadone"
- required_reagents = list("clonexadone" = 1, "tramadol" = 3, "phoron" = 1)
- catalysts = list("phoron" = 5)
+ required_reagents = list("clonexadone" = 1, "tramadol" = 3, REAGENT_ID_PHORON = 1)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 5
/decl/chemical_reaction/instant/macrocillin
@@ -54,7 +54,7 @@
id = "amorphorovir"
result = "amorphorovir"
required_reagents = list("cryptobiolin" = 30, "biomass" = 30, "hyperzine" = 20)
- catalysts = list("phoron" = 5)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
/decl/chemical_reaction/instant/androrovir
@@ -152,15 +152,15 @@
name = "Vermicetol"
id = "vermicetol"
result = "vermicetol"
- required_reagents = list("bicaridine" = 2, "shockchem" = 1, "phoron" = 0.1)
- catalysts = list("phoron" = 5)
+ required_reagents = list("bicaridine" = 2, "shockchem" = 1, REAGENT_ID_PHORON = 0.1)
+ catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 3
/decl/chemical_reaction/instant/prussian_blue
name = "Prussian Blue"
id = "prussian_blue"
result = "prussian_blue"
- required_reagents = list("carbon" = 3, "iron" = 1, "nitrogen" = 3)
+ required_reagents = list("carbon" = 3, "iron" = 1, REAGENT_ID_NITROGEN = 3)
result_amount = 7
/decl/chemical_reaction/instant/lipozilase
@@ -205,5 +205,5 @@
name = "Advanced Mutation Toxin"
id = "advmutationtoxin2"
result = "advmutationtoxin"
- required_reagents = list("phoron" = 15, "slimejelly" = 15, "mutationtoxin" = 15) //In case a xenobiologist wants to become a fully fledged slime person.
- result_amount = 1
\ No newline at end of file
+ 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/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index f8d5038326..d6bebd2769 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -16,7 +16,7 @@
name = "phoronic virus food"
id = "phoronvirusfood"
result = "phoronvirusfood"
- required_reagents = list("phoron" = 1, "virusfood" = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 1, "virusfood" = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_phoron_adranol
@@ -65,7 +65,7 @@
/decl/chemical_reaction/instant/mix_virus/mix_virus_3
name = "Mix Virus 3"
id = "mixvirus3"
- required_reagents = list("phoron" = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 1)
level_min = 4
level_max = 6
diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm
index 8157632742..dc014a44eb 100644
--- a/code/modules/reagents/reagents/core.dm
+++ b/code/modules/reagents/reagents/core.dm
@@ -205,15 +205,15 @@
#define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
/datum/reagent/water
- name = "Water"
- id = "water"
- taste_description = "water"
+ name = REAGENT_WATER
+ id = REAGENT_ID_WATER
+ taste_description = REAGENT_ID_WATER
description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
reagent_state = LIQUID
color = "#0064C877"
metabolism = REM * 10
- glass_name = "water"
+ glass_name = REAGENT_ID_WATER
glass_desc = "The father of all refreshments."
/datum/reagent/water/touch_turf(var/turf/simulated/T)
diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm
index dcdc0f7c50..681860427c 100644
--- a/code/modules/reagents/reagents/dispenser.dm
+++ b/code/modules/reagents/reagents/dispenser.dm
@@ -274,16 +274,16 @@
M.adjustBrainLoss(0.5 * removed)
/datum/reagent/nitrogen
- name = "Nitrogen"
- id = "nitrogen"
+ name = REAGENT_NITROGEN
+ id = REAGENT_ID_NITROGEN
description = "A colorless, odorless, tasteless gas."
taste_mult = 0 //no taste
reagent_state = GAS
color = "#808080"
/datum/reagent/oxygen
- name = "Oxygen"
- id = "oxygen"
+ name = REAGENT_OXYGEN
+ id = REAGENT_ID_OXYGEN
description = "A colorless, odorless gas."
taste_mult = 0
reagent_state = GAS
diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm
index c0545b8b06..9046ce5cfa 100644
--- a/code/modules/reagents/reagents/toxins.dm
+++ b/code/modules/reagents/reagents/toxins.dm
@@ -109,9 +109,9 @@
if(!istype(T))
return
..()
- T.assume_gas("phoron", CEILING(volume/2, 1), T20C)
+ T.assume_gas(GAS_PHORON, CEILING(volume/2, 1), T20C)
for(var/turf/simulated/floor/target_tile in range(0,T))
- target_tile.assume_gas("phoron", volume/2, 400+T0C)
+ target_tile.assume_gas(GAS_PHORON, volume/2, 400+T0C)
spawn (0) target_tile.hotspot_expose(700, 400)
remove_self(volume)
@@ -125,22 +125,22 @@
M.IgniteMob()
/datum/reagent/toxin/lead
- name = "lead"
- id = "lead"
+ name = REAGENT_LEAD
+ id = REAGENT_ID_LEAD
description = "Elemental Lead."
color = "#273956"
strength = 4
/datum/reagent/toxin/spidertoxin
- name = "Spidertoxin"
- id = "spidertoxin"
+ name = REAGENT_SPIDERTOXIN
+ id = REAGENT_ID_SPIDERTOXIN
description = "A liquifying toxin produced by giant spiders."
color = "#2CE893"
strength = 5
/datum/reagent/toxin/phoron
- name = "Phoron"
- id = "phoron"
+ name = REAGEMT_PHORON
+ id = REAGENT_ID_PHORON
description = "Phoron in its liquid form."
taste_mult = 1.5
reagent_state = LIQUID
@@ -175,7 +175,7 @@
..()
if(!istype(T))
return
- T.assume_gas("volatile_fuel", amount, T20C)
+ T.assume_gas(GAS_VOLATILE_FUEL, amount, T20C)
remove_self(amount)
/datum/reagent/toxin/cyanide //Fast and Lethal
diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm
index 6a11ff6083..1ddb06f193 100644
--- a/code/modules/resleeving/infocore_records.dm
+++ b/code/modules/resleeving/infocore_records.dm
@@ -88,7 +88,7 @@
var/sizemult
var/weight
var/aflags
- var/breath_type = "oxygen"
+ var/breath_type = GAS_O2
/datum/transhuman/body_record/New(var/copyfrom, var/add_to_db = 0, var/ckeylock = 0)
..()
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index f59494250d..4e46d84b97 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -74,10 +74,10 @@
I.digitize()
//Give breathing equipment if needed
- if(current_project.breath_type != "oxygen")
+ if(current_project.breath_type != GAS_O2)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
var/obj/item/tank/tankpath
- if(current_project.breath_type == "phoron")
+ if(current_project.breath_type == GAS_PHORON)
tankpath = /obj/item/tank/vox
else
tankpath = text2path("/obj/item/tank/" + current_project.breath_type)
diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm
index 79c79d82ad..1e1ac99bb8 100644
--- a/code/modules/shuttles/shuttles_web.dm
+++ b/code/modules/shuttles/shuttles_web.dm
@@ -458,17 +458,17 @@
var/total_moles = environment.total_moles
if(total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[GAS_O2]/total_moles
+ var/n2_level = environment.gas[GAS_N2]/total_moles
+ var/co2_level = environment.gas[GAS_CO2]/total_moles
+ var/phoron_level = environment.gas[GAS_PHORON]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
aircontents = list(\
"pressure" = "[round(pressure,0.1)]",\
- "nitrogen" = "[round(n2_level*100,0.1)]",\
- "oxygen" = "[round(o2_level*100,0.1)]",\
- "carbon_dioxide" = "[round(co2_level*100,0.1)]",\
- "phoron" = "[round(phoron_level*100,0.01)]",\
+ GAS_N2 = "[round(n2_level*100,0.1)]",\
+ GAS_O2 = "[round(o2_level*100,0.1)]",\
+ GAS_CO2 = "[round(co2_level*100,0.1)]",\
+ GAS_PHORON = "[round(phoron_level*100,0.01)]",\
"other" = "[round(unknown_level, 0.01)]",\
"temp" = "[round(environment.temperature-T0C,0.1)]",\
"reading" = TRUE\
diff --git a/code/modules/tgui/modules/supermatter_monitor.dm b/code/modules/tgui/modules/supermatter_monitor.dm
index 0e0aed4f1b..618f1e99cd 100644
--- a/code/modules/tgui/modules/supermatter_monitor.dm
+++ b/code/modules/tgui/modules/supermatter_monitor.dm
@@ -57,10 +57,10 @@
data["SM_EPR"] = active.get_epr()
//data["SM_EPR"] = active.get_epr()
if(air.total_moles)
- data["SM_gas_O2"] = round(100*air.gas["oxygen"]/air.total_moles,0.01)
- data["SM_gas_CO2"] = round(100*air.gas["carbon_dioxide"]/air.total_moles,0.01)
- data["SM_gas_N2"] = round(100*air.gas["nitrogen"]/air.total_moles,0.01)
- data["SM_gas_PH"] = round(100*air.gas["phoron"]/air.total_moles,0.01)
+ data["SM_gas_O2"] = round(100*air.gas[GAS_O2]/air.total_moles,0.01)
+ data["SM_gas_CO2"] = round(100*air.gas[GAS_CO2]/air.total_moles,0.01)
+ data["SM_gas_N2"] = round(100*air.gas[GAS_N2]/air.total_moles,0.01)
+ data["SM_gas_PH"] = round(100*air.gas[GAS_PHORON]/air.total_moles,0.01)
data["SM_gas_N2O"] = round(100*air.gas["sleeping_agent"]/air.total_moles,0.01)
else
data["SM_gas_O2"] = 0
@@ -105,4 +105,4 @@
. = TRUE
/datum/tgui_module/supermatter_monitor/ntos
- ntos = TRUE
\ No newline at end of file
+ ntos = TRUE
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index b568f1b319..bbd4e10832 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -791,8 +791,8 @@
/datum/gas_mixture/belly_air/New()
. = ..()
gas = list(
- "oxygen" = 21,
- "nitrogen" = 79)
+ GAS_O2 = 21,
+ GAS_N2 = 79)
/datum/gas_mixture/belly_air/vox
volume = 2500
@@ -802,7 +802,7 @@
/datum/gas_mixture/belly_air/vox/New()
. = ..()
gas = list(
- "phoron" = 100)
+ GAS_PHORON = 100)
/datum/gas_mixture/belly_air/zaddat
volume = 2500
@@ -812,7 +812,7 @@
/datum/gas_mixture/belly_air/zaddat/New()
. = ..()
gas = list(
- "oxygen" = 100)
+ GAS_O2 = 100)
/datum/gas_mixture/belly_air/nitrogen_breather
volume = 2500
@@ -822,7 +822,7 @@
/datum/gas_mixture/belly_air/nitrogen_breather/New()
. = ..()
gas = list(
- "nitrogen" = 100)
+ GAS_N2 = 100)
/mob/living/proc/feed_grabbed_to_self_falling_nom(var/mob/living/user, var/mob/living/prey)
diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm
index a886201ed7..fb7798ab50 100644
--- a/code/modules/xenoarcheaology/effect_master.dm
+++ b/code/modules/xenoarcheaology/effect_master.dm
@@ -302,7 +302,7 @@
else if(W.reagents.has_reagent("sacid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1))
if(my_effect.trigger == TRIGGER_ACID)
my_effect.ToggleActivate()
- else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1))
+ else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent("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))
@@ -329,7 +329,7 @@
var/list/water = list("hydrogen", "water")
var/list/acid = list("sacid", "pacid", "diethylamine")
- var/list/volatile = list("phoron","thermite")
+ var/list/volatile = list(REAGENT_ID_PHORON,"thermite")
var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin")
for(var/datum/artifact_effect/my_effect in my_effects)
@@ -387,13 +387,13 @@
else if(env.temperature > 375)
trigger_hot = 1
- if(env.gas["phoron"] >= 10)
+ if(env.gas[GAS_PHORON] >= 10)
trigger_phoron = 1
- if(env.gas["oxygen"] >= 10)
+ if(env.gas[GAS_O2] >= 10)
trigger_oxy = 1
- if(env.gas["carbon_dioxide"] >= 10)
+ if(env.gas[GAS_CO2] >= 10)
trigger_co2 = 1
- if(env.gas["nitrogen"] >= 10)
+ if(env.gas[GAS_N2] >= 10)
trigger_nitro = 1
for(var/datum/artifact_effect/my_effect in my_effects)
diff --git a/code/modules/xenoarcheaology/effects/gasco2.dm b/code/modules/xenoarcheaology/effects/gasco2.dm
index 5543517dac..a99ce0af03 100644
--- a/code/modules/xenoarcheaology/effects/gasco2.dm
+++ b/code/modules/xenoarcheaology/effects/gasco2.dm
@@ -13,11 +13,11 @@
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("carbon_dioxide", rand(2, 15))
+ holder_loc.assume_gas(GAS_CO2, rand(2, 15))
/datum/artifact_effect/gasco2/DoEffectAura()
var/atom/holder = get_master_holder()
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("carbon_dioxide", pick(0, 0, 0.1, rand()))
+ holder_loc.assume_gas(GAS_CO2, pick(0, 0, 0.1, rand()))
diff --git a/code/modules/xenoarcheaology/effects/gasnitro.dm b/code/modules/xenoarcheaology/effects/gasnitro.dm
index e076ff3aa3..66fd4452b6 100644
--- a/code/modules/xenoarcheaology/effects/gasnitro.dm
+++ b/code/modules/xenoarcheaology/effects/gasnitro.dm
@@ -13,11 +13,11 @@
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("nitrogen", rand(2, 15))
+ holder_loc.assume_gas(GAS_N2, rand(2, 15))
/datum/artifact_effect/gasnitro/DoEffectAura()
var/atom/holder = get_master_holder()
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("nitrogen", pick(0, 0, 0.1, rand()))
+ holder_loc.assume_gas(GAS_N2, pick(0, 0, 0.1, rand()))
diff --git a/code/modules/xenoarcheaology/effects/gasoxy.dm b/code/modules/xenoarcheaology/effects/gasoxy.dm
index 798154e38a..f18447dfe1 100644
--- a/code/modules/xenoarcheaology/effects/gasoxy.dm
+++ b/code/modules/xenoarcheaology/effects/gasoxy.dm
@@ -11,11 +11,11 @@
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("oxygen", rand(2, 15))
+ holder_loc.assume_gas(GAS_O2, rand(2, 15))
/datum/artifact_effect/gasoxy/DoEffectAura()
var/atom/holder = get_master_holder()
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("oxygen", pick(0, 0, 0.1, rand()))
+ holder_loc.assume_gas(GAS_O2, pick(0, 0, 0.1, rand()))
diff --git a/code/modules/xenoarcheaology/effects/gasphoron.dm b/code/modules/xenoarcheaology/effects/gasphoron.dm
index 66cdee98c2..be6eca75be 100644
--- a/code/modules/xenoarcheaology/effects/gasphoron.dm
+++ b/code/modules/xenoarcheaology/effects/gasphoron.dm
@@ -13,11 +13,11 @@
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("phoron", rand(2, 15))
+ holder_loc.assume_gas(GAS_PHORON, rand(2, 15))
/datum/artifact_effect/gasphoron/DoEffectAura()
var/atom/holder = get_master_holder()
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("phoron", pick(0, 0, 0.1, rand()))
+ holder_loc.assume_gas(GAS_PHORON, pick(0, 0, 0.1, rand()))
diff --git a/code/modules/xenoarcheaology/effects/gassleeping.dm b/code/modules/xenoarcheaology/effects/gassleeping.dm
index a77ca5b88d..f5a7ff7c33 100644
--- a/code/modules/xenoarcheaology/effects/gassleeping.dm
+++ b/code/modules/xenoarcheaology/effects/gassleeping.dm
@@ -11,11 +11,11 @@
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("nitrous_oxide", rand(2, 15))
+ holder_loc.assume_gas(GAS_N2O, rand(2, 15))
/datum/artifact_effect/gassleeping/DoEffectAura()
var/atom/holder = get_master_holder()
if(holder)
var/turf/holder_loc = holder.loc
if(istype(holder_loc))
- holder_loc.assume_gas("nitrous_oxide", pick(0, 0, 0.1, rand()))
+ holder_loc.assume_gas(GAS_N2O, pick(0, 0, 0.1, rand()))
diff --git a/code/modules/xenoarcheaology/finds/finds_defines.dm b/code/modules/xenoarcheaology/finds/finds_defines.dm
index f827435155..132d741937 100644
--- a/code/modules/xenoarcheaology/finds/finds_defines.dm
+++ b/code/modules/xenoarcheaology/finds/finds_defines.dm
@@ -2,12 +2,12 @@ var/global/list/responsive_carriers = list(
"carbon",
"potassium",
"hydrogen",
- "nitrogen",
+ REAGENT_ID_NITROGEN,
"mercury",
"iron",
"chlorine",
"phosphorus",
- "phoron")
+ REAGENT_ID_PHORON)
var/global/list/finds_as_strings = list(
"Trace organic cells",
@@ -27,12 +27,12 @@ var/global/list/finds_as_strings = list(
if(ARCHAEO_COIN, ARCHAEO_KNIFE, ARCHAEO_TOOL, ARCHAEO_METAL, ARCHAEO_CLAYMORE, ARCHAEO_RODS, ARCHAEO_KATANA, ARCHAEO_LASER, ARCHAEO_GUN)
return "iron"
if(ARCHAEO_CRYSTAL, ARCHAEO_SHARD, ARCHAEO_SOULSTONE)
- return "nitrogen"
+ return REAGENT_ID_NITROGEN
if(ARCHAEO_CULTBLADE, ARCHAEO_TELEBEACON, ARCHAEO_CULTROBES, ARCHAEO_STOCKPARTS)
return "potassium"
if(ARCHAEO_FOSSIL, ARCHAEO_SHELL, ARCHAEO_PLANT, ARCHAEO_REMAINS_HUMANOID, ARCHAEO_REMAINS_ROBOT, ARCHAEO_REMAINS_XENO, ARCHAEO_GASMASK)
return "carbon"
- return "phoron"
+ return REAGENT_ID_PHORON
/proc/get_random_digsite_type()
return pick(100;DIGSITE_GARDEN, 95;DIGSITE_ANIMAL, 90;DIGSITE_HOUSE, 85;DIGSITE_TECHNICAL, 85;DIGSITE_MIDDEN, 80;DIGSITE_TEMPLE, 75;DIGSITE_WAR)
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index 98783dff9f..ed275edeef 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -73,7 +73,7 @@
name = "Slime Spawn"
id = "m_spawn"
result = null
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/grey
@@ -128,7 +128,7 @@
/decl/chemical_reaction/instant/slime/metal_metamorphic
name = "Slime Metal"
id = "m_metal"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result = "metamorphic"
result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal.
required = /obj/item/slime_extract/metal
@@ -185,8 +185,8 @@
/decl/chemical_reaction/instant/metamorphic/phoron
name = "Morph into Phoron"
id = "morph_phoron"
- required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "phoron" = REAGENTS_PER_SHEET)
- result = "phoron"
+ required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
+ result = REAGENT_ID_PHORON
// Creates 'alloys' which can be finalized with frost oil.
@@ -264,7 +264,7 @@
name = "Slime Frost Oil"
id = "m_frostoil"
result = "frostoil"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 20
required = /obj/item/slime_extract/blue
@@ -296,7 +296,7 @@
/decl/chemical_reaction/instant/slime/purple_steroid
name = "Slime Steroid"
id = "m_steroid"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
@@ -318,7 +318,7 @@
/decl/chemical_reaction/instant/slime/orange_fire
name = "Slime Fire"
id = "m_fire"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
@@ -333,8 +333,8 @@
return
for(var/turf/simulated/target_turf in view(2, T))
- target_turf.assume_gas("volatile_fuel", 33, 1500+T0C)
- target_turf.assume_gas("oxygen", 66, 1500+T0C)
+ target_turf.assume_gas(GAS_VOLATILE_FUEL, 33, 1500+T0C)
+ target_turf.assume_gas(GAS_O2, 66, 1500+T0C)
spawn(0)
target_turf.hotspot_expose(1500+T0C, 400)
@@ -373,7 +373,7 @@
/decl/chemical_reaction/instant/slime/yellow_battery
name = "Slime Cell"
id = "m_cell"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -407,7 +407,7 @@
name = "Slime Gold"
id = "m_gold"
result = "gold"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/gold
@@ -426,7 +426,7 @@
name = "Slime Silver"
id = "m_silver"
result = "silver"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/silver
@@ -445,7 +445,7 @@
/decl/chemical_reaction/instant/slime/dark_purple_phoron
name = "Slime Phoron"
id = "m_phoron_harvest"
- result = "phoron"
+ result = REAGENT_ID_PHORON
required_reagents = list("water" = 5)
result_amount = REAGENTS_PER_SHEET * 2
required = /obj/item/slime_extract/dark_purple
@@ -467,7 +467,7 @@
/decl/chemical_reaction/instant/slime/dark_blue_cold_snap
name = "Slime Cold Snap"
id = "m_cold_snap"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/dark_blue
@@ -585,7 +585,7 @@
/decl/chemical_reaction/instant/slime/red_mutation
name = "Slime Mutation"
id = "m_mutation"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/red
@@ -606,7 +606,7 @@
name = "Slime Uranium"
id = "m_uranium"
result = "uranium"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/green
@@ -635,7 +635,7 @@
name = "Slime Bone Med"
id = "m_bone_fixer"
result = "slime_bone_fixer"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -735,7 +735,7 @@
/decl/chemical_reaction/instant/slime/bluespace_greater
name = "Slime Greater Tele"
id = "m_tele_lesser"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
@@ -757,7 +757,7 @@
/decl/chemical_reaction/instant/slime/cerulean_enhancer
name = "Slime Enhancer"
id = "m_enhancer"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
@@ -779,7 +779,7 @@
/decl/chemical_reaction/instant/slime/amber_slimefood
name = "Slime Feeding"
id = "m_slime_food"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
@@ -814,7 +814,7 @@
/decl/chemical_reaction/instant/slime/sapphire_promethean
name = "Slime Promethean"
id = "m_promethean"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
@@ -835,7 +835,7 @@
/decl/chemical_reaction/instant/slime/ruby_swole
name = "Slime Strength"
id = "m_strength"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
@@ -884,7 +884,7 @@
/decl/chemical_reaction/instant/slime/emerald_fast
name = "Slime Agility"
id = "m_agility"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
@@ -933,7 +933,7 @@
/decl/chemical_reaction/instant/slime/light_pink_friendship
name = "Slime Friendship"
id = "m_friendship"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
@@ -957,7 +957,7 @@
/decl/chemical_reaction/instant/slime/rainbow_random_slime
name = "Slime Random Slime"
id = "m_rng_slime"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index 2f3992ec63..77d7aab8e6 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -80,7 +80,7 @@
name = "Slime Spawn"
id = "m_grey_spawn"
result = null
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/grey
@@ -128,7 +128,7 @@
name = "Slime Basic Construction Materials"
id = "m_metal_basic"
result = null
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
@@ -194,7 +194,7 @@
name = "Slime Frost Oil"
id = "m_blue_frostoil"
result = "frostoil"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/blue
@@ -268,7 +268,7 @@
/decl/chemical_reaction/instant/slime/purple_steroid
name = "Slime Steroid"
id = "m_purple_steroid"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
@@ -327,7 +327,7 @@
/decl/chemical_reaction/instant/slime/orange_fire
name = "Slime Fire"
id = "m_orange_fire"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
@@ -342,8 +342,8 @@
return
for(var/turf/simulated/target_turf in view(2, T))
- target_turf.assume_gas("volatile_fuel", 33, 1500+T0C)
- target_turf.assume_gas("oxygen", 66, 1500+T0C)
+ target_turf.assume_gas(GAS_VOLATILE_FUEL, 33, 1500+T0C)
+ target_turf.assume_gas(GAS_O2, 66, 1500+T0C)
spawn(0)
target_turf.hotspot_expose(1500+T0C, 400)
@@ -448,7 +448,7 @@
/decl/chemical_reaction/instant/slime/yellow_lightning
name = "Slime Lightning"
id = "m_yellow_lightning"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -518,7 +518,7 @@
/decl/chemical_reaction/instant/slime/gold_random_mobs
name = "Slime Random Mobs"
id = "m_gold_random_mobs"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
@@ -602,7 +602,7 @@
/decl/chemical_reaction/instant/slime/silver_materials_basic
name = "Slime Basic Science Materials"
id = "m_silver_basic"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
@@ -676,7 +676,7 @@
/decl/chemical_reaction/instant/slime/dark_purple_phoron
name = "Slime Phoron"
id = "m_darkpurple_phoron"
- result = "phoron"
+ result = REAGENT_ID_PHORON
required_reagents = list("water" = 5)
result_amount = 30
required = /obj/item/slime_extract/dark_purple
@@ -705,7 +705,7 @@
/decl/chemical_reaction/instant/slime/dark_blue_cold_snap
name = "Slime Cold Snap"
id = "m_darkblue_coldsnap"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/dark_blue
@@ -834,7 +834,7 @@
/decl/chemical_reaction/instant/slime/red_mutation
name = "Slime Mutation"
id = "m_red_mutation"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/red
@@ -913,7 +913,7 @@
/decl/chemical_reaction/instant/slime/green_radpulse
name = "Slime Radiation Pulse"
id = "m_green_radpulse"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/green
@@ -975,7 +975,7 @@
name = "Slime Bone Med"
id = "m_pink_bone_fixer"
result = "slime_bone_fixer"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -1033,7 +1033,7 @@
name = "Slime Fuel"
id = "m_oil_fuel"
result = "fuel"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/oil
@@ -1101,7 +1101,7 @@
/decl/chemical_reaction/instant/slime/bluespace_crystals
name = "Slime Bluespace Crystals"
id = "m_bs_crystals"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
@@ -1175,7 +1175,7 @@
/decl/chemical_reaction/instant/slime/cerulean_enhancer
name = "Slime Enhancer"
id = "m_cerulean_enhancer"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
@@ -1235,7 +1235,7 @@
/decl/chemical_reaction/instant/slime/amber_slimefood
name = "Slime Feeding"
id = "m_amber_slime_food"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
@@ -1304,7 +1304,7 @@
/decl/chemical_reaction/instant/slime/sapphire_promethean
name = "Slime Promethean"
id = "m_sapphire_promethean"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
@@ -1365,7 +1365,7 @@
/decl/chemical_reaction/instant/slime/ruby_swole
name = "Slime Strength"
id = "m_ruby_strength"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
@@ -1454,7 +1454,7 @@
/decl/chemical_reaction/instant/slime/emerald_agility
name = "Slime Agility"
id = "m_emerald_agility"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
@@ -1542,7 +1542,7 @@
/decl/chemical_reaction/instant/slime/light_pink_friendship
name = "Slime Friendship"
id = "m_lightpink_friendship"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
@@ -1602,7 +1602,7 @@
/decl/chemical_reaction/instant/slime/rainbow_random_slime
name = "Slime Random Slime"
id = "m_rainow_random_slime"
- required_reagents = list("phoron" = 5)
+ required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm
index 7d2d2a2e80..a57e6adad1 100644
--- a/code/modules/xenobio2/_xeno_setup.dm
+++ b/code/modules/xenobio2/_xeno_setup.dm
@@ -60,7 +60,7 @@ var/global/list/xenoChemList = list("mutationtoxin",
"lexorin",
"pacid",
"cyanide",
- "phoron",
+ REAGENT_ID_PHORON,
"plasticide",
"amatoxin",
"carbon",
@@ -212,5 +212,3 @@ var/global/list/xenoChemList = list("mutationtoxin",
var/genetype //Label for specifying what gene is used.
var/list/values //What's going to be put into specific traits
var/list/chems
-
-
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index 58460b7a41..9abd7d9593 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -68,7 +68,7 @@ Slime definitions, Life and New live here.
"fuel" = list("toxic" = 0.4),
"toxin" = list("toxic" = 0.5),
"carpotoxin" = list("toxic" = 1, "mut" = 1.5),
- "phoron" = list("toxic" = 1.5, "mut" = 0.03),
+ REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03),
"virusfood" = list("nutr" = 1.5, "mut" = 0.32),
"cyanide" = list("toxic" = 3.5),
"slimejelly" = list("nutr" = 0.5),
diff --git a/maps/cynosure/overmap/sectors.dm b/maps/cynosure/overmap/sectors.dm
index 968a30544c..5d0a7a1e8a 100644
--- a/maps/cynosure/overmap/sectors.dm
+++ b/maps/cynosure/overmap/sectors.dm
@@ -26,8 +26,8 @@
/obj/effect/overmap/visitable/planet/Sif/Initialize()
atmosphere = new(CELL_VOLUME)
- atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273)
- atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273)
+ atmosphere.adjust_gas_temp(GAS_O2, MOLES_O2STANDARD, 273)
+ atmosphere.adjust_gas_temp(GAS_N2, MOLES_N2STANDARD, 273)
. = ..()
diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm
index 2648d130af..e89260a4bd 100644
--- a/maps/expedition_vr/aerostat/_aerostat.dm
+++ b/maps/expedition_vr/aerostat/_aerostat.dm
@@ -48,67 +48,67 @@
continue
if(!priority_process) sleep(-1)
T.resources = list()
- T.resources["sand"] = rand(3,5)
- T.resources["carbon"] = rand(3,5)
+ T.resources[ORE_SAND] = rand(3,5)
+ T.resources[ORE_CARBON] = rand(3,5)
var/current_cell = map[get_map_cell(x,y)]
if(current_cell < rare_val) // Surface metals.
- T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["marble"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- T.resources["diamond"] = 0
- T.resources["phoron"] = 0
- T.resources["platinum"] = 0
- T.resources["mhydrogen"] = 0
- T.resources["verdantium"] = 0
- T.resources["lead"] = 0
- //T.resources["copper"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
- //T.resources["tin"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- //T.resources["bauxite"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["rutile"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- //T.resources["void opal"] = 0
- //T.resources["quartz"] = 0
- //T.resources["painite"] = 0
+ T.resources[ORE_HEMATITE] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_GOLD] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_SILVER] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_URANIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_MARBLE] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_DIAMOND] = 0
+ T.resources[ORE_PHORON] = 0
+ T.resources[ORE_PLATINUM] = 0
+ T.resources[ORE_MHYDROGEN] = 0
+ T.resources[ORE_VERDANTIUM] = 0
+ T.resources[ORE_LEAD] = 0
+ //T.resources[ORE_COPPER] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
+ //T.resources[ORE_TIN] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ //T.resources[ORE_BAUXITE] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_RUTILE] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ //T.resources[ORE_VOPAL] = 0
+ //T.resources[ORE_QUARTZ] = 0
+ //T.resources[ORE_PAINITE] = 0
else if(current_cell < deep_val) // Rare metals.
- T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["phoron"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["platinum"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- T.resources["mhydrogen"] = 0
- T.resources["diamond"] = 0
- T.resources["hematite"] = 0
- T.resources["marble"] = 0
- //T.resources["copper"] = 0
- //T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- //T.resources["bauxite"] = 0
- T.resources["rutile"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- //T.resources["void opal"] = 0
- //T.resources["quartz"] = 0
- //T.resources["painite"] = 0
+ T.resources[ORE_GOLD] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_SILVER] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_URANIUM] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_PHORON] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_PLATINUM] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_VERDANTIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_LEAD] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_MHYDROGEN] = 0
+ T.resources[ORE_DIAMOND] = 0
+ T.resources[ORE_HEMATITE] = 0
+ T.resources[ORE_MARBLE] = 0
+ //T.resources[ORE_COPPER] = 0
+ //T.resources[ORE_TIN] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ //T.resources[ORE_BAUXITE] = 0
+ T.resources[ORE_RUTILE] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ //T.resources[ORE_VOPAL] = 0
+ //T.resources[ORE_QUARTZ] = 0
+ //T.resources[ORE_PAINITE] = 0
else // Deep metals.
- T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- T.resources["platinum"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
- T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX)
- T.resources["hematite"] = 0
- T.resources["gold"] = 0
- T.resources["silver"] = 0
- //T.resources["copper"] = 0
- //T.resources["tin"] = 0
- //T.resources["bauxite"] = 0
- T.resources["rutile"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- //T.resources["void opal"] = 0
- //T.resources["quartz"] = 0
- //T.resources["painite"] = 0
+ T.resources[ORE_URANIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_DIAMOND] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_VERDANTIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_PHORON] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_PLATINUM] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_MHYDROGEN] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_MARBLE] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_LEAD] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_HEMATITE] = 0
+ T.resources[ORE_GOLD] = 0
+ T.resources[ORE_SILVER] = 0
+ //T.resources[ORE_COPPER] = 0
+ //T.resources[ORE_TIN] = 0
+ //T.resources[ORE_BAUXITE] = 0
+ T.resources[ORE_RUTILE] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ //T.resources[ORE_VOPAL] = 0
+ //T.resources[ORE_QUARTZ] = 0
+ //T.resources[ORE_PAINITE] = 0
return
// -- Objs -- //
@@ -215,7 +215,7 @@ VIRGO2_TURF_CREATE(/turf/simulated/mineral)
if(mineral)
return
- var/mineral_name = pickweight(list("marble" = 5, "uranium" = 5, "platinum" = 5, "hematite" = 5, "carbon" = 5, "diamond" = 5, "gold" = 5, "silver" = 5, "lead" = 5, "verdantium" = 5, "rutile" = 20))
+ var/mineral_name = pickweight(list(ORE_MARBLE = 5, ORE_URANIUM = 5, ORE_PLATINUM = 5, ORE_HEMATITE = 5, ORE_CARBON = 5, ORE_DIAMOND = 5, ORE_GOLD = 5, ORE_SILVER = 5, ORE_LEAD = 5, ORE_VERDANTIUM = 5, ORE_RUTILE = 20))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
index 5fd5ef60bb..37805dfa7f 100644
--- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
+++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
@@ -151,28 +151,28 @@ VIRGO2_TURF_CREATE(/turf/simulated/mineral)
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 3,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 20,
- "carbon" = 20,
- "diamond" = 1,
- "gold" = 8,
- "silver" = 8,
- "phoron" = 18,
- "lead" = 2,
- "verdantium" = 1))
+ ORE_MARBLE = 3,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 20,
+ ORE_CARBON = 20,
+ ORE_DIAMOND = 1,
+ ORE_GOLD = 8,
+ ORE_SILVER = 8,
+ ORE_PHORON = 18,
+ ORE_LEAD = 2,
+ ORE_VERDANTIUM = 1))
else
mineral_name = pickweight(list(
- "marble" = 2,
- "uranium" = 5,
- "platinum" = 5,
- "hematite" = 35,
- "carbon" = 35,
- "gold" = 3,
- "silver" = 3,
- "phoron" = 25,
- "lead" = 1))
+ ORE_MARBLE = 2,
+ ORE_URANIUM = 5,
+ ORE_PLATINUM = 5,
+ ORE_HEMATITE = 35,
+ ORE_CARBON = 35,
+ ORE_GOLD = 3,
+ ORE_SILVER = 3,
+ ORE_PHORON = 25,
+ ORE_LEAD = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
diff --git a/maps/groundbase/groundbase_mining.dm b/maps/groundbase/groundbase_mining.dm
index 13ca26d1f9..e396abdd75 100644
--- a/maps/groundbase/groundbase_mining.dm
+++ b/maps/groundbase/groundbase_mining.dm
@@ -4,28 +4,28 @@
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 3,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 20,
- "carbon" = 20,
- "diamond" = 1,
- "gold" = 8,
- "silver" = 8,
- "phoron" = 18,
- "lead" = 2,
- "verdantium" = 1))
+ ORE_MARBLE = 3,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 20,
+ ORE_CARBON = 20,
+ ORE_DIAMOND = 1,
+ ORE_GOLD = 8,
+ ORE_SILVER = 8,
+ ORE_PHORON = 18,
+ ORE_LEAD = 2,
+ ORE_VERDANTIUM = 1))
else
mineral_name = pickweight(list(
- "marble" = 2,
- "uranium" = 5,
- "platinum" = 5,
- "hematite" = 35,
- "carbon" = 35,
- "gold" = 3,
- "silver" = 3,
- "phoron" = 25,
- "lead" = 1))
+ ORE_MARBLE = 2,
+ ORE_URANIUM = 5,
+ ORE_PLATINUM = 5,
+ ORE_HEMATITE = 35,
+ ORE_CARBON = 35,
+ ORE_GOLD = 3,
+ ORE_SILVER = 3,
+ ORE_PHORON = 25,
+ ORE_LEAD = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm
index b0bac955da..ae324db4de 100644
--- a/maps/offmap_vr/common_offmaps.dm
+++ b/maps/offmap_vr/common_offmaps.dm
@@ -520,21 +520,21 @@
var/list/gaslist = env.gas
if(my_mob.min_oxy)
- my_mob.min_oxy = gaslist["oxygen"] * 0.8
+ my_mob.min_oxy = gaslist[GAS_O2] * 0.8
if(my_mob.min_tox)
- my_mob.min_tox = gaslist["phoron"] * 0.8
+ my_mob.min_tox = gaslist[GAS_PHORON] * 0.8
if(my_mob.min_n2)
- my_mob.min_n2 = gaslist["nitrogen"] * 0.8
+ my_mob.min_n2 = gaslist[GAS_N2] * 0.8
if(my_mob.min_co2)
- my_mob.min_co2 = gaslist["carbon_dioxide"] * 0.8
+ my_mob.min_co2 = gaslist[GAS_CO2] * 0.8
if(my_mob.max_oxy)
- my_mob.max_oxy = gaslist["oxygen"] * 1.2
+ my_mob.max_oxy = gaslist[GAS_O2] * 1.2
if(my_mob.max_tox)
- my_mob.max_tox = gaslist["phoron"] * 1.2
+ my_mob.max_tox = gaslist[GAS_PHORON] * 1.2
if(my_mob.max_n2)
- my_mob.max_n2 = gaslist["nitrogen"] * 1.2
+ my_mob.max_n2 = gaslist[GAS_N2] * 1.2
if(my_mob.max_co2)
- my_mob.max_co2 = gaslist["carbon_dioxide"] * 1.2
+ my_mob.max_co2 = gaslist[GAS_CO2] * 1.2
/* //VORESTATION AI TEMPORARY REMOVAL
if(guard)
my_mob.returns_home = TRUE
diff --git a/maps/om_adventure/grasscave.dm b/maps/om_adventure/grasscave.dm
index c52271f59a..43ebe3f49e 100644
--- a/maps/om_adventure/grasscave.dm
+++ b/maps/om_adventure/grasscave.dm
@@ -64,28 +64,28 @@
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 3,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 20,
- "carbon" = 30,
- "diamond" = 20,
- "gold" = 8,
- "silver" = 8,
- "phoron" = 18,
- "lead" = 5,
- "verdantium" = 5))
+ ORE_MARBLE = 3,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 20,
+ ORE_CARBON = 30,
+ ORE_DIAMOND = 20,
+ ORE_GOLD = 8,
+ ORE_SILVER = 8,
+ ORE_PHORON = 18,
+ ORE_LEAD = 5,
+ ORE_VERDANTIUM = 5))
else
mineral_name = pickweight(list(
- "marble" = 2,
- "uranium" = 5,
- "platinum" = 5,
- "hematite" = 35,
- "carbon" = 30,
- "gold" = 3,
- "silver" = 3,
- "phoron" = 25,
- "lead" = 1))
+ ORE_MARBLE = 2,
+ ORE_URANIUM = 5,
+ ORE_PLATINUM = 5,
+ ORE_HEMATITE = 35,
+ ORE_CARBON = 30,
+ ORE_GOLD = 3,
+ ORE_SILVER = 3,
+ ORE_PHORON = 25,
+ ORE_LEAD = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
diff --git a/maps/southern_cross/overmap/sectors.dm b/maps/southern_cross/overmap/sectors.dm
index c198ecc31c..145e054137 100644
--- a/maps/southern_cross/overmap/sectors.dm
+++ b/maps/southern_cross/overmap/sectors.dm
@@ -15,8 +15,8 @@
/obj/effect/overmap/visitable/planet/Sif/Initialize()
atmosphere = new(CELL_VOLUME)
- atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273)
- atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273)
+ atmosphere.adjust_gas_temp(GAS_O2, MOLES_O2STANDARD, 273)
+ atmosphere.adjust_gas_temp(GAS_N2, MOLES_N2STANDARD, 273)
. = ..()
diff --git a/maps/submaps/space_rocks/space_rocks.dm b/maps/submaps/space_rocks/space_rocks.dm
index 62437676d5..e3df6374f3 100644
--- a/maps/submaps/space_rocks/space_rocks.dm
+++ b/maps/submaps/space_rocks/space_rocks.dm
@@ -7,28 +7,28 @@
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 3,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 20,
- "carbon" = 20,
- "diamond" = 1,
- "gold" = 8,
- "silver" = 8,
- "phoron" = 18,
- "lead" = 2,
- "verdantium" = 1))
+ ORE_MARBLE = 3,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 20,
+ ORE_CARBON = 20,
+ ORE_DIAMOND = 1,
+ ORE_GOLD = 8,
+ ORE_SILVER = 8,
+ ORE_PHORON = 18,
+ ORE_LEAD = 2,
+ ORE_VERDANTIUM = 1))
else
mineral_name = pickweight(list(
- "marble" = 2,
- "uranium" = 5,
- "platinum" = 5,
- "hematite" = 35,
- "carbon" = 35,
- "gold" = 3,
- "silver" = 3,
- "phoron" = 25,
- "lead" = 1))
+ ORE_MARBLE = 2,
+ ORE_URANIUM = 5,
+ ORE_PLATINUM = 5,
+ ORE_HEMATITE = 35,
+ ORE_CARBON = 35,
+ ORE_GOLD = 3,
+ ORE_SILVER = 3,
+ ORE_PHORON = 25,
+ ORE_LEAD = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
@@ -50,4 +50,4 @@
var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small")
if(zlevel == Z_LEVEL_SPACE_ROCKS)
- return smallone
\ No newline at end of file
+ return smallone
diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm
index 88a4191f8a..f474524c1a 100644
--- a/maps/tether/tether_phoronlock.dm
+++ b/maps/tether/tether_phoronlock.dm
@@ -23,7 +23,7 @@
if(on)
var/datum/gas_mixture/air_sample = return_air()
var/pressure = round(air_sample.return_pressure(), 0.1)
- var/phoron = ("phoron" in air_sample.gas) ? round(air_sample.gas["phoron"], 0.1) : 0
+ var/phoron = (GAS_PHORON in air_sample.gas) ? round(air_sample.gas[GAS_PHORON], 0.1) : 0
if(abs(pressure - previousPressure) > 0.1 || previousPressure == null || abs(phoron - previousPhoron) > 0.1 || previousPhoron == null)
var/datum/signal/signal = new
@@ -31,7 +31,7 @@
signal.data["tag"] = id_tag
signal.data["timestamp"] = world.time
signal.data["pressure"] = num2text(pressure)
- signal.data["phoron"] = num2text(phoron)
+ signal.data[GAS_PHORON] = num2text(phoron)
radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK)
previousPressure = pressure
previousPhoron = phoron
@@ -176,14 +176,14 @@
if(..()) return 1
if(receive_tag==tag_chamber_sensor)
- memory["chamber_sensor_phoron"] = text2num(signal.data["phoron"])
+ memory["chamber_sensor_phoron"] = text2num(signal.data[GAS_PHORON])
memory["chamber_sensor_pressure"] = text2num(signal.data["pressure"])
else if(receive_tag==tag_exterior_sensor)
- memory["external_sensor_phoron"] = text2num(signal.data["phoron"])
+ memory["external_sensor_phoron"] = text2num(signal.data[GAS_PHORON])
else if(receive_tag==tag_interior_sensor)
- memory["internal_sensor_phoron"] = text2num(signal.data["phoron"])
+ memory["internal_sensor_phoron"] = text2num(signal.data[GAS_PHORON])
else if(receive_tag==tag_scrubber)
if(signal.data["power"])
diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm
index b23fde6a79..ee0ad51dc1 100644
--- a/maps/tether/tether_turfs.dm
+++ b/maps/tether/tether_turfs.dm
@@ -67,28 +67,28 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 3,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 20,
- "carbon" = 20,
- "diamond" = 1,
- "gold" = 8,
- "silver" = 8,
- "phoron" = 18,
- "lead" = 2,
- "verdantium" = 1))
+ ORE_MARBLE = 3,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 20,
+ ORE_CARBON = 20,
+ ORE_DIAMOND = 1,
+ ORE_GOLD = 8,
+ ORE_SILVER = 8,
+ ORE_PHORON = 18,
+ ORE_LEAD = 2,
+ ORE_VERDANTIUM = 1))
else
mineral_name = pickweight(list(
- "marble" = 2,
- "uranium" = 5,
- "platinum" = 5,
- "hematite" = 35,
- "carbon" = 35,
- "gold" = 3,
- "silver" = 3,
- "phoron" = 25,
- "lead" = 1))
+ ORE_MARBLE = 2,
+ ORE_URANIUM = 5,
+ ORE_PLATINUM = 5,
+ ORE_HEMATITE = 35,
+ ORE_CARBON = 35,
+ ORE_GOLD = 3,
+ ORE_SILVER = 3,
+ ORE_PHORON = 25,
+ ORE_LEAD = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
UpdateMineral()
@@ -100,28 +100,28 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 7,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 10,
- "carbon" = 10,
- "diamond" = 4,
- "gold" = 15,
- "silver" = 15,
- "lead" = 5,
- "verdantium" = 2))
+ ORE_MARBLE = 7,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 10,
+ ORE_CARBON = 10,
+ ORE_DIAMOND = 4,
+ ORE_GOLD = 15,
+ ORE_SILVER = 15,
+ ORE_LEAD = 5,
+ ORE_VERDANTIUM = 2))
else
mineral_name = pickweight(list(
- "marble" = 5,
- "uranium" = 7,
- "platinum" = 7,
- "hematite" = 28,
- "carbon" = 28,
- "diamond" = 2,
- "gold" = 7,
- "silver" = 7,
- "lead" = 4,
- "verdantium" = 1))
+ ORE_MARBLE = 5,
+ ORE_URANIUM = 7,
+ ORE_PLATINUM = 7,
+ ORE_HEMATITE = 28,
+ ORE_CARBON = 28,
+ ORE_DIAMOND = 2,
+ ORE_GOLD = 7,
+ ORE_SILVER = 7,
+ ORE_LEAD = 4,
+ ORE_VERDANTIUM = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
UpdateMineral()
diff --git a/vorestation.dme b/vorestation.dme
index 292246512e..28a4afcb3c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -97,6 +97,7 @@
#include "code\__defines\nifsoft.dm"
#include "code\__defines\objects.dm"
#include "code\__defines\observer.dm"
+#include "code\__defines\ores.dm"
#include "code\__defines\organ_internal.dm"
#include "code\__defines\overmap.dm"
#include "code\__defines\paicard.dm"
@@ -113,6 +114,7 @@
#include "code\__defines\projectiles.dm"
#include "code\__defines\qdel.dm"
#include "code\__defines\radio.dm"
+#include "code\__defines\reagents.dm"
#include "code\__defines\recipe.dm"
#include "code\__defines\request_console.dm"
#include "code\__defines\research.dm"
From 429398bdd767e5958df1bc6eba8540a0c1fbb5f4 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 6 Dec 2024 21:54:05 +0100
Subject: [PATCH 02/29] some moire
---
code/__defines/chemistry.dm | 4 +-
code/__defines/reagents.dm | 648 ++++++++++++++++--
code/controllers/subsystems/plants.dm | 4 +-
code/datums/diseases/advance/advance.dm | 4 +-
.../diseases/advance/symptoms/sensory.dm | 6 +-
code/datums/diseases/anxiety.dm | 2 +-
code/datums/diseases/beesease.dm | 2 +-
code/datums/diseases/cold.dm | 2 +-
code/datums/diseases/flu.dm | 2 +-
code/datums/diseases/food_poisoning.dm | 2 +-
code/datums/diseases/lycancoughy.dm | 2 +-
code/datums/diseases/magnitis.dm | 2 +-
code/game/gamemodes/newobjective.dm | 4 +-
.../technomancer/spells/condensation.dm | 6 +-
code/game/machinery/Sleeper.dm | 2 +-
code/game/machinery/biogenerator.dm | 4 +-
code/game/machinery/bioprinter.dm | 2 +-
code/game/machinery/computer/Operating.dm | 2 +-
code/game/machinery/computer/arcade.dm | 2 +-
code/game/machinery/iv_drip.dm | 2 +-
code/game/machinery/pandemic.dm | 2 +-
code/game/objects/effects/chem/foam.dm | 2 +-
.../temporary_visuals/miscellaneous.dm | 2 +-
code/game/objects/items/contraband.dm | 4 +-
code/game/objects/items/devices/defib.dm | 2 +-
code/game/objects/items/devices/flashlight.dm | 2 +-
.../objects/items/devices/scanners/guide.dm | 2 +-
.../objects/items/devices/scanners/health.dm | 2 +-
.../devices/scanners/mass_spectrometer.dm | 2 +-
code/game/objects/items/selectable_item_vr.dm | 6 +-
code/game/objects/items/toys/toys.dm | 2 +-
code/game/objects/items/weapons/chewables.dm | 10 +-
.../objects/items/weapons/cigs_lighters.dm | 6 +-
code/game/objects/items/weapons/ecigs.dm | 40 +-
.../items/weapons/grenades/chem_grenade.dm | 26 +-
.../weapons/implants/implantreagent_vr.dm | 4 +-
.../items/weapons/material/chainsaw.dm | 8 +-
code/game/objects/items/weapons/mop_deploy.dm | 2 +-
.../objects/items/weapons/storage/bags.dm | 40 +-
.../objects/items/weapons/storage/bible.dm | 6 +-
.../game/objects/items/weapons/storage/mre.dm | 8 +-
.../items/weapons/storage/uplink_kits.dm | 12 +-
.../items/weapons/tools/weldingtool.dm | 10 +-
.../objects/items/weapons/weldbackpack.dm | 2 +-
.../objects/structures/medical_stand_vr.dm | 2 +-
code/game/objects/structures/watercloset.dm | 8 +-
code/game/turfs/simulated/underwater.dm | 2 +-
code/game/turfs/simulated/wall_types_vr.dm | 2 +-
code/game/turfs/simulated/water.dm | 8 +-
code/game/turfs/turf.dm | 2 +-
code/modules/blob2/overmind/types/classic.dm | 4 +-
.../rig/modules/specific/chem_dispenser.dm | 8 +-
.../spacesuits/rig/modules/utility.dm | 6 +-
code/modules/detectivework/tools/rag.dm | 6 +-
code/modules/fishing/fishing_rod.dm | 2 +-
code/modules/food/drinkingglass/extras.dm | 4 +-
.../food/drinkingglass/metaglass_vr.dm | 2 +-
code/modules/food/drinkingglass/shaker.dm | 8 +-
code/modules/food/drinkingglass/shaker_vr.dm | 4 +-
code/modules/food/food/cans.dm | 50 +-
code/modules/food/food/condiment.dm | 30 +-
.../modules/food/food/drinks/drinkingglass.dm | 6 +-
code/modules/food/food/snacks.dm | 250 +++----
code/modules/food/food/snacks/meat.dm | 8 +-
code/modules/food/food/snacks_vr.dm | 52 +-
code/modules/food/food/superfoods.dm | 26 +-
code/modules/food/food/z_custom_food_vr.dm | 2 +-
code/modules/food/glass/bottle.dm | 4 +-
code/modules/food/glass/bottle_potion.dm | 20 +-
code/modules/food/glass/bottle_vr.dm | 4 +-
.../kitchen/cooking_machines/_appliance.dm | 6 +-
code/modules/food/kitchen/gibber.dm | 2 +-
code/modules/food/kitchen/icecream.dm | 10 +-
code/modules/food/kitchen/microwave.dm | 2 +-
code/modules/food/recipes_fryer.dm | 20 +-
code/modules/food/recipes_fryer_vr.dm | 6 +-
code/modules/food/recipes_grill.dm | 8 +-
code/modules/food/recipes_microwave.dm | 136 ++--
code/modules/food/recipes_microwave_vr.dm | 20 +-
code/modules/food/recipes_oven.dm | 64 +-
code/modules/food/recipes_oven_vr.dm | 4 +-
code/modules/hydroponics/backtank.dm | 4 +-
code/modules/hydroponics/grown.dm | 12 +-
code/modules/hydroponics/seed.dm | 12 +-
code/modules/hydroponics/seed_datums_vr.dm | 6 +-
code/modules/hydroponics/seedtypes/amauri.dm | 4 +-
.../modules/hydroponics/seedtypes/ambrosia.dm | 10 +-
code/modules/hydroponics/seedtypes/apples.dm | 8 +-
code/modules/hydroponics/seedtypes/berries.dm | 10 +-
code/modules/hydroponics/seedtypes/cabbage.dm | 4 +-
code/modules/hydroponics/seedtypes/carrots.dm | 4 +-
code/modules/hydroponics/seedtypes/celery.dm | 4 +-
.../modules/hydroponics/seedtypes/cherries.dm | 4 +-
code/modules/hydroponics/seedtypes/chili.dm | 10 +-
code/modules/hydroponics/seedtypes/citrus.dm | 8 +-
code/modules/hydroponics/seedtypes/cocoa.dm | 4 +-
code/modules/hydroponics/seedtypes/corn.dm | 4 +-
code/modules/hydroponics/seedtypes/durian.dm | 4 +-
.../modules/hydroponics/seedtypes/eggplant.dm | 4 +-
code/modules/hydroponics/seedtypes/flowers.dm | 10 +-
code/modules/hydroponics/seedtypes/gelthi.dm | 4 +-
code/modules/hydroponics/seedtypes/grapes.dm | 6 +-
code/modules/hydroponics/seedtypes/grass.dm | 4 +-
code/modules/hydroponics/seedtypes/jurlmah.dm | 4 +-
code/modules/hydroponics/seedtypes/kudzu.dm | 4 +-
code/modules/hydroponics/seedtypes/lettuce.dm | 6 +-
.../hydroponics/seedtypes/mushrooms.dm | 16 +-
code/modules/hydroponics/seedtypes/nettles.dm | 4 +-
code/modules/hydroponics/seedtypes/onion.dm | 4 +-
code/modules/hydroponics/seedtypes/peanuts.dm | 4 +-
.../hydroponics/seedtypes/pineapple.dm | 6 +-
code/modules/hydroponics/seedtypes/potato.dm | 4 +-
code/modules/hydroponics/seedtypes/pumpkin.dm | 4 +-
code/modules/hydroponics/seedtypes/rhubarb.dm | 4 +-
code/modules/hydroponics/seedtypes/rice.dm | 4 +-
code/modules/hydroponics/seedtypes/soybean.dm | 4 +-
.../hydroponics/seedtypes/sugarcane.dm | 4 +-
code/modules/hydroponics/seedtypes/surik.dm | 4 +-
code/modules/hydroponics/seedtypes/telriis.dm | 4 +-
code/modules/hydroponics/seedtypes/thaadra.dm | 4 +-
code/modules/hydroponics/seedtypes/tobacco.dm | 4 +-
.../modules/hydroponics/seedtypes/tomatoes.dm | 10 +-
code/modules/hydroponics/seedtypes/vale.dm | 4 +-
code/modules/hydroponics/seedtypes/vanilla.dm | 2 +-
code/modules/hydroponics/seedtypes/wabback.dm | 8 +-
.../hydroponics/seedtypes/watermelon.dm | 4 +-
code/modules/hydroponics/seedtypes/wheat.dm | 4 +-
.../hydroponics/seedtypes/whitebeets.dm | 4 +-
.../modules/hydroponics/seedtypes/wurmwoad.dm | 2 +-
.../hydroponics/spreading/spreading.dm | 2 +-
.../hydroponics/spreading/spreading_growth.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 56 +-
.../integrated_electronics/passive/power.dm | 2 +-
.../materials/materials/metals/metals.dm | 42 +-
code/modules/materials/sheets/metals/metal.dm | 64 +-
code/modules/mining/alloys.dm | 36 +-
code/modules/mining/alloys_vr.dm | 6 +-
code/modules/mining/ore_datum.dm | 14 +-
.../living/carbon/human/MedicalSideEffects.dm | 2 +-
.../living/carbon/human/chem_side_effects.dm | 2 +-
code/modules/mob/living/carbon/human/human.dm | 8 +-
.../mob/living/carbon/human/human_damage.dm | 2 +-
code/modules/mob/living/carbon/human/life.dm | 2 +-
.../living/carbon/human/species/species.dm | 4 +-
.../carbon/human/species/station/alraune.dm | 2 +-
.../carbon/human/species/station/station.dm | 2 +-
.../station/station_special_abilities_vr.dm | 8 +-
.../human/species/station/station_vr.dm | 2 +-
.../species/station/traits_vr/neutral.dm | 18 +-
.../mob/living/carbon/metroid/items.dm | 2 +-
code/modules/mob/living/carbon/taste.dm | 2 +-
.../silicon/robot/dogborg/dog_sleeper_vr.dm | 2 +-
.../silicon/robot/robot_modules/station.dm | 8 +-
.../subtypes/animal/alien animals/catslug.dm | 2 +-
.../animal/alien animals/jellyfish.dm | 2 +-
.../subtypes/animal/alien animals/teppi.dm | 2 +-
.../simple_mob/subtypes/animal/borer/borer.dm | 2 +-
.../animal/giant_spider/_giant_spider.dm | 2 +-
.../animal/giant_spider/giant_spider_vr.dm | 4 +-
.../animal/giant_spider/webslinger.dm | 4 +-
.../simple_mob/subtypes/animal/sif/leech.dm | 2 +-
.../subtypes/animal/space/snake_vr.dm | 4 +-
.../subtypes/slime/xenobio/subtypes.dm | 2 +-
.../living/simple_mob/subtypes/vore/bee.dm | 2 +-
.../simple_mob/subtypes/vore/bigdragon.dm | 2 +-
code/modules/organs/blood.dm | 26 +-
code/modules/organs/internal/stomach.dm | 4 +-
code/modules/organs/organ.dm | 2 +-
code/modules/power/antimatter/fuel.dm | 2 +-
code/modules/power/fusion/fusion_reactions.dm | 4 +-
.../particle_accelerator/particle_smasher.dm | 8 +-
code/modules/projectiles/projectile/arc.dm | 2 +-
code/modules/projectiles/projectile/beams.dm | 4 +-
code/modules/projectiles/projectile/blob.dm | 4 +-
code/modules/random_map/noise/ore.dm | 100 +--
code/modules/reagents/holder/holder.dm | 2 +-
.../machinery/dispenser/cartridge_presets.dm | 42 +-
.../dispenser/cartridge_presets_vr.dm | 4 +-
.../machinery/dispenser/dispenser2_energy.dm | 14 +-
.../dispenser/dispenser_presets_vr.dm | 6 +-
.../machinery/dispenser/reagent_tank.dm | 18 +-
code/modules/reagents/machinery/grinder.dm | 70 +-
code/modules/reagents/machinery/pump.dm | 6 +-
.../reactions/distilling/distilling.dm | 14 +-
.../reagents/reactions/instant/drinks.dm | 94 +--
.../reagents/reactions/instant/drinks_vr.dm | 231 ++++---
.../reagents/reactions/instant/food.dm | 34 +-
.../reagents/reactions/instant/food_vr.dm | 2 +-
.../reagents/reactions/instant/instant.dm | 274 ++++----
.../reagents/reactions/instant/instant_vr.dm | 112 +--
.../reagents/reactions/instant/virology.dm | 8 +-
.../reagents/reagent_containers/blood_pack.dm | 6 +-
.../reagent_containers/blood_pack_vr.dm | 2 +-
.../reagents/reagent_containers/borghypo.dm | 6 +-
.../reagents/reagent_containers/glass.dm | 2 +-
.../reagents/reagent_containers/glass_vr.dm | 30 +-
.../reagents/reagent_containers/hypospray.dm | 4 +-
.../reagents/reagent_containers/pill.dm | 14 +-
.../reagents/reagent_containers/pill_vr.dm | 4 +-
.../reagents/reagent_containers/spray.dm | 6 +-
.../reagents/reagent_containers/syringes.dm | 4 +-
.../reagents/reagent_containers/virology.dm | 4 +-
code/modules/reagents/reagents/core.dm | 28 +-
code/modules/reagents/reagents/dispenser.dm | 84 +--
code/modules/reagents/reagents/drugs.dm | 40 +-
code/modules/reagents/reagents/food_drinks.dm | 12 +-
.../reagents/reagents/food_drinks_vr.dm | 366 +++++-----
code/modules/reagents/reagents/other.dm | 6 +-
code/modules/reagents/reagents/toxins.dm | 4 +-
code/modules/reagents/reagents/vore_vr.dm | 58 +-
.../research/designs/circuits/circuits.dm | 8 +-
.../research/designs/circuits/disks.dm | 2 +-
code/modules/research/designs/uncommented.dm | 12 +-
code/modules/vore/eating/living_vr.dm | 2 +-
.../vore/fluffstuff/custom_implants_vr.dm | 2 +-
.../vore/fluffstuff/custom_items_vr.dm | 2 +-
code/modules/vore/smoleworld/smoleworld_vr.dm | 2 +-
code/modules/xenoarcheaology/effect_master.dm | 8 +-
code/modules/xenoarcheaology/effects/heal.dm | 4 +-
.../xenoarcheaology/finds/finds_defines.dm | 22 +-
code/modules/xenoarcheaology/finds/special.dm | 2 +-
code/modules/xenoarcheaology/sampling.dm | 8 +-
.../tools/geosample_scanner.dm | 2 +-
code/modules/xenobio/items/extracts.dm | 36 +-
code/modules/xenobio/items/extracts_vr.dm | 92 +--
code/modules/xenobio/items/slime_objects.dm | 2 +-
code/modules/xenobio2/_xeno_setup.dm | 14 +-
code/modules/xenobio2/_xeno_setup_vr.dm | 26 +-
code/modules/xenobio2/mob/slime/slime.dm | 66 +-
code/modules/xenobio2/mob/xeno procs.dm | 16 +-
maps/stellar_delight/stellar_delight_turfs.dm | 44 +-
231 files changed, 2484 insertions(+), 1945 deletions(-)
diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index 8213aa200f..519609f0e9 100644
--- a/code/__defines/chemistry.dm
+++ b/code/__defines/chemistry.dm
@@ -49,8 +49,8 @@
#define ANTIBIO_SUPER 3
// Chemistry lists.
-var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
-var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "bliss", "stoxin", "ambrosia_extract") // Decrease heart rate.
+var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "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/reagents.dm b/code/__defines/reagents.dm
index e215eaafc5..6d3efe468e 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -15,29 +15,347 @@
#define REAGENT_OXYGEN "Oxygen"
#define REAGENT_ID_OXYGEN "oxygen"
#define REAGENT_VOLATILE_FUEL "Volatile Fuel"
-
-
-
-
-
-
-
-
-
-
-
+#define REAGENT_HYDROGEN "Hydrogen"
#define REAGENT_ID_HYDROGEN "hydrogen"
+#define REAGENT_FLUORINE "Fluorine"
+#define REAGENT_ID_FLUORINE "fluorine"
+#define REAGENT_CHLORINE "Chlorine"
+#define REAGENT_ID_CHLORINE "chlorine"
+
// Fluid Reagents
+#define REAGENT_ETHANOL "Ethanol"
+#define REAGENT_ID_ETHANOL "ethanol"
+#define REAGENT_SACID "Sulphuric acid"
+#define REAGENT_ID_SACID "sacid"
+#define REAGENT_BLOOD "Blood"
+#define REAGENT_ID_BLOOD "blood"
+#define REAGENT_SYNTHBLOOD "synthetic blood"
+#define REAGENT_ID_SYNTHBLOOD "synthblood"
+#define REAGENT_SYNTHBLOOD_DILUTE "synthetic plasma"
+#define REAGENT_ID_SYNTHBLOOD_DILUTE "synthblood_dilute"
+#define REAGENT_ANTIBODIES "Antibodies"
+#define REAGENT_ID_ANTIBODIES "antibodies"
#define REAGENT_WATER "Water"
#define REAGENT_ID_WATER "water"
-#define REAGENT_PACID "pacid"
+#define REAGENT_FUEL "Welding fuel"
+#define REAGENT_ID_FUEL "fuel"
+
// Solid Reagents
#define REAGENT_IRON "Iron"
#define REAGENT_ID_IRON "iron"
+#define REAGENT_LITHIUM "Lithium"
+#define REAGENT_ID_LITHIUM "lithium"
+#define REAGENT_ALUMINIUM "Aluminum"
+#define REAGENT_ID_ALUMINIUM "aluminum"
+#define REAGENT_CALCIUM "Calcium"
+#define REAGENT_ID_CALCIUM "calcium"
+#define REAGENT_CARBON "Carbon"
+#define REAGENT_ID_CARBON "carbon"
#define REAGENT_COPPER "Copper"
#define REAGENT_ID_COPPER "copper"
+#define REAGENT_MERCURY "Mercury"
+#define REAGENT_ID_MERCURY "mercury"
+#define REAGENT_PHOSPHORUS "Phosphorus"
+#define REAGENT_ID_PHOSPHORUS "phosphorus"
+#define REAGENT_POTASSIUM "Potassium"
+#define REAGENT_ID_POTASSIUM "potassium"
+#define REAGENT_RADIUM "Radium"
+#define REAGENT_ID_RADIUM "radium"
+#define REAGENT_SILICON "Silicon"
+#define REAGENT_ID_SILICON "silicon"
+#define REAGENT_SODIUM "Sodium"
+#define REAGENT_ID_SODIUM "sodium"
+#define REAGENT_SUGAR "Sugar"
+#define REAGENT_ID_SUGAR "sugar"
+#define REAGENT_SULFUR "Sulfur"
+#define REAGENT_ID_SULFUR "sulfur"
+#define REAGENT_TUNGSTEN "Tungsten"
+#define REAGENT_ID_TUNGSTEN "tungsten"
+#define REAGENT_SODIUMCHLORIDE "Table Salt"
+#define REAGENT_ID_SODIUMCHLORIDE "sodiumchloride"
+#define REAGENT_NUTRIMENT "Nutriment"
+#define REAGENT_ID_NUTRIMENT "nutriment"
+
+
+// Xeno chem react
+#define XENO_CHEM_NUTRI "nutr"
+#define XENO_CHEM_MUT "mut"
+#define XENO_CHEM_TOXIC "toxic"
+#define XENO_CHEM_HEAL "heal"
+
+
+// Drugs and Chemical reactions
+#define REAGENT_SIZEOXADONE "Sizeoxadone"
+#define REAGENT_ID_SIZEOXADONE "sizeoxadone"
+#define REAGENT_MACROCILLIN "Macrocillin"
+#define REAGENT_ID_MACROCILLIN "macrocillin"
+#define REAGENT_MICROCILLIN "Microcillin"
+#define REAGENT_ID_MICROCILLIN "microcillin"
+#define REAGENT_NORMALCILLIN "Normalcillin"
+#define REAGENT_ID_NORMALCILLIN "normalcillin"
+#define REAGENT_ICKYPAK "Ickypak"
+#define REAGENT_ID_ICKYPAK "ickypak"
+#define REAGENT_UNSORBITOL "Unsorbitol"
+#define REAGENT_ID_UNSORBITOL "unsorbitol"
+#define REAGENT_AMORPHOROVIR "Amorphorovir"
+#define REAGENT_ID_AMORPHOROVIR "amorphorovir"
+#define REAGENT_ANDROROVIR "Androrovir"
+#define REAGENT_ID_ANDROROVIR "androrovir"
+#define REAGENT_GYNOROVIR "Gynorovir"
+#define REAGENT_ID_GYNOROVIR "gynorovir"
+#define REAGENT_ANDROGYNOROVIR "Androgynorovir"
+#define REAGENT_ID_ANDROGYNOROVIR "androgynorovir"
+#define REAGENT_RAINBOWTOXIN "Rainbow Toxin"
+#define REAGENT_ID_RAINBOWTOXIN "rainbowtoxin"
+#define REAGENT_PARALYSISTOXIN "Tetrodotoxin"
+#define REAGENT_ID_PARALYSISTOXIN "paralysistoxin"
+#define REAGENT_PAINENZYME "Pain Enzyme"
+#define REAGENT_ID_PAINENZYME "painenzyme"
+
+
+// Drugs
+#define REAGENT_DRUGS "generic drugs"
+#define REAGENT_ID_DRUGS "drugs"
+#define REAGENT_BLISS "Bliss"
+#define REAGENT_ID_BLISS "bliss"
+#define REAGENT_AMBROSIAEXTRACT "Ambrosia extract"
+#define REAGENT_ID_AMBROSIAEXTRACT "ambrosia_extract"
+#define REAGENT_PSILOCYBIN "Psilocybin"
+#define REAGENT_ID_PSILOCYBIN "psilocybin"
+#define REAGENT_TALUMQUEM "Talum-quem"
+#define REAGENT_ID_TALUMQUEM "talum_quem"
+#define REAGENT_NICOTINE "Nicotine"
+#define REAGENT_ID_NICOTINE "nicotine"
+#define REAGENT_METHYLPHENIDATE "Methylphenidate"
+#define REAGENT_ID_METHYLPHENIDATE "methylphenidate"
+#define REAGENT_CITALOPRAM "Citalopram"
+#define REAGENT_ID_CITALOPRAM "citalopram"
+#define REAGENT_PAROXETINE "Paroxetine"
+#define REAGENT_ID_PAROXETINE "paroxetine"
+#define REAGENT_QERRQUEM "Qerr-quem"
+#define REAGENT_ID_QERRQUEM "qerr_quem"
+
+
+// Toxins
+#define REAGENT_PACID "Polytrinic acid"
+#define REAGENT_ID_PACID "pacid"
+#define REAGEMT_PHORON "Phoron"
+#define REAGENT_ID_PHORON "phoron"
+#define REAGENT_SPIDERTOXIN "Spidertoxin"
+#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
+#define REAGENT_LEAD "Lead"
+#define REAGENT_ID_LEAD "lead"
+
+
+// Food and Drinks
+#define REAGENT_MEATCOLONY "A colony of meat cells"
+#define REAGENT_ID_MEATCOLONY "meatcolony"
+#define REAGENT_PLANTCOLONY "A colony of plant cells"
+#define REAGENT_ID_PLANTCOLONY "plantcolony"
+#define REAGENT_GRUBSHAKE "Grub shake"
+#define REAGENT_ID_GRUBSHAKE "grubshake"
+#define REAGENT_BURNOUT "Burnout"
+#define REAGENT_ID_BURNOUT "burnout"
+#define REAGENT_MONSTERTAMER "Monster Tamer"
+#define REAGENT_ID_MONSTERTAMER "monstertamer"
+#define REAGENT_PINKRUSSIAN "Pink Russian"
+#define REAGENT_ID_PINKRUSSIAN "pinkrussian"
+#define REAGENT_ORIGINALSIN "Original Sin"
+#define REAGENT_ID_ORIGINALSIN "originalsin"
+#define REAGENT_NEWYORKSOUR "New York Sour"
+#define REAGENT_ID_NEWYORKSOUR "newyorksour"
+#define REAGENT_WINDGARITA "WND-Garita"
+#define REAGENT_ID_WINDGARITA "windgarita"
+#define REAGENT_MUDSLIDE "Mudslide"
+#define REAGENT_ID_MUDSLIDE "mudslide"
+#define REAGENT_GALACTICPANIC "Galactic Panic Attack"
+#define REAGENT_ID_GALACTICPANIC "galacticpanic"
+#define REAGENT_BULLDOG "Space Bulldog"
+#define REAGENT_ID_BULLDOG "bulldog"
+#define REAGENT_SBAGLIATO "Negroni Sbagliato"
+#define REAGENT_ID_SBAGLIATO "sbagliato"
+#define REAGENT_ITALIANCRISIS "Italian Crisis"
+#define REAGENT_ID_ITALIANCRISIS "italiancrisis"
+#define REAGENT_SUGARRUSH "Sweet Rush"
+#define REAGENT_ID_SUGARRUSH "sugarrush"
+#define REAGENT_LOTUS "Lotus"
+#define REAGENT_ID_LOTUS "lotus"
+#define REAGENT_SHROOMJUICE "Dumb Shroom Juice"
+#define REAGENT_ID_SHROOMJUICE "shroomjuice"
+#define REAGENT_RUSSIANROULETTE "Russian Roulette"
+#define REAGENT_ID_RUSSIANROULETTE "russianroulette"
+#define REAGENT_LOVEMAKER "The Love Maker"
+#define REAGENT_ID_LOVEMAKER "lovemaker"
+#define REAGENT_HONEYSHOT "Honey Shot"
+#define REAGENT_ID_HONEYSHOT "honeyshot"
+#define REAGENT_APPLETINI "Appletini"
+#define REAGENT_ID_APPLETINIT "appletini"
+#define REAGENT_GLOWINGAPPLETINI "Glowing Appletini"
+#define REAGENT_ID_GLOWINGAPPLETINI "glowingappletini"
+#define REAGENT_SCSATW "Slow Comfortable Screw Against the Wall"
+#define REAGENT_ID_SCSATW "scsatw"
+#define REAGENT_CHOCCYMILK "Choccy Milk"
+#define REAGENT_ID_CHOCCYMILK "choccymilk"
+#define REAGENT_REDSPACEFLUSH "Redspace Flush"
+#define REAGENT_ID_REDSPACEFLUSH "redspaceflush"
+#define REAGENT_GRAVEYARD "Graveyard"
+#define REAGENT_ID_GRAVEYARD "graveyard"
+#define REAGENT_BIGBEER "Giant Beer"
+#define REAGENT_ID_BIGBEER "bigbeer"
+#define REAGENT_MANAGERSUMMONER "Manager Summoner"
+#define REAGENT_ID_MANAGERSUMMONER "manager_summoner"
+#define REAGENT_SWEETTEA "Sweet Tea"
+#define REAGENT_ID_SWEETTEA "sweettea"
+#define REAGENT_UNSWEETTEA "Unsweetened Tea"
+#define REAGENT_ID_UNSWEETTEA "unsweettea"
+#define REAGENT_HAIROFTHERAT "Hair of the Rat"
+#define REAGENT_ID_HAIROFTHERAT "hairoftherat"
+#define REAGENT_BEPIS "Bepis"
+#define REAGENT_ID_BEPIS "bepis"
+#define REAGENT_BEPIS "Bepis Cola"
+#define REAGENT_ID_BEPIS "bepis"
+#define REAGENT_BUZZFUZZ "Buzz Fuzz"
+#define REAGENT_ID_BUZZFUZZ "buzz_fuzz"
+#define REAGENT_SPRITEDCRANBERRY "Sprited Cranberry"
+#define REAGENT_ID_SPRITEDCRANBERRY "sprited_cranberry"
+#define REAGENT_SHAMBLERS "Shambler's Juice"
+#define REAGENT_ID_SHAMBLERS "shamblers"
+#define REAGENT_BRAINPROTEIN "grey matter"
+#define REAGENT_ID_BRAINPROTEIN "brain_protein"
+#define REAGENT_ID_REDBRAINPROTEIN "red_brain_protein"
+#define REAGENT_PROTEINPOWDER "Protein Powder"
+#define REAGENT_ID_PROTEINPOWDER "protein_powder"
+#define REAGENT_PROTEINSHAKE "Protein Shake"
+#define REAGENT_ID_PROTEINSHAKE "protein_shake"
+#define REAGENT_VANILLAPROTEINPOWDER "Vanilla Protein Powder"
+#define REAGENT_ID_VANILLAPROTEINPOWDER "vanilla_protein_powder"
+#define REAGENT_VANILLAPROTEINSHAKE "Vanilla Protein Shake"
+#define REAGENT_ID_VANILLAPROTEINSHAKER "vanilla_protein_shake"
+#define REAGENT_BANANAPROTEINPOWDER "Banana Protein Powder"
+#define REAGENT_ID_BANANAPROTEINPOWDER "banana_protein_powder"
+#define REAGENT_BANANAPROTEINSHAKE "Banana Protein Shake"
+#define REAGENT_ID_BANANAPROTEINSHAKE "banana_protein_shake"
+#define REAGENT_CHOCOLATEPROTEINPOWDER "Chocolate Protein Powder"
+#define REAGENT_ID_CHOCOLATEPROTEINPOWDER "chocolate_protein_powder"
+#define REAGENT_CHOCOLATEPROTEINSHAKE "Chocolate Protein Shake"
+#define REAGENT_ID_CHOCOLATEPROTEINSHAKE "chocolate_protein_shake"
+#define REAGENT_STRAWBERRYPROTEINPOWDER "Strawberry Protein Powder"
+#define REAGENT_ID_STRAWBERRYPROTEINPOWDER "strawberry_protein_powder"
+#define REAGENT_STRAWBERRYPROTEINSHAKE "Strawberry Protein Shake"
+#define REAGENT_ID_STRAWBERRYPROTEINSHAKE "strawberry_protein_shake"
+#define REAGENT_SOUP "Soup
+#define REAGENT_ID_SOUP "generic_soup"
+#define REAGENT_TOMATOSOUP "Tomato Soup"
+#define REAGENT_ID_TOMATOSOUP "tomato_soup"
+#define REAGENT_MUSHROOMSOUP "Cream of Mushroom Soup"
+#define REAGENT_ID_MUSHROOMSOUP "mushroom_soup"
+#define REAGENT_CHICKENSOUP "Cream of Chicken Soup"
+#define REAGENT_ID_CHICKENSOUP "chicken_soup"
+#define REAGENT_CHICKENNOODLESOUP "Chicken Noodle Soup"
+#define REAGENT_ID_CHICKENNOODLESOUP "chicken_noodle_soup"
+#define REAGENT_ONIONSOUP "Onion Soup"
+#define REAGENT_ID_ONIONSOUP "onion_soup"
+#define REAGENT_VEGETABLESOUP "Vegetable Soup"
+#define REAGENT_ID_VEGETABLESOUP "vegetable_soup"
+#define REAGENT_BEETSOUP "Beet Soup"
+#define REAGENT_ID_BEETSOUP "beet_soup"
+#define REAGENT_HOTNSOURSOUP "Hot & Sour Soup"
+#define REAGENT_ID_HOTNSOURSOUP "hot_n_sour_soup"
+#define REAGENT_NUKIE "Nukie"
+#define REAGENT_ID_NUKIE "nukie"
+#define REAGENT_NUKIEPEACH "Nukie Peach"
+#define REAGENT_ID_NUKIEPEACH "nukie_peach"
+#define REAGENT_NUKIEPEAR "Nukie Pear"
+#define REAGENT_ID_NUKIEPEAR "nukie_pear"
+#define REAGENT_NUKIECHERRY "Nukie Cherry"
+#define REAGENT_ID_NUKIECHERRY "nukie_cherry"
+#define REAGENT_NUKIEMELON "Nukie Melon"
+#define REAGENT_ID_NUKIEMELON "nukie_melon"
+#define REAGENT_NUKIEBANANA "Nukie Banana"
+#define REAGENT_ID_NUKIEBANANA "nukie_banana"
+#define REAGENT_NUKIEROSE "Nukie Rose"
+#define REAGENT_ID_NUKIEROSE "nukie_rose"
+#define REAGENT_NUKIELEMON "Nukie Lemon"
+#define REAGENT_ID_NUKIELEMON "nukie_lemon"
+#define REAGENT_NUKIEFRUIT "Nukie Fruit"
+#define REAGENT_ID_NUKIEFRUIT "nukie_fruit"
+#define REAGENT_NUKIESPECIAL "Nukie Limited Edition"
+#define REAGENT_ID_NUKIESPECIAL "nukie_special"
+#define REAGENT_NUKIEMEGA "Mega Nukie"
+#define REAGENT_ID_NUKIEMEGA "nukie_mega"
+#define REAGENT_NUKIEMEGASIGHT "Nukie Mega Plum"
+#define REAGENT_ID_NUKIEMEGASIGHT "nukie_mega_sight"
+#define REAGENT_NUKIEMEGAHEART "Nukie Mega Juice"
+#define REAGENT_ID_NUKIEMEGAHEART "nukie_mega_heart"
+#define REAGENT_NUKIEMEGASLEEP "Nukie Nega"
+#define REAGENT_ID_NUKIEMEGASLEEP "nukie_mega_sleep"
+#define REAGENT_NUKIEMEGASHOCK "Nukie Mega Shock"
+#define REAGENT_ID_NUKIEMEGASHOCK "nukie_mega_shock"
+#define REAGENT_NUKIEMEGAFAST "Nukie Mega Rapid"
+#define REAGENT_ID_NUKIEMEGAFAST "nukie_mega_fast"
+#define REAGENT_NUKIEMEGAHIGH "Nukie Mega Sky"
+#define REAGENT_ID_NUKIEMEGAHIGH "nukie_mega_high"
+#define REAGENT_NUKIEMEGASHRINK "Nukie Mega Shrink"
+#define REAGENT_ID_NUKIEMEGASHRINK "nukie_mega_shrink"
+#define REAGENT_NUKIEMEGAGROWTH "Nukie Mega Growth"
+#define REAGENT_ID_NUKIEMEGAGROWTH "nukie_mega_growth"
+
+
+
+
+
+
+
+#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_
+#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_
+#define REAGENT_
+#define REAGENT_ID_
+
+
+
+
+
+includes: .dm
+excludes: reagents.dm,ores.dm,materials.dm,mre.dm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#define REAGENT_SILVER "Silver"
#define REAGENT_ID_SILVER "silver"
#define REAGENT_GOLD "Gold"
@@ -45,68 +363,282 @@
#define REAGENT_SLIMEJELLY "Slimejelly"
#define REAGENT_ID_SLIMEJELLY "slimejelly"
-// Toxins
-#define REAGEMT_PHORON "Phoron"
-#define REAGENT_ID_PHORON "phoron"
-#define REAGENT_LEAD "Lead"
-#define REAGENT_ID_LEAD "lead"
-#define REAGENT_SPIDERTOXIN "Spidertoxin"
-#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
-
#define REAGENT_ID_SILICATE "silicate"
-#define REAGENT_ID_POTASSIUM "potassium"
#define REAGENT_ID_URANIUM "uranium"
-#define REAGENT_ID_CARBON "carbon"
#define REAGENT_ID_PLATINUM "platinum"
-#define REAGENT_ID_ALUMINIUM "aluminum"
#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
todos
defective_nanites
-
+coco
+mold
+left4zed
var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
+
+
+
+
+
+ xenoChemList += "inaprovaline"
+ xenoChemList += "bicaridine"
+ xenoChemList += "dylovene"
+ xenoChemList += "dexalinp"
+ xenoChemList += "tricordrazine"
+ xenoChemList += "cryoxadone"
+ xenoChemList += "clonexadone"
+ xenoChemList += "paracetamol"
+ xenoChemList += "tramadol"
+ xenoChemList += "oxycodone"
+ xenoChemList += "ryetalyn"
+ xenoChemList += "hyperzine"
+ xenoChemList += "ethylredoxrazine"
+ xenoChemList += "hyronalin"
+ xenoChemList += "arithrazine"
+ xenoChemList += "spaceacillin"
+ xenoChemList += "sterilizine"
+ xenoChemList += "leporazine"
+ xenoChemList += "methylphenidate"
+ xenoChemList += "citalopram"
+ xenoChemList += "paroxetine"
+ xenoChemList += "macrocillin"
+ xenoChemList += "microcillin"
+ xenoChemList += "normalcillin"
+ xenoChemList += "sizeoxadone"
+ xenoChemList += "ickypak"
+ xenoChemList += "unsorbitol"
+ xenoChemList += "toxin"
+ xenoChemList += "carpotoxin"
+ xenoChemList += "potassium_chloride"
+ xenoChemList += "potassium_chlorophoride"
+ xenoChemList += "zombiepowder"
+ xenoChemList += "fertilizer"
+ xenoChemList += "eznutrient"
+ xenoChemList += "left4zed"
+ xenoChemList += "robustharvest"
+ xenoChemList += "plantbgone"
+ xenoChemList += "serotrotium"
+ xenoChemList += "nicotine"
+ xenoChemList += "uranium"
+ xenoChemList += "silver"
+ xenoChemList += "gold"
+ xenoChemList += "adrenaline"
+ xenoChemList += "holywater"
+ xenoChemList += "ammonia"
+ xenoChemList += "diethylamine"
+ xenoChemList += "fluorosurfactant"
+ xenoChemList += "foaming_agent"
+ xenoChemList += "thermite"
+ xenoChemList += "cleaner"
+ xenoChemList += "lube"
+ xenoChemList += "glycerol"
+ xenoChemList += "coolant"
+ xenoChemList += "luminol"
+ xenoChemList += "cornoil"
+ xenoChemList += "lipozine"
+ xenoChemList += "sodiumchloride"
+ xenoChemList += "frostoil"
+ xenoChemList += "capsaicin"
+ xenoChemList += "condensedcapsaicin"
+ xenoChemList += "neurotoxin"
+
+
supermatter
mydrogen
silicon
-lithium
+
deuterium
tritium
helium-3
boron
+ "adminordrazine",
+ REAGENT_ID_NUTRIMENT,
+ "macrocillin",
+ "microcillin",
+ "normalcillin",
+ "magicdust"
+ kitchen_tag = "lime"
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
- chemreact = list( "nutriment" = list("nutr" = 0.5),
- "radium" = list("toxic" = 0.3, "mut" = 1),
- "mutagen" = list("nutr" = 0.4, "mut" = 2),
- "water" = list("nutr" = -0.1),
- "milk" = list("nutr" = 0.3),
- "sacid" = list("toxic" = 1),
- "pacid" = list("toxic" = 2),
- "chlorine" = list("toxic" = 0.5),
- "ammonia" = list("toxic" = 0.5),
- "sodawater" = list("toxic" = 0.1, "nutr" = -0.1),
- "beer" = list("nutr" = 0.6),
- "diethylamine" = list("nutr" = 0.9),
- "sugar" = list("toxic" = 0.4, "nutr" = 0.2),
- "eznutrient" = list("nutr" = 0.8),
- "cryoxadone" = list("toxic" = 0.4),
- "flourine" = list("toxic" = 0.1),
- "robustharvest" = list("nutr" = 1.5),
- "glucose" = list("nutr" = 0.5),
- "blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45),
- "fuel" = list("toxic" = 0.4),
- "toxin" = list("toxic" = 0.5),
- "carpotoxin" = list("toxic" = 1, "mut" = 1.5),
- REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03),
- "virusfood" = list("nutr" = 1.5, "mut" = 0.32),
- "cyanide" = list("toxic" = 3.5),
- "slimejelly" = list("nutr" = 0.5),
- "amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3),
- "mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5),
- "gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3),
- "uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2),
- "glycerol" = list("nutr" = 0.6),
- "woodpulp" = list("heal" = 0.1, "nutr" = 0.7),
- "docilitytoxin" = list("nutr" = 0.3) )
+/datum/seed/citrus/New()
+ ..()
+ set_trait(TRAIT_HARVEST_REPEAT,1)
+ set_trait(TRAIT_JUICY,1)
+ set_trait(TRAIT_MATURATION,6)
+ set_trait(TRAIT_PRODUCTION,6)
+ set_trait(TRAIT_YIELD,4)
+ set_trait(TRAIT_POTENCY,15)
+ set_trait(TRAIT_PRODUCT_ICON,"treefruit")
+ set_trait(TRAIT_PRODUCT_COLOUR,"#3AF026")
+ set_trait(TRAIT_PLANT_ICON,"tree")
+ set_trait(TRAIT_FLESH_COLOUR,"#3AF026")
+
+/datum/seed/citrus/lemon
+ name = "lemon"
+ seed_name = "lemon"
+ display_name = "lemon trees"
+ kitchen_tag = "lemon"
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
+
+/datum/seed/citrus/lemon/New()
+ ..()
+ set_trait(TRAIT_PRODUCES_POWER,1)
+ set_trait(TRAIT_PRODUCT_ICON,"lemon")
+ set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226")
+ set_trait(TRAIT_FLESH_COLOUR,"#F0E226")
+ set_trait(TRAIT_IDEAL_LIGHT, 6)
+
+/datum/seed/citrus/orange
+ name = "orange"
+ seed_name = "orange"
+ display_name = "orange trees"
+ kitchen_tag = "orange"
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
+ list("zombiepowder" = list(1,10),"condensedcapsaicin""imidazoline" = list(3,5), "carrotjuice" = list(10,20))
+ chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5),
+ "radium" = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
+ "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
+ "water" = list(XENO_CHEM_NUTRI = -0.1),
+ "milk" = list(XENO_CHEM_NUTRI = 0.3),
+ "sacid" = list(XENO_CHEM_TOXIC = 1),
+ "pacid" = list(XENO_CHEM_TOXIC = 2),
+ "chlorine" = list(XENO_CHEM_TOXIC = 0.5),
+ "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),
+ "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),
+ "flourine" = list(XENO_CHEM_TOXIC = 0.1),
+ "robustharvest" = list(XENO_CHEM_NUTRI = 1.5),
+ "glucose" = list(XENO_CHEM_NUTRI = 0.5),
+ "blood" = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
+ "fuel" = list(XENO_CHEM_TOXIC = 0.4),
+ "toxin" = list(XENO_CHEM_TOXIC = 0.5),
+ "carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
+ REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
+ "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
+ "cyanide" = list(XENO_CHEM_TOXIC = 3.5),
+ "slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
+ "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),
+ "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),
+ "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) )
+re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
+liquid_protean
+peanutoil
+cornoil
+durianpaste
+ if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
+ descriptors |= "sweet"
+ if(reagents.has_reagent("anti_toxin"))
+ descriptors |= "astringent"
+ if(reagents.has_reagent("frostoil"))
+ descriptors |= "numbing"
+ if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
+ descriptors |= "nutritious"
+ if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
+ descriptors |= "spicy"
+ if(reagents.has_reagent("coco"))
+ descriptors |= "bitter"
+ if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
+ descriptors |= "sweet-sour"
+ if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
+ descriptors |= "radioactive"
+ if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
+ descriptors |= "poisonous"
+ if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
+ descriptors |= "hallucinogenic"
+ if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
+ descriptors |= "medicinal"
+ if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood"))
+ descriptors |= "shiny"
+ if(reagents.has_reagent("lube"))
+ descriptors |= "slippery"
+ if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
+ descriptors |= "acidic"
+
+ var/static/list/toxic_reagents = list(
+ "anti_toxin" = -2,
+ "toxin" = 2,
+ REAGENT_ID_FLUORINE = 2.5,
+ "chlorine" = 1.5,
+ "sacid" = 1.5,
+ "pacid" = 3,
+ "plantbgone" = 3,
+ "cryoxadone" = -3,
+ "radium" = 2
+ )
+ var/static/list/nutrient_reagents = list(
+ "milk" = 0.1,
+ "beer" = 0.25,
+ "phosphorus" = 0.1,
+ "sugar" = 0.1,
+ "sodawater" = 0.1,
+ "ammonia" = 1,
+ "diethylamine" = 2,
+ REAGENT_ID_NUTRIMENT = 1,
+ "adminordrazine" = 1,
+ "eznutrient" = 1,
+ "robustharvest" = 1,
+ "left4zed" = 1
+ )
+ var/static/list/weedkiller_reagents = list(
+ REAGENT_ID_FLUORINE = -4,
+ "chlorine" = -3,
+ "phosphorus" = -2,
+ "sugar" = 2,
+ "sacid" = -2,
+ "pacid" = -4,
+ "plantbgone" = -8,
+ "adminordrazine" = -5
+ )
+ var/static/list/pestkiller_reagents = list(
+ "sugar" = 2,
+ "diethylamine" = -2,
+ "adminordrazine" = -5
+ )
+ var/static/list/water_reagents = list(
+ "water" = 1,
+ "adminordrazine" = 1,
+ "milk" = 0.9,
+ "beer" = 0.7,
+ REAGENT_ID_FLUORINE = -0.5,
+ "chlorine" = -0.5,
+ "phosphorus" = -0.5,
+ "water" = 1,
+ "sodawater" = 1,
+ )
+
+ // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
+ var/static/list/beneficial_reagents = list(
+ "beer" = list( -0.05, 0, 0 ),
+ REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
+ "chlorine" = list( -1, 0, 0 ),
+ "phosphorus" = list( -0.75, 0, 0 ),
+ "sodawater" = list( 0.1, 0, 0 ),
+ "sacid" = list( -1, 0, 0 ),
+ "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_NUTRIMENT = list( 0.5, 0.1, 0 ),
+ "radium" = list( -1.5, 0, 0.2),
+ "adminordrazine" = list( 1, 1, 1 ),
+ "robustharvest" = list( 0, 0.2, 0 ),
+ "left4zed" = list( 0, 0, 0.2)
+ )
+
+ // Mutagen list specifies minimum value for the mutation to take place, rather
+ // than a bound as the lists above specify.
+ var/static/list/mutagenic_reagents = list(
+ "radium" = 8,
+ "mutagen" = 15
+ )
diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm
index 730b8cd05f..bfa2df55e8 100644
--- a/code/controllers/subsystems/plants.dm
+++ b/code/controllers/subsystems/plants.dm
@@ -110,8 +110,8 @@ SUBSYSTEM_DEF(plants)
if(seed.consume_gasses)
seed.consume_gasses[GAS_PHORON] = null
seed.consume_gasses[GAS_CO2] = null
- if(seed.chems && !isnull(seed.chems[REAGENT_PACID]))
- seed.chems[REAGENT_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
+ if(seed.chems && !isnull(seed.chems[REAGENT_ID_PACID]))
+ seed.chems[REAGENT_ID_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
seed.chems -= null // Setting to null does not actually remove the entry, which is weird.
seed.set_trait(TRAIT_IDEAL_HEAT,293)
seed.set_trait(TRAIT_HEAT_TOLERANCE,20)
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 6eda375458..e442023856 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -1,8 +1,8 @@
GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
- "sodiumchloride", "sugar", "orangejuice",
- "spaceacillin", "glucose", "ethanol",
+ REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
+ "spaceacillin", "glucose", REAGENT_ID_ETHANOL,
"dyloteane", "impedrezene", "hepanephrodaxon",
"gold", "silver"
))
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 8e19382f94..84328d194c 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -32,11 +32,11 @@ Bonus
if(A.stage >= 3)
M.slurring = max(0, M.slurring-4)
M.druggy = max(0, M.druggy-4)
- M.reagents.remove_reagent("ethanol", 3)
+ M.reagents.remove_reagent(REAGENT_ID_ETHANOL, 3)
if(A.stage >= 4)
M.drowsyness = max(0, M.drowsyness-4)
- if(M.reagents.has_reagent("bliss"))
- M.reagents.del_reagent("bliss")
+ if(M.reagents.has_reagent(REAGENT_ID_BLISS))
+ M.reagents.del_reagent(REAGENT_ID_BLISS)
M.hallucination = max(0, M.hallucination-4)
if(A.stage >= 5)
if(M.reagents.get_reagent_amount("alkysine") < 10)
diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm
index 78b630bc15..2bb5a1f81f 100644
--- a/code/datums/diseases/anxiety.dm
+++ b/code/datums/diseases/anxiety.dm
@@ -5,7 +5,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
- cures = list("ethanol")
+ cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Lepdopticides"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate butterflies."
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index a867c8d9d9..436bbbe187 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -5,7 +5,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Sugar"
- cures = list("sugar")
+ cures = list(REAGENT_ID_SUGAR)
agent = "Apidae Infection"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated, subject will regurgitate bees."
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index 487f466761..ae9c307297 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -4,7 +4,7 @@
spread_text = "Airborne"
spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
- cures = list("spaceacillin", "chicken_soup")
+ cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
agent = "XY-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 2962f48e9b..8c3062809b 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -3,7 +3,7 @@
max_stages = 3
spread_text = "Airborne"
cure_text = "Spaceacillin"
- cures = list("spaceacillin", "chicken_soup")
+ cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
cure_chance = 10
agent = "H13N1 flu virion"
diff --git a/code/datums/diseases/food_poisoning.dm b/code/datums/diseases/food_poisoning.dm
index cbb7a0c804..4c7f0eabf8 100644
--- a/code/datums/diseases/food_poisoning.dm
+++ b/code/datums/diseases/food_poisoning.dm
@@ -6,7 +6,7 @@
spread_flags = NON_CONTAGIOUS
cure_text = "Sleep"
agent = "Salmonella"
- cures = list("chicken_soup")
+ cures = list(REAGENT_ID_CHICKENSOUP)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
desc = "Nausea, sickness, and vomitting."
diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm
index 6d8f106163..1869179283 100644
--- a/code/datums/diseases/lycancoughy.dm
+++ b/code/datums/diseases/lycancoughy.dm
@@ -5,7 +5,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
- cures = list("ethanol")
+ cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Snuggles"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate... puppies."
diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm
index 24b2261cda..e3c73aaffd 100644
--- a/code/datums/diseases/magnitis.dm
+++ b/code/datums/diseases/magnitis.dm
@@ -3,7 +3,7 @@
max_stages = 4
spread_text = "Airbone"
cure_text = "Iron"
- cures = list("iron")
+ cures = list(REAGENT_ID_IRON)
agent = "Fukkos Miracos"
viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 5c60665a74..3857664671 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -1143,14 +1143,14 @@ datum
var/target_name
New(var/text,var/joba)
..()
- var/list/items = list("Sulphuric acid", "Polytrinic acid", "Space Lube", "Unstable mutagen",\
+ var/list/items = list("Sulphuric acid", REAGENT_PACID, "Space Lube", "Unstable mutagen",\
"Leporazine", "Cryptobiolin", "Lexorin ",\
"Kelotane", "Dexalin", "Tricordrazine")
target_name = pick(items)
switch(target_name)
if("Sulphuric acid")
steal_target = /datum/reagent/acid
- if("Polytrinic acid")
+ if(REAGENT_PACID)
steal_target = /datum/reagent/pacid
if("Space Lube")
steal_target = /datum/reagent/lube
diff --git a/code/game/gamemodes/technomancer/spells/condensation.dm b/code/game/gamemodes/technomancer/spells/condensation.dm
index c1fe4912c6..39b52923ec 100644
--- a/code/game/gamemodes/technomancer/spells/condensation.dm
+++ b/code/game/gamemodes/technomancer/spells/condensation.dm
@@ -27,7 +27,7 @@
if(desired_turf) // This shouldn't fail but...
var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(T))
W.create_reagents(60)
- W.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
+ W.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0)
W.set_color()
W.set_up(desired_turf)
flick(initial(icon_state),W) // Otherwise pooling causes the animation to stay stuck at the end.
@@ -40,5 +40,5 @@
else
add_attack_logs(user,hit_atom,"Wetted the floor with [src] at [T.x],[T.y],[T.z]")
else if(hit_atom.reagents && !ismob(hit_atom)) //TODO: Something for the scepter
- hit_atom.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
- adjust_instability(5)
\ No newline at end of file
+ hit_atom.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0)
+ adjust_instability(5)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 180bebe532..ee418024f8 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -234,7 +234,7 @@
if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel)
occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
occupantData["hasBlood"] = 1
- var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
+ var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
occupantData["bloodLevel"] = blood_volume
occupantData["bloodMax"] = occupant.species.blood_volume
occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index b3b41376ff..a4df3f8814 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -274,9 +274,9 @@
var/S = 0
for(var/obj/item/reagent_containers/food/snacks/grown/I in contents)
S += 5
- if(I.reagents.get_reagent_amount("nutriment") < 0.1)
+ if(I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) < 0.1)
points += 1
- else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff
+ else points += I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 10 * eat_eff
qdel(I)
if(S)
processing = 1
diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm
index cc3e3fc755..8750514b60 100644
--- a/code/game/machinery/bioprinter.dm
+++ b/code/game/machinery/bioprinter.dm
@@ -297,7 +297,7 @@
var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood
if(injected && injected.data)
loaded_dna = injected.data
- S.reagents.remove_reagent("blood", injected.volume)
+ S.reagents.remove_reagent(REAGENT_ID_BLOOD, injected.volume)
to_chat(user, span_info("You scan the blood sample into the bioprinter."))
return
else if(istype(W,/obj/item/reagent_containers/glass))
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 4f4722c559..95ba958438 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -108,7 +108,7 @@
if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel)
occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
occupantData["hasBlood"] = 1
- var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
+ var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
occupantData["bloodLevel"] = blood_volume
occupantData["bloodMax"] = occupant.species.blood_volume
occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index f6a50c3254..50e439b75e 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -161,7 +161,7 @@
enemy_hp -= attackamt
arcade_action(ui.user)
- if("heal")
+ if(XENO_CHEM_HEAL)
blocked = 1
var/pointamt = rand(1,3)
var/healamt = rand(6,8)
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 5e7f12fd6c..f38e2e08cc 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -127,7 +127,7 @@
return
// If the human is losing too much blood, beep.
- if(T.vessel.get_reagent_amount("blood") < T.species.blood_volume*T.species.blood_level_safe)
+ if(T.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < T.species.blood_volume*T.species.blood_level_safe)
visible_message("\The [src] beeps loudly.")
var/datum/reagent/B = T.take_blood(beaker,amount)
diff --git a/code/game/machinery/pandemic.dm b/code/game/machinery/pandemic.dm
index cd51b2a9fc..65ec57eafc 100644
--- a/code/game/machinery/pandemic.dm
+++ b/code/game/machinery/pandemic.dm
@@ -119,7 +119,7 @@
return
var/obj/item/reagent_containers/glass/bottle/B = create_culture(name)
B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
- B.reagents.add_reagent("blood", 20, list("viruses" = list(D)))
+ B.reagents.add_reagent(REAGENT_ID_BLOOD, 20, list("viruses" = list(D)))
if("clone_vaccine")
if(wait)
atom_say("The replicator is not ready yet.")
diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm
index 84ef931b74..a8d7b243ac 100644
--- a/code/game/objects/effects/chem/foam.dm
+++ b/code/game/objects/effects/chem/foam.dm
@@ -127,7 +127,7 @@
for(var/id in carried_reagents)
F.reagents.add_reagent(id, 1, safety = 1) //makes a safety call because all reagents should have already reacted anyway
else
- F.reagents.add_reagent("water", 1, safety = 1)
+ F.reagents.add_reagent(REAGENT_ID_WATER, 1, safety = 1)
// wall formed by metal foams, dense and opaque, but easy to break
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index c22ddaa46f..0da54588e6 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -105,7 +105,7 @@
/obj/effect/temp_visual/heal
name = "healing glow"
- icon_state = "heal"
+ icon_state = XENO_CHEM_HEAL
duration = 15
/obj/effect/temp_visual/heal/Initialize(mapload)
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index 05cd09f6d5..50c8b45e8a 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -17,11 +17,11 @@
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
- var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1)
+ var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list("cleaner" = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
- list("mindbreaker" = 10, "bliss" = 20) = 3,
+ list("mindbreaker" = 10, REAGENT_ID_BLISS = 20) = 3,
list("carpotoxin" = 15) = 2,
list("impedrezene" = 15) = 2,
list("zombiepowder" = 10) = 1)
diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index e765f3a0e1..23c7e436cd 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -339,7 +339,7 @@
if(!heart)
return TRUE
- var/blood_volume = H.vessel.get_reagent_amount("blood")
+ var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(!heart || heart.is_broken())
blood_volume *= 0.3
else if(heart.is_bruised())
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index eb9db84acd..4b520e4ace 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -150,7 +150,7 @@
to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
- var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1)
+ var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,"mindbreaker"=1)
if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating))
diff --git a/code/game/objects/items/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm
index 68bd33d8e8..18405d9c97 100644
--- a/code/game/objects/items/devices/scanners/guide.dm
+++ b/code/game/objects/items/devices/scanners/guide.dm
@@ -67,7 +67,7 @@
if(org.damage >= 1 && !istype(org, /obj/item/organ/internal/brain))
organ = TRUE
- var/blood_volume = M.vessel.get_reagent_amount("blood")
+ var/blood_volume = M.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(blood_volume <= M.species.blood_volume*M.species.blood_level_safe)
bloodloss = TRUE
diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm
index 348d8b55e6..4eca83946c 100644
--- a/code/game/objects/items/devices/scanners/health.dm
+++ b/code/game/objects/items/devices/scanners/health.dm
@@ -359,7 +359,7 @@
// Blood level
if(M:vessel)
- var/blood_volume = H.vessel.get_reagent_amount("blood")
+ var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
var/blood_percent = round((blood_volume / H.species.blood_volume)*100)
var/blood_type = H.dna.b_type
var/blood_reagent = H.species.blood_reagents
diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm
index 45286f9abf..f8de73ad8c 100644
--- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm
+++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm
@@ -40,7 +40,7 @@
if(reagents.total_volume)
var/list/blood_traces = list()
for(var/datum/reagent/R in reagents.reagent_list)
- if(R.id != "blood")
+ if(R.id != REAGENT_ID_BLOOD)
reagents.clear_reagents()
to_chat(user, span_warning("The sample was contaminated! Please insert another sample"))
return
diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm
index 3183971bce..bf7ab989af 100644
--- a/code/game/objects/items/selectable_item_vr.dm
+++ b/code/game/objects/items/selectable_item_vr.dm
@@ -43,6 +43,6 @@
desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals."
preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one."
preface_title = "Gender Chemistry Kit"
- item_options = list("Androrovir" = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
- "Gynorovir" = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
- "Androgynorovir" = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
+ item_options = list(REAGENT_ANDROROVIR = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
+ REAGENT_GYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
+ REAGENT_ANDROGYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index 6a444248c6..9611a4b14d 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -59,7 +59,7 @@
if(O.reagents.total_volume < 1)
to_chat(user, "The [O] is empty.")
else if(O.reagents.total_volume >= 1)
- if(O.reagents.has_reagent("pacid", 1))
+ if(O.reagents.has_reagent(REAGENT_ID_PACID, 1))
to_chat(user, "The acid chews through the balloon!")
O.reagents.splash(user, reagents.total_volume)
qdel(src)
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 34b463330f..1f57b7a9c4 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -104,12 +104,12 @@
/obj/item/clothing/mask/chewable/tobacco/cheap
name = "chewing tobacco"
desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face."
- filling = list("nicotine" = 2)
+ filling = list(REAGENT_ID_NICOTINE = 2)
/obj/item/clothing/mask/chewable/tobacco/fine
name = "deluxe chewing tobacco"
desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
- filling = list("nicotine" = 3)
+ filling = list(REAGENT_ID_NICOTINE = 3)
/obj/item/clothing/mask/chewable/tobacco/nico
name = "nicotine gum"
@@ -120,7 +120,7 @@
/obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
. = ..()
- reagents.add_reagent("nicotine", 2)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 2)
color = reagents.get_color()
/obj/item/storage/chewables
@@ -215,7 +215,7 @@
slot_flags = SLOT_EARS | SLOT_MASK
chem_volume = 50
chewtime = 300
- filling = list("sugar" = 2)
+ filling = list(REAGENT_ID_SUGAR = 2)
/obj/item/clothing/mask/chewable/candy/gum
name = "chewing gum"
@@ -287,7 +287,7 @@
desc = "A chocolate-coated biscuit stick."
icon_state = "pockystick"
item_state = "pocky"
- filling = list("sugar" = 2, "chocolate" = 5)
+ filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5)
type_butt = null
/obj/item/clothing/mask/chewable/candy/pocky/process()
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 23d0d1b28c..e85596a9ed 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -175,9 +175,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
e.start()
qdel(src)
return
- if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
+ if(reagents.get_reagent_amount(REAGENT_ID_FUEL)) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
+ e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_FUEL) / 5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
@@ -292,7 +292,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/cigarette/Initialize()
. = ..()
if(nicotine_amt)
- reagents.add_reagent("nicotine", nicotine_amt)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, nicotine_amt)
/obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob)
..()
diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
index f29636a2d3..93cfd6bd68 100644
--- a/code/game/objects/items/weapons/ecigs.dm
+++ b/code/game/objects/items/weapons/ecigs.dm
@@ -170,32 +170,32 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
/obj/item/reagent_containers/ecig_cartridge/blanknico/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/med_nicotine
name = "tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored."
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 15)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 15)
/obj/item/reagent_containers/ecig_cartridge/high_nicotine
name = "high nicotine tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/New()
..()
- reagents.add_reagent("nicotine", 10)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/orange
name = "orange flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
/obj/item/reagent_containers/ecig_cartridge/orange/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("orangejuice", 5)
/obj/item/reagent_containers/ecig_cartridge/mint
@@ -203,8 +203,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored."
/obj/item/reagent_containers/ecig_cartridge/mint/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("menthol", 5)
/obj/item/reagent_containers/ecig_cartridge/watermelon
@@ -212,8 +212,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored."
/obj/item/reagent_containers/ecig_cartridge/watermelon/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("watermelonjuice", 5)
/obj/item/reagent_containers/ecig_cartridge/grape
@@ -221,8 +221,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored."
/obj/item/reagent_containers/ecig_cartridge/grape/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("grapejuice", 5)
/obj/item/reagent_containers/ecig_cartridge/lemonlime
@@ -230,8 +230,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored."
/obj/item/reagent_containers/ecig_cartridge/lemonlime/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("lemon_lime", 5)
/obj/item/reagent_containers/ecig_cartridge/coffee
@@ -239,8 +239,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
/obj/item/reagent_containers/ecig_cartridge/coffee/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("coffee", 5)
/*
/obj/item/reagent_containers/ecig_cartridge/cannabis
@@ -248,7 +248,7 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..."
/obj/item/reagent_containers/ecig_cartridge/cannabis/New()
..()
- reagents.add_reagent("nicotine", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("cannabis", 5)
*/
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index dbee592959..c626f8f0d3 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -213,9 +213,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("aluminum", 30)
+ B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30)
B2.reagents.add_reagent("foaming_agent", 10)
- B2.reagents.add_reagent("pacid", 10)
+ B2.reagents.add_reagent(REAGENT_ID_PACID, 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -235,11 +235,11 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
- B1.reagents.add_reagent("aluminum", 15)
- B1.reagents.add_reagent("fuel",20)
+ B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 15)
+ B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
B2.reagents.add_reagent(REAGENT_ID_PHORON, 15)
- B2.reagents.add_reagent("sacid", 15)
- B1.reagents.add_reagent("fuel",20)
+ B2.reagents.add_reagent(REAGENT_ID_SACID, 15)
+ B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -259,9 +259,9 @@
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("plantbgone", 25)
- B1.reagents.add_reagent("potassium", 25)
- B2.reagents.add_reagent("phosphorus", 25)
- B2.reagents.add_reagent("sugar", 25)
+ B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 25)
+ B2.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 25)
+ B2.reagents.add_reagent(REAGENT_ID_SUGAR, 25)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -283,7 +283,7 @@
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
- B2.reagents.add_reagent("water", 40)
+ B2.reagents.add_reagent(REAGENT_ID_WATER, 40)
B2.reagents.add_reagent("cleaner", 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -304,10 +304,10 @@
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
- B1.reagents.add_reagent("phosphorus", 40)
- B1.reagents.add_reagent("potassium", 40)
+ B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40)
+ B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40)
B1.reagents.add_reagent("condensedcapsaicin", 40)
- B2.reagents.add_reagent("sugar", 40)
+ B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40)
B2.reagents.add_reagent("condensedcapsaicin", 80)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm
index 48a60b0f53..f619d0588d 100644
--- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm
+++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm
@@ -2,8 +2,8 @@
name = "reagent generator implant"
desc = "This is an implant that has attached storage and generates a reagent."
implant_color = "r"
- var/list/generated_reagents = list("water" = 2) //Any number of reagents, the associated value is how many units are generated per process()
- var/reagent_name = "water" //What is shown when reagents are removed, doesn't need to be an actual reagent
+ var/list/generated_reagents = list(REAGENT_ID_WATER = 2) //Any number of reagents, the associated value is how many units are generated per process()
+ var/reagent_name = REAGENT_ID_WATER //What is shown when reagents are removed, doesn't need to be an actual reagent
var/gen_cost = 0.5 //amount of nutrient taken from the host per process tick
var/transfer_amount = 30 //amount transferred when using verb
var/usable_volume = 120
diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm
index 7984198f2a..f595a757fd 100644
--- a/code/game/objects/items/weapons/material/chainsaw.dm
+++ b/code/game/objects/items/weapons/material/chainsaw.dm
@@ -16,7 +16,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
- R.add_reagent("fuel", max_fuel)
+ R.add_reagent(REAGENT_ID_FUEL, max_fuel)
START_PROCESSING(SSobj, src)
. = ..()
@@ -73,7 +73,7 @@
playsound(src, 'sound/weapons/chainsaw_attack.ogg',40,1)
if(A && on)
if(get_fuel() > 0)
- reagents.remove_reagent("fuel", 1)
+ reagents.remove_reagent(REAGENT_ID_FUEL, 1)
if(istype(A,/obj/structure/window))
var/obj/structure/window/W = A
W.shatter()
@@ -103,14 +103,14 @@
if(on)
if(get_fuel() > 0)
- reagents.remove_reagent("fuel", 1)
+ reagents.remove_reagent(REAGENT_ID_FUEL, 1)
playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',15,1)
if(get_fuel() <= 0)
to_chat(usr, "\The [src] sputters to a stop!")
turnOff()
/obj/item/chainsaw/proc/get_fuel()
- return reagents.get_reagent_amount("fuel")
+ return reagents.get_reagent_amount(REAGENT_ID_FUEL)
/obj/item/chainsaw/examine(mob/user)
. = ..()
diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm
index 182f4971dc..315fc56e42 100644
--- a/code/game/objects/items/weapons/mop_deploy.dm
+++ b/code/game/objects/items/weapons/mop_deploy.dm
@@ -20,7 +20,7 @@
START_PROCESSING(SSobj, src)
/turf/proc/clean_deploy(atom/source)
- if(source.reagents.has_reagent("water", 1))
+ if(source.reagents.has_reagent(REAGENT_ID_WATER, 1))
clean_blood()
if(istype(src, /turf/simulated))
var/turf/simulated/T = src
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index ad934b0d03..add1c8f968 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -108,26 +108,26 @@
var/current_capacity = 0
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
var/list/stored_ore = list(
- "sand" = 0,
- "hematite" = 0,
- "carbon" = 0,
- "raw copper" = 0,
- "raw tin" = 0,
- "void opal" = 0,
- "painite" = 0,
- "quartz" = 0,
- "raw bauxite" = 0,
- "phoron" = 0,
- "silver" = 0,
- "gold" = 0,
- "marble" = 0,
- "uranium" = 0,
- "diamond" = 0,
- "platinum" = 0,
- "lead" = 0,
- "mhydrogen" = 0,
- "verdantium" = 0,
- "rutile" = 0)
+ ORE_SAND = 0,
+ ORE_HEMATITE = 0,
+ ORE_CARBON = 0,
+ ORE_COPPER = 0,
+ ORE_TIN = 0,
+ ORE_VOPAL = 0,
+ ORE_PAINITE = 0,
+ ORE_QUARTZ = 0,
+ ORE_BAUXITE = 0,
+ ORE_PHORON = 0,
+ ORE_SILVER = 0,
+ ORE_GOLD = 0,
+ ORE_MARBLE = 0,
+ ORE_URANIUM = 0,
+ ORE_DIAMOND = 0,
+ ORE_PLATINUM = 0,
+ ORE_LEAD = 0,
+ ORE_MHYDROGEN = 0,
+ ORE_VERDANTIUM = 0,
+ ORE_RUTILE = 0)
var/last_update = 0
/obj/item/storage/bag/ore/holding
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 80cfb13338..627fe4e88c 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -103,10 +103,10 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
/obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity) return
if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN))
- if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
+ if(A.reagents && A.reagents.has_reagent(REAGENT_ID_WATER)) //blesses all the water in the holder
to_chat(user, span_notice("You bless [A]."))
- var/water2holy = A.reagents.get_reagent_amount("water")
- A.reagents.del_reagent("water")
+ var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER)
+ A.reagents.del_reagent(REAGENT_ID_WATER)
A.reagents.add_reagent("holywater",water2holy)
/obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm
index c164aef120..ff9a02dca9 100644
--- a/code/game/objects/items/weapons/storage/mre.dm
+++ b/code/game/objects/items/weapons/storage/mre.dm
@@ -364,19 +364,19 @@ MRE Stuff
if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders")
icon_state = "tgmcmre_entree"
nutriment_amt = 5
- starts_with = list("sodiumchloride" = 1)
+ starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("meatballs", "cheese spread", "beef turnover", "mashed potatoes")
icon_state = "tgmcmre_side"
nutriment_amt = 3
- starts_with = list("sodiumchloride" = 1)
+ starts_with = list(REAGENT_ID_SODIUMCHLORIDE= 1)
if("biscuit", "pretzels", "peanuts", "cracker")
icon_state = "tgmcmre_snack"
nutriment_amt = 2
- starts_with = list("sodiumchloride" = 1)
+ starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar")
icon_state = "tgmcmre_dessert"
nutriment_amt = 2
- starts_with = list("sugar" = 1)
+ starts_with = list(REAGENT_ID_SUGAR = 1)
package_open_state = "tgmcmre_[flavor]"
nutriment_desc = list("[new_taste]" = nutriment_amt)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 91d1031fad..f0f3a37867 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -196,26 +196,26 @@
var/obj/item/storage/fancy/cigarettes/pack
pack = new /obj/item/storage/fancy/cigarettes(src)
- fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
+ fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
- fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
+ fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
- fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
+ fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
- fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
+ fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
- fill_cigarre_package(pack, list("potassium" = 1.5, REAGENT_ID_NITROGEN = 1.5, "silicon" = 1.5))
+ fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 1.5, REAGENT_ID_NITROGEN = 1.5, REAGENT_ID_SILICON = 1.5))
// Mindbreaker
- fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
+ fill_cigarre_package(pack, list(REAGENT_ID_SILICON = 4.5, REAGENT_ID_HYDROGEN = 4.5))
pack.desc += " 'MB' has been scribbled on it."
diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm
index e0ce8ab19b..ed36b077e5 100644
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -49,7 +49,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
- R.add_reagent("fuel", max_fuel)
+ R.add_reagent(REAGENT_ID_FUEL, max_fuel)
update_icon()
if(always_process)
START_PROCESSING(SSobj, src)
@@ -185,7 +185,7 @@
//Returns the amount of fuel in the welder
/obj/item/weldingtool/proc/get_fuel()
- return reagents.get_reagent_amount("fuel")
+ return reagents.get_reagent_amount(REAGENT_ID_FUEL)
/obj/item/weldingtool/proc/get_max_fuel()
return max_fuel
@@ -197,7 +197,7 @@
if(amount)
burned_fuel_for = 0 // Reset the counter since we're removing fuel.
if(get_fuel() >= amount)
- reagents.remove_reagent("fuel", amount)
+ reagents.remove_reagent(REAGENT_ID_FUEL, amount)
if(M)
eyecheck(M)
update_icon()
@@ -440,7 +440,7 @@
/obj/item/weldingtool/alien/process()
if(get_fuel() <= get_max_fuel())
- reagents.add_reagent("fuel", 1)
+ reagents.add_reagent(REAGENT_ID_FUEL, 1)
..()
/obj/item/weldingtool/experimental
@@ -461,7 +461,7 @@
..()
if(get_fuel() < get_max_fuel() && nextrefueltick < world.time)
nextrefueltick = world.time + 10
- reagents.add_reagent("fuel", 1)
+ reagents.add_reagent(REAGENT_ID_FUEL, 1)
/obj/item/weldingtool/experimental/hybrid
name = "strange welding tool"
diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm
index e8be87608d..ae6bea6ddd 100644
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -17,7 +17,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
reagents = R
R.my_atom = src
- R.add_reagent("fuel", max_fuel)
+ R.add_reagent(REAGENT_ID_FUEL, max_fuel)
nozzle = new nozzle_type(src)
nozzle_attached = 1
diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm
index 05bd7fde60..7e7a89f641 100644
--- a/code/game/objects/structures/medical_stand_vr.dm
+++ b/code/game/objects/structures/medical_stand_vr.dm
@@ -423,7 +423,7 @@
return
// If the human is losing too much blood, beep.
- if(H.vessel.get_reagent_amount("blood") < H.species.blood_volume*H.species.blood_level_safe)
+ if(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < H.species.blood_volume*H.species.blood_level_safe)
visible_message("\The [src] beeps loudly.")
var/datum/reagent/B = H.take_blood(beaker,amount)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 74c86c61e1..d62252012e 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -216,7 +216,7 @@
mymist = null
if(on)
- add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir))
+ add_overlay(image('icons/obj/watercloset.dmi', src, REAGENT_ID_WATER, MOB_LAYER + 1, dir))
if(temperature_settings[watertemp] < T20C)
return //no mist for cold water
if(!ismist)
@@ -265,7 +265,7 @@
var/mob/living/L = AM
process_heat(L)
wash_floor()
- reagents.add_reagent("water", reagents.get_free_space())
+ reagents.add_reagent(REAGENT_ID_WATER, reagents.get_free_space())
/obj/machinery/shower/proc/wash_floor()
if(is_washing)
@@ -588,7 +588,7 @@
var/obj/item/reagent_containers/RG = O
if (istype(RG) && RG.is_open_container())
- RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+ RG.reagents.add_reagent(REAGENT_ID_WATER, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src]."))
playsound(src, 'sound/effects/sink.ogg', 75, 1)
return 1
@@ -612,7 +612,7 @@
span_userdanger("[user] was stunned by [TU.his] wet [O]!"))
return 1
else if(istype(O, /obj/item/mop))
- O.reagents.add_reagent("water", 5)
+ O.reagents.add_reagent(REAGENT_ID_WATER, 5)
to_chat(user, span_notice("You wet \the [O] in \the [src]."))
playsound(src, 'sound/effects/slosh.ogg', 25, 1)
return
diff --git a/code/game/turfs/simulated/underwater.dm b/code/game/turfs/simulated/underwater.dm
index 02dcbd5235..0e72122cf9 100644
--- a/code/game/turfs/simulated/underwater.dm
+++ b/code/game/turfs/simulated/underwater.dm
@@ -14,7 +14,7 @@
depth = 10 // Higher numbers indicates deeper water, 10 is unused right now, but may be useful for adding effects in the future.
- reagent_type = "water"
+ reagent_type = REAGENT_ID_WATER
/turf/simulated/floor/water/underwater/return_air_for_internal_lifeform(var/mob/living/L)
if(L.can_breathe_water()) // For squid.
diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm
index 976fe96c8f..5ecb521de7 100644
--- a/code/game/turfs/simulated/wall_types_vr.dm
+++ b/code/game/turfs/simulated/wall_types_vr.dm
@@ -236,4 +236,4 @@ var/list/flesh_overlay_cache = list()
icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/stonelogs/Initialize(mapload)
- . = ..(mapload, "concrete",MAT_LOG)
\ No newline at end of file
+ . = ..(mapload, "concrete",MAT_LOG)
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index f84d3311ad..9d24aea00b 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -19,7 +19,7 @@
var/depth = 1 // Higher numbers indicates deeper water.
- var/reagent_type = "water"
+ var/reagent_type = REAGENT_ID_WATER
/turf/simulated/floor/water/Initialize()
. = ..()
@@ -241,14 +241,14 @@ var/list/shoreline_icon_cache = list()
L.adjustToxLoss(poisonlevel)
/turf/simulated/floor/water/blood
- name = "blood"
+ name = REAGENT_ID_BLOOD
desc = "A body of blood. It seems shallow enough to walk through, if needed."
icon = 'icons/turf/outdoors.dmi'
icon_state = "bloodshallow"
water_icon = 'icons/turf/outdoors.dmi'
water_state = "bloodshallow"
under_state = "rock"
- reagent_type = "blood"
+ reagent_type = REAGENT_ID_BLOOD
/turf/simulated/floor/water/blood/get_edge_icon_state()
return "bloodshallow"
@@ -272,4 +272,4 @@ var/list/shoreline_icon_cache = list()
water_icon = 'icons/turf/flooring/glamour.dmi'
water_state = "water"
under_state = "glamour"
- reagent_type = "water"
+ reagent_type = REAGENT_ID_WATER
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index a44d915277..b788f9b20e 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("water", 1) || source.reagents.has_reagent("cleaner", 1))
+ if(source.reagents.has_reagent(REAGENT_ID_WATER, 1) || source.reagents.has_reagent("cleaner", 1))
clean_blood()
if(istype(src, /turf/simulated))
var/turf/simulated/T = src
diff --git a/code/modules/blob2/overmind/types/classic.dm b/code/modules/blob2/overmind/types/classic.dm
index 86094def25..b7d5fe28bc 100644
--- a/code/modules/blob2/overmind/types/classic.dm
+++ b/code/modules/blob2/overmind/types/classic.dm
@@ -22,7 +22,7 @@
spawn()
var/obj/effect/effect/water/splash = new(T)
splash.create_reagents(15)
- splash.reagents.add_reagent("blood", 10,list("blood_colour" = color))
+ splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
splash.set_color()
splash.set_up(F, 2, 3)
@@ -30,7 +30,7 @@
var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T
if(!istype(blood))
blood = new(T)
- blood.reagents.add_reagent("blood", 10,list("blood_colour" = color))
+ blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
blood.reagents.add_reagent("tricorlidaze", 5)
blood.update_icon()
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
index 4018b5cb53..77cd68161c 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
@@ -20,7 +20,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
- list("radium", "radium", 0, 80)
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
var/max_reagent_volume = 80 //Used when refilling.
@@ -40,7 +40,7 @@
list("clotting agent", "myelamine", 0, 30),
list("peridaxon", "peridaxon", 0, 30),
list("hyronalin", "hyronalin", 0, 30),
- list("radium", "radium", 0, 30)
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
@@ -156,7 +156,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
- list("radium", "radium", 0, 80),
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", "myelamine", 0, 80)
)
@@ -169,6 +169,6 @@
list("antitoxins", "anti_toxin", 0, 0),
list("nutrients", "glucose", 0, 0),
list("hyronalin", "hyronalin", 0, 0),
- list("radium", "radium", 0, 0),
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0),
list("clotting agent", "myelamine", 0, 0)
)
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 6e66d2504f..e53816b98e 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -150,7 +150,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
- list("radium", "radium", 0, 80)
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
var/max_reagent_volume = 80 //Used when refilling.
@@ -170,7 +170,7 @@
list("clotting agent", "myelamine", 0, 30),
list("peridaxon", "peridaxon", 0, 30),
list("hyronalin", "hyronalin", 0, 30),
- list("radium", "radium", 0, 30)
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
@@ -286,7 +286,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
- list("radium", "radium", 0, 80),
+ list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", "myelamine", 0, 80)
)
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index 2ec2692630..f9dbcf34fa 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -168,8 +168,8 @@
//rag must have a minimum of 2 units welder fuel or ehtanol based reagents and at least 80% of the reagents must so.
/obj/item/reagent_containers/glass/rag/proc/can_ignite()
var/fuel
- if(reagents.get_reagent_amount("fuel"))
- fuel += reagents.get_reagent_amount("fuel")
+ if(reagents.get_reagent_amount(REAGENT_ID_FUEL))
+ fuel += reagents.get_reagent_amount(REAGENT_ID_FUEL)
else
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
@@ -231,7 +231,7 @@
qdel(src)
return
- reagents.remove_reagent("fuel", reagents.maximum_volume/25)
+ reagents.remove_reagent(REAGENT_ID_FUEL, reagents.maximum_volume/25)
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
if(istype(R, /datum/reagent/ethanol))
reagents.remove_reagent(R.id, reagents.maximum_volume/25)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 6c3d6161d5..78646aa794 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 == "nutriment" || re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
+ if(re.id == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.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/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm
index afcd7044a3..2394143a13 100644
--- a/code/modules/food/drinkingglass/extras.dm
+++ b/code/modules/food/drinkingglass/extras.dm
@@ -86,11 +86,11 @@
sipp_mob(target, user, "liquid_protean")
return
if(SPECIES_PROMETHEAN)
- sipp_mob(target, user, "nutriment")
+ sipp_mob(target, user, REAGENT_ID_NUTRIMENT)
return
return ..()
-/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = "nutriment")
+/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = REAGENT_ID_NUTRIMENT)
if(victim.health <= 0)
to_chat(user, span_warning("There's not enough of [victim] left to sip on!"))
return
diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm
index ebaf4670e6..579a0cea87 100644
--- a/code/modules/food/drinkingglass/metaglass_vr.dm
+++ b/code/modules/food/drinkingglass/metaglass_vr.dm
@@ -241,5 +241,5 @@
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/manager_summoner
- glass_icon_state = "manager_summoner"
+ glass_icon_state = REAGENT_ID_MANAGERSUMMONER
glass_icon_file = 'icons/obj/drinks_vr.dmi'
diff --git a/code/modules/food/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm
index 8d9ff65249..1369441664 100644
--- a/code/modules/food/drinkingglass/shaker.dm
+++ b/code/modules/food/drinkingglass/shaker.dm
@@ -32,10 +32,10 @@
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize()
. = ..()
cut_overlays()
- reagents.add_reagent("nutriment", 30)
- reagents.add_reagent("iron", 10)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
+ reagents.add_reagent(REAGENT_ID_IRON, 10)
reagents.add_reagent("protein", 35)
- reagents.add_reagent("water", 25)
+ reagents.add_reagent(REAGENT_ID_WATER, 25)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/food/drinkingglass/shaker_vr.dm b/code/modules/food/drinkingglass/shaker_vr.dm
index 2bc6528b38..0bdbe75d86 100644
--- a/code/modules/food/drinkingglass/shaker_vr.dm
+++ b/code/modules/food/drinkingglass/shaker_vr.dm
@@ -9,7 +9,7 @@
. = ..()
cut_overlays()
reagents.add_reagent("liquid_protean", 50)
- reagents.add_reagent("nutriment", 50)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 50)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
index 4a175222a5..ec7c739dee 100644
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -41,7 +41,7 @@
/obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize()
. = ..()
- reagents.add_reagent("water", 30)
+ reagents.add_reagent(REAGENT_ID_WATER, 30)
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
name = "\improper Space Mountain Wind"
@@ -278,8 +278,8 @@
/obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize()
. = ..()
- reagents.add_reagent("water", 25)
- reagents.add_reagent("iron", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 25)
+ reagents.add_reagent(REAGENT_ID_IRON, 5)
/////////////////////////MISC VENDOR DRINKS/////////////////////////
@@ -365,7 +365,7 @@
/obj/item/reagent_containers/food/drinks/cans/bepis/Initialize()
. = ..()
- reagents.add_reagent("bepis", 30)
+ reagents.add_reagent(REAGENT_ID_BEPIS, 30)
/obj/item/reagent_containers/food/drinks/cans/astrodew
name = "\improper Astro Dew Spring Water"
@@ -376,7 +376,7 @@
/obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize()
. = ..()
- reagents.add_reagent("water", 30)
+ reagents.add_reagent(REAGENT_ID_WATER, 30)
/obj/item/reagent_containers/food/drinks/cans/icecoffee
name = "\improper Café Del Consumir"
@@ -403,7 +403,7 @@
/obj/item/reagent_containers/food/drinks/cans/buzz/Initialize()
. = ..()
- reagents.add_reagent("buzz_fuzz", 30)
+ reagents.add_reagent(REAGENT_ID_BUZZFUZZ, 30)
/obj/item/reagent_containers/food/drinks/cans/shambler
name = "\improper Shambler's Juice"
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/food/drinks/cans/shambler/Initialize()
. = ..()
- reagents.add_reagent("shamblers", 30)
+ reagents.add_reagent(REAGENT_ID_SHAMBLERS, 30)
/obj/item/reagent_containers/food/drinks/cans/cranberry
name = "\improper Sprited Cranberry"
@@ -425,7 +425,7 @@
/obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize()
. = ..()
- reagents.add_reagent("sprited_cranberry", 30)
+ reagents.add_reagent(REAGENT_ID_SPRITEDCRANBERRY, 30)
/////////////////////////CANNED BOOZE DRINKS/////////////////////////
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize()
. = ..()
- reagents.add_reagent("nukie_peach", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEPEACH, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_pear
name = "\improper Nukies - Great Pear"
@@ -471,7 +471,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize()
. = ..()
- reagents.add_reagent("nukie_pear", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEPEAR, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry
name = "\improper Nukies - Popping Cherry"
@@ -482,7 +482,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize()
. = ..()
- reagents.add_reagent("nukie_cherry", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIECHERRY, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_melon
name = "\improper Nukies - Melon Squirter"
@@ -493,7 +493,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize()
. = ..()
- reagents.add_reagent("nukie_melon", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMELON, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_banana
name = "\improper Nukies - Bursting Banana"
@@ -504,7 +504,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize()
. = ..()
- reagents.add_reagent("nukie_banana", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEBANANA, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_rose
name = "\improper Nukies - Insatiable Rose"
@@ -515,7 +515,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize()
. = ..()
- reagents.add_reagent("nukie_rose", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEROSE, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon
name = "\improper Nukies - Citrus Got Real"
@@ -526,7 +526,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize()
. = ..()
- reagents.add_reagent("nukie_lemon", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIELEMON, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit
name = "\improper Nukies - Swelling Fruit"
@@ -537,7 +537,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize()
. = ..()
- reagents.add_reagent("nukie_fruit", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEFRUIT, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_special
name = "\improper Nukies - Limited Edition"
@@ -548,7 +548,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize()
. = ..()
- reagents.add_reagent("nukie_special", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIESPECIAL, 60)
/////////////////////////MEGA NUKIES/////////////////////////
//Rare loot energy drinks with special properties, for the funnies.
@@ -562,7 +562,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_sight", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGASIGHT, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart
name = "\improper Nukies Mega - Juice Pumper"
@@ -573,7 +573,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_heart", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGAHEART, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep
name = "\improper Nukies Nega - Vibrating Nights"
@@ -584,7 +584,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_sleep", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGASLEEP, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock
name = "\improper Nukies Mega - Jolt Railer"
@@ -595,7 +595,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_shock", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGASHOCK, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast
name = "\improper Nukies Mega - Rapid Rager"
@@ -606,7 +606,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_fast", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGAFAST, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high
name = "\improper Nukies Mega - Diamond Sky"
@@ -617,7 +617,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_high", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGAHIGH, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink
name = "\improper Nukies Mega - Shrinking Flower"
@@ -628,7 +628,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_shrink", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGASHRINK, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow
name = "\improper Nukies Mega - Growing Geyser"
@@ -639,4 +639,4 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize()
. = ..()
- reagents.add_reagent("nukie_mega_growth", 60)
+ reagents.add_reagent(REAGENT_ID_NUKIEMEGAGROWTH, 60)
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index 0eb6cb0408..35974d7095 100644
--- a/code/modules/food/food/condiment.dm
+++ b/code/modules/food/food/condiment.dm
@@ -91,7 +91,7 @@
desc = "Leaves the tongue numb in its passage."
icon_state = "coldsauce"
center_of_mass = list("x"=16, "y"=6)
- if("sodiumchloride")
+ if(REAGENT_ID_SODIUMCHLORIDE)
name = "Salt Shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshaker"
@@ -106,7 +106,7 @@
desc = "A delicious oil used in cooking. General purpose."
icon_state = "oliveoil"
center_of_mass = list("x"=16, "y"=6)
- if("sugar")
+ if(REAGENT_ID_SUGAR)
name = "Sugar"
desc = "Tastey space sugar!"
center_of_mass = list("x"=16, "y"=6)
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/food/condiment/sugar/Initialize()
. = ..()
- reagents.add_reagent("sugar", 50)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 50)
/obj/item/reagent_containers/food/condiment/ketchup/Initialize()
. = ..()
@@ -237,7 +237,7 @@
/obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize()
. = ..()
- reagents.add_reagent("sodiumchloride", 20)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 20)
/obj/item/reagent_containers/food/condiment/small/peppermill //Keeping name here to save map based headaches
name = "pepper shaker"
@@ -260,13 +260,13 @@
reagents.add_reagent("blackpepper", 30)
/obj/item/reagent_containers/food/condiment/small/sugar
- name = "sugar"
+ name = REAGENT_ID_SUGAR
desc = "Sweetness in a bottle"
icon_state = "sugarsmall"
/obj/item/reagent_containers/food/condiment/small/sugar/Initialize()
. = ..()
- reagents.add_reagent("sugar", 20)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 20)
//MRE condiments and drinks.
@@ -284,7 +284,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/salt/Initialize()
. = ..()
- reagents.add_reagent("sodiumchloride", 5)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/pepper
name = "pepper packet"
@@ -302,7 +302,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/sugar/Initialize()
. = ..()
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/condiment/small/packet/jelly
name = "jelly packet"
@@ -495,7 +495,7 @@
/obj/item/reagent_containers/food/condiment/carton/sugar
name = "sugar carton"
desc = "A big carton of sugar. Sweet!"
- icon_state = "sugar"
+ icon_state = REAGENT_ID_SUGAR
volume = 120
center_of_mass = list("x"=16, "y"=8)
@@ -505,7 +505,7 @@
/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize()
. = ..()
- reagents.add_reagent("sugar", 100)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 100)
/obj/item/reagent_containers/food/condiment/carton/sugar/rustic
name = "sugar sack"
@@ -534,7 +534,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/Initialize()
. = ..()
- reagents.add_reagent("protein_powder", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla
name = "vanilla protein powder packet"
@@ -543,7 +543,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla/Initialize()
. = ..()
- reagents.add_reagent("vanilla_protein_powder", 5)
+ reagents.add_reagent(REAGENT_ID_VANILLAPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana
name = "banana protein powder packet"
@@ -552,7 +552,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana/Initialize()
. = ..()
- reagents.add_reagent("banana_protein_powder", 5)
+ reagents.add_reagent(REAGENT_ID_BANANAPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate
name = "chocolate protein powder packet"
@@ -561,7 +561,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate/Initialize()
. = ..()
- reagents.add_reagent("chocolate_protein_powder", 5)
+ reagents.add_reagent(REAGENT_ID_CHOCOLATEPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry
name = "strawberry protein powder packet"
@@ -570,4 +570,4 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize()
. = ..()
- reagents.add_reagent("strawberry_protein_powder", 5)
+ reagents.add_reagent(REAGENT_ID_STRAWBERRYPROTEINPOWDER, 5)
diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm
index 3d48ab9068..97db510bd5 100644
--- a/code/modules/food/food/drinks/drinkingglass.dm
+++ b/code/modules/food/food/drinks/drinkingglass.dm
@@ -157,7 +157,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 30)
- reagents.add_reagent("iron", 10)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
+ reagents.add_reagent(REAGENT_ID_IRON, 10)
reagents.add_reagent("protein", 15)
- reagents.add_reagent("water", 45)
\ No newline at end of file
+ reagents.add_reagent(REAGENT_ID_WATER, 45)
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 0a89dd26b8..9674d5cf55 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -53,7 +53,7 @@
/obj/item/reagent_containers/food/snacks/Initialize()
. = ..()
if(nutriment_amt)
- reagents.add_reagent("nutriment",(nutriment_amt*2),nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc)
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/living/M)
@@ -116,7 +116,7 @@
var/swallow_whole = FALSE
var/obj/belly/belly_target // These are surprise tools that will help us later
- var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
+ var/fullness = M.nutrition + (M.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 25)
if(M == user) //If you're eating it yourself
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/snacks/candy/donor/Initialize()
. = ..()
- reagents.add_reagent("sugar", 3)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -475,7 +475,7 @@
/obj/item/reagent_containers/food/snacks/candy_corn/Initialize()
. = ..()
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/chocolatebar //not a vending item
name = "Chocolate Bar"
@@ -489,7 +489,7 @@
/obj/item/reagent_containers/food/snacks/chocolatebar/Initialize()
. = ..()
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
reagents.add_reagent("coco", 2)
/obj/item/reagent_containers/food/snacks/chocolatepiece
@@ -527,7 +527,7 @@
/obj/item/reagent_containers/food/snacks/chocolateegg/Initialize()
. = ..()
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
reagents.add_reagent("coco", 2)
/obj/item/reagent_containers/food/snacks/donut
@@ -548,7 +548,7 @@
desc = "A plain ol' donut."
/obj/item/reagent_containers/food/snacks/donut/plain/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly
name = "plain jelly donut"
@@ -556,7 +556,7 @@
desc = "At least this one has jelly!"
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/pink
@@ -566,7 +566,7 @@
overlay_state = "donut_pink_inbox"
/obj/item/reagent_containers/food/snacks/donut/pink/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/pink/jelly
name = "pink frosted jelly donut"
@@ -574,7 +574,7 @@
desc = "This one has pink frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/purple
@@ -584,7 +584,7 @@
overlay_state = "donut_purple_inbox"
/obj/item/reagent_containers/food/snacks/donut/purple/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/purple/jelly
name = "purple frosted jelly donut"
@@ -592,7 +592,7 @@
desc = "This one has purple frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/green
@@ -602,7 +602,7 @@
overlay_state = "donut_green_inbox"
/obj/item/reagent_containers/food/snacks/donut/green/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/green/jelly
name = "green frosted jelly donut"
@@ -610,7 +610,7 @@
desc = "This one has green frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/beige
@@ -620,7 +620,7 @@
overlay_state = "donut_beige_inbox"
/obj/item/reagent_containers/food/snacks/donut/beige/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/beige/jelly
name = "beige frosted jelly donut"
@@ -628,7 +628,7 @@
desc = "This one has beige frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/choc
@@ -638,7 +638,7 @@
overlay_state = "donut_choc_inbox"
/obj/item/reagent_containers/food/snacks/donut/choc/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("chocolate", 5)
/obj/item/reagent_containers/food/snacks/donut/choc/jelly
@@ -647,7 +647,7 @@
desc = "This one has chocolate frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("chocolate", 5)
@@ -658,7 +658,7 @@
overlay_state = "donut_blue_inbox"
/obj/item/reagent_containers/food/snacks/donut/blue/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/blue/jelly
name = "blue frosted jelly donut"
@@ -666,7 +666,7 @@
desc = "This one has blue frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/yellow
@@ -676,7 +676,7 @@
overlay_state = "donut_yellow_inbox"
/obj/item/reagent_containers/food/snacks/donut/yellow/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly
name = "yellow frosted jelly donut"
@@ -684,7 +684,7 @@
desc = "This one has yellow frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/olive
@@ -694,7 +694,7 @@
overlay_state = "donut_olive_inbox"
/obj/item/reagent_containers/food/snacks/donut/olive/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/olive/jelly
name = "olive frosted jelly donut"
@@ -702,7 +702,7 @@
desc = "This one has olive frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/homer
@@ -712,7 +712,7 @@
overlay_state = "donut_homer_inbox"
/obj/item/reagent_containers/food/snacks/donut/homer/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
/obj/item/reagent_containers/food/snacks/donut/homer/jelly
@@ -721,7 +721,7 @@
desc = "It's a d'ohnut with jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
@@ -732,7 +732,7 @@
overlay_state = "donut_choc_sprinkles_inbox"
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("chocolate", 1)
@@ -742,7 +742,7 @@
desc = "Pretty sure this is the most sugar you can pack into a donut."
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("chocolate", 1)
@@ -763,7 +763,7 @@
overlay_state = "donut_laugh_inbox"
/obj/item/reagent_containers/food/snacks/donut/laugh/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly
name = "laugh jelly donut"
@@ -771,7 +771,7 @@
desc = "Try not to be jelly."
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
@@ -789,7 +789,7 @@
reagents.add_reagent("sprinkles", 1)
switch(rand(1,10))
if(1)
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
if(2)
reagents.add_reagent("capsaicin", 3)
if(3)
@@ -909,7 +909,7 @@
/obj/item/reagent_containers/food/snacks/friedegg/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("blackpepper", 1)
/obj/item/reagent_containers/food/snacks/boiledegg
@@ -1016,7 +1016,7 @@
/obj/item/reagent_containers/food/snacks/crab_legs/Initialize()
. = ..()
reagents.add_reagent("seafood", 6)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
@@ -1054,7 +1054,7 @@
/obj/item/reagent_containers/food/snacks/mushroomslice/Initialize()
. = ..()
- reagents.add_reagent("psilocybin", 3)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -1090,7 +1090,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
- reagents.add_reagent("pacid",6)
+ reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "spider meat"
@@ -1102,8 +1102,8 @@
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
. = ..()
- reagents.add_reagent("spidertoxin",6)
- reagents.remove_reagent("pacid",6)
+ reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6)
+ reagents.remove_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/meatball
name = "meatball"
@@ -1212,7 +1212,7 @@
icon_state = "dankpocket"
nutriment_amt = 2
nutriment_desc = list("heartiness" = 1, "dough" = 2)
- heated_reagents = list("bliss" = 5)
+ heated_reagents = list(REAGENT_ID_BLISS = 5)
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket
name = "\improper Sin-pocket"
@@ -1518,7 +1518,7 @@
/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 3)
- reagents.add_reagent("psilocybin", 1)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1)
/obj/item/reagent_containers/food/snacks/plump_pie
name = "plump pie"
@@ -1535,7 +1535,7 @@
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
- reagents.add_reagent("nutriment", 8, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, nutriment_desc)
reagents.add_reagent("tricordrazine", 5)
/obj/item/reagent_containers/food/snacks/xemeatpie
@@ -1752,7 +1752,7 @@
/obj/item/reagent_containers/food/snacks/blackpudding/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
- reagents.add_reagent("blood", 5)
+ reagents.add_reagent(REAGENT_ID_BLOOD, 5)
/obj/item/reagent_containers/food/snacks/soydope
name = "Soy Dope"
@@ -1786,7 +1786,7 @@
/obj/item/reagent_containers/food/snacks/badrecipe/Initialize()
. = ..()
reagents.add_reagent("toxin", 1)
- reagents.add_reagent("carbon", 3)
+ reagents.add_reagent(REAGENT_ID_CARBON, 3)
/obj/item/reagent_containers/food/snacks/meatsteak
name = "Meat steak"
@@ -1800,7 +1800,7 @@
/obj/item/reagent_containers/food/snacks/meatsteak/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("blackpepper", 1)
/obj/item/reagent_containers/food/snacks/spacylibertyduff
@@ -1816,7 +1816,7 @@
/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize()
. = ..()
- reagents.add_reagent("psilocybin", 6)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 6)
/obj/item/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -1832,7 +1832,7 @@
/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 6)
- reagents.add_reagent("psilocybin", 3)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/poppypretzel
name = "Poppy pretzel"
@@ -1895,7 +1895,7 @@
Expand()
/obj/item/reagent_containers/food/snacks/monkeycube/on_reagent_change()
- if(reagents.has_reagent("water"))
+ if(reagents.has_reagent(REAGENT_ID_WATER))
Expand()
/obj/item/reagent_containers/food/snacks/monkeycube/wrapped
@@ -1981,7 +1981,7 @@
reagents.add_reagent("protein", 10)
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/baguette
name = "Baguette"
@@ -1996,7 +1996,7 @@
/obj/item/reagent_containers/food/snacks/baguette/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishandchips
name = "Fish and Chips"
@@ -2025,7 +2025,7 @@
/obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize()
. = ..()
- reagents.add_reagent("psilocybin", 8)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 8)
/obj/item/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -2290,7 +2290,7 @@
/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
- reagents.add_reagent("carbon", 2)
+ reagents.add_reagent(REAGENT_ID_CARBON, 2)
/obj/item/reagent_containers/food/snacks/grilledcheese
name = "Grilled Cheese Sandwich"
@@ -2358,7 +2358,7 @@
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
- reagents.add_reagent("nutriment", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -2431,7 +2431,7 @@
/obj/item/reagent_containers/food/snacks/meatballsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 8)
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/slimesoup
name = "slime soup"
@@ -2444,7 +2444,7 @@
/obj/item/reagent_containers/food/snacks/slimesoup/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
@@ -2458,8 +2458,8 @@
/obj/item/reagent_containers/food/snacks/bloodsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
- reagents.add_reagent("blood", 10)
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_BLOOD, 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/clownstears
name = JOB_CLOWN + "'s Tears"
@@ -2475,7 +2475,7 @@
/obj/item/reagent_containers/food/snacks/clownstears/Initialize()
. = ..()
reagents.add_reagent("banana", 5)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -2490,7 +2490,7 @@
/obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize()
. = ..()
- reagents.add_reagent("vegetable_soup", 10)
+ reagents.add_reagent(REAGENT_ID_VEGETABLESOUP, 10)
/obj/item/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -2506,7 +2506,7 @@
/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize()
. = ..()
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
reagents.add_reagent("tricordrazine", 5)
/obj/item/reagent_containers/food/snacks/mysterysoup
@@ -2526,37 +2526,37 @@
var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
switch(mysteryselect)
if(1)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
if(2)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
if(3)
- reagents.add_reagent("nutriment", 5, nutriment_desc)
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
reagents.add_reagent("tricordrazine", 5)
if(4)
- reagents.add_reagent("nutriment", 5, nutriment_desc)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
if(5)
- reagents.add_reagent("nutriment", 2, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2, nutriment_desc)
reagents.add_reagent("banana", 10)
if(6)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
- reagents.add_reagent("blood", 10)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_BLOOD, 10)
if(7)
reagents.add_reagent("slimejelly", 10)
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
if(8)
- reagents.add_reagent("carbon", 10)
+ reagents.add_reagent(REAGENT_ID_CARBON, 10)
reagents.add_reagent("toxin", 10)
if(9)
- reagents.add_reagent("nutriment", 5, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent("tomatojuice", 10)
if(10)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
@@ -2572,10 +2572,10 @@
/obj/item/reagent_containers/food/snacks/wishsoup/Initialize()
. = ..()
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
if(prob(25))
src.desc = "A wish come true!"
- reagents.add_reagent("nutriment", 8, list("something good" = 8))
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, list("something good" = 8))
/obj/item/reagent_containers/food/snacks/tomatosoup
name = "Tomato Soup"
@@ -2589,7 +2589,7 @@
/obj/item/reagent_containers/food/snacks/tomatosoup/Initialize()
. = ..()
- reagents.add_reagent("tomato_soup", 10)
+ reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 10)
/obj/item/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -2603,7 +2603,7 @@
/obj/item/reagent_containers/food/snacks/mushroomsoup/Initialize()
. = ..()
- reagents.add_reagent("mushroom_soup", 10)
+ reagents.add_reagent(REAGENT_ID_MUSHROOMSOUP, 10)
/obj/item/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -2618,7 +2618,7 @@
/obj/item/reagent_containers/food/snacks/beetsoup/Initialize()
. = ..()
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
- reagents.add_reagent("beet_soup", 10)
+ reagents.add_reagent(REAGENT_ID_BEETSOUP, 10)
/obj/item/reagent_containers/food/snacks/soup/onion
name = "onion soup"
@@ -2632,7 +2632,7 @@
/obj/item/reagent_containers/food/snacks/soup/onion/Initialize()
. = ..()
- reagents.add_reagent("onion_soup", 10)
+ reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10)
/obj/item/reagent_containers/food/snacks/chickennoodlesoup
name = "chicken noodle soup"
@@ -2644,7 +2644,7 @@
/obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
. = ..()
- reagents.add_reagent("chicken_noodle_soup", 10)
+ reagents.add_reagent(REAGENT_ID_CHICKENNOODLESOUP, 10)
/obj/item/reagent_containers/food/snacks/stew
name = "Stew"
@@ -2664,7 +2664,7 @@
reagents.add_reagent("protein", 4)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/bearstew
name = "bear stew"
@@ -2684,7 +2684,7 @@
reagents.add_reagent("hyperzine", 5)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/hotchili
@@ -3435,7 +3435,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
- reagents.add_reagent("ambrosia_extract", 2)
+ reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
reagents.add_reagent("bicaridine", 1)
reagents.add_reagent("kelotane", 1)
reagents.add_reagent("toxin", 1)
@@ -3503,7 +3503,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize()
. = ..()
- reagents.add_reagent("sugar", 9)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 9)
reagents.add_reagent("coco", 5)
/obj/item/reagent_containers/food/snacks/bucheslice
@@ -3531,7 +3531,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("cookingoil", 1)
/obj/item/reagent_containers/food/snacks/turkeyslice
@@ -3561,7 +3561,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("cookingoil", 1)
/obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra()
@@ -4039,7 +4039,7 @@
/obj/item/reagent_containers/food/snacks/dionaroast/Initialize()
. = ..()
- reagents.add_reagent("radium", 2)
+ reagents.add_reagent(REAGENT_ID_RADIUM, 2)
/obj/item/reagent_containers/food/snacks/dough
name = "dough"
@@ -4281,7 +4281,7 @@
reagents.add_reagent("oxycodone", 1)
reagents.add_reagent("sifsap", 5)
- reagents.add_reagent("bliss", 5)
+ reagents.add_reagent(REAGENT_ID_BLISS, 5)
/obj/item/reagent_containers/food/snacks/bellefritter
name = "frostbelle fritters"
@@ -4295,7 +4295,7 @@
/obj/item/reagent_containers/food/snacks/bellefritter/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/roastedsunflower
name = "sunflower seeds"
@@ -4333,7 +4333,7 @@
/obj/item/reagent_containers/food/snacks/liquidfood/Initialize()
. = ..()
- reagents.add_reagent("iron", 3)
+ reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidprotein
name = "\improper LiquidProtein Ration"
@@ -4349,7 +4349,7 @@
/obj/item/reagent_containers/food/snacks/liquidprotein/Initialize()
. = ..()
reagents.add_reagent("protein", 30)
- reagents.add_reagent("iron", 3)
+ reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidvitamin
name = "\improper VitaPaste Ration"
@@ -4368,7 +4368,7 @@
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("paracetamol", 5)
reagents.add_reagent("enzyme", 1)
- reagents.add_reagent("iron", 3)
+ reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/meatcube
name = "cubed meat"
@@ -4564,7 +4564,7 @@
icon_state = "rosesalad"
filling_color = "#FF3867"
nutriment_amt = 10
- nutriment_desc = list("bittersweet" = 10, "iron" = 5)
+ nutriment_desc = list("bittersweet" = 10, REAGENT_ID_IRON = 5)
bitesize = 4
/obj/item/reagent_containers/food/snacks/rosesalad/Initialize()
@@ -4919,7 +4919,7 @@
// composition_reagent = "slimejelly"
/mob/living/carbon/alien/diona
- composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein
+ composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein
/mob/living/simple_mob/slime
composition_reagent = "slimejelly"
@@ -5009,7 +5009,7 @@
/obj/item/reagent_containers/food/snacks/funnelcake/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/spreads
name = "nutri-spread"
@@ -5031,7 +5031,7 @@
/obj/item/reagent_containers/food/snacks/spreads/Initialize()
. = ..()
reagents.add_reagent("triglyceride", 20)
- reagents.add_reagent("sodiumchloride",1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1)
/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/material/knife))
@@ -6190,7 +6190,7 @@
/obj/item/reagent_containers/food/snacks/candy/Initialize()
. = ..()
- reagents.add_reagent("sugar", 3)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/namagashi
name = "\improper Ryo-kucha Namagashi"
@@ -6206,7 +6206,7 @@
/obj/item/reagent_containers/food/snacks/namagashi/Initialize()
. = ..()
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/candy/proteinbar
name = "\improper SwoleMAX protein bar"
@@ -6222,7 +6222,7 @@
/obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- reagents.add_reagent("sugar", 4)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/candy/gummy
name = "\improper AlliCo Gummies"
@@ -6237,7 +6237,7 @@
/obj/item/reagent_containers/food/snacks/candy/gummy/Initialize()
. = ..()
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/cookiesnack
name = "Carps Ahoy! miniature cookies"
@@ -6259,12 +6259,12 @@
icon_state = "fruitbar"
trash = /obj/item/trash/candy/fruitbar
nutriment_amt = 13
- nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
+ nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
bitesize = 6
/obj/item/reagent_containers/food/snacks/fruitbar/Initialize()
. = ..()
- reagents.add_reagent("sugar", 4)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/////////////////////////////////////////////////////////////////////////////
//////////////////////////////Candy Bars (1-10)//////////////////////////////
@@ -6285,7 +6285,7 @@
/obj/item/reagent_containers/food/snacks/cb01/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb02
name = "\improper Hundred-Thousand Thaler Bar"
@@ -6302,7 +6302,7 @@
/obj/item/reagent_containers/food/snacks/cb02/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb03
name = "\improper Aerostat Bar"
@@ -6319,7 +6319,7 @@
/obj/item/reagent_containers/food/snacks/cb03/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb04
name = "\improper Lars' Saltlakris"
@@ -6336,7 +6336,7 @@
/obj/item/reagent_containers/food/snacks/cb04/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb05
name = "\improper Andromeda Bar"
@@ -6353,7 +6353,7 @@
/obj/item/reagent_containers/food/snacks/cb05/Initialize()
. = ..()
- reagents.add_reagent("sugar", 3)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/cb06
name = "\improper Mocha Crunch"
@@ -6370,7 +6370,7 @@
/obj/item/reagent_containers/food/snacks/cb06/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("coffee", 1)
/obj/item/reagent_containers/food/snacks/cb07
@@ -6388,7 +6388,7 @@
/obj/item/reagent_containers/food/snacks/cb07/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb08
name = "\improper Cronk Bar"
@@ -6405,7 +6405,7 @@
/obj/item/reagent_containers/food/snacks/cb08/Initialize()
. = ..()
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/cb09
name = "\improper Kaju Mamma! Bar"
@@ -6422,7 +6422,7 @@
/obj/item/reagent_containers/food/snacks/cb09/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("milk", 1)
reagents.add_reagent("peanutoil", 1)
@@ -6441,7 +6441,7 @@
/obj/item/reagent_containers/food/snacks/cb10/Initialize()
. = ..()
- reagents.add_reagent("sugar", 1)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("protein", 1)
reagents.add_reagent("peanutoil", 1)
@@ -6664,7 +6664,7 @@
//
///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize()
// . = ..()
-// reagents.add_reagent("sugar", 4)
+// reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -6936,12 +6936,12 @@
/obj/item/reagent_containers/food/snacks/old/Initialize()
.=..()
reagents.add_reagent(pick(list(
- "fuel",
+ REAGENT_ID_FUEL,
"amatoxin",
"carpotoxin",
"zombiepowder",
"cryptobiolin",
- "psilocybin")), 5)
+ REAGENT_ID_PSILOCYBIN)), 5)
reagents.add_reagent("salmonella", 5)
/obj/item/reagent_containers/food/snacks/old/pizza
@@ -6997,7 +6997,7 @@
/obj/item/reagent_containers/food/snacks/canned/beef/Initialize()
.=..()
reagents.add_reagent("protein", 4)
- reagents.add_reagent("sodiumchloride", 2)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/beans
name = "baked beans"
@@ -7027,7 +7027,7 @@
/obj/item/reagent_containers/food/snacks/canned/tomato/Initialize()
.=..()
- reagents.add_reagent("tomato_soup", 12)
+ reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 12)
/obj/item/reagent_containers/food/snacks/canned/spinach
name = "spinach"
@@ -7044,7 +7044,7 @@
.=..()
reagents.add_reagent("adrenaline", 4)
reagents.add_reagent("hyperzine", 4)
- reagents.add_reagent("iron", 4)
+ reagents.add_reagent(REAGENT_ID_IRON, 4)
//////////////////////////////Advanced Canned Food//////////////////////////////
@@ -7092,7 +7092,7 @@
/obj/item/reagent_containers/food/snacks/canned/maps/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
- reagents.add_reagent("sodiumchloride", 2)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/appleberry
name = "\improper Appleberry Bits"
@@ -7108,7 +7108,7 @@
/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize()
. = ..()
reagents.add_reagent("milk", 8)
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/canned/ntbeans
name = "baked beans"
@@ -7137,7 +7137,7 @@
filling_color = "#caa3c9"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
- var/brainmeat = "brain_protein"
+ var/brainmeat = REAGENT_ID_BRAINPROTEIN
/obj/item/reagent_containers/food/snacks/canned/brainzsnax/Initialize()
. = ..()
@@ -7155,7 +7155,7 @@
filling_color = "#a6898d"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
- brainmeat = "red_brain_protein"
+ brainmeat = REAGENT_ID_REDBRAINPROTEIN
//////////////Packaged Food - break open and eat//////////////
@@ -7221,7 +7221,7 @@
/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize()
. = ..()
- reagents.add_reagent("sugar", 4)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/packaged/genration
name = "generic ration"
@@ -7277,7 +7277,7 @@
/obj/item/reagent_containers/food/snacks/packaged/sweetration/Initialize()
. = ..()
- reagents.add_reagent("sugar", 6)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 6)
/obj/item/reagent_containers/food/snacks/packaged/vendburger
name = "packaged burger"
@@ -7290,7 +7290,7 @@
/obj/item/reagent_containers/food/snacks/packaged/vendburger/Initialize()
. = ..()
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/packaged/vendhotdog
name = "packaged hotdog"
@@ -7303,7 +7303,7 @@
/obj/item/reagent_containers/food/snacks/packaged/vendhotdog/Initialize()
. = ..()
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/packaged/vendburrito
name = "packaged burrito"
@@ -7316,4 +7316,4 @@
/obj/item/reagent_containers/food/snacks/packaged/vendburrito/Initialize()
. = ..()
- reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index 90f1088534..8cecbf1977 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -80,7 +80,7 @@
/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize()
. = ..()
- reagents.add_reagent("psilocybin", 3)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -116,7 +116,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
- reagents.add_reagent("pacid",6)
+ reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "insect meat"
@@ -128,8 +128,8 @@
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
. = ..()
- reagents.add_reagent("spidertoxin",6)
- reagents.remove_reagent("pacid",6)
+ reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6)
+ reagents.remove_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/rawturkey
name = "raw turkey"
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index fbc04990f8..5e1fea294b 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -38,7 +38,7 @@
/obj/item/reagent_containers/food/snacks/goulash/Initialize()
. = ..()
reagents.add_reagent("protein", 3) //For meaty things.
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/donerkebab
@@ -79,7 +79,7 @@
/obj/item/reagent_containers/food/snacks/reishicup/Initialize()
. = ..()
- reagents.add_reagent("psilocybin", 3)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
bitesize = 6
/obj/item/storage/box/wings //This is kinda like the donut box.
@@ -134,7 +134,7 @@
/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize()
. = ..()
bitesize = 2
- reagents.add_reagent("hot_n_sour_soup", 10)
+ reagents.add_reagent(REAGENT_ID_HOTNSOURSOUP, 10)
/obj/item/reagent_containers/food/snacks/kitsuneudon
name = "kitsune udon"
@@ -178,7 +178,7 @@
/obj/item/reagent_containers/food/snacks/bugball/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
- reagents.add_reagent("carbon", 5)
+ reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 7
/obj/item/reagent_containers/food/snacks/pillbug
@@ -207,7 +207,7 @@
/obj/item/reagent_containers/food/snacks/pillbug/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
- reagents.add_reagent("carbon", 5)
+ reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 3
/obj/item/reagent_containers/food/snacks/mammi
@@ -263,7 +263,7 @@
bitesize = 5
reagents.add_reagent("protein", 20)
reagents.add_reagent("tricordrazine", 5)
- reagents.add_reagent("iron", 5)
+ reagents.add_reagent(REAGENT_ID_IRON, 5)
/obj/item/reagent_containers/food/snacks/cuttlefish
name = "raw cuttlefish"
@@ -343,7 +343,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize()
. = ..()
bitesize = 0.01 //impossible to eat
- reagents.add_reagent("carbon", 5)
+ reagents.add_reagent(REAGENT_ID_CARBON, 5)
/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk
name = "chunk of shark meat"
@@ -472,14 +472,14 @@
qdel(src)
/obj/item/reagent_containers/food/snacks/cube/on_reagent_change()
- if(reagents.has_reagent("water"))
+ if(reagents.has_reagent(REAGENT_ID_WATER))
Expand()
/obj/item/reagent_containers/food/snacks/cube/protein
/obj/item/reagent_containers/food/snacks/cube/protein/Initialize()
. = ..()
- reagents.add_reagent("meatcolony", 5)
+ reagents.add_reagent(REAGENT_ID_MEATCOLONY, 5)
/obj/item/reagent_containers/food/snacks/proteinslab
name = "Protein slab"
@@ -502,7 +502,7 @@
/obj/item/reagent_containers/food/snacks/cube/nutriment/Initialize()
. = ..()
- reagents.add_reagent("plantcolony", 5)
+ reagents.add_reagent(REAGENT_ID_PLANTCOLONY, 5)
/obj/item/reagent_containers/food/snacks/nutrimentslab
name = "Nutriment slab"
@@ -561,7 +561,7 @@
/obj/item/reagent_containers/food/snacks/nachos/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 1)
bitesize = 1
/obj/item/reagent_containers/food/snacks/cheesenachos
@@ -573,7 +573,7 @@
/obj/item/reagent_containers/food/snacks/cheesenachos/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
reagents.add_reagent("protein", 2)
bitesize = 2
@@ -590,7 +590,7 @@
/obj/item/reagent_containers/food/snacks/milosoup/Initialize()
. = ..()
- reagents.add_reagent("water", 5)
+ reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/onionsoup
name = "Onion Soup"
@@ -604,7 +604,7 @@
/obj/item/reagent_containers/food/snacks/onionsoup/Initialize()
. = ..()
- reagents.add_reagent("onion_soup", 10)
+ reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10)
//Fennec foods
/obj/item/storage/box/wings/bucket
@@ -691,7 +691,7 @@
/obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2)
reagents.add_reagent("protein", 4)
bitesize = 4
@@ -736,7 +736,7 @@
/obj/item/reagent_containers/food/snacks/honey_candy/Initialize()
. = ..()
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/locust
@@ -981,28 +981,28 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list("sugar" = 5, "berry" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2)
/obj/item/reagent_containers/food/snacks/winegum/orange
icon_state = "winegum_orange"
- nutriment_desc = list("sugar" = 5, "orange" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "orange" = 2)
/obj/item/reagent_containers/food/snacks/winegum/black
icon_state = "winegum_black"
- nutriment_desc = list("sugar" = 5, "berry" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2)
/obj/item/reagent_containers/food/snacks/winegum/green
icon_state = "winegum_green"
- nutriment_desc = list("sugar" = 5, "lime" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lime" = 2)
/obj/item/reagent_containers/food/snacks/winegum/yellow
icon_state = "winegum_yellow"
- nutriment_desc = list("sugar" = 5, "lemon" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lemon" = 2)
/obj/item/reagent_containers/food/snacks/winegum/white
icon_state = "winegum_white"
- nutriment_desc = list("sugar" = 5, "pineapplejuice" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "pineapplejuice" = 2)
/obj/item/storage/box/winegum //This is kinda like the donut box.
name = "Desatti Wine Gums"
@@ -1044,7 +1044,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list("sugar" = 5)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5)
var/list/color_options = list("saucer_pink","saucer_blue","saucer_orange","saucer_green","saucer_yellow")
/obj/item/reagent_containers/food/snacks/saucer/Initialize()
@@ -1149,7 +1149,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list("sugar" = 5, "banana" = 3)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "banana" = 3)
/obj/item/reagent_containers/food/snacks/foam_shrimp
name = "Foam Shrimp"
@@ -1159,7 +1159,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list("sugar" = 5, "strawberry" = 3)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "strawberry" = 3)
/obj/item/storage/box/shrimpsandbananas //This is kinda like the donut box.
name = "Shrimps and Bananas"
@@ -1184,7 +1184,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list("sugar" = 5, "rhubarb" = 2, "custard" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, "rhubarb" = 2, "custard" = 2)
var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2")
/obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize()
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 74f94c5575..9d6edf9e89 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -1,7 +1,7 @@
// Chaos cake
/datum/recipe/chaoscake_layerone
- reagents = list("flour" = 30,"milk" = 20, "sugar" = 10, "egg" = 9)
+ reagents = list("flour" = 30,"milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9)
fruit = list("poisonberries" = 2, "cherries" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meat/,
@@ -12,7 +12,7 @@
result = /obj/structure/chaoscake
/datum/recipe/chaoscake_layertwo
- reagents = list("flour" = 30, "milk" = 20, "sugar" = 10, "egg" = 9, )
+ reagents = list("flour" = 30, "milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9, )
fruit = list("vanilla" = 2, "banana" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -23,7 +23,7 @@
result = /obj/item/chaoscake_layer
/datum/recipe/chaoscake_layerthree
- reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "deathbell" = 10)
+ reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "deathbell" = 10)
fruit = list("grapes" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -33,7 +33,7 @@
result = /obj/item/chaoscake_layer/three
/datum/recipe/chaoscake_layerfour
- reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "milkshake" = 30)
+ reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "milkshake" = 30)
fruit = list("rice" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -43,13 +43,13 @@
result = /obj/item/chaoscake_layer/four
/datum/recipe/chaoscake_layerfive
- reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "blood" = 30)
+ reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, REAGENT_ID_BLOOD = 30)
fruit = list("tomato" = 2)
items = list() //supposed to be made with lobster, still has to be ported.
result = /obj/item/chaoscake_layer/five
/datum/recipe/chaoscake_layersix
- reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "sprinkles" = 5)
+ reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, "sprinkles" = 5)
fruit = list("apple" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -62,7 +62,7 @@
result = /obj/item/chaoscake_layer/six
/datum/recipe/chaoscake_layerseven
- reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "devilskiss" = 20)
+ reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "devilskiss" = 20)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -72,7 +72,7 @@
result = /obj/item/chaoscake_layer/seven
/datum/recipe/chaoscake_layereight
- reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "cream" = 20)
+ reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "cream" = 20)
fruit = list("lemon" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -82,7 +82,7 @@
result = /obj/item/chaoscake_layer/eight
/datum/recipe/chaoscake_layernine
- reagents = list("water" = 10, "blood" = 10)
+ reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_BLOOD = 10)
fruit = list("goldapple" = 1)
items = list()
result = /obj/item/chaoscake_layer/nine
@@ -194,24 +194,24 @@
reagents.add_reagent("shockchem", 2)
reagents.add_reagent("amatoxin", 2)
reagents.add_reagent("carpotoxin", 2)
- reagents.add_reagent("spidertoxin", 2)
+ reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2)
bitesize = 7
if(2)
name = "Slice Of Evil" //A bad trip
desc = "A mysterious slice, coated in purple frosting that smells like grapes."
nutriment_desc = list("The desire to show off an party" = 10)
reagents.add_reagent("stoxin", 2)
- reagents.add_reagent("bliss", 10)
+ reagents.add_reagent(REAGENT_ID_BLISS, 10)
reagents.add_reagent("serotrotium", 4)
reagents.add_reagent("cryptobiolin", 8)
reagents.add_reagent("mindbreaker", 10)
- reagents.add_reagent("psilocybin", 10)
+ reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10)
bitesize = 30 //even a single bite won't make you escape fate.
if(3)
name = "Slice Of Evil" //acidic
desc = "A menacing slice, smelling clearly of copper, blood clots float on top."
nutriment_desc = list("Infernal Rage" = 10)
- reagents.add_reagent("blood", 20)
+ reagents.add_reagent(REAGENT_ID_BLOOD, 20)
reagents.add_reagent("stomacid", 10)
reagents.add_reagent("mutagen", 4)
reagents.add_reagent("thirteenloko", 20)
diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm
index 50c87dcb4e..82eab62aaf 100644
--- a/code/modules/food/food/z_custom_food_vr.dm
+++ b/code/modules/food/food/z_custom_food_vr.dm
@@ -22,7 +22,7 @@ var/global/ingredientLimit = 20
. = ..()
topping = image(icon,,"[initial(icon_state)]_top")
filling = image(icon,,"[initial(icon_state)]_filling")
- src.reagents.add_reagent("nutriment",3)
+ src.reagents.add_reagent(REAGENT_ID_NUTRIMENT,3)
src.updateName()
return
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index ba16cd6889..1c1fffe6a5 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -147,7 +147,7 @@
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("pacid" = 60)
+ prefill = list(REAGENT_ID_PACID = 60)
/obj/item/reagent_containers/glass/bottle/adminordrazine
name = "adminordrazine 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)
\ No newline at end of file
+ prefill = list("biomass" = 60)
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index 274db27da7..6efeffcbc0 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -45,7 +45,7 @@
/obj/item/reagent_containers/glass/bottle/potion/lightness
name = "feather weight potion"
desc = "A small green bottle containing some mysterious liquid that claims to make you feel lighter."
- prefill = list("ickypak" = 30)
+ prefill = list(REAGENT_ID_ICKYPAK = 30)
/obj/item/reagent_containers/glass/bottle/potion/SOP
name = "standard operating potion"
@@ -55,12 +55,12 @@
/obj/item/reagent_containers/glass/bottle/potion/shrink
name = "diminution potion"
desc = "A small green bottle containing some swirling cyan liquid that claims to reduce the drinkers stature."
- prefill = list("microcillin" = 1)
+ prefill = list(REAGENT_ID_MICROCILLIN = 1)
/obj/item/reagent_containers/glass/bottle/potion/growth
name = "fire giant potion"
desc = "A small green bottle containing some bubbling yellow liquid that claims to turn the drinker into a fire giant."
- prefill = list("macrocillin" = 1, "capsaicin" = 5)
+ prefill = list(REAGENT_ID_MACROCILLIN = 1, "capsaicin" = 5)
/obj/item/reagent_containers/glass/bottle/potion/pain
name = "grit potion"
@@ -70,12 +70,12 @@
/obj/item/reagent_containers/glass/bottle/potion/faerie
name = "faerie dance potion"
desc = "A small green bottle containing some swishing pink liquid that claims to help you open your mind."
- prefill = list("psilocybin" = 30)
+ prefill = list(REAGENT_ID_PSILOCYBIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/relaxation
name = "relaxation potion"
desc = "A small green bottle containing some still green liquid that claims to make everything feel just fine, really."
- prefill = list("ambrosia_extract" = 30)
+ prefill = list(REAGENT_ID_AMBROSIAEXTRACT = 30)
/obj/item/reagent_containers/glass/bottle/potion/speed
name = "blinding speed potion"
@@ -90,12 +90,12 @@
/obj/item/reagent_containers/glass/bottle/potion/girljuice
name = "girl transformation potion"
desc = "A small green bottle containing some pretty pink liquid that claims to turn the drinker into a woman."
- prefill = list("gynorovir" = 1)
+ prefill = list(REAGENT_ID_GYNOROVIR = 1)
/obj/item/reagent_containers/glass/bottle/potion/boyjuice
name = "boy transformation potion"
desc = "A small green bottle containing some strong blue liquid that claims to turn the drinker into a man."
- prefill = list("androrovir" = 1)
+ prefill = list(REAGENT_ID_ANDROROVIR = 1)
/obj/item/reagent_containers/glass/bottle/potion/badpolymorph
name = "unstable polymorph potion"
@@ -122,17 +122,17 @@
/obj/item/reagent_containers/glass/bottle/potion/plain
name = "plain potion"
desc = "A small green bottle containing some plain transparent liquid."
- prefill = list("water" = 30)
+ prefill = list(REAGENT_ID_WATER = 30)
/obj/item/reagent_containers/glass/bottle/potion/ethanol
name = "thin potion"
desc = "A small green bottle containing some thin transparent liquid with a solvent scent."
- prefill = list("ethanol" = 30)
+ prefill = list(REAGENT_ID_ETHANOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/sugar
name = "sweet potion"
desc = "A small green bottle containing some white translucent liquid with a sweet scent."
- prefill = list("sugar" = 30)
+ prefill = list(REAGENT_ID_SUGAR = 30)
/obj/item/reagent_containers/glass/bottle/potion/capsaicin
name = "warm potion"
diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm
index 18d8f9201a..0a3c4c11a6 100644
--- a/code/modules/food/glass/bottle_vr.dm
+++ b/code/modules/food/glass/bottle_vr.dm
@@ -136,14 +136,14 @@
desc = "A small bottle of ickypak. The smell alone makes you gag."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
- prefill = list("ickypak" = 60)
+ prefill = list(REAGENT_ID_ICKYPAK = 60)
/obj/item/reagent_containers/glass/bottle/unsorbitol
name = "unsorbitol bottle"
desc = "A small bottle of unsorbitol. Sickeningly sweet."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
- prefill = list("unsorbitol" = 60)
+ prefill = list(REAGENT_ID_UNSORBITOL = 60)
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose
name = "glucose container"
diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm
index 6d95e881cd..067006e956 100644
--- a/code/modules/food/kitchen/cooking_machines/_appliance.dm
+++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm
@@ -716,16 +716,16 @@
/mob/living/proc/calculate_composition() // moved from devour.dm on aurora's side
if (!composition_reagent)//if no reagent has been set, then we'll set one
if (isSynthetic())
- src.composition_reagent = "iron"
+ src.composition_reagent = REAGENT_ID_IRON
else
if(istype(src, /mob/living/carbon/human/diona) || istype(src, /mob/living/carbon/alien/diona))
- src.composition_reagent = "nutriment" // diona are plants, not meat
+ src.composition_reagent = REAGENT_ID_NUTRIMENT // diona are plants, not meat
else
src.composition_reagent = "protein"
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
if(istype(H.species, /datum/species/diona))
- src.composition_reagent = "nutriment"
+ src.composition_reagent = REAGENT_ID_NUTRIMENT
//if the mob is a simple animal - MOB NOT ANIMAL - with a defined meat quantity
if (istype(src, /mob/living/simple_mob))
diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm
index bd9379bf52..e3edfe0ba6 100644
--- a/code/modules/food/kitchen/gibber.dm
+++ b/code/modules/food/kitchen/gibber.dm
@@ -209,7 +209,7 @@
var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src, rand(3,8))
if(istype(new_meat))
new_meat.name = "[slab_name] [new_meat.name]"
- new_meat.reagents.add_reagent("nutriment",slab_nutrition)
+ new_meat.reagents.add_reagent(REAGENT_ID_NUTRIMENT,slab_nutrition)
if(src.occupant.reagents)
src.occupant.reagents.trans_to_obj(new_meat, round(occupant.reagents.total_volume/(2 + occupant.meat_amount),1))
diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm
index 6d48a6e698..fa9ac03798 100644
--- a/code/modules/food/kitchen/icecream.dm
+++ b/code/modules/food/kitchen/icecream.dm
@@ -30,9 +30,9 @@
if(ICECREAM_BLUE)
return list("milk", "ice", "singulo")
if(CONE_WAFFLE)
- return list("flour", "sugar")
+ return list("flour", REAGENT_ID_SUGAR)
if(CONE_CHOC)
- return list("flour", "sugar", "coco")
+ return list("flour", REAGENT_ID_SUGAR, "coco")
else
return list("milk", "ice")
@@ -58,7 +58,7 @@
product_types.Add(5)
reagents.add_reagent("milk", 5)
reagents.add_reagent("flour", 5)
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 5)
reagents.add_reagent("ice", 5)
/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
@@ -98,7 +98,7 @@
// if(beaker)
// beaker.reagents.trans_to(I, 10)
if(I.reagents.total_volume < 10)
- I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
+ I.reagents.add_reagent(REAGENT_ID_SUGAR, 10 - I.reagents.total_volume)
else
to_chat(user, span_warning("There is not enough icecream left!"))
else
@@ -179,7 +179,7 @@
/obj/item/reagent_containers/food/snacks/icecream/New()
create_reagents(20)
- reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name)
name = "[flavour_name] icecream"
diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index eeadee61e7..0f239316a2 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -552,7 +552,7 @@
qdel(H.held_mob)
qdel(O)
src.reagents.clear_reagents()
- ffuu.reagents.add_reagent("carbon", amount)
+ ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount)
ffuu.reagents.add_reagent("toxin", amount/10)
return ffuu
diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm
index ce4f32982f..c288a140bb 100644
--- a/code/modules/food/recipes_fryer.dm
+++ b/code/modules/food/recipes_fryer.dm
@@ -22,7 +22,7 @@
/datum/recipe/risottoballs
appliance = FRYER
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/risotto)
coating = /datum/reagent/nutriment/coating/batter
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
@@ -32,7 +32,7 @@
/datum/recipe/bellefritter
appliance = FRYER
coating = /datum/reagent/nutriment/coating/batter
- reagents = list("sugar" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/frostbelle)
result = /obj/item/reagent_containers/food/snacks/bellefritter
result_quantity = 2
@@ -128,7 +128,7 @@
// All donuts were given reagents of 5 to equal old recipes and make for faster cook times.
/datum/recipe/jellydonut
appliance = FRYER
- reagents = list("berryjuice" = 5, "sugar" = 5)
+ reagents = list("berryjuice" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -136,23 +136,23 @@
result_quantity = 2
/datum/recipe/jellydonut/poisonberry
- reagents = list("poisonberryjuice" = 5, "sugar" = 5)
+ reagents = list("poisonberryjuice" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry
/datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies.
- reagents = list("slimejelly" = 5, "sugar" = 5)
+ reagents = list("slimejelly" = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly
/datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies.
- reagents = list("cherryjelly" = 5, "sugar" = 5)
+ reagents = list("cherryjelly" = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly
/datum/recipe/donut
appliance = FRYER
- reagents = list("sugar" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -161,7 +161,7 @@
/datum/recipe/chaosdonut
appliance = FRYER
- reagents = list("frostoil" = 10, "capsaicin" = 10, "sugar" = 10)
+ reagents = list("frostoil" = 10, "capsaicin" = 10, REAGENT_ID_SUGAR = 10)
reagent_mix = RECIPE_REAGENT_REPLACE //This creates its own reagents
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
@@ -171,7 +171,7 @@
/datum/recipe/funnelcake
appliance = FRYER
- reagents = list("sugar" = 5, "batter" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 5, "batter" = 10)
result = /obj/item/reagent_containers/food/snacks/funnelcake
result_quantity = 2
@@ -185,7 +185,7 @@
//VOREStation Add Start
/datum/recipe/generalschicken
appliance = FRYER
- reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
+ reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
diff --git a/code/modules/food/recipes_fryer_vr.dm b/code/modules/food/recipes_fryer_vr.dm
index 6843ffec34..9b2bc5d49d 100644
--- a/code/modules/food/recipes_fryer_vr.dm
+++ b/code/modules/food/recipes_fryer_vr.dm
@@ -1,6 +1,6 @@
/datum/recipe/generalschicken
appliance = FRYER
- reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
+ reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
@@ -30,8 +30,8 @@
/datum/recipe/locust
appliance = FRYER
- reagents = list("sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/locust
)
- result = /obj/item/reagent_containers/food/snacks/locust_cooked
\ No newline at end of file
+ result = /obj/item/reagent_containers/food/snacks/locust_cooked
diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm
index a357da8263..ce0e0e6bbe 100644
--- a/code/modules/food/recipes_grill.dm
+++ b/code/modules/food/recipes_grill.dm
@@ -186,7 +186,7 @@
/datum/recipe/superbiteburger
appliance = GRILL
fruit = list("tomato" = 1)
- reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, "blackpepper" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bigbiteburger,
/obj/item/reagent_containers/food/snacks/dough,
@@ -247,17 +247,17 @@
/datum/recipe/omurice/heart
appliance = GRILL
- reagents = list("rice" = 5, "ketchup" = 5, "sugar" = 5, "egg" = 3)
+ reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/heart
/datum/recipe/omurice/face
appliance = GRILL
- reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 1, "egg" = 3)
+ reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/face
/datum/recipe/meatsteak
appliance = GRILL
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/meatsteak
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 90af4ee63f..f2b7399431 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -20,14 +20,14 @@ I said no!
*/
/datum/recipe/friedegg
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
result = /obj/item/reagent_containers/food/snacks/friedegg
/datum/recipe/boiledegg
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/egg
@@ -36,7 +36,7 @@ I said no!
/datum/recipe/devilledegg
fruit = list("chili" = 1)
- reagents = list("sodiumchloride" = 2, "mayo" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "mayo" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -67,7 +67,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
/datum/recipe/muffin
- reagents = list("milk" = 5, "sugar" = 5)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -146,7 +146,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cheesymash
/datum/recipe/blackpudding
- reagents = list("blood" = 5)
+ reagents = list(REAGENT_ID_BLOOD = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sausage,
)
@@ -157,7 +157,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/popcorn
/datum/recipe/fortunecookie
- reagents = list("sugar" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper,
@@ -165,16 +165,16 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fortunecookie
/datum/recipe/syntisteak
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat/syntiflesh)
result = /obj/item/reagent_containers/food/snacks/meatsteak
/datum/recipe/spacylibertyduff
- reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5)
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
- reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
@@ -184,22 +184,22 @@ I said no!
/datum/recipe/meatballsoup
fruit = list("carrot" = 1, "potato" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meatball)
result = /obj/item/reagent_containers/food/snacks/meatballsoup
/datum/recipe/vegetablesoup
fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/vegetablesoup
/datum/recipe/nettlesoup
fruit = list("nettle" = 1, "potato" = 1)
- reagents = list("water" = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/nettlesoup
/datum/recipe/wishsoup
- reagents = list("water" = 20)
+ reagents = list(REAGENT_ID_WATER = 20)
result= /obj/item/reagent_containers/food/snacks/wishsoup
/datum/recipe/hotchili
@@ -250,11 +250,11 @@ I said no!
/datum/recipe/tomatosoup
fruit = list("tomato" = 2)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/tomatosoup
/datum/recipe/rofflewaffles
- reagents = list("psilocybin" = 5, "sugar" = 10)
+ reagents = list(REAGENT_ID_PSILOCYBIN = 5, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -264,7 +264,7 @@ I said no!
/datum/recipe/stew
fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/stew
@@ -283,7 +283,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
/datum/recipe/milosoup
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/soydope,
/obj/item/reagent_containers/food/snacks/soydope,
@@ -301,14 +301,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/stewedsoymeat
/datum/recipe/boiledspagetti
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
)
result = /obj/item/reagent_containers/food/snacks/boiledspagetti
/datum/recipe/boiledrice
- reagents = list("water" = 5, "rice" = 10)
+ reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
result = /obj/item/reagent_containers/food/snacks/boiledrice
/datum/recipe/ricepudding
@@ -317,12 +317,12 @@ I said no!
/datum/recipe/pastatomato
fruit = list("tomato" = 2)
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(/obj/item/reagent_containers/food/snacks/spagetti)
result = /obj/item/reagent_containers/food/snacks/pastatomato
/datum/recipe/meatballspagetti
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -331,7 +331,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/meatballspagetti
/datum/recipe/spesslaw
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -343,12 +343,12 @@ I said no!
/datum/recipe/candiedapple
fruit = list("apple" = 1)
- reagents = list("water" = 5, "sugar" = 5) //Makes sense seeing as how it's just syrup on the exterior
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SUGAR = 5) //Makes sense seeing as how it's just syrup on the exterior
result = /obj/item/reagent_containers/food/snacks/candiedapple
/datum/recipe/caramelapple
fruit = list("apple" = 1)
- reagents = list("milk" = 5, "sugar" = 5) //Since caramel can be made with milk I thought this was appropriate
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate
result = /obj/item/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
@@ -376,16 +376,16 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
/datum/recipe/bloodsoup
- reagents = list("blood" = 30)
+ reagents = list(REAGENT_ID_BLOOD = 30)
result = /obj/item/reagent_containers/food/snacks/bloodsoup
/datum/recipe/slimesoup
- reagents = list("water" = 10, "slimejelly" = 5)
+ reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/slimesoup
/datum/recipe/boiledslimeextract
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/slime_extract,
)
@@ -415,7 +415,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/kudzudonburi
/datum/recipe/mysterysoup
- reagents = list("water" = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/badrecipe,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -426,24 +426,24 @@ I said no!
/datum/recipe/plumphelmetbiscuit
fruit = list("plumphelmet" = 1)
- reagents = list("water" = 5, "flour" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "flour" = 5)
result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
result_quantity = 2
/datum/recipe/mushroomsoup
fruit = list("mushroom" = 1)
- reagents = list("water" = 5, "milk" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "milk" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/mushroomsoup
/datum/recipe/chawanmushi
fruit = list("mushroom" = 1)
- reagents = list("water" = 5, "soysauce" = 5, "egg" = 6)
+ reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5, "egg" = 6)
result = /obj/item/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
fruit = list("whitebeet" = 1, "cabbage" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/beetsoup
/datum/recipe/tossedsalad
@@ -487,7 +487,7 @@ I said no!
being_cooked.reagents.del_reagent("toxin")
/datum/recipe/stuffing
- reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/bread,
)
@@ -510,7 +510,7 @@ I said no!
/datum/recipe/onionsoup
fruit = list("onion" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/soup/onion
/datum/recipe/microwavebun
@@ -539,7 +539,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cutlet
/datum/recipe/roastedcornsunflowerseeds
- reagents = list("sodiumchloride" = 1, "cornoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cornoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -547,7 +547,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedsunflowerseeds
- reagents = list("sodiumchloride" = 1, "cookingoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cookingoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -555,7 +555,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedpeanutsunflowerseeds
- reagents = list("sodiumchloride" = 1, "peanutoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "peanutoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -564,24 +564,24 @@ I said no!
/datum/recipe/roastedpeanuts
fruit = list("peanut" = 2)
- reagents = list("sodiumchloride" = 2, "cookingoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cookingoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutscorn
fruit = list("peanut" = 2)
- reagents = list("sodiumchloride" = 2, "cornoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cornoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutspeanut
fruit = list("peanut" = 2)
- reagents = list("sodiumchloride" = 2, "peanutoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "peanutoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/mint
- reagents = list("sugar" = 5, "frostoil" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5, "frostoil" = 5)
result = /obj/item/reagent_containers/food/snacks/mint
/datum/recipe/sashimi
@@ -608,12 +608,12 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
- reagents = list("sugar" = 5, "egg" = 3)
+ reagents = list(REAGENT_ID_SUGAR = 5, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
result_quantity = 4
/datum/recipe/berrymuffin
- reagents = list("milk" = 5, "sugar" = 5)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -622,7 +622,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonberrymuffin
- reagents = list("milk" = 5, "sugar" = 5)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -631,7 +631,7 @@ I said no!
result_quantity = 2
/datum/recipe/ghostmuffin
- reagents = list("milk" = 5, "sugar" = 5)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -641,7 +641,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonghostmuffin
- reagents = list("milk" = 5, "sugar" = 5)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -663,11 +663,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fruitsalad
/datum/recipe/eggbowl
- reagents = list("water" = 5, "rice" = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/eggbowl
/datum/recipe/porkbowl
- reagents = list("water" = 5, "rice" = 10)
+ reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet
)
@@ -694,14 +694,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/piginblanket
/datum/recipe/bagelplain
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/bagelplain
/datum/recipe/bagelsunflower
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/rawsunflower
@@ -709,7 +709,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bagelsunflower
/datum/recipe/bagelcheese
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -717,7 +717,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bagelcheese
/datum/recipe/bagelraisin
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/no_raisin
@@ -726,14 +726,14 @@ I said no!
/datum/recipe/bagelpoppy
fruit = list("poppy" = 1)
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/bagelpoppy
/datum/recipe/bageleverything
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/fuel_assembly/supermatter
@@ -741,7 +741,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bageleverything
/datum/recipe/bageltwo
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/soulstone
@@ -786,7 +786,7 @@ I said no!
/datum/recipe/bearstew
fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/bearmeat)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bearstew
@@ -802,13 +802,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bibimbap
/datum/recipe/friedrice
- reagents = list("water" = 5, "rice" = 10, "soysauce" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "soysauce" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/friedrice
/datum/recipe/lomein
- reagents = list("water" = 5, "soysauce" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti
@@ -818,7 +818,7 @@ I said no!
/datum/recipe/chickennoodlesoup
fruit = list("carrot" = 1)
- reagents = list("water" = 10)
+ reagents = list(REAGENT_ID_WATER = 10)
items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/rawcutlet)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/chickennoodlesoup
@@ -839,7 +839,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/risotto
/datum/recipe/poachedegg
- reagents = list("spacespice" = 1, "sodiumchloride" = 1, "blackpepper" = 1, "water" = 5)
+ reagents = list("spacespice" = 1, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
@@ -857,7 +857,7 @@ I said no!
// Chip update
/datum/recipe/microwavetortilla
- reagents = list("flour" = 5, "water" = 5)
+ reagents = list("flour" = 5, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -874,7 +874,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/taco
/datum/recipe/chips
- reagents = list("sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
)
@@ -889,13 +889,13 @@ I said no!
/datum/recipe/salsa
fruit = list("chili" = 1, "tomato" = 1, "lime" = 1)
- reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
+ reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/dip/salsa
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/guac
fruit = list("chili" = 1, "lime" = 1)
- reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
+ reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -904,7 +904,7 @@ I said no!
/datum/recipe/cheesesauce
fruit = list("chili" = 1, "tomato" = 1)
- reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
+ reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge
)
@@ -1037,7 +1037,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
)
- reagents = list("blood" = 15)
+ reagents = list(REAGENT_ID_BLOOD = 15)
result = /obj/item/reagent_containers/food/snacks/riztizkzi_sea
/datum/recipe/father_breakfast
@@ -1116,7 +1116,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi
/datum/recipe/gigapuddi/happy
- reagents = list("milk" = 15, "sugar" = 5)
+ reagents = list("milk" = 15, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -1124,7 +1124,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi/happy
/datum/recipe/gigapuddi/anger
- reagents = list("milk" = 15, "sodiumchloride" = 5)
+ reagents = list("milk" = 15, REAGENT_ID_SODIUMCHLORIDE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm
index 9b53d364da..9e68234e4a 100644
--- a/code/modules/food/recipes_microwave_vr.dm
+++ b/code/modules/food/recipes_microwave_vr.dm
@@ -30,7 +30,7 @@
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
- reagents = list("sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meatsteak,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -46,7 +46,7 @@
result = /obj/item/reagent_containers/food/snacks/roastbeef
/datum/recipe/reishicup
- reagents = list("psilocybin" = 3, "sugar" = 3)
+ reagents = list(REAGENT_ID_PSILOCYBIN = 3, REAGENT_ID_SUGAR = 3)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -54,7 +54,7 @@
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
- reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "blackpepper" = 2, REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -69,7 +69,7 @@
result = /obj/item/reagent_containers/food/snacks/kitsuneudon
/datum/recipe/pillbugball
- reagents = list("carbon" = 5)
+ reagents = list(REAGENT_ID_CARBON = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meat/grubmeat
)
@@ -77,7 +77,7 @@
/datum/recipe/mammi
fruit = list("orange" = 1)
- reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_WATER = 10, "flour" = 10, "milk" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/mammi
/datum/recipe/makaroni
@@ -121,14 +121,14 @@
result = /obj/item/reagent_containers/food/snacks/monkfishcooked
/datum/recipe/sharksteak
- reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
+ reagents = list("blackpepper"= 1, REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/reagent_containers/food/snacks/sharkmeatcooked
/datum/recipe/sharkdip
- reagents = list("sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("chili" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -136,7 +136,7 @@
result = /obj/item/reagent_containers/food/snacks/sharkmeatdip
/datum/recipe/sharkcubes
- reagents = list("soysauce" = 5, "sodiumchloride" = 1)
+ reagents = list("soysauce" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -146,7 +146,7 @@
//// food cubes
/datum/recipe/foodcubes
- reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
+ reagents = list("enzyme" = 20, "virusfood" = 5, REAGENT_ID_NUTRIMENT = 15, "protein" = 15) // labor intensive
items = list()
result = /obj/item/storage/box/wings/tray
@@ -182,7 +182,7 @@
result = /obj/item/reagent_containers/food/snacks/grub_purple
/datum/recipe/honey_candy
- reagents = list("sugar" = 5, "nutriment" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_NUTRIMENT = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/honey_candy
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index 57a58cb57d..6c6e3ab2aa 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -11,7 +11,7 @@
/datum/recipe/dionaroast
appliance = OVEN
fruit = list("apple" = 1)
- reagents = list("pacid" = 5) //It dissolves the carapace. Still poisonous, though.
+ reagents = list(REAGENT_ID_PACID = 5) //It dissolves the carapace. Still poisonous, though.
items = list(/obj/item/holder/diona)
result = /obj/item/reagent_containers/food/snacks/dionaroast
reagent_mix = RECIPE_REAGENT_REPLACE //No eating polyacid
@@ -19,7 +19,7 @@
/datum/recipe/monkeysdelight
appliance = OVEN
fruit = list("banana" = 1)
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "flour" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/monkeycube
)
@@ -36,7 +36,7 @@
/* OLD RECIPE
/datum/recipe/turkey
appliance = OVEN
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -47,7 +47,7 @@
/datum/recipe/turkey
appliance = OVEN
fruit = list("potato" = 1)
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawturkey,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -56,7 +56,7 @@
/datum/recipe/tofurkey
appliance = OVEN
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -67,7 +67,7 @@
/datum/recipe/zestfish
appliance = OVEN
fruit = list("lemon" = 1)
- reagents = list("sodiumchloride" = 3)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -76,7 +76,7 @@
/datum/recipe/limezestfish
appliance = OVEN
fruit = list("lime" = 1)
- reagents = list("sodiumchloride" = 3)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -91,12 +91,12 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
- reagents = list("sodiumchloride" = 1, "yeast" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "yeast" = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/baguette
appliance = OVEN
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "yeast" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -182,7 +182,7 @@
/datum/recipe/bananabread
appliance = OVEN
fruit = list("banana" = 1)
- reagents = list("milk" = 5, "sugar" = 15)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -228,14 +228,14 @@
/datum/recipe/pie
appliance = OVEN
fruit = list("banana" = 1)
- reagents = list("sugar" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/pie
/datum/recipe/cherrypie
appliance = OVEN
fruit = list("cherries" = 1)
- reagents = list("sugar" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -262,14 +262,14 @@
/datum/recipe/pumpkinpie
appliance = OVEN
fruit = list("pumpkin" = 1)
- reagents = list("sugar" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
/datum/recipe/appletart
appliance = OVEN
fruit = list("goldapple" = 1)
- reagents = list("sugar" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 10)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/appletart
result_quantity = 2
@@ -278,7 +278,7 @@
/datum/recipe/keylimepie
appliance = OVEN
fruit = list("lime" = 2)
- reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3, "flour" = 10)
result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie
reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise
@@ -294,7 +294,7 @@
/datum/recipe/cookie
appliance = OVEN
- reagents = list("milk" = 10, "sugar" = 10)
+ reagents = list("milk" = 10, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/chocolatebar
@@ -305,7 +305,7 @@
/datum/recipe/ovenfortunecookie
appliance = OVEN
- reagents = list("sugar" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper
@@ -321,7 +321,7 @@
/datum/recipe/cracker
appliance = OVEN
- reagents = list("sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -348,7 +348,7 @@
/datum/recipe/cinnamonbun
appliance = OVEN
- reagents = list("sugar" = 15, "cream" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 15, "cream" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -515,7 +515,7 @@
/datum/recipe/pancakes
appliance = OVEN
- reagents = list("milk" = 5, "sugar" = 15)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -526,7 +526,7 @@
/datum/recipe/pancakes/berry
appliance = OVEN
fruit = list("berries" = 2)
- reagents = list("milk" = 5, "sugar" = 15)
+ reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -595,7 +595,7 @@
/datum/recipe/truffle
appliance = OVEN
- reagents = list("sugar" = 5, "cream" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5, "cream" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -605,7 +605,7 @@
/datum/recipe/croissant
appliance = OVEN
- reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, "milk" = 5, "yeast" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(/obj/item/reagent_containers/food/snacks/dough)
result = /obj/item/reagent_containers/food/snacks/croissant
@@ -623,7 +623,7 @@
/datum/recipe/suppermatter
appliance = OVEN
- reagents = list("radium" = 5, "milk" = 5)
+ reagents = list(REAGENT_ID_RADIUM = 5, "milk" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -632,7 +632,7 @@
/datum/recipe/excitingsuppermatter
appliance = OVEN
- reagents = list("radium" = 5, "spacespice" = 5)
+ reagents = list(REAGENT_ID_RADIUM = 5, "spacespice" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -641,7 +641,7 @@
/datum/recipe/waffles
appliance = OVEN
- reagents = list("sugar" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -658,7 +658,7 @@
/datum/recipe/meatbun
appliance = OVEN
fruit = list("cabbage" = 1)
- reagents = list("water" = 5)
+ reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
@@ -669,7 +669,7 @@
/datum/recipe/spicedmeatbun
appliance = OVEN
- reagents = list("spacespice" = 2, "water" = 5)
+ reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/rawcutlet
@@ -680,7 +680,7 @@
/datum/recipe/custardbun
appliance = OVEN
- reagents = list("spacespice" = 1, "water" = 5, "egg" = 3)
+ reagents = list("spacespice" = 1, REAGENT_ID_WATER = 5, "egg" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -689,7 +689,7 @@
/datum/recipe/chickenmomo
appliance = OVEN
- reagents = list("spacespice" = 2, "water" = 5)
+ reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -702,7 +702,7 @@
/datum/recipe/veggiemomo
appliance = OVEN
- reagents = list("spacespice" = 2, "water" = 5)
+ reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -711,4 +711,4 @@
)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/reagent_containers/food/snacks/veggiemomo
- result_quantity = 2
\ No newline at end of file
+ result_quantity = 2
diff --git a/code/modules/food/recipes_oven_vr.dm b/code/modules/food/recipes_oven_vr.dm
index b73704b91a..94db2d390c 100644
--- a/code/modules/food/recipes_oven_vr.dm
+++ b/code/modules/food/recipes_oven_vr.dm
@@ -1,7 +1,7 @@
/datum/recipe/scorpion
appliance = OVEN
- reagents = list("sodiumchloride" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/scorpion
)
- result = /obj/item/reagent_containers/food/snacks/scorpion_cooked
\ No newline at end of file
+ result = /obj/item/reagent_containers/food/snacks/scorpion_cooked
diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm
index ce35eeabc3..bcc84c2614 100644
--- a/code/modules/hydroponics/backtank.dm
+++ b/code/modules/hydroponics/backtank.dm
@@ -233,7 +233,7 @@
/obj/item/watertank/op/Initialize()
. = ..()
- reagents.add_reagent("fuel", 500)
+ reagents.add_reagent(REAGENT_ID_FUEL, 500)
reagents.add_reagent("cryptobiolin", 500)
reagents.add_reagent(REAGENT_ID_PHORON, 500)
reagents.add_reagent("condensedcapsaicin", 500)
@@ -266,7 +266,7 @@
/obj/item/watertank/atmos/Initialize()
. = ..()
- reagents.add_reagent("water", 200)
+ reagents.add_reagent(REAGENT_ID_WATER, 200)
/obj/item/watertank/atmos/make_noz()
return new /obj/item/reagent_containers/spray/mister/atmos(src)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index e42d0ff0cb..ac4e2083b2 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -52,7 +52,7 @@
var/list/data = list()
if(reagent_data.len > 1 && potency > 0)
rtotal += round(potency/reagent_data[2])
- if(rid == "nutriment")
+ if(rid == REAGENT_ID_NUTRIMENT)
data[seed.seed_name] = max(1,rtotal)
reagents.add_reagent(rid,max(1,rtotal),data)
@@ -70,13 +70,13 @@
desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
- if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
+ if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
if(reagents.has_reagent("anti_toxin"))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
- if(reagents.has_reagent("nutriment"))
+ if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
descriptors |= "nutritious"
if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
descriptors |= "spicy"
@@ -84,11 +84,11 @@
descriptors |= "bitter"
if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
descriptors |= "sweet-sour"
- if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
+ if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium"))
descriptors |= "radioactive"
if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
descriptors |= "poisonous"
- if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
@@ -96,7 +96,7 @@
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
- if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
+ if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID))
descriptors |= "acidic"
if(seed.get_trait(TRAIT_JUICY))
descriptors |= "juicy"
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 49d3760380..733b0c933a 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -390,7 +390,7 @@
"calvatia", "gigantea", "clitopilis", "prumulus", "entoloma", "abortivum",
"suillus", "tuber", "aestivum", "volvacea", "delica", "russula", "rozites")
- possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
+ possible_prefixes |= list("butter", "shad", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
"black", "white", "paper", "slippery", "honey", "bitter")
prefix = pick(possible_prefixes)
@@ -455,7 +455,7 @@
chems = list()
if(prob(80))
- chems["nutriment"] = list(rand(1,10),rand(10,20))
+ chems[REAGENT_ID_NUTRIMENT] = list(rand(1,10),rand(10,20))
var/additional_chems = rand(0,5)
@@ -463,10 +463,10 @@
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
"adminordrazine",
- "nutriment",
- "macrocillin",
- "microcillin",
- "normalcillin",
+ REAGENT_ID_NUTRIMENT,
+ REAGENT_ID_MACROCILLIN,
+ REAGENT_ID_MICROCILLIN,
+ REAGENT_ID_NORMALCILLIN,
"magicdust"
)
// VOREStation Edit End: Modified exclusion list
diff --git a/code/modules/hydroponics/seed_datums_vr.dm b/code/modules/hydroponics/seed_datums_vr.dm
index 5fcf7c4432..02c1c9b370 100644
--- a/code/modules/hydroponics/seed_datums_vr.dm
+++ b/code/modules/hydroponics/seed_datums_vr.dm
@@ -7,7 +7,7 @@
display_name = "Shrinking mushroom trees"
mutants = list("megam")
kitchen_tag = "microm"
- chems = list("microcillin" = list(1,20))
+ chems = list(REAGENT_ID_MICROCILLIN = list(1,20))
/datum/seed/size/New()
..()
@@ -27,7 +27,7 @@
display_name = "Mega mushroom trees"
mutants = list("microm")
kitchen_tag = "megam"
- chems = list("macrocillin" = list(1,20))
+ chems = list(REAGENT_ID_MACROCILLIN = list(1,20))
/datum/seed/size/megam/New()
..()
@@ -41,4 +41,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
/datum/seed/gnomes
- harvest_sound = 'sound/items/hooh.ogg'
\ No newline at end of file
+ harvest_sound = 'sound/items/hooh.ogg'
diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm
index 0ad44e7862..4a0f3567b4 100644
--- a/code/modules/hydroponics/seedtypes/amauri.dm
+++ b/code/modules/hydroponics/seedtypes/amauri.dm
@@ -3,7 +3,7 @@
seed_name = "amauri"
display_name = "amauri plant"
kitchen_tag = "amauri"
- chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),"nutriment" = list(1,5))
+ chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,4)
- set_trait(TRAIT_POTENCY,10)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,10)
diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm
index 289b182d9a..5e1e65a153 100644
--- a/code/modules/hydroponics/seedtypes/ambrosia.dm
+++ b/code/modules/hydroponics/seedtypes/ambrosia.dm
@@ -5,7 +5,7 @@
display_name = "ambrosia vulgaris"
kitchen_tag = "ambrosia"
mutants = list("ambrosiadeus")
- chems = list("nutriment" = list(1), "ambrosia_extract" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
/datum/seed/ambrosia/New()
..()
@@ -25,7 +25,7 @@
display_name = "ambrosia deus"
kitchen_tag = "ambrosiadeus"
mutants = list("ambrosiainfernus", "ambrosiagaia")
- chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "ambrosia_extract" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
..()
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
- chems = list("nutriment" = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), "ambrosia_extract" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
@@ -51,7 +51,7 @@
display_name = "ambrosia gaia"
kitchen_tag = "ambrosiagaia"
mutants = null
- chems = list ("earthsblood" = list(3,5), "nutriment" = list(1,3))
+ chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
/datum/seed/ambrosia/gaia/New()
..()
@@ -65,4 +65,4 @@
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#ffb500")
set_trait(TRAIT_PRODUCT_COLOUR, "#ffee00")
- set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm
index 4bd8a0bade..ff909ff146 100644
--- a/code/modules/hydroponics/seedtypes/apples.dm
+++ b/code/modules/hydroponics/seedtypes/apples.dm
@@ -5,7 +5,7 @@
display_name = "apple tree"
kitchen_tag = "apple"
mutants = list("poisonapple","goldapple")
- chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20))
/datum/seed/apple/New()
..()
@@ -31,7 +31,7 @@
display_name = "gold apple tree"
kitchen_tag = "goldapple"
mutants = null
- chems = list("nutriment" = list(1,10), "gold" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5))
/datum/seed/apple/gold/New()
..()
@@ -46,7 +46,7 @@
seed_name = "sivian pod"
display_name = "sivian pod"
kitchen_tag = "apple"
- chems = list("nutriment" = list(1,5),"sifsap" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20))
/datum/seed/apple/sif/New()
..()
@@ -59,4 +59,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_FLESH_COLOUR,"#05157d")
- set_trait(TRAIT_IDEAL_LIGHT, 1)
\ No newline at end of file
+ set_trait(TRAIT_IDEAL_LIGHT, 1)
diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm
index 3654a62cb3..08fe6eb1b4 100644
--- a/code/modules/hydroponics/seedtypes/berries.dm
+++ b/code/modules/hydroponics/seedtypes/berries.dm
@@ -5,7 +5,7 @@
display_name = "berry bush"
kitchen_tag = "berries"
mutants = list("glowberries","poisonberries")
- chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10))
/datum/seed/berry/New()
..()
@@ -26,7 +26,7 @@
seed_name = "glowberry"
display_name = "glowberry bush"
mutants = null
- chems = list("nutriment" = list(1,10), "uranium" = list(3,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5))
/datum/seed/berry/glow/New()
..()
@@ -47,7 +47,7 @@
kitchen_tag = "poisonberries"
display_name = "poison berry bush"
mutants = list("deathberries")
- chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
/datum/seed/berry/poison/New()
..()
@@ -60,7 +60,7 @@
seed_name = "death berry"
display_name = "death berry bush"
mutants = null
- chems = list("nutriment" = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
/datum/seed/berry/poison/death/New()
..()
@@ -79,4 +79,4 @@
/datum/seed/berry/peppercorn/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#303030")
- set_trait(TRAIT_WATER_CONSUMPTION, 2)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 2)
diff --git a/code/modules/hydroponics/seedtypes/cabbage.dm b/code/modules/hydroponics/seedtypes/cabbage.dm
index 0ee7fb2693..bf6b1a51a8 100644
--- a/code/modules/hydroponics/seedtypes/cabbage.dm
+++ b/code/modules/hydroponics/seedtypes/cabbage.dm
@@ -3,7 +3,7 @@
seed_name = "cabbage"
display_name = "cabbages"
kitchen_tag = "cabbage"
- chems = list("nutriment" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/cabbage/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm
index 2b8ef7577b..f1e40e6320 100644
--- a/code/modules/hydroponics/seedtypes/carrots.dm
+++ b/code/modules/hydroponics/seedtypes/carrots.dm
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
- chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
/datum/seed/carrots/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"carrot")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFDB4A")
set_trait(TRAIT_PLANT_ICON,"carrot")
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/celery.dm b/code/modules/hydroponics/seedtypes/celery.dm
index c404ed670f..3f478dc769 100644
--- a/code/modules/hydroponics/seedtypes/celery.dm
+++ b/code/modules/hydroponics/seedtypes/celery.dm
@@ -3,7 +3,7 @@
seed_name = "celery"
display_name = "celery"
kitchen_tag = "celery"
- chems = list("nutriment" = list(5,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(5,20))
/datum/seed/celery/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,8)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#56FD56")
- set_trait(TRAIT_PLANT_ICON,"stalk3")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_ICON,"stalk3")
diff --git a/code/modules/hydroponics/seedtypes/cherries.dm b/code/modules/hydroponics/seedtypes/cherries.dm
index ece8d793e7..7767263023 100644
--- a/code/modules/hydroponics/seedtypes/cherries.dm
+++ b/code/modules/hydroponics/seedtypes/cherries.dm
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "cherry tree"
kitchen_tag = "cherries"
- chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15))
/datum/seed/cherries/New()
..()
@@ -17,4 +17,4 @@
set_trait(TRAIT_PRODUCT_ICON,"cherry")
set_trait(TRAIT_PRODUCT_COLOUR,"#A80000")
set_trait(TRAIT_PLANT_ICON,"tree2")
- set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm
index 8a93d5b786..59adafd8fd 100644
--- a/code/modules/hydroponics/seedtypes/chili.dm
+++ b/code/modules/hydroponics/seedtypes/chili.dm
@@ -4,7 +4,7 @@
seed_name = "chili"
display_name = "chili plants"
kitchen_tag = "chili"
- chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
+ chems = list("capsaicin" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
mutants = list("icechili", "ghostchili")
/datum/seed/chili/New()
@@ -26,7 +26,7 @@
display_name = "ice-pepper plants"
kitchen_tag = "icechili"
mutants = null
- chems = list("frostoil" = list(3,5), "nutriment" = list(1,50))
+ chems = list("frostoil" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
/datum/seed/chili/ice/New()
..()
@@ -40,10 +40,10 @@
display_name = "ghost chili plants"
kitchen_tag = "ghostchili"
mutants = null
- chems = list("condensedcapsaicin" = list (3,10), "nutriment" = list (1,25))
-
+ chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
+
/datum/seed/chili/ghost/New()
..()
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,3)
- set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
\ No newline at end of file
+ set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
diff --git a/code/modules/hydroponics/seedtypes/citrus.dm b/code/modules/hydroponics/seedtypes/citrus.dm
index ebc154aa40..063026342b 100644
--- a/code/modules/hydroponics/seedtypes/citrus.dm
+++ b/code/modules/hydroponics/seedtypes/citrus.dm
@@ -3,7 +3,7 @@
seed_name = "lime"
display_name = "lime trees"
kitchen_tag = "lime"
- chems = list("nutriment" = list(1,20), "limejuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
/datum/seed/citrus/New()
..()
@@ -23,7 +23,7 @@
seed_name = "lemon"
display_name = "lemon trees"
kitchen_tag = "lemon"
- chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
/datum/seed/citrus/lemon/New()
..()
@@ -38,9 +38,9 @@
seed_name = "orange"
display_name = "orange trees"
kitchen_tag = "orange"
- chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
/datum/seed/citrus/orange/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A")
- set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
\ No newline at end of file
+ set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
diff --git a/code/modules/hydroponics/seedtypes/cocoa.dm b/code/modules/hydroponics/seedtypes/cocoa.dm
index 7f7aa31b39..c89bfcf0e6 100644
--- a/code/modules/hydroponics/seedtypes/cocoa.dm
+++ b/code/modules/hydroponics/seedtypes/cocoa.dm
@@ -3,7 +3,7 @@
seed_name = "cacao"
display_name = "cacao tree"
kitchen_tag = "cocoa"
- chems = list("nutriment" = list(1,10), "coco" = list(4,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5))
/datum/seed/cocoa/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#CCA935")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_IDEAL_HEAT, 298)
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/corn.dm b/code/modules/hydroponics/seedtypes/corn.dm
index 40071604fb..e46cf0f2d9 100644
--- a/code/modules/hydroponics/seedtypes/corn.dm
+++ b/code/modules/hydroponics/seedtypes/corn.dm
@@ -3,7 +3,7 @@
seed_name = "corn"
display_name = "ears of corn"
kitchen_tag = "corn"
- chems = list("nutriment" = list(1,10), "cornoil" = list(3,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15))
trash_type = /obj/item/corncob
/datum/seed/corn/New()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/durian.dm b/code/modules/hydroponics/seedtypes/durian.dm
index 8963f4c9ec..b0ad06f648 100644
--- a/code/modules/hydroponics/seedtypes/durian.dm
+++ b/code/modules/hydroponics/seedtypes/durian.dm
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "durian"
kitchen_tag = "durian"
- chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20))
/datum/seed/durian/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_IDEAL_LIGHT, 8)
- set_trait(TRAIT_WATER_CONSUMPTION, 8)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 8)
diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm
index 587146d9d0..1661aabe40 100644
--- a/code/modules/hydroponics/seedtypes/eggplant.dm
+++ b/code/modules/hydroponics/seedtypes/eggplant.dm
@@ -5,7 +5,7 @@
display_name = "eggplants"
kitchen_tag = "eggplant"
mutants = list("egg-plant")
- chems = list("nutriment" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/eggplant/New()
..()
@@ -27,5 +27,5 @@
display_name = "egg-plants"
kitchen_tag = "egg-plant"
mutants = null
- chems = list("nutriment" = list(1,5), "egg" = list(3,12))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm
index e6c2e86f59..076179df38 100644
--- a/code/modules/hydroponics/seedtypes/flowers.dm
+++ b/code/modules/hydroponics/seedtypes/flowers.dm
@@ -4,7 +4,7 @@
seed_name = "harebell"
display_name = "harebells"
kitchen_tag = "harebell"
- chems = list("nutriment" = list(1,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/flower/New()
..()
@@ -22,7 +22,7 @@
seed_name = "poppy"
display_name = "poppies"
kitchen_tag = "poppy"
- chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/poppy/New()
..()
@@ -58,7 +58,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
- chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/lavender/New()
..()
@@ -79,7 +79,7 @@
display_name = "rose"
kitchen_tag = "rose"
mutants = list("bloodrose")
- chems = list("nutriment" = list(1,5), "stoxin" = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2))
/datum/seed/flower/rose/New()
..()
@@ -99,7 +99,7 @@
name = "bloodrose"
display_name = "bleeding rose"
mutants = null
- chems = list("nutriment" = list(1,5), "stoxin" = list(1,5), "blood" = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(1,5), REAGENT_ID_BLOOD = list(0,2))
/datum/seed/flower/rose/blood/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm
index 1fa365c875..6232408f6c 100644
--- a/code/modules/hydroponics/seedtypes/gelthi.dm
+++ b/code/modules/hydroponics/seedtypes/gelthi.dm
@@ -3,7 +3,7 @@
seed_name = "gelthi"
display_name = "gelthi plant"
kitchen_tag = "gelthi"
- chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),"nutriment" = list(1,5))
+ chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/gelthi/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,2)
- set_trait(TRAIT_POTENCY,1)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,1)
diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm
index e61978e5f0..fd63ef95bd 100644
--- a/code/modules/hydroponics/seedtypes/grapes.dm
+++ b/code/modules/hydroponics/seedtypes/grapes.dm
@@ -5,7 +5,7 @@
display_name = "grapevines"
kitchen_tag = "grapes"
mutants = list("greengrapes")
- chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), "grapejuice" = list(10,10))
/datum/seed/grapes/New()
..()
@@ -26,8 +26,8 @@
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
- chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
/datum/seed/grapes/green/New()
..()
- set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
\ No newline at end of file
+ set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm
index 25231b84a8..c5cb6a814f 100644
--- a/code/modules/hydroponics/seedtypes/grass.dm
+++ b/code/modules/hydroponics/seedtypes/grass.dm
@@ -4,7 +4,7 @@
display_name = "grass"
kitchen_tag = "grass"
mutants = list("carpet")
- chems = list("nutriment" = list(1,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/grass/New()
..()
@@ -33,4 +33,4 @@
set_trait(TRAIT_PRODUCT_ICON,"grass")
set_trait(TRAIT_PRODUCT_COLOUR,"#9e2500")
set_trait(TRAIT_PLANT_COLOUR,"#ee4401")
- set_trait(TRAIT_PLANT_ICON,"grass")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_ICON,"grass")
diff --git a/code/modules/hydroponics/seedtypes/jurlmah.dm b/code/modules/hydroponics/seedtypes/jurlmah.dm
index 61e810b9da..32d197764c 100644
--- a/code/modules/hydroponics/seedtypes/jurlmah.dm
+++ b/code/modules/hydroponics/seedtypes/jurlmah.dm
@@ -3,7 +3,7 @@
seed_name = "jurl'mah"
display_name = "jurl'mah reeds"
kitchen_tag = "jurlmah"
- chems = list("serotrotium" = list(1,5),"nutriment" = list(1,5))
+ chems = list("serotrotium" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/jurlmah/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,3)
- set_trait(TRAIT_POTENCY,10)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,10)
diff --git a/code/modules/hydroponics/seedtypes/kudzu.dm b/code/modules/hydroponics/seedtypes/kudzu.dm
index 336c205b25..667ff7e845 100644
--- a/code/modules/hydroponics/seedtypes/kudzu.dm
+++ b/code/modules/hydroponics/seedtypes/kudzu.dm
@@ -3,7 +3,7 @@
seed_name = "kudzu"
display_name = "kudzu vines"
kitchen_tag = "kudzu"
- chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "anti_toxin" = list(1,25))
/datum/seed/kudzu/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#96D278")
set_trait(TRAIT_PLANT_COLOUR,"#6F7A63")
set_trait(TRAIT_PLANT_ICON,"vine2")
- set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
diff --git a/code/modules/hydroponics/seedtypes/lettuce.dm b/code/modules/hydroponics/seedtypes/lettuce.dm
index b9293fbed7..77281dc5e0 100644
--- a/code/modules/hydroponics/seedtypes/lettuce.dm
+++ b/code/modules/hydroponics/seedtypes/lettuce.dm
@@ -4,7 +4,7 @@
seed_name = "lettuce"
display_name = "lettuce"
kitchen_tag = "lettuce"
- chems = list("nutriment" = list(1,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/lettuce/New()
..()
@@ -26,9 +26,9 @@
seed_name = "glacial lettuce"
display_name = "glacial lettuce"
kitchen_tag = "icelettuce"
- chems = list("nutriment" = list(1,5), "paracetamol" = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "paracetamol" = list(0,2))
/datum/seed/lettuce/ice/New()
..()
set_trait(TRAIT_ALTER_TEMP, -5)
- set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9")
\ No newline at end of file
+ set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9")
diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm
index 4be5e0fb31..8fe783850a 100644
--- a/code/modules/hydroponics/seedtypes/mushrooms.dm
+++ b/code/modules/hydroponics/seedtypes/mushrooms.dm
@@ -5,7 +5,7 @@
seed_noun = "spores"
display_name = "chanterelle mushrooms"
mutants = list("reishi","amanita","plumphelmet")
- chems = list("nutriment" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,25))
splat_type = /obj/effect/plant
kitchen_tag = "mushroom"
@@ -44,7 +44,7 @@
seed_name = "plump helmet"
display_name = "plump helmet mushrooms"
mutants = list("walkingmushroom","towercap")
- chems = list("nutriment" = list(2,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(2,10))
kitchen_tag = "plumphelmet"
/datum/seed/mushroom/plump/New()
@@ -62,7 +62,7 @@
seed_name = "reishi"
display_name = "reishi"
mutants = list("libertycap","glowshroom")
- chems = list("nutriment" = list(1,50), "psilocybin" = list(3,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PSILOCYBIN = list(3,5))
/datum/seed/mushroom/hallucinogenic/New()
..()
@@ -80,7 +80,7 @@
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
mutants = null
- chems = list("nutriment" = list(1), "stoxin" = list(3,3), "bliss" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), "stoxin" = list(3,3), REAGENT_ID_BLISS = list(1,25))
/datum/seed/mushroom/hallucinogenic/strong/New()
..()
@@ -96,7 +96,7 @@
seed_name = "fly amanita"
display_name = "fly amanita mushrooms"
mutants = list("destroyingangel","plastic")
- chems = list("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), "amatoxin" = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/New()
..()
@@ -114,7 +114,7 @@
seed_name = "destroying angel"
display_name = "destroying angel mushrooms"
mutants = null
- chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "amatoxin" = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/death/New()
..()
@@ -159,7 +159,7 @@
seed_name = "glowshroom"
display_name = "glowshrooms"
mutants = null
- chems = list("radium" = list(1,20))
+ chems = list(REAGENT_ID_RADIUM = list(1,20))
/datum/seed/mushroom/glowshroom/New()
..()
@@ -209,4 +209,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#e29cd2")
set_trait(TRAIT_PLANT_COLOUR,"#f8e6f4")
set_trait(TRAIT_PLANT_ICON,"mushroom9")
- set_trait(TRAIT_SPORING, TRUE)
\ No newline at end of file
+ set_trait(TRAIT_SPORING, TRUE)
diff --git a/code/modules/hydroponics/seedtypes/nettles.dm b/code/modules/hydroponics/seedtypes/nettles.dm
index 5a1073c6fc..81f05cb323 100644
--- a/code/modules/hydroponics/seedtypes/nettles.dm
+++ b/code/modules/hydroponics/seedtypes/nettles.dm
@@ -4,7 +4,7 @@
seed_name = "nettle"
display_name = "nettles"
mutants = list("deathnettle")
- chems = list("nutriment" = list(1,50), "sacid" = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_SACID = list(0,1))
kitchen_tag = "nettle"
/datum/seed/nettle/New()
@@ -25,7 +25,7 @@
display_name = "death nettles"
kitchen_tag = "deathnettle"
mutants = null
- chems = list("nutriment" = list(1,50), "pacid" = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PACID = list(0,1))
/datum/seed/nettle/death/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/onion.dm b/code/modules/hydroponics/seedtypes/onion.dm
index 2123ad2b38..3bd214261e 100644
--- a/code/modules/hydroponics/seedtypes/onion.dm
+++ b/code/modules/hydroponics/seedtypes/onion.dm
@@ -3,7 +3,7 @@
seed_name = "onion"
display_name = "onions"
kitchen_tag = "onion"
- chems = list("nutriment" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/onion/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"onion")
set_trait(TRAIT_PRODUCT_COLOUR,"#E0C367")
set_trait(TRAIT_PLANT_ICON,"carrot")
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/peanuts.dm b/code/modules/hydroponics/seedtypes/peanuts.dm
index cc710d25ca..8dfa76addb 100644
--- a/code/modules/hydroponics/seedtypes/peanuts.dm
+++ b/code/modules/hydroponics/seedtypes/peanuts.dm
@@ -4,7 +4,7 @@
seed_name = "peanut"
display_name = "peanut vines"
kitchen_tag = "peanut"
- chems = list("nutriment" = list(1,10), "peanutoil" = list(3,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "peanutoil" = list(3,10))
/datum/seed/peanuts/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_ICON,"nuts")
set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A")
set_trait(TRAIT_PLANT_ICON,"bush2")
- set_trait(TRAIT_IDEAL_LIGHT, 6)
\ No newline at end of file
+ set_trait(TRAIT_IDEAL_LIGHT, 6)
diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm
index 9e14b244dc..27e14c6c92 100644
--- a/code/modules/hydroponics/seedtypes/pineapple.dm
+++ b/code/modules/hydroponics/seedtypes/pineapple.dm
@@ -6,7 +6,7 @@
display_name = "pineapple"
kitchen_tag = "pineapple"
mutants = list("spineapple")
- chems = list("nutriment" = list(1,5), "pineapplejuice" = list(1, 20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/pineapple/New()
..()
@@ -30,7 +30,7 @@
seed_name = "spineapple"
display_name = "spineapple"
kitchen_tag = "spineapple"
- chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/spineapple/New()
..()
@@ -46,4 +46,4 @@
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 4)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
- set_trait(TRAIT_STINGS,1)
\ No newline at end of file
+ set_trait(TRAIT_STINGS,1)
diff --git a/code/modules/hydroponics/seedtypes/potato.dm b/code/modules/hydroponics/seedtypes/potato.dm
index 8aad55afc6..f3a76300a6 100644
--- a/code/modules/hydroponics/seedtypes/potato.dm
+++ b/code/modules/hydroponics/seedtypes/potato.dm
@@ -3,7 +3,7 @@
seed_name = "potato"
display_name = "potatoes"
kitchen_tag = "potato"
- chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "potatojuice" = list(10,10))
/datum/seed/potato/New()
..()
@@ -15,4 +15,4 @@
set_trait(TRAIT_PRODUCT_ICON,"potato")
set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4")
set_trait(TRAIT_PLANT_ICON,"bush2")
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/pumpkin.dm b/code/modules/hydroponics/seedtypes/pumpkin.dm
index 916d44e58b..ed1392993d 100644
--- a/code/modules/hydroponics/seedtypes/pumpkin.dm
+++ b/code/modules/hydroponics/seedtypes/pumpkin.dm
@@ -3,7 +3,7 @@
seed_name = "pumpkin"
display_name = "pumpkin vine"
kitchen_tag = "pumpkin"
- chems = list("nutriment" = list(1,6))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/pumpkin/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DBAC02")
set_trait(TRAIT_PLANT_COLOUR,"#21661E")
set_trait(TRAIT_PLANT_ICON,"vine2")
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/rhubarb.dm b/code/modules/hydroponics/seedtypes/rhubarb.dm
index f3ee13ce41..8534c9727e 100644
--- a/code/modules/hydroponics/seedtypes/rhubarb.dm
+++ b/code/modules/hydroponics/seedtypes/rhubarb.dm
@@ -3,7 +3,7 @@
seed_name = "rhubarb"
display_name = "rhubarb"
kitchen_tag = "rhubarb"
- chems = list("nutriment" = list(1,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/rhubarb/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,6)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#FD5656")
- set_trait(TRAIT_PLANT_ICON,"stalk3")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_ICON,"stalk3")
diff --git a/code/modules/hydroponics/seedtypes/rice.dm b/code/modules/hydroponics/seedtypes/rice.dm
index 413c43b9fc..e90c6b1e96 100644
--- a/code/modules/hydroponics/seedtypes/rice.dm
+++ b/code/modules/hydroponics/seedtypes/rice.dm
@@ -3,7 +3,7 @@
seed_name = "rice"
display_name = "rice stalks"
kitchen_tag = "rice"
- chems = list("nutriment" = list(1,25), "rice" = list(10,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "rice" = list(10,15))
/datum/seed/rice/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#8ED17D")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/soybean.dm b/code/modules/hydroponics/seedtypes/soybean.dm
index 22329be263..c12d36803a 100644
--- a/code/modules/hydroponics/seedtypes/soybean.dm
+++ b/code/modules/hydroponics/seedtypes/soybean.dm
@@ -3,7 +3,7 @@
seed_name = "soybean"
display_name = "soybeans"
kitchen_tag = "soybeans"
- chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "soymilk" = list(10,20))
/datum/seed/soybean/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_PRODUCT_ICON,"bean")
set_trait(TRAIT_PRODUCT_COLOUR,"#EBE7C0")
- set_trait(TRAIT_PLANT_ICON,"stalk")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_ICON,"stalk")
diff --git a/code/modules/hydroponics/seedtypes/sugarcane.dm b/code/modules/hydroponics/seedtypes/sugarcane.dm
index c670500a1d..6abdf841c1 100644
--- a/code/modules/hydroponics/seedtypes/sugarcane.dm
+++ b/code/modules/hydroponics/seedtypes/sugarcane.dm
@@ -3,7 +3,7 @@
seed_name = "sugarcane"
display_name = "sugarcanes"
kitchen_tag = "sugarcanes"
- chems = list("sugar" = list(4,5))
+ chems = list(REAGENT_ID_SUGAR = list(4,5))
/datum/seed/sugarcane/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#B4D6BD")
set_trait(TRAIT_PLANT_COLOUR,"#6BBD68")
set_trait(TRAIT_PLANT_ICON,"stalk3")
- set_trait(TRAIT_IDEAL_HEAT, 298)
\ No newline at end of file
+ set_trait(TRAIT_IDEAL_HEAT, 298)
diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm
index 8ea521995c..dfc0cafc71 100644
--- a/code/modules/hydroponics/seedtypes/surik.dm
+++ b/code/modules/hydroponics/seedtypes/surik.dm
@@ -3,7 +3,7 @@
seed_name = "surik"
display_name = "surik vine"
kitchen_tag = "surik"
- chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),"nutriment" = list(1,5))
+ chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,7)
set_trait(TRAIT_PRODUCTION,7)
set_trait(TRAIT_YIELD,3)
- set_trait(TRAIT_POTENCY,3)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,3)
diff --git a/code/modules/hydroponics/seedtypes/telriis.dm b/code/modules/hydroponics/seedtypes/telriis.dm
index 47c577b787..49b573453a 100644
--- a/code/modules/hydroponics/seedtypes/telriis.dm
+++ b/code/modules/hydroponics/seedtypes/telriis.dm
@@ -3,7 +3,7 @@
seed_name = "telriis"
display_name = "telriis grass"
kitchen_tag = "telriis"
- chems = list("pwine" = list(1,5), "nutriment" = list(1,6))
+ chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/telriis/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,5)
set_trait(TRAIT_YIELD,4)
- set_trait(TRAIT_POTENCY,5)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,5)
diff --git a/code/modules/hydroponics/seedtypes/thaadra.dm b/code/modules/hydroponics/seedtypes/thaadra.dm
index 209b495c82..7d2aaa1d93 100644
--- a/code/modules/hydroponics/seedtypes/thaadra.dm
+++ b/code/modules/hydroponics/seedtypes/thaadra.dm
@@ -3,7 +3,7 @@
seed_name = "thaa'dra"
display_name = "thaa'dra lichen"
kitchen_tag = "thaadra"
- chems = list("frostoil" = list(1,5),"nutriment" = list(1,5))
+ chems = list("frostoil" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/thaadra/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,2)
- set_trait(TRAIT_POTENCY,5)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,5)
diff --git a/code/modules/hydroponics/seedtypes/tobacco.dm b/code/modules/hydroponics/seedtypes/tobacco.dm
index d9550fef8c..52136e0b15 100644
--- a/code/modules/hydroponics/seedtypes/tobacco.dm
+++ b/code/modules/hydroponics/seedtypes/tobacco.dm
@@ -5,7 +5,7 @@
display_name = "tobacco"
kitchen_tag = "tobacco"
mutants = list("stimbush")
- chems = list("nutriment" = list(1,15), "nicotine" = list(1,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_NICOTINE = list(1,20))
/datum/seed/tobacco/New()
..()
@@ -23,7 +23,7 @@
name = "stimbush"
seed_name = "stim-bush"
display_name = "stim-bush"
- chems = list("nutriment" = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
/datum/seed/tobacco/stimbush/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm
index 3454d69952..312c799957 100644
--- a/code/modules/hydroponics/seedtypes/tomatoes.dm
+++ b/code/modules/hydroponics/seedtypes/tomatoes.dm
@@ -4,7 +4,7 @@
seed_name = "tomato"
display_name = "tomato plant"
mutants = list("bluetomato","bloodtomato")
- chems = list("nutriment" = list(1,10), "tomatojuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "tomatojuice" = list(10,10))
kitchen_tag = "tomato"
/datum/seed/tomato/New()
@@ -27,7 +27,7 @@
seed_name = "blood tomato"
display_name = "blood tomato plant"
mutants = list("killertomato")
- chems = list("nutriment" = list(1,10), "blood" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BLOOD = list(1,5))
splat_type = /obj/effect/decal/cleanable/blood/splatter
/datum/seed/tomato/blood/New()
@@ -53,7 +53,7 @@
seed_name = "blue tomato"
display_name = "blue tomato plant"
mutants = list("bluespacetomato")
- chems = list("nutriment" = list(1,20), "lube" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lube" = list(1,5))
/datum/seed/tomato/blue/New()
..()
@@ -65,11 +65,11 @@
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
mutants = null
- chems = list("nutriment" = list(1,20), "singulo" = list(10,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5))
/datum/seed/tomato/blue/teleport/New()
..()
set_trait(TRAIT_TELEPORTING,1)
set_trait(TRAIT_PRODUCT_COLOUR,"#00E5FF")
set_trait(TRAIT_BIOLUM,1)
- set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8")
\ No newline at end of file
+ set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8")
diff --git a/code/modules/hydroponics/seedtypes/vale.dm b/code/modules/hydroponics/seedtypes/vale.dm
index 166fafcf97..37cf0d7a58 100644
--- a/code/modules/hydroponics/seedtypes/vale.dm
+++ b/code/modules/hydroponics/seedtypes/vale.dm
@@ -3,7 +3,7 @@
seed_name = "vale"
display_name = "vale bush"
kitchen_tag = "vale"
- chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),"nutriment"= list(1,5))
+ chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
/datum/seed/vale/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,10)
set_trait(TRAIT_YIELD,3)
- set_trait(TRAIT_POTENCY,3)
\ No newline at end of file
+ set_trait(TRAIT_POTENCY,3)
diff --git a/code/modules/hydroponics/seedtypes/vanilla.dm b/code/modules/hydroponics/seedtypes/vanilla.dm
index a2bc5c8dcf..2d42a80c65 100644
--- a/code/modules/hydroponics/seedtypes/vanilla.dm
+++ b/code/modules/hydroponics/seedtypes/vanilla.dm
@@ -3,7 +3,7 @@
seed_name = "vanilla"
display_name = "vanilla"
kitchen_tag = "vanilla"
- chems = list("nutriment" = list(1,10), "vanilla" = list(2,8), "sugar" = list(1, 4))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "vanilla" = list(2,8), REAGENT_ID_SUGAR = list(1, 4))
/datum/seed/vanilla/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm
index 8c1e9411f0..f2293c6133 100644
--- a/code/modules/hydroponics/seedtypes/wabback.dm
+++ b/code/modules/hydroponics/seedtypes/wabback.dm
@@ -4,7 +4,7 @@
seed_name = "white wabback"
seed_noun = "nodes"
display_name = "white wabback"
- chems = list("nutriment" = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
kitchen_tag = "wabback"
mutants = list("blackwabback","wildwabback")
has_item_product = /obj/item/stack/material/cloth
@@ -31,7 +31,7 @@
seed_name = "black wabback"
display_name = "black wabback"
mutants = null
- chems = list("nutriment" = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
/datum/seed/wabback/vine/New()
..()
@@ -44,11 +44,11 @@
display_name = "wild wabback"
mutants = list("whitewabback")
has_item_product = null
- chems = list("nutriment" = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
/datum/seed/wabback/wild/New()
..()
set_trait(TRAIT_IDEAL_LIGHT, 3)
set_trait(TRAIT_WATER_CONSUMPTION, 7)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.1)
- set_trait(TRAIT_YIELD,5)
\ No newline at end of file
+ set_trait(TRAIT_YIELD,5)
diff --git a/code/modules/hydroponics/seedtypes/watermelon.dm b/code/modules/hydroponics/seedtypes/watermelon.dm
index 79ae157295..0999d88cba 100644
--- a/code/modules/hydroponics/seedtypes/watermelon.dm
+++ b/code/modules/hydroponics/seedtypes/watermelon.dm
@@ -3,7 +3,7 @@
seed_name = "watermelon"
display_name = "watermelon vine"
kitchen_tag = "watermelon"
- chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,6), "watermelonjuice" = list(10,6))
/datum/seed/watermelon/New()
..()
@@ -20,4 +20,4 @@
set_trait(TRAIT_FLESH_COLOUR,"#F22C2C")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/wheat.dm b/code/modules/hydroponics/seedtypes/wheat.dm
index a657490c15..5febc076fb 100644
--- a/code/modules/hydroponics/seedtypes/wheat.dm
+++ b/code/modules/hydroponics/seedtypes/wheat.dm
@@ -3,7 +3,7 @@
seed_name = "wheat"
display_name = "wheat stalks"
kitchen_tag = "wheat"
- chems = list("nutriment" = list(1,25), "flour" = list(10,30))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "flour" = list(10,30))
/datum/seed/wheat/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#BFAF82")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/whitebeets.dm b/code/modules/hydroponics/seedtypes/whitebeets.dm
index 3534fcc7ff..04dfca254f 100644
--- a/code/modules/hydroponics/seedtypes/whitebeets.dm
+++ b/code/modules/hydroponics/seedtypes/whitebeets.dm
@@ -3,7 +3,7 @@
seed_name = "white-beet"
display_name = "white-beets"
kitchen_tag = "whitebeet"
- chems = list("nutriment" = list(0,20), "sugar" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(0,20), REAGENT_ID_SUGAR = list(1,5))
/datum/seed/whitebeets/New()
..()
@@ -15,4 +15,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#EEF5B0")
set_trait(TRAIT_PLANT_COLOUR,"#4D8F53")
set_trait(TRAIT_PLANT_ICON,"carrot2")
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/wurmwoad.dm b/code/modules/hydroponics/seedtypes/wurmwoad.dm
index bb4df620a2..3ca70c9af6 100644
--- a/code/modules/hydroponics/seedtypes/wurmwoad.dm
+++ b/code/modules/hydroponics/seedtypes/wurmwoad.dm
@@ -4,7 +4,7 @@
name = "wurmwoad"
seed_name = "wurmwoad"
display_name = "wurmwoad growth"
- chems = list("nutriment" = list(1,10), "spacespice" = list(5,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "spacespice" = list(5,15))
kitchen_tag = "wurmwoad"
/datum/seed/wurmwoad/New()
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index 00f6e4dbb2..cb1fc39437 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -135,7 +135,7 @@
update_icon()
SSplants.add_plant(src)
//Some plants eat through plating.
- if(islist(seed.chems) && !isnull(seed.chems["pacid"]))
+ if(islist(seed.chems) && !isnull(seed.chems[REAGENT_ID_PACID]))
var/turf/T = get_turf(src)
T.ex_act(prob(80) ? 3 : 2)
diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm
index 1fe2f70b05..6536b88efd 100644
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -26,7 +26,7 @@
continue
if(floor.density)
- if(!isnull(seed.chems["pacid"]))
+ if(!isnull(seed.chems[REAGENT_ID_PACID]))
spawn(rand(5,25)) floor.ex_act(3)
continue
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 62fe40d707..f10585a8e9 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -57,70 +57,70 @@
var/static/list/toxic_reagents = list(
"anti_toxin" = -2,
"toxin" = 2,
- "fluorine" = 2.5,
- "chlorine" = 1.5,
- "sacid" = 1.5,
- "pacid" = 3,
+ REAGENT_ID_FLUORINE = 2.5,
+ REAGENT_ID_CHLORINE = 1.5,
+ REAGENT_ID_SACID = 1.5,
+ REAGENT_ID_PACID = 3,
"plantbgone" = 3,
"cryoxadone" = -3,
- "radium" = 2
+ REAGENT_ID_RADIUM = 2
)
var/static/list/nutrient_reagents = list(
"milk" = 0.1,
"beer" = 0.25,
- "phosphorus" = 0.1,
- "sugar" = 0.1,
+ REAGENT_ID_PHOSPHORUS = 0.1,
+ REAGENT_ID_SUGAR = 0.1,
"sodawater" = 0.1,
"ammonia" = 1,
"diethylamine" = 2,
- "nutriment" = 1,
+ REAGENT_ID_NUTRIMENT = 1,
"adminordrazine" = 1,
"eznutrient" = 1,
"robustharvest" = 1,
"left4zed" = 1
)
var/static/list/weedkiller_reagents = list(
- "fluorine" = -4,
- "chlorine" = -3,
- "phosphorus" = -2,
- "sugar" = 2,
- "sacid" = -2,
- "pacid" = -4,
+ REAGENT_ID_FLUORINE = -4,
+ REAGENT_ID_CHLORINE = -3,
+ REAGENT_ID_PHOSPHORUS = -2,
+ REAGENT_ID_SUGAR = 2,
+ REAGENT_ID_SACID = -2,
+ REAGENT_ID_PACID = -4,
"plantbgone" = -8,
"adminordrazine" = -5
)
var/static/list/pestkiller_reagents = list(
- "sugar" = 2,
+ REAGENT_ID_SUGAR = 2,
"diethylamine" = -2,
"adminordrazine" = -5
)
var/static/list/water_reagents = list(
- "water" = 1,
+ REAGENT_ID_WATER = 1,
"adminordrazine" = 1,
"milk" = 0.9,
"beer" = 0.7,
- "fluorine" = -0.5,
- "chlorine" = -0.5,
- "phosphorus" = -0.5,
- "water" = 1,
+ REAGENT_ID_FLUORINE = -0.5,
+ REAGENT_ID_CHLORINE = -0.5,
+ REAGENT_ID_PHOSPHORUS = -0.5,
+ REAGENT_ID_WATER = 1,
"sodawater" = 1,
)
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
var/static/list/beneficial_reagents = list(
"beer" = list( -0.05, 0, 0 ),
- "fluorine" = list( -2, 0, 0 ),
- "chlorine" = list( -1, 0, 0 ),
- "phosphorus" = list( -0.75, 0, 0 ),
+ REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
+ REAGENT_ID_CHLORINE = list( -1, 0, 0 ),
+ REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ),
"sodawater" = list( 0.1, 0, 0 ),
- "sacid" = list( -1, 0, 0 ),
- "pacid" = list( -2, 0, 0 ),
+ REAGENT_ID_SACID = list( -1, 0, 0 ),
+ 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 ),
- "nutriment" = list( 0.5, 0.1, 0 ),
- "radium" = list( -1.5, 0, 0.2),
+ REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
+ REAGENT_ID_RADIUM = list( -1.5, 0, 0.2),
"adminordrazine" = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2)
@@ -129,7 +129,7 @@
// Mutagen list specifies minimum value for the mutation to take place, rather
// than a bound as the lists above specify.
var/static/list/mutagenic_reagents = list(
- "radium" = 8,
+ REAGENT_ID_RADIUM = 8,
"mutagen" = 15
)
diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm
index 8af9708865..b96b6d32d2 100644
--- a/code/modules/integrated_electronics/passive/power.dm
+++ b/code/modules/integrated_electronics/passive/power.dm
@@ -118,7 +118,7 @@
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2)
var/volume = 60
- var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" = 8000, "blood" = 5000)
+ var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, REAGENT_ID_FUEL = 15000, REAGENT_ID_CARBON = 10000, REAGENT_ID_ETHANOL= 10000, REAGENT_ID_NUTRIMENT = 8000, REAGENT_ID_BLOOD = 5000)
/obj/item/integrated_circuit/passive/power/chemical_cell/New()
..()
diff --git a/code/modules/materials/materials/metals/metals.dm b/code/modules/materials/materials/metals/metals.dm
index dbf1e502ac..123585efcc 100644
--- a/code/modules/materials/materials/metals/metals.dm
+++ b/code/modules/materials/materials/metals/metals.dm
@@ -4,7 +4,7 @@
// Very rare alloy that is reflective, should be used sparingly.
/datum/material/durasteel
- name = "durasteel"
+ name = MAT_DURASTEEL
stack_type = /obj/item/stack/material/durasteel
integrity = 600
melting_point = 7000
@@ -41,7 +41,7 @@
)
/datum/material/iron
- name = "iron"
+ name = MAT_IRON
stack_type = /obj/item/stack/material/iron
icon_colour = "#5C5454"
weight = 22
@@ -61,7 +61,7 @@
supply_conversion_value = 2
/datum/material/gold
- name = "gold"
+ name = MAT_GOLD
stack_type = /obj/item/stack/material/gold
icon_colour = "#EDD12F"
weight = 24
@@ -73,7 +73,7 @@
supply_conversion_value = 2
/datum/material/silver
- name = "silver"
+ name = MAT_SILVER
stack_type = /obj/item/stack/material/silver
icon_colour = "#D1E6E3"
weight = 22
@@ -85,7 +85,7 @@
supply_conversion_value = 2
/datum/material/platinum
- name = "platinum"
+ name = MAT_PLATINUM
stack_type = /obj/item/stack/material/platinum
icon_colour = "#9999FF"
weight = 27
@@ -96,7 +96,7 @@
supply_conversion_value = 5
/datum/material/uranium
- name = "uranium"
+ name = MAT_URANIUM
stack_type = /obj/item/stack/material/uranium
radioactivity = 12
icon_base = "stone"
@@ -108,7 +108,7 @@
supply_conversion_value = 2
/datum/material/mhydrogen
- name = "mhydrogen"
+ name = MAT_METALHYDROGEN
stack_type = /obj/item/stack/material/mhydrogen
icon_colour = "#E6C5DE"
stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5)
@@ -117,7 +117,7 @@
supply_conversion_value = 6
/datum/material/deuterium
- name = "deuterium"
+ name = MAT_DEUTERIUM
stack_type = /obj/item/stack/material/deuterium
icon_colour = "#999999"
stack_origin_tech = list(TECH_MATERIAL = 3)
@@ -127,7 +127,7 @@
conductive = 0
/datum/material/tritium
- name = "tritium"
+ name = MAT_TRITIUM
stack_type = /obj/item/stack/material/tritium
icon_colour = "#777777"
stack_origin_tech = list(TECH_MATERIAL = 5)
@@ -137,7 +137,7 @@
conductive = 0
/datum/material/osmium
- name = "osmium"
+ name = MAT_OSMIUM
stack_type = /obj/item/stack/material/osmium
icon_colour = "#9999FF"
stack_origin_tech = list(TECH_MATERIAL = 5)
@@ -164,7 +164,7 @@
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2)
/datum/material/bronze
- name = "bronze"
+ name = MAT_BRONZE
stack_type = /obj/item/stack/material/bronze
icon_colour = "#EDD12F"
icon_base = "solid"
@@ -174,9 +174,9 @@
protectiveness = 9 // 33%
/datum/material/tin
- name = "tin"
- display_name = "tin"
- use_name = "tin"
+ name = MAT_TIN
+ display_name = MAT_TIN
+ use_name = MAT_TIN
stack_type = /obj/item/stack/material/tin
icon_colour = "#b2afaf"
sheet_singular_name = "ingot"
@@ -186,9 +186,9 @@
weight = 13
/datum/material/copper
- name = "copper"
- display_name = "copper"
- use_name = "copper"
+ name = MAT_COPPER
+ display_name = MAT_COPPER
+ use_name = MAT_COPPER
stack_type = /obj/item/stack/material/copper
conductivity = 52
icon_colour = "#af633e"
@@ -199,12 +199,12 @@
hardness = 50
/datum/material/aluminium
- name = "aluminium"
- display_name = "aluminium"
- use_name = "aluminium"
+ name = MAT_ALUMINIUM
+ display_name = MAT_ALUMINIUM
+ use_name = MAT_ALUMINIUM
icon_colour = "#e5e2d0"
stack_type = /obj/item/stack/material/aluminium
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 2
- weight = 10
\ No newline at end of file
+ weight = 10
diff --git a/code/modules/materials/sheets/metals/metal.dm b/code/modules/materials/sheets/metals/metal.dm
index 65b41df81e..b80408d871 100644
--- a/code/modules/materials/sheets/metals/metal.dm
+++ b/code/modules/materials/sheets/metals/metal.dm
@@ -6,9 +6,9 @@
apply_colour = TRUE
/obj/item/stack/material/plasteel
- name = "plasteel"
+ name = MAT_PLASTEEL
icon_state = "sheet-reinforced"
- default_type = "plasteel"
+ default_type = MAT_PLASTEEL
no_variants = FALSE
apply_colour = TRUE
@@ -26,10 +26,10 @@
icon_state = "rods"
/obj/item/stack/material/durasteel
- name = "durasteel"
+ name = MAT_DURASTEEL
icon_state = "sheet-reinforced"
item_state = "sheet-metal"
- default_type = "durasteel"
+ default_type = MAT_DURASTEEL
no_variants = FALSE
apply_colour = TRUE
@@ -42,112 +42,112 @@
no_variants = FALSE
/obj/item/stack/material/iron
- name = "iron"
+ name = MAT_IRON
icon_state = "sheet-ingot"
- default_type = "iron"
+ default_type = MAT_IRON
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/lead
- name = "lead"
+ name = MAT_LEAD
icon_state = "sheet-ingot"
- default_type = "lead"
+ default_type = MAT_LEAD
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/gold
- name = "gold"
+ name = MAT_GOLD
icon_state = "sheet-ingot"
- default_type = "gold"
+ default_type = MAT_GOLD
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/silver
- name = "silver"
+ name = MAT_SILVER
icon_state = "sheet-ingot"
- default_type = "silver"
+ default_type = MAT_SILVER
no_variants = FALSE
apply_colour = TRUE
//Valuable resource, cargo can sell it.
/obj/item/stack/material/platinum
- name = "platinum"
+ name = MAT_PLATINUM
icon_state = "sheet-adamantine"
- default_type = "platinum"
+ default_type = MAT_PLATINUM
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/uranium
- name = "uranium"
+ name = MAT_URANIUM
icon_state = "sheet-uranium"
- default_type = "uranium"
+ default_type = MAT_URANIUM
no_variants = FALSE
//Extremely valuable to Research.
/obj/item/stack/material/mhydrogen
name = "metallic hydrogen"
icon_state = "sheet-mythril"
- default_type = "mhydrogen"
+ default_type = MAT_METALHYDROGEN
no_variants = FALSE
// Fusion fuel.
/obj/item/stack/material/deuterium
- name = "deuterium"
+ name = MAT_DEUTERIUM
icon_state = "sheet-puck"
- default_type = "deuterium"
+ default_type = MAT_DEUTERIUM
apply_colour = 1
no_variants = FALSE
//Fuel for MRSPACMAN generator.
/obj/item/stack/material/tritium
- name = "tritium"
+ name = MAT_TRITIUM
icon_state = "sheet-puck"
- default_type = "tritium"
+ default_type = MAT_TRITIUM
apply_colour = TRUE
no_variants = FALSE
/obj/item/stack/material/osmium
- name = "osmium"
+ name = MAT_OSMIUM
icon_state = "sheet-ingot"
- default_type = "osmium"
+ default_type = MAT_OSMIUM
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/graphite
- name = "graphite"
+ name = MAT_GRAPHITE
icon_state = "sheet-puck"
default_type = MAT_GRAPHITE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/bronze
- name = "bronze"
+ name = MAT_BRONZE
icon_state = "sheet-ingot"
singular_name = "bronze ingot"
- default_type = "bronze"
+ default_type = MAT_BRONZE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/tin
- name = "tin"
+ name = MAT_TIN
icon_state = "sheet-ingot"
singular_name = "tin ingot"
- default_type = "tin"
+ default_type = MAT_TIN
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/copper
- name = "copper"
+ name = MAT_COPPER
icon_state = "sheet-ingot"
singular_name = "copper ingot"
- default_type = "copper"
+ default_type = MAT_COPPER
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/aluminium
- name = "aluminium"
+ name = MAT_ALUMINIUM
icon_state = "sheet-ingot"
singular_name = "aluminium ingot"
- default_type = "aluminium"
+ default_type = MAT_ALUMINIUM
apply_colour = 1
no_variants = FALSE
diff --git a/code/modules/mining/alloys.dm b/code/modules/mining/alloys.dm
index 4ca7e64571..826f30dd5e 100644
--- a/code/modules/mining/alloys.dm
+++ b/code/modules/mining/alloys.dm
@@ -9,22 +9,22 @@
var/metaltag
/datum/alloy/durasteel
- metaltag = "durasteel"
+ metaltag = MAT_DURASTEEL
requires = list(
- "diamond" = 1,
- "platinum" = 1,
- "carbon" = 2,
- "hematite" = 2
+ ORE_DIAMOND = 1,
+ ORE_PLATINUM = 1,
+ ORE_CARBON = 2,
+ ORE_HEMATITE = 2
)
product_mod = 0.3
product = /obj/item/stack/material/durasteel
/datum/alloy/plasteel
- metaltag = "plasteel"
+ metaltag = MAT_PLASTEEL
requires = list(
- "platinum" = 1,
- "carbon" = 2,
- "hematite" = 2
+ ORE_PLATINUM = 1,
+ ORE_CARBON = 2,
+ ORE_HEMATITE = 2
)
product_mod = 0.3
product = /obj/item/stack/material/plasteel
@@ -32,24 +32,24 @@
/datum/alloy/steel
metaltag = MAT_STEEL
requires = list(
- "carbon" = 1,
- "hematite" = 1
+ ORE_CARBON = 1,
+ ORE_HEMATITE = 1
)
product = /obj/item/stack/material/steel
/datum/alloy/borosilicate
- metaltag = "borosilicate glass"
+ metaltag = MAT_PGLASS
requires = list(
- "platinum" = 1,
- "sand" = 2
+ ORE_PLATINUM = 1,
+ ORE_SAND = 2
)
product = /obj/item/stack/material/glass/phoronglass
/*
/datum/alloy/bronze
- metaltag = "bronze"
+ metaltag = MAT_BRONZE
requires = list(
- "copper" = 2,
- "tin" = 1
+ ORE_COPPER = 2,
+ ORE_TIN = 1
)
product = /obj/item/stack/material/bronze
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/mining/alloys_vr.dm b/code/modules/mining/alloys_vr.dm
index 6b2348bdba..b04f5d197e 100644
--- a/code/modules/mining/alloys_vr.dm
+++ b/code/modules/mining/alloys_vr.dm
@@ -3,7 +3,7 @@
requires = list(
"rutile" = 1,
"platinum" = 1,
- "carbon" = 2,
+ REAGENT_ID_CARBON = 2,
)
product_mod = 0.3
product = /obj/item/stack/material/plastitanium
@@ -23,7 +23,7 @@
"rutile" = 1,
"sand" = 2,
"platinum" = 1,
- "carbon" = 2,
+ REAGENT_ID_CARBON = 2,
)
product_mod = 1
- product = /obj/item/stack/material/glass/plastitanium
\ No newline at end of file
+ product = /obj/item/stack/material/glass/plastitanium
diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm
index 786ff0210e..3764591ebf 100644
--- a/code/modules/mining/ore_datum.dm
+++ b/code/modules/mining/ore_datum.dm
@@ -39,7 +39,7 @@
/ore/hematite
name = ORE_HEMATITE
- display_name = "hematite"
+ display_name = ORE_HEMATITE
smelts_to = MAT_IRON
alloy = 1
result_amount = 5
@@ -62,7 +62,7 @@
/ore/glass
name = ORE_SAND
- display_name = "sand"
+ display_name = ORE_SAND
smelts_to = MAT_GLASS
alloy = 1
compresses_to = "sandstone"
@@ -113,7 +113,7 @@
/ore/diamond
name = ORE_DIAMOND
- display_name = "diamond"
+ display_name = ORE_DIAMOND
alloy = 1
compresses_to = MAT_DIAMOND
result_amount = 5
@@ -178,7 +178,7 @@
/*
/ore/copper
name = ORE_COPPER
- display_name = "copper"
+ display_name = ORE_COPPER
smelts_to = MAT_COPPER
alloy = 1
result_amount = 5
@@ -189,7 +189,7 @@
/ore/tin
name = ORE_TIN
- display_name = "tin"
+ display_name = ORE_TIN
smelts_to = MAT_TIN
alloy = 1
result_amount = 5
@@ -208,7 +208,7 @@
/ore/bauxite
name = ORE_BAUXITE
- display_name = "bauxite"
+ display_name = ORE_BAUXITE
smelts_to = MAT_ALUMINIUM
result_amount = 5
spread_chance = 25
@@ -218,7 +218,7 @@
*/
/ore/rutile
name = ORE_RUTILE
- display_name = "rutile"
+ display_name = ORE_RUTILE
smelts_to = MAT_TITANIUM
result_amount = 5
spread_chance = 12
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index f5b52e0929..4a6e50cfcc 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -134,7 +134,7 @@
// ====
/datum/medical_effect/itch
name = "Itch"
- triggers = list("bliss" = 10)
+ triggers = list(REAGENT_ID_BLISS = 10)
cures = list("inaprovaline")
cure_message = "The itching stops..."
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index f5b52e0929..4a6e50cfcc 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -134,7 +134,7 @@
// ====
/datum/medical_effect/itch
name = "Itch"
- triggers = list("bliss" = 10)
+ triggers = list(REAGENT_ID_BLISS = 10)
cures = list("inaprovaline")
cure_message = "The itching stops..."
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 5756af7e0a..a0e41c8ab4 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1040,7 +1040,7 @@
/mob/living/carbon/human/revive()
if(should_have_organ(O_HEART))
- vessel.add_reagent("blood",species.blood_volume-vessel.total_volume)
+ vessel.add_reagent(REAGENT_ID_BLOOD,species.blood_volume-vessel.total_volume)
fixblood()
species.create_organs(src) // Reset our organs/limbs.
@@ -1313,9 +1313,9 @@
make_blood()
if(vessel.total_volume < species.blood_volume)
vessel.maximum_volume = species.blood_volume
- vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
+ vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)
else if(vessel.total_volume > species.blood_volume)
- vessel.remove_reagent("blood",vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart
+ vessel.remove_reagent(REAGENT_ID_BLOOD,vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart
vessel.maximum_volume = species.blood_volume
fixblood()
species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup.
@@ -1788,7 +1788,7 @@
if(species?.flags & NO_BLOOD)
bloodtrail = 0
else
- var/blood_volume = vessel.get_reagent_amount("blood")
+ var/blood_volume = vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(blood_volume < species?.blood_volume*species?.blood_level_fatal)
bloodtrail = 0 //Most of it's gone already, just leave it be
else
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 6ccfeb5fb8..aff6851e97 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -436,7 +436,7 @@ This function restores the subjects blood to max.
if(!should_have_organ(O_HEART))
return
if(vessel.total_volume < species.blood_volume)
- vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
+ vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)
/*
This function restores all organs.
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index e66793b754..7f0d4d7ed3 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1942,7 +1942,7 @@
if(Pump)
temp += Pump.standard_pulse_level - PULSE_NORM
- if(round(vessel.get_reagent_amount("blood")) <= species.blood_volume*species.blood_level_danger) //how much blood do we have
+ if(round(vessel.get_reagent_amount(REAGENT_ID_BLOOD)) <= species.blood_volume*species.blood_level_danger) //how much blood do we have
temp = temp + 3 //not enough :(
if(status_flags & FAKEDEATH)
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 128d4d70b8..2ec37f00d8 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -41,8 +41,8 @@
var/show_ssd = "fast asleep"
var/virus_immune
var/short_sighted // Permanent weldervision.
- var/blood_name = "blood" // Name for the species' blood.
- var/blood_reagents = "iron" // Reagent(s) that restore lost blood. goes by reagent IDs.
+ var/blood_name = REAGENT_ID_BLOOD // Name for the species' blood.
+ var/blood_reagents = REAGENT_ID_IRON // Reagent(s) that restore lost blood. goes by reagent IDs.
var/blood_volume = 560 // Initial blood volume.
var/bloodloss_rate = 1 // Multiplier for how fast a species bleeds out. Higher = Faster
var/blood_level_safe = 0.85 //"Safe" blood level; above this, you're OK
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index 3123fa8670..60bbc3ac10 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -338,7 +338,7 @@
name = "fruit gland"
desc = "A bulbous gourd-like structure."
organ_tag = A_FRUIT
- var/generated_reagents = list("sugar" = 2) //This actually allows them. This could be anything, but sugar seems most fitting.
+ var/generated_reagents = list(REAGENT_ID_SUGAR = 2) //This actually allows them. This could be anything, but sugar seems most fitting.
var/usable_volume = 250 //Five fruit.
var/transfer_amount = 50
var/empty_message = list("Your have no fruit on you.", "You have a distinct lack of fruit..")
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 4c027e07c3..eb4e6a8f5b 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -318,7 +318,7 @@
flash_mod = 1.2
chemOD_mod = 0.9
- blood_reagents = "copper"
+ blood_reagents = REAGENT_ID_COPPER
bloodloss_rate = 1.5
ambiguous_genders = TRUE
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index fb8f73b952..0ccbaf0f19 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -87,9 +87,9 @@
/mob/living/carbon/human/proc/hasnutriment()
- if (bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
+ if (bloodstr.has_reagent(REAGENT_ID_NUTRIMENT, 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
return TRUE
- else if (ingested.has_reagent("nutriment", 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
+ else if (ingested.has_reagent(REAGENT_ID_NUTRIMENT, 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
return TRUE
else return FALSE
@@ -1621,9 +1621,9 @@
continue
if(L == src) //no getting high off your own supply, get a nif or something, nerd.
continue
- if(!L.resizable && (trait_injection_selected == "macrocillin" || trait_injection_selected == "microcillin" || trait_injection_selected == "normalcillin")) // If you're using a size reagent, ignore those with pref conflicts.
+ if(!L.resizable && (trait_injection_selected == REAGENT_ID_MACROCILLIN || trait_injection_selected == REAGENT_ID_MICROCILLIN || trait_injection_selected == REAGENT_ID_NORMALCILLIN)) // If you're using a size reagent, ignore those with pref conflicts.
continue
- if(!L.allow_spontaneous_tf && (trait_injection_selected == "androrovir" || trait_injection_selected == "gynorovir" || trait_injection_selected == "androgynorovir")) // If you're using a TF reagent, ignore those with pref conflicts.
+ if(!L.allow_spontaneous_tf && (trait_injection_selected == REAGENT_ID_ANDROROVIR || trait_injection_selected == REAGENT_ID_GYNOROVIR || trait_injection_selected == REAGENT_ID_ANDROGYNOROVIR)) // If you're using a TF reagent, ignore those with pref conflicts.
continue
targets += L
diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
index 6532e7c749..ad66fdeefd 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
@@ -206,7 +206,7 @@
flesh_color = "#AFA59E"
base_color = "#333333"
blood_color = "#240bc4"
- blood_reagents = "copper"
+ blood_reagents = REAGENT_ID_COPPER
reagent_tag = IS_ZORREN
color_mult = 1
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index b69a65d13b..bb17f937a6 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -170,17 +170,17 @@
/datum/trait/neutral/venom_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/injection)
- H.trait_injection_reagents += "microcillin" // get small
- H.trait_injection_reagents += "macrocillin" // get BIG
- H.trait_injection_reagents += "normalcillin" // normal
+ H.trait_injection_reagents += REAGENT_ID_MICROCILLIN // get small
+ H.trait_injection_reagents += REAGENT_ID_MACROCILLIN // get BIG
+ H.trait_injection_reagents += REAGENT_ID_NORMALCILLIN // normal
H.trait_injection_reagents += "numbenzyme" // no feelings
- H.trait_injection_reagents += "androrovir" // -> MALE
- H.trait_injection_reagents += "gynorovir" // -> FEMALE
- H.trait_injection_reagents += "androgynorovir" // -> PLURAL
+ H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE
+ H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE
+ H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL
H.trait_injection_reagents += "stoxin" // night night chem
- H.trait_injection_reagents += "rainbowtoxin" // Funny flashing lights.
- H.trait_injection_reagents += "paralysistoxin" // Paralysis!
- H.trait_injection_reagents += "painenzyme" // Pain INCREASER
+ H.trait_injection_reagents += REAGENT_ID_RAINBOWTOXIN // Funny flashing lights.
+ H.trait_injection_reagents += REAGENT_ID_PARALYSISTOXIN // Paralysis!
+ H.trait_injection_reagents += REAGENT_ID_PAINENZYME // Pain INCREASER
/datum/trait/neutral/long_vore
name = "Long Predatorial Reach"
diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm
index ad240a4a56..3564a2c5a9 100644
--- a/code/modules/mob/living/carbon/metroid/items.dm
+++ b/code/modules/mob/living/carbon/metroid/items.dm
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/snacks/egg/slime/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4)
reagents.add_reagent("slimejelly", 1)
addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS))
diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm
index 90e249b79a..d1d4ef4a4c 100644
--- a/code/modules/mob/living/carbon/taste.dm
+++ b/code/modules/mob/living/carbon/taste.dm
@@ -37,7 +37,7 @@ calculate text size per text.
for(var/datum/reagent/R in reagent_list)
if(!R.taste_mult)
continue
- if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why
+ if(R.id == REAGENT_ID_NUTRIMENT) //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why
var/list/taste_data = R.get_data()
for(var/taste in taste_data)
if(taste in tastes)
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index 0baa98d422..10b7738149 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -797,7 +797,7 @@
name = "Combat Triage Belly"
desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves. This one is for more extreme combat scenarios."
icon_state = "sleepersyndiemed"
- injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood")
+ injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
digest_multiplier = 2
/obj/item/dogborg/sleeper/K9/syndie
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 5a4c4ea64c..7ff7c3c125 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -260,7 +260,7 @@ var/global/list/robot_modules = list(
var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src)
src.emag += PS
- PS.reagents.add_reagent("pacid", 250)
+ PS.reagents.add_reagent(REAGENT_ID_PACID, 250)
PS.name = "Polyacid spray"
var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000)
@@ -296,7 +296,7 @@ var/global/list/robot_modules = list(
var/obj/item/reagent_containers/spray/PS = locate() in src.emag
if(PS)
- PS.reagents.add_reagent("pacid", 2 * amount)
+ PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount)
..()
@@ -319,7 +319,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/inflatable_dispenser/robot(src)
var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src)
src.emag += PS
- PS.reagents.add_reagent("pacid", 250)
+ PS.reagents.add_reagent(REAGENT_ID_PACID, 250)
PS.name = "Polyacid spray"
var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(15000)
@@ -355,7 +355,7 @@ var/global/list/robot_modules = list(
var/obj/item/reagent_containers/spray/PS = locate() in src.emag
if(PS)
- PS.reagents.add_reagent("pacid", 2 * amount)
+ PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount)
..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
index e951368c32..6c20b92636 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
@@ -161,7 +161,7 @@
return
to_chat(user, span_notice("\The [src] seems too full to eat."))
return
- var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much?
+ var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much?
var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much?
var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much?
var/yum = nutriment_amount + protein_amount + glucose_amount
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
index 79a6786396..64791a2fb1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
@@ -168,4 +168,4 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize()
nutriment_amt += inherited_nutriment
. = ..()
- reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, nutriment_amt, nutriment_desc)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
index 4f9e9188c2..a8f73c964b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
@@ -512,7 +512,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
if(nutrition >= 5000)
user.visible_message(span_notice("\The [user] tries to feed \the [O] to \the [src]. It snoofs but does not eat."),span_notice("You try to feed \the [O] to \the [src], but it only snoofts at it."))
return
- var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much?
+ var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much?
var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much?
var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much?
var/yum = nutriment_amount + protein_amount + glucose_amount
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
index 779e871695..d263936fc8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
@@ -70,7 +70,7 @@
/mob/living/simple_mob/animal/borer/handle_special()
if(host && !stat && !host.stat)
// Handle docility.
- if(host.reagents.has_reagent("sugar") && !docile)
+ if(host.reagents.has_reagent(REAGENT_ID_SUGAR) && !docile)
var/message = "You feel the soporific flow of sugar in your host's blood, lulling you into docility."
var/target = controlling ? host : src
to_chat(target, span_warning(message))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
index 3e8f88b01a..a8e84ebd62 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
@@ -109,7 +109,7 @@
/obj/item/reagent_containers/food/snacks/meat = 20
)
- var/poison_type = "spidertoxin" // The reagent that gets injected when it attacks.
+ var/poison_type = REAGENT_ID_SPIDERTOXIN // The reagent that gets injected when it attacks.
var/poison_chance = 10 // Chance for injection to occur.
var/poison_per_bite = 5 // Amount added per injection.
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
index d4d59ed4ac..5cbb3d9fa0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
@@ -24,7 +24,7 @@
poison_chance = 15
poison_per_bite = 2
- poison_type = "psilocybin"
+ poison_type = REAGENT_ID_PSILOCYBIN
ai_holder_type = /datum/ai_holder/simple_mob/ranged/electric_spider
@@ -62,4 +62,4 @@
can_lay_eggs = FALSE
/mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless
- can_lay_eggs = FALSE
\ No newline at end of file
+ can_lay_eggs = FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm
index d793e1ae53..425d37f0af 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm
@@ -34,7 +34,7 @@
melee_damage_lower = 8
melee_damage_upper = 15
poison_per_bite = 2
- poison_type = "psilocybin"
+ poison_type = REAGENT_ID_PSILOCYBIN
player_msg = "You can fire a ranged attack by clicking on an enemy or tile at a distance."
ai_holder_type = /datum/ai_holder/simple_mob/ranged
@@ -57,4 +57,4 @@
return
B.old_style_target(A, src)
B.fire()
- set_AI_busy(FALSE)
\ No newline at end of file
+ set_AI_busy(FALSE)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index 029b3986ce..4917eeff5a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -198,7 +198,7 @@
chemicals -= 50
if(host.getOxyLoss() >= 30 && chemicals > 50)
- host.reagents.add_reagent("iron", 10)
+ host.reagents.add_reagent(REAGENT_ID_IRON, 10)
chemicals -= 40
if(host.getBrainLoss() >= 10 && chemicals > 100)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
index d75fc6e33c..87e5217d5b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
@@ -158,7 +158,7 @@
icon = 'icons/mob/snake_vr.dmi'
icon_state = "snack_yellow"
nutriment_amt = 1
- nutriment_desc = list("sugar" = 1)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 1)
/obj/item/reagent_containers/food/snacks/snakesnack/Initialize()
. = ..()
@@ -166,7 +166,7 @@
snack_colour = pick( list("yellow","green","pink","blue") )
icon_state = "snack_[snack_colour]"
desc = "A little mouse treat made of coloured sugar. Noodle loves these! This one is [snack_colour]."
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/storage/box/snakesnackbox
name = "box of Snake Snax"
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
index dfa5a6967a..a23102b717 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -509,7 +509,7 @@
slime_color = "green"
coretype = /obj/item/slime_extract/green
glow_toggle = TRUE
- reagent_injected = "radium"
+ reagent_injected = REAGENT_ID_RADIUM
var/rads = 25
description_info = "This slime will irradiate anything nearby passively, and will inject radium on attack. \
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
index faeafaa866..86c3b58848 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
@@ -40,7 +40,7 @@
faction = FACTION_BEE
- var/poison_type = "spidertoxin" // The reagent that gets injected when it attacks, can be changed to different toxin.
+ var/poison_type = REAGENT_ID_SPIDERTOXIN // The reagent that gets injected when it attacks, can be changed to different toxin.
var/poison_chance = 10 // Chance for injection to occur.
var/poison_per_bite = 1 // Amount added per injection.
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
index 3036edd2f2..93c2958519 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
@@ -1007,7 +1007,7 @@ I think I covered everything.
//Alternatively bully a coder (me) to make a unique digest_mode for mob healbellies that prevents death, or something.
if(istype(A, /mob/living/carbon/human))
var/mob/living/carbon/human/P = L
- var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", "iron", "hyronalin")
+ var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", REAGENT_ID_IRON, "hyronalin")
//Lets not OD them...
for(var/RG in to_inject)
if(!P.reagents.has_reagent(RG))
diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index 3364d33068..efd5db1e7d 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -35,17 +35,17 @@ var/const/CE_STABLE_THRESHOLD = 0.5
return
if(!amt)
- vessel.add_reagent("blood",species.blood_volume)
+ vessel.add_reagent(REAGENT_ID_BLOOD,species.blood_volume)
else
- vessel.add_reagent("blood", clamp(amt, 1, species.blood_volume))
+ vessel.add_reagent(REAGENT_ID_BLOOD, clamp(amt, 1, species.blood_volume))
//Resets blood data
/mob/living/carbon/human/proc/fixblood()
for(var/datum/reagent/blood/B in vessel.reagent_list)
- if(B.id == "blood")
+ if(B.id == REAGENT_ID_BLOOD)
B.data = list( "donor"=src,"viruses"=null,"species"=species.name,"blood_DNA"=dna.unique_enzymes,"blood_colour"= species.get_blood_colour(src),"blood_type"=dna.b_type, \
- "resistances"=null,"trace_chem"=null, "virus2" = null, "antibodies" = list(), "blood_name" = species.get_blood_name(src))
+ "resistances"=null,"trace_chem"=null, "virus2" = null, REAGENT_ID_ANTIBODIES = list(), "blood_name" = species.get_blood_name(src))
if(isSynthetic())
B.data["species"] = "synthetic"
@@ -63,7 +63,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood.
- var/blood_volume_raw = vessel.get_reagent_amount("blood")
+ var/blood_volume_raw = vessel.get_reagent_amount(REAGENT_ID_BLOOD)
var/blood_volume = round((blood_volume_raw/species.blood_volume)*100) // Percentage.
//Blood regeneration if there is some space
@@ -222,14 +222,14 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(!amt)
return 0
- var/current_blood = vessel.get_reagent_amount("blood")
+ var/current_blood = vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(current_blood < BLOOD_MINIMUM_STOP_PROCESS)
return 0 //We stop processing under 3 units of blood because apparently weird shit can make it overflowrandomly.
if(amt > current_blood)
amt = current_blood - 2 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel.
- return vessel.remove_reagent("blood",amt)
+ return vessel.remove_reagent(REAGENT_ID_BLOOD,amt)
/****************************************************
BLOOD TRANSFERS
@@ -281,7 +281,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(!should_have_organ(O_HEART))
return null
- if(vessel.get_reagent_amount("blood") < max(amount, BLOOD_MINIMUM_STOP_PROCESS))
+ if(vessel.get_reagent_amount(REAGENT_ID_BLOOD) < max(amount, BLOOD_MINIMUM_STOP_PROCESS))
return null
. = ..()
@@ -299,8 +299,8 @@ var/const/CE_STABLE_THRESHOLD = 0.5
ContractDisease(D)
if (injected.data["resistances"] && prob(5))
antibodies |= injected.data["resistances"]
- if (injected.data["antibodies"] && prob(5))
- antibodies |= injected.data["antibodies"]
+ if (injected.data[REAGENT_ID_ANTIBODIES] && prob(5))
+ antibodies |= injected.data[REAGENT_ID_ANTIBODIES]
var/list/chems = list()
chems = params2list(injected.data["trace_chem"])
for(var/C in chems)
@@ -311,7 +311,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
/mob/living/carbon/human/inject_blood(var/datum/reagent/blood/injected, var/amount)
if(!should_have_organ(O_HEART))
- reagents.add_reagent("blood", amount, injected.data)
+ reagents.add_reagent(REAGENT_ID_BLOOD, amount, injected.data)
reagents.update_total()
return
@@ -329,7 +329,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
log_debug("Failed to re-initialize blood datums on [src]!")
return
if(vessel.total_volume < species.blood_volume)
- vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
+ vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)
else if(vessel.total_volume > species.blood_volume)
vessel.maximum_volume = species.blood_volume
fixblood()
@@ -343,7 +343,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
reagents.add_reagent("toxin",amount * 0.5)
reagents.update_total()
else
- vessel.add_reagent("blood", amount, injected.data)
+ vessel.add_reagent(REAGENT_ID_BLOOD, amount, injected.data)
vessel.update_total()
..()
diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm
index 38fe8a3863..48d0b87472 100644
--- a/code/modules/organs/internal/stomach.dm
+++ b/code/modules/organs/internal/stomach.dm
@@ -47,7 +47,7 @@
/obj/item/organ/internal/stomach/xeno
color = "#555555"
- acidtype = "pacid"
+ acidtype = REAGENT_ID_PACID
/obj/item/organ/internal/stomach/machine
name = "reagent cycler"
@@ -56,7 +56,7 @@
robotic = ORGAN_ROBOT
- acidtype = "sacid"
+ acidtype = REAGENT_ID_SACID
organ_verbs = list(/mob/living/carbon/human/proc/reagent_purge) //VOREStation Add
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 37f7d08b90..083b197307 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -177,7 +177,7 @@ var/list/organ_cache = list()
if(!owner && reagents)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list
if(B && prob(40) && !isbelly(loc)) //VOREStation Edit
- reagents.remove_reagent("blood",0.1)
+ reagents.remove_reagent(REAGENT_ID_BLOOD,0.1)
blood_splatter(src,B,1)
if(CONFIG_GET(flag/organs_decay) && decays) damage += rand(1,3)
if(damage >= max_damage)
diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm
index b602ac1e49..40c51d1fa1 100644
--- a/code/modules/power/antimatter/fuel.dm
+++ b/code/modules/power/antimatter/fuel.dm
@@ -89,7 +89,7 @@
O.item = src
O.s_loc = user.loc
O.t_loc = M.loc
- O.place = "fuel"
+ O.place = REAGENT_ID_FUEL
M.requests += O
spawn( 0 )
O.process()
diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm
index 4835c788ba..5a62f7bc54 100644
--- a/code/modules/power/fusion/fusion_reactions.dm
+++ b/code/modules/power/fusion/fusion_reactions.dm
@@ -67,7 +67,7 @@ var/list/fusion_reactions
/decl/fusion_reaction/deuterium_lithium
p_react = "deuterium"
- s_react = "lithium"
+ s_react = REAGENT_ID_LITHIUM
energy_consumption = 2
energy_production = 0
radiation = 3
@@ -82,7 +82,7 @@ var/list/fusion_reactions
energy_production = 0
instability = 5
radiation = 5
- products = list("silicon"= 1)
+ products = list(REAGENT_ID_SILICON= 1)
/decl/fusion_reaction/iron_iron
p_react = REAGENT_ID_IRON
diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
index 15fb77c197..7e4f2643a6 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
@@ -270,7 +270,7 @@
*/
/datum/particle_smasher_recipe
- var/list/reagents // example: = list("pacid" = 5)
+ var/list/reagents // example: = list(REAGENT_ID_PACID = 5)
var/list/items // example: = list(/obj/item/tool/crowbar, /obj/item/welder) Place /foo/bar before /foo. Do not include fruit. Maximum of 3 items.
var/recipe_type = PS_RESULT_STACK // Are we producing a stack or an item?
@@ -319,7 +319,7 @@
return .
/datum/particle_smasher_recipe/deuterium_tritium
- reagents = list("hydrogen" = 15)
+ reagents = list(REAGENT_ID_HYDROGEN = 15)
result = /obj/item/stack/material/tritium
required_material = /obj/item/stack/material/deuterium
@@ -349,7 +349,7 @@
probability = 10
/datum/particle_smasher_recipe/osmium_lead
- reagents = list("tungsten" = 10)
+ reagents = list(REAGENT_ID_TUNGSTEN = 10)
result = /obj/item/stack/material/lead
required_material = /obj/item/stack/material/osmium
@@ -362,7 +362,7 @@
probability = 50
/datum/particle_smasher_recipe/phoron_valhollide
- reagents = list(REAGENT_ID_PHORON = 10, "pacid" = 10)
+ reagents = list(REAGENT_ID_PHORON = 10, REAGENT_ID_PACID = 10)
result = /obj/item/stack/material/valhollide
required_material = /obj/item/stack/material/phoron
diff --git a/code/modules/projectiles/projectile/arc.dm b/code/modules/projectiles/projectile/arc.dm
index 0324d273cc..271e5f2576 100644
--- a/code/modules/projectiles/projectile/arc.dm
+++ b/code/modules/projectiles/projectile/arc.dm
@@ -190,7 +190,7 @@
var/obj/effect/effect/water/splash = new(T)
splash.create_reagents(15)
splash.reagents.add_reagent("stomacid", 5)
- splash.reagents.add_reagent("blood", 10,list("blood_colour" = "#ec4940"))
+ splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = "#ec4940"))
splash.set_color()
splash.set_up(F, 2, 3)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index d0a4865482..8efdf1caa1 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -510,8 +510,8 @@
if(M.health < M.maxHealth)
var/obj/effect/overlay/pulse = new /obj/effect/overlay(get_turf(M))
pulse.icon = 'icons/effects/effects.dmi'
- pulse.icon_state = "heal"
- pulse.name = "heal"
+ pulse.icon_state = XENO_CHEM_HEAL
+ pulse.name = XENO_CHEM_HEAL
pulse.anchored = TRUE
spawn(20)
qdel(pulse)
diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm
index f73fe9d008..a20adf0df9 100644
--- a/code/modules/projectiles/projectile/blob.dm
+++ b/code/modules/projectiles/projectile/blob.dm
@@ -53,7 +53,7 @@
/obj/item/projectile/energy/blob/acid
damage_type = BURN
check_armour = "bio"
- my_chems = list("sacid", "mold")
+ my_chems = list(REAGENT_ID_SACID, "mold")
/obj/item/projectile/energy/blob/acid/splattering
splatter = TRUE
@@ -61,7 +61,7 @@
/obj/item/projectile/energy/blob/combustible
splatter = TRUE
flammability = 0.25
- my_chems = list("fuel", "mold")
+ my_chems = list(REAGENT_ID_FUEL, "mold")
/obj/item/projectile/energy/blob/freezing
my_chems = list("frostoil")
diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm
index 4fe1b65b94..d6a57da929 100644
--- a/code/modules/random_map/noise/ore.dm
+++ b/code/modules/random_map/noise/ore.dm
@@ -48,67 +48,67 @@
continue
if(!priority_process) sleep(-1)
T.resources = list()
- T.resources["sand"] = rand(3,5)
- T.resources["carbon"] = rand(3,5)
+ T.resources[ORE_SAND] = rand(3,5)
+ T.resources[ORE_CARBON] = rand(3,5)
var/current_cell = map[get_map_cell(x,y)]
if(current_cell < rare_val) // Surface metals.
- T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["marble"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- T.resources["diamond"] = 0
+ T.resources[ORE_HEMATITE] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_GOLD] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_SILVER] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_URANIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_MARBLE] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_DIAMOND] = 0
T.resources[ORE_PHORON] = 0
- T.resources["platinum"] = 0
- T.resources["mhydrogen"] = 0
- T.resources["verdantium"] = 0
- T.resources["lead"] = 0
- //T.resources["copper"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
- //T.resources["tin"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- //T.resources["bauxite"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_PLATINUM] = 0
+ T.resources[ORE_MHYDROGEN] = 0
+ T.resources[ORE_VERDANTIUM] = 0
+ T.resources[ORE_LEAD] = 0
+ //T.resources[ORE_COPPER] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
+ //T.resources[ORE_TIN] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ //T.resources[ORE_BAUXITE] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources[ORE_RUTILE] = 0
- //T.resources["void opal"] = 0
- //T.resources["quartz"] = 0
- //T.resources["painite"] = 0
+ //T.resources[ORE_VOPAL] = 0
+ //T.resources[ORE_QUARTZ] = 0
+ //T.resources[ORE_PAINITE] = 0
else if(current_cell < deep_val) // Rare metals.
- T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_GOLD] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_SILVER] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_URANIUM] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources[ORE_PHORON] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["platinum"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
- T.resources["mhydrogen"] = 0
- T.resources["diamond"] = 0
- T.resources["hematite"] = 0
- T.resources["marble"] = 0
- //T.resources["copper"] = 0
- //T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- //T.resources["bauxite"] = 0
+ T.resources[ORE_PLATINUM] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_VERDANTIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_LEAD] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_MHYDROGEN] = 0
+ T.resources[ORE_DIAMOND] = 0
+ T.resources[ORE_HEMATITE] = 0
+ T.resources[ORE_MARBLE] = 0
+ //T.resources[ORE_COPPER] = 0
+ //T.resources[ORE_TIN] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ //T.resources[ORE_BAUXITE] = 0
T.resources[ORE_RUTILE] = 0
- //T.resources["void opal"] = 0
- //T.resources["quartz"] = 0
- //T.resources["painite"] = 0
+ //T.resources[ORE_VOPAL] = 0
+ //T.resources[ORE_QUARTZ] = 0
+ //T.resources[ORE_PAINITE] = 0
else // Deep metals.
- T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
- T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_URANIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_DIAMOND] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
+ T.resources[ORE_VERDANTIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
T.resources[ORE_PHORON] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- T.resources["platinum"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
- T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
- T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
- T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX)
- T.resources["hematite"] = 0
- T.resources["gold"] = 0
- T.resources["silver"] = 0
- //T.resources["copper"] = 0
- //T.resources["tin"] = 0
- //T.resources["bauxite"] = 0
+ T.resources[ORE_PLATINUM] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_MHYDROGEN] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+ T.resources[ORE_MARBLE] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_LEAD] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX)
+ T.resources[ORE_HEMATITE] = 0
+ T.resources[ORE_GOLD] = 0
+ T.resources[ORE_SILVER] = 0
+ //T.resources[ORE_COPPER] = 0
+ //T.resources[ORE_TIN] = 0
+ //T.resources[ORE_BAUXITE] = 0
T.resources[ORE_RUTILE] = 0
- //T.resources["void opal"] = 0
- //T.resources["quartz"] = 0
- //T.resources["painite"] = 0
+ //T.resources[ORE_VOPAL] = 0
+ //T.resources[ORE_QUARTZ] = 0
+ //T.resources[ORE_PAINITE] = 0
return
/datum/random_map/noise/ore/get_map_char(var/value)
diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm
index 96bd9a6e05..764edc03e5 100644
--- a/code/modules/reagents/holder/holder.dm
+++ b/code/modules/reagents/holder/holder.dm
@@ -109,7 +109,7 @@
for(var/datum/reagent/current in reagent_list)
if(current.id == id)
- if(current.id == "blood")
+ if(current.id == REAGENT_ID_BLOOD)
if(LAZYLEN(data) && !isnull(data["species"]) && !isnull(current.data["species"]) && data["species"] != current.data["species"]) // Species bloodtypes are already incompatible, this just stops it from mixing into the one already in a container.
continue
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index 9f5be5b0b1..4163478a79 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -6,53 +6,53 @@
// Multiple
/obj/item/reagent_containers/chem_disp_cartridge/water
- spawn_reagent = "water"
+ spawn_reagent = REAGENT_ID_WATER
/obj/item/reagent_containers/chem_disp_cartridge/sugar
- spawn_reagent = "sugar"
+ spawn_reagent = REAGENT_ID_SUGAR
// Chemistry
/obj/item/reagent_containers/chem_disp_cartridge/hydrogen
- spawn_reagent = "hydrogen"
+ spawn_reagent = REAGENT_ID_HYDROGEN
/obj/item/reagent_containers/chem_disp_cartridge/lithium
- spawn_reagent = "lithium"
+ spawn_reagent = REAGENT_ID_LITHIUM
/obj/item/reagent_containers/chem_disp_cartridge/carbon
- spawn_reagent = "carbon"
+ spawn_reagent = REAGENT_ID_CARBON
/obj/item/reagent_containers/chem_disp_cartridge/nitrogen
spawn_reagent = REAGENT_ID_NITROGEN
/obj/item/reagent_containers/chem_disp_cartridge/oxygen
spawn_reagent = REAGENT_ID_OXYGEN
/obj/item/reagent_containers/chem_disp_cartridge/fluorine
- spawn_reagent = "fluorine"
+ spawn_reagent = REAGENT_ID_FLUORINE
/obj/item/reagent_containers/chem_disp_cartridge/sodium
- spawn_reagent = "sodium"
+ spawn_reagent = REAGENT_ID_SODIUM
/obj/item/reagent_containers/chem_disp_cartridge/aluminum
- spawn_reagent = "aluminum"
+ spawn_reagent = REAGENT_ID_ALUMINIUM
/obj/item/reagent_containers/chem_disp_cartridge/silicon
- spawn_reagent = "silicon"
+ spawn_reagent = REAGENT_ID_SILICON
/obj/item/reagent_containers/chem_disp_cartridge/phosphorus
- spawn_reagent = "phosphorus"
+ spawn_reagent = REAGENT_ID_PHOSPHORUS
/obj/item/reagent_containers/chem_disp_cartridge/sulfur
- spawn_reagent = "sulfur"
+ spawn_reagent = REAGENT_ID_SULFUR
/obj/item/reagent_containers/chem_disp_cartridge/chlorine
- spawn_reagent = "chlorine"
+ spawn_reagent = REAGENT_ID_CHLORINE
/obj/item/reagent_containers/chem_disp_cartridge/potassium
- spawn_reagent = "potassium"
+ spawn_reagent = REAGENT_ID_POTASSIUM
/obj/item/reagent_containers/chem_disp_cartridge/iron
- spawn_reagent = "iron"
+ spawn_reagent = REAGENT_ID_IRON
/obj/item/reagent_containers/chem_disp_cartridge/copper
- spawn_reagent = "copper"
+ spawn_reagent = REAGENT_ID_COPPER
/obj/item/reagent_containers/chem_disp_cartridge/mercury
- spawn_reagent = "mercury"
+ spawn_reagent = REAGENT_ID_MERCURY
/obj/item/reagent_containers/chem_disp_cartridge/radium
- spawn_reagent = "radium"
+ spawn_reagent = REAGENT_ID_RADIUM
/obj/item/reagent_containers/chem_disp_cartridge/ethanol
- spawn_reagent = "ethanol"
+ spawn_reagent = REAGENT_ID_ETHANOL
/obj/item/reagent_containers/chem_disp_cartridge/sacid
- spawn_reagent = "sacid"
+ spawn_reagent = REAGENT_ID_SACID
/obj/item/reagent_containers/chem_disp_cartridge/tungsten
- spawn_reagent = "tungsten"
+ spawn_reagent = REAGENT_ID_TUNGSTEN
/obj/item/reagent_containers/chem_disp_cartridge/calcium
- spawn_reagent = "calcium"
+ spawn_reagent = REAGENT_ID_CALCIUM
// Bar, alcoholic
/obj/item/reagent_containers/chem_disp_cartridge/beer
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
index abd54931b7..767e269b87 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
@@ -6,7 +6,7 @@
mutagen spawn_reagent = "mutagen"
//Biochem
- nutriment spawn_reagent = "nutriment"
+ nutriment spawn_reagent = REAGENT_ID_NUTRIMENT
protein spawn_reagent = "protein"
//Special Ops
@@ -14,4 +14,4 @@
carthatoline spawn_reagent = "carthatoline"
corophizine spawn_reagent = "corophizine"
myelamine spawn_reagent = "myelamine"
- osteodaxon spawn_reagent = "osteodaxon"
\ No newline at end of file
+ osteodaxon spawn_reagent = "osteodaxon"
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index 37e1100f8d..771319a6e1 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -29,10 +29,10 @@
/obj/machinery/chemical_dispenser
dispense_reagents = list(
- "hydrogen", "lithium", "carbon", REAGENT_ID_NITROGEN, REAGENT_ID_OXYGEN, "fluorine", "sodium",
- "aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron",
- "copper", "mercury", "radium", "water", "ethanol", "sugar", "sacid", "tungsten",
- "calcium"
+ REAGENT_ID_HYDROGEN, REAGENT_ID_LITHIUM, REAGENT_ID_CARBON, REAGENT_ID_NITROGEN, REAGENT_ID_OXYGEN, REAGENT_ID_FLUORINE, REAGENT_ID_SODIUM,
+ REAGENT_ID_ALUMINIUM, REAGENT_ID_SILICON, REAGENT_ID_PHOSPHORUS, REAGENT_ID_SULFUR, REAGENT_ID_CHLORINE, REAGENT_ID_POTASSIUM, REAGENT_ID_IRON,
+ REAGENT_ID_COPPER, REAGENT_ID_MERCURY, REAGENT_ID_RADIUM, REAGENT_ID_WATER, REAGENT_ID_ETHANOL, REAGENT_ID_SUGAR, REAGENT_ID_SACID, REAGENT_ID_TUNGSTEN,
+ REAGENT_ID_CALCIUM
)
/obj/machinery/chemical_dispenser/ert
@@ -46,13 +46,13 @@
/obj/machinery/chemical_dispenser/bar_soft
dispense_reagents = list(
- "water", "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic",
- "sodawater", "lemonjuice", "lemon_lime", "sugar", "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda"
+ REAGENT_ID_WATER, "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic",
+ "sodawater", "lemonjuice", "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda"
)
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
- "lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
+ "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
"whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
)
diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
index 5a09eac7df..81c6d97350 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(
- "water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium"
+ REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, "ammonia", "diethylamine", "plantbgone", "mutagen", REAGENT_ID_CALCIUM
)
/obj/machinery/chemical_dispenser/xenoflora/full
@@ -22,7 +22,7 @@
name = "bioproduct dispenser"
ui_title = "Bioproduct Dispenser"
dispense_reagents = list(
- "nutriment", "protein", "milk"
+ REAGENT_ID_NUTRIMENT, "protein", "milk"
)
/obj/machinery/chemical_dispenser/biochemistry/full
@@ -70,4 +70,4 @@
name = "chemical dispenser"
icon = 'icons/obj/abductor_vr.dmi'
icon_state = "dispenser_2way"
- desc = "A mysterious machine which can fabricate many chemicals."
\ No newline at end of file
+ desc = "A mysterious machine which can fabricate many chemicals."
diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index 9e823fb51a..3ad75cc46c 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -108,7 +108,7 @@
/obj/structure/reagent_dispensers/watertank/Initialize()
. = ..()
- reagents.add_reagent("water", 1000)
+ reagents.add_reagent(REAGENT_ID_WATER, 1000)
/obj/structure/reagent_dispensers/watertank/high
name = "high-capacity water tank"
@@ -117,7 +117,7 @@
/obj/structure/reagent_dispensers/watertank/high/Initialize()
. = ..()
- reagents.add_reagent("water", 4000)
+ reagents.add_reagent(REAGENT_ID_WATER, 4000)
/obj/structure/reagent_dispensers/watertank/barrel
name = "water barrel"
@@ -128,14 +128,14 @@
/obj/structure/reagent_dispensers/fueltank
name = "fuel tank"
desc = "A fuel tank."
- icon_state = "fuel"
+ icon_state = REAGENT_ID_FUEL
amount_per_transfer_from_this = 10
var/modded = 0
var/obj/item/assembly_holder/rig = null
/obj/structure/reagent_dispensers/fueltank/Initialize()
. = ..()
- reagents.add_reagent("fuel",1000)
+ reagents.add_reagent(REAGENT_ID_FUEL,1000)
/obj/structure/reagent_dispensers/fueltank/high
name = "high-capacity fuel tank"
@@ -144,7 +144,7 @@
/obj/structure/reagent_dispensers/fueltank/high/Initialize()
. = ..()
- reagents.add_reagent("fuel",4000)
+ reagents.add_reagent(REAGENT_ID_FUEL,4000)
//Foam
/obj/structure/reagent_dispensers/foam
@@ -293,7 +293,7 @@
return
amount = min(amount, reagents.total_volume)
- reagents.remove_reagent("fuel",amount)
+ reagents.remove_reagent(REAGENT_ID_FUEL,amount)
new /obj/effect/decal/cleanable/liquid_fuel(src.loc, amount,1)
/obj/structure/reagent_dispensers/peppertank
@@ -333,7 +333,7 @@
/obj/structure/reagent_dispensers/acid/Initialize()
. = ..()
- reagents.add_reagent("sacid", 1000)
+ reagents.add_reagent(REAGENT_ID_SACID, 1000)
/obj/structure/reagent_dispensers/water_cooler
name = "Water-Cooler"
@@ -356,7 +356,7 @@
/obj/structure/reagent_dispensers/water_cooler/Initialize()
. = ..()
if(bottle)
- reagents.add_reagent("water",2000)
+ reagents.add_reagent(REAGENT_ID_WATER,2000)
update_icon()
/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
@@ -550,4 +550,4 @@
/obj/structure/reagent_dispensers/bloodbarrel/Initialize()
. = ..()
- reagents.add_reagent("blood", 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null))
+ reagents.add_reagent(REAGENT_ID_BLOOD, 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null))
diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm
index 61559ad6db..240a1d564a 100644
--- a/code/modules/reagents/machinery/grinder.dm
+++ b/code/modules/reagents/machinery/grinder.dm
@@ -1,53 +1,53 @@
// Don't need a new list for every grinder in the game
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("carbon","carbon",REAGENT_ID_OXYGEN,"chlorine","sulfur"),
- /obj/item/stack/material/copper = list("copper"),
- /obj/item/stack/material/wood = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
- /obj/item/stack/material/stick = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
- /obj/item/stack/material/log = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
- /obj/item/stack/material/algae = list("carbon",REAGENT_ID_NITROGEN,REAGENT_ID_NITROGEN,"phosphorus","phosphorus"),
- /obj/item/stack/material/graphite = list("carbon"),
- /obj/item/stack/material/aluminium = list("aluminum"), // The material is aluminium, but the reagent is aluminum...
- /obj/item/stack/material/glass/reinforced = list("silicon","silicon","silicon","iron","carbon"),
- /obj/item/stack/material/leather = list("carbon","carbon","protein","protein","triglyceride"),
- /obj/item/stack/material/cloth = list("carbon","carbon","carbon","protein","sodium"),
- /obj/item/stack/material/fiber = list("carbon","carbon","carbon","protein","sodium"),
- /obj/item/stack/material/fur = list("carbon","carbon","carbon","sulfur","sodium"),
- /obj/item/stack/material/deuterium = list("hydrogen"),
- /obj/item/stack/material/glass/phoronrglass = list("silicon","silicon","silicon",REAGENT_ID_PHORON,REAGENT_ID_PHORON),
- /obj/item/stack/material/diamond = list("carbon"),
- /obj/item/stack/material/durasteel = list("iron","iron","carbon","carbon","platinum"),
- /obj/item/stack/material/wax = list("ethanol","triglyceride"),
- /obj/item/stack/material/iron = list("iron"),
+ /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/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...
+ /obj/item/stack/material/glass/reinforced = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_IRON,REAGENT_ID_CARBON),
+ /obj/item/stack/material/leather = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein","protein","triglyceride"),
+ /obj/item/stack/material/cloth = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein",REAGENT_ID_SODIUM),
+ /obj/item/stack/material/fiber = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein",REAGENT_ID_SODIUM),
+ /obj/item/stack/material/fur = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_SULFUR,REAGENT_ID_SODIUM),
+ /obj/item/stack/material/deuterium = list(REAGENT_ID_HYDROGEN),
+ /obj/item/stack/material/glass/phoronrglass = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_PHORON,REAGENT_ID_PHORON),
+ /obj/item/stack/material/diamond = list(REAGENT_ID_CARBON),
+ /obj/item/stack/material/durasteel = list(REAGENT_ID_IRON,REAGENT_ID_IRON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"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/phoron = list(REAGENT_ID_PHORON),
/obj/item/stack/material/gold = list("gold"),
/obj/item/stack/material/silver = list("silver"),
/obj/item/stack/material/platinum = list("platinum"),
- /obj/item/stack/material/mhydrogen = list("hydrogen"),
- /obj/item/stack/material/steel = list("iron", "carbon"),
- /obj/item/stack/material/plasteel = list("iron", "iron", "carbon", "carbon", "platinum"), //8 iron, 8 carbon, 4 platinum,
- /obj/item/stack/material/snow = list("water"),
- /obj/item/stack/material/sandstone = list("silicon", REAGENT_ID_OXYGEN),
- /obj/item/stack/material/glass = list("silicon"),
- /obj/item/stack/material/glass/phoronglass = list("platinum", "silicon", "silicon", "silicon"), //5 platinum, 15 silicon,
+ /obj/item/stack/material/mhydrogen = list(REAGENT_ID_HYDROGEN),
+ /obj/item/stack/material/steel = list(REAGENT_ID_IRON, REAGENT_ID_CARBON),
+ /obj/item/stack/material/plasteel = list(REAGENT_ID_IRON, REAGENT_ID_IRON, REAGENT_ID_CARBON, REAGENT_ID_CARBON, "platinum"), //8 iron, 8 carbon, 4 platinum,
+ /obj/item/stack/material/snow = list(REAGENT_ID_WATER),
+ /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("platinum", REAGENT_ID_SILICON, REAGENT_ID_SILICON, REAGENT_ID_SILICON), //5 platinum, 15 silicon,
/obj/item/stack/material/supermatter = list("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("silicon"),
- /obj/item/ore/iron = list("iron"),
- /obj/item/ore/coal = list("carbon"),
+ /obj/item/ore/glass = list(REAGENT_ID_SILICON),
+ /obj/item/ore/iron = list(REAGENT_ID_IRON),
+ /obj/item/ore/coal = list(REAGENT_ID_CARBON),
/obj/item/ore/phoron = list(REAGENT_ID_PHORON),
/obj/item/ore/silver = list("silver"),
/obj/item/ore/gold = list("gold"),
- /obj/item/ore/marble = list("silicon","aluminum","aluminum","sodium","calcium"), // Some nice variety here
+ /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/diamond = list("carbon"),
+ /obj/item/ore/diamond = list(REAGENT_ID_CARBON),
/obj/item/ore/osmium = list("platinum"), // should contain osmium
- /obj/item/ore/lead = list("lead"),
- /obj/item/ore/hydrogen = list("hydrogen"),
- /obj/item/ore/verdantium = list("radium",REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,"phosphorus","sodium"), // Some fun stuff to be useful with
- /obj/item/ore/rutile = list("tungsten",REAGENT_ID_OXYGEN) // Should be titanium
+ /obj/item/ore/lead = list(REAGENT_ID_LEAD),
+ /obj/item/ore/hydrogen = list(REAGENT_ID_HYDROGEN),
+ /obj/item/ore/verdantium = list(REAGENT_ID_RADIUM,REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,REAGENT_ID_PHOSPHORUS,REAGENT_ID_SODIUM), // Some fun stuff to be useful with
+ /obj/item/ore/rutile = list(REAGENT_ID_TUNGSTEN,REAGENT_ID_OXYGEN) // Should be titanium
)
/obj/machinery/reagentgrinder
diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm
index ed371c9673..a233d624aa 100644
--- a/code/modules/reagents/machinery/pump.dm
+++ b/code/modules/reagents/machinery/pump.dm
@@ -190,7 +190,7 @@
/turf/simulated/floor/water/pump_reagents(var/datum/reagents/R, var/volume)
. = ..()
- R.add_reagent("water", round(volume, 0.1))
+ R.add_reagent(REAGENT_ID_WATER, round(volume, 0.1))
var/datum/gas_mixture/air = return_air() // v
if(air.temperature <= T0C) // Uses the current air temp, instead of the turf starting temp
@@ -202,11 +202,11 @@
/turf/simulated/floor/water/pool/pump_reagents(var/datum/reagents/R, var/volume)
. = ..()
- R.add_reagent("chlorine", round(volume / 10, 0.1))
+ R.add_reagent(REAGENT_ID_CHLORINE, round(volume / 10, 0.1))
/turf/simulated/floor/water/deep/pool/pump_reagents(var/datum/reagents/R, var/volume)
. = ..()
- R.add_reagent("chlorine", round(volume / 10, 0.1))
+ R.add_reagent(REAGENT_ID_CHLORINE, round(volume / 10, 0.1))
/turf/simulated/floor/water/contaminated/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 043e88067f..7e77348a87 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -53,7 +53,7 @@
name = "Distilling Biomass"
id = "distill_biomass"
result = "biomass"
- required_reagents = list("blood" = 1, "sugar" = 1, REAGENT_ID_PHORON = 0.5)
+ 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.
temp_range = list(T20C + 80, T20C + 130)
@@ -118,8 +118,8 @@
/decl/chemical_reaction/distilling/synthplas
name = "Distilling Synthplas"
id = "distill_synthplas"
- result = "synthblood_dilute"
- required_reagents = list("protein" = 2, "antibodies" = 1, "bicaridine" = 1)
+ result = REAGENT_ID_SYNTHBLOOD_DILUTE
+ required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, "bicaridine" = 1)
result_amount = 3
reaction_rate = HALF_LIFE(15)
@@ -131,7 +131,7 @@
name = "Distilling Beer"
id = "distill_beer"
result = "beer"
- required_reagents = list("nutriment" = 1, "water" = 1, "sugar" = 1)
+ required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
reaction_rate = HALF_LIFE(30)
@@ -142,8 +142,8 @@
name = "Distilling Ale"
id = "distill_ale"
result = "ale"
- required_reagents = list("nutriment" = 1, "beer" = 1)
- inhibitors = list("water" = 1)
+ required_reagents = list(REAGENT_ID_NUTRIMENT = 1, "beer" = 1)
+ inhibitors = list(REAGENT_ID_WATER = 1)
result_amount = 2
reaction_rate = HALF_LIFE(30)
@@ -175,7 +175,7 @@
id = "distill_cryoslurry"
result = "cryoslurry"
required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, "foaming_agent" = 2)
- inhibitors = list("water" = 5)
+ inhibitors = list(REAGENT_ID_WATER = 5)
result_amount = 1
temp_range = list(0, 15)
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 2dae89f233..0ea27c54ef 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -2,49 +2,49 @@
name = "Coffee"
id = "coffee"
result = "coffee"
- required_reagents = list("water" = 5, "coffeepowder" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 5, "coffeepowder" = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tea
name = "Black tea"
id = "tea"
result = "tea"
- required_reagents = list("water" = 5, "teapowder" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 5, "teapowder" = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/hot_coco
name = "Hot Coco"
id = "hot_coco"
result = "hot_coco"
- required_reagents = list("water" = 5, "coco" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 5, "coco" = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/grapejuice
name = "Grape Juice"
id = "grapejuice"
result = "grapejuice"
- required_reagents = list("water" = 3, "instantgrape" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 3, "instantgrape" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/orangejuice
name = "Orange Juice"
id = "orangejuice"
result = "orangejuice"
- required_reagents = list("water" = 3, "instantorange" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 3, "instantorange" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
result = "watermelonjuice"
- required_reagents = list("water" = 3, "instantwatermelon" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 3, "instantwatermelon" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/applejuice
name = "Apple Juice"
id = "applejuice"
result = "applejuice"
- required_reagents = list("water" = 3, "instantapple" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 3, "instantapple" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/goldschlager
@@ -93,7 +93,7 @@
name = "Moonshine"
id = "moonshine"
result = "moonshine"
- required_reagents = list("nutriment" = 10)
+ required_reagents = list(REAGENT_ID_NUTRIMENT = 10)
catalysts = list("enzyme" = 5)
result_amount = 10
@@ -174,7 +174,7 @@
name = "Kahlua"
id = "kahlua"
result = "kahlua"
- required_reagents = list("coffee" = 5, "sugar" = 5)
+ required_reagents = list("coffee" = 5, REAGENT_ID_SUGAR = 5)
catalysts = list("enzyme" = 5)
result_amount = 5
@@ -274,7 +274,7 @@
name = "Beepksy Smash"
id = "beepksysmash"
result = "beepskysmash"
- required_reagents = list("limejuice" = 1, "whiskey" = 1, "iron" = 1)
+ required_reagents = list("limejuice" = 1, "whiskey" = 1, REAGENT_ID_IRON = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/doctor_delight
@@ -302,7 +302,7 @@
name = "Hooch"
id = "hooch"
result = "hooch"
- required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
+ required_reagents = list (REAGENT_ID_SUGAR = 1, REAGENT_ID_ETHANOL = 2, REAGENT_ID_FUEL = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/irish_coffee
@@ -400,7 +400,7 @@
name = "Singulo"
id = "singulo"
result = "singulo"
- required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5)
+ required_reagents = list("vodka" = 5, REAGENT_ID_RADIUM = 1, "redwine" = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/alliescocktail
@@ -414,7 +414,7 @@
name = "Demons Blood"
id = "demonsblood"
result = "demonsblood"
- required_reagents = list("rum" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
+ required_reagents = list("rum" = 3, "spacemountainwind" = 1, REAGENT_ID_BLOOD = 1, "dr_gibb" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/booger
@@ -456,14 +456,14 @@
name = "Red Mead"
id = "red_mead"
result = "red_mead"
- required_reagents = list("blood" = 1, "mead" = 1)
+ required_reagents = list(REAGENT_ID_BLOOD = 1, "mead" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/mead
name = "Mead"
id = "mead"
result = "mead"
- required_reagents = list("sugar" = 1, "water" = 1)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
catalysts = list("enzyme" = 5)
result_amount = 2
@@ -485,7 +485,7 @@
name = "Grog"
id = "grog"
result = "grog"
- required_reagents = list("rum" = 1, "water" = 1)
+ required_reagents = list("rum" = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/soy_latte
@@ -506,14 +506,14 @@
name = "Acid Spit"
id = "acidspit"
result = "acidspit"
- required_reagents = list("sacid" = 1, "redwine" = 5)
+ required_reagents = list(REAGENT_ID_SACID = 1, "redwine" = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/amasec
name = "Amasec"
id = "amasec"
result = "amasec"
- required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5)
+ required_reagents = list(REAGENT_ID_IRON = 1, "redwine" = 5, "vodka" = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/changelingsting
@@ -541,7 +541,7 @@
name = "Snow White"
id = "snowwhite"
result = "snowwhite"
- required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit
+ required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit
result_amount = 2
/decl/chemical_reaction/instant/drinks/irishcarbomb
@@ -569,28 +569,28 @@
name = "Devils Kiss"
id = "devilskiss"
result = "devilskiss"
- required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
+ required_reagents = list(REAGENT_ID_BLOOD = 1, "kahlua" = 1, "rum" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/hippiesdelight
name = "Hippies Delight"
id = "hippiesdelight"
result = "hippiesdelight"
- required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
+ required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "gargleblaster" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/bananahonk
name = "Banana Honk"
id = "bananahonk"
result = "bananahonk"
- required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
+ required_reagents = list("banana" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/silencer
name = "Silencer"
id = "silencer"
result = "silencer"
- required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
+ required_reagents = list("nothing" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/driestmartini
@@ -604,21 +604,21 @@
name = "Lemonade"
id = "lemonade"
result = "lemonade"
- required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
+ required_reagents = list("lemonjuice" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/melonade
name = "Melonade"
id = "melonade"
result = "melonade"
- required_reagents = list("watermelonjuice" = 1, "sugar" = 1, "sodawater" = 1)
+ required_reagents = list("watermelonjuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/appleade
name = "Appleade"
id = "appleade"
result = "appleade"
- required_reagents = list("applejuice" = 1, "sugar" = 1, "sodawater" = 1)
+ required_reagents = list("applejuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/pineappleade
@@ -647,7 +647,7 @@
name = "Berry Cordial"
id = "berrycordial"
result = "berrycordial"
- required_reagents = list("berryjuice" = 4, "sugar" = 1, "lemonjuice" = 1)
+ required_reagents = list("berryjuice" = 4, REAGENT_ID_SUGAR = 1, "lemonjuice" = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tropicalfizz
@@ -655,7 +655,7 @@
id = "tropicalfizz"
result = "tropicalfizz"
required_reagents = list("sodawater" = 6, "berryjuice" = 1, "mint" = 1, "limejuice" = 1, "lemonjuice" = 1, "pineapplejuice" = 1)
- inhibitors = list("sugar" = 1)
+ inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 8
/decl/chemical_reaction/instant/drinks/melonspritzer
@@ -670,14 +670,14 @@
id = "fauxfizz"
result = "fauxfizz"
required_reagents = list("sodawater" = 2, "berryjuice" = 1, "applejuice" = 1, "limejuice" = 1, "honey" = 1)
- inhibitors = list("sugar" = 1)
+ inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/firepunch
name = "Fire Punch"
id = "firepunch"
result = "firepunch"
- required_reagents = list("sugar" = 1, "rum" = 2)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, "rum" = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/kiraspecial
@@ -838,7 +838,7 @@
name = "Tamagozake"
id = "tamagozake"
result = "tamagozake"
- required_reagents = list("sake" = 10, "sugar" = 5, "egg" = 3)
+ required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3)
result_amount = 15
/decl/chemical_reaction/instant/drinks/ginzamary
@@ -908,14 +908,14 @@
name = "Debugger"
id = "debugger"
result = "debugger"
- required_reagents = list("fuel" = 1, "sugar" = 2, "cookingoil" = 2)
+ required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, "cookingoil" = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/spacersbrew
name = "Spacer's Brew"
id = "spacersbrew"
result = "spacersbrew"
- required_reagents = list("brownstar" = 4, "ethanol" = 1)
+ required_reagents = list("brownstar" = 4, REAGENT_ID_ETHANOL = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/binmanbliss
@@ -966,7 +966,7 @@
name = "Love Potion"
id = "lovepotion"
result = "lovepotion"
- required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1)
+ required_reagents = list("cream" = 1, "berryjuice" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/morningafter
@@ -1001,7 +1001,7 @@
name = "Vox's Delight"
id = "voxdelight"
result = "voxdelight"
- required_reagents = list(REAGENT_ID_PHORON = 3, "fuel" = 1, "water" = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 3, REAGENT_ID_FUEL = 1, REAGENT_ID_WATER = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/screamingviking
@@ -1029,14 +1029,14 @@
name = "Robustin"
id = "robustin"
result = "robustin"
- required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, "fuel" = 1, "vodka" = 1)
+ required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, "vodka" = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/virginsip
name = "Virgin Sip"
id = "virginsip"
result = "virginsip"
- required_reagents = list("driestmartini" = 1, "water" = 1)
+ required_reagents = list("driestmartini" = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/chocoshake
@@ -1092,28 +1092,28 @@
name = "Old Fashioned"
id = "oldfashioned"
result = "oldfashioned"
- required_reagents = list("whiskey" = 3, "bitters" = 1, "sugar" = 1)
+ required_reagents = list("whiskey" = 3, "bitters" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/whiskeysour
name = "Whiskey Sour"
id = "whiskeysour"
result = "whiskeysour"
- required_reagents = list("whiskey" = 2, "lemonjuice" = 1, "sugar" = 1)
+ required_reagents = list("whiskey" = 2, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/daiquiri
name = "Daiquiri"
id = "daiquiri"
result = "daiquiri"
- required_reagents = list("rum" = 3, "limejuice" = 2, "sugar" = 1)
+ required_reagents = list("rum" = 3, "limejuice" = 2, REAGENT_ID_SUGAR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mintjulep
name = "Mint Julep"
id = "mintjulep"
result = "mintjulep"
- required_reagents = list("whiskey" = 2, "water" = 1, "mint" = 1)
+ required_reagents = list("whiskey" = 2, REAGENT_ID_WATER = 1, "mint" = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/paloma
@@ -1134,14 +1134,14 @@
name = "Mojito"
id = "virginmojito"
result = "virginmojito"
- required_reagents = list("sodawater" = 3, "limejuice" = 1, "mint" = 1, "sugar" = 1)
+ required_reagents = list("sodawater" = 3, "limejuice" = 1, "mint" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/piscosour
name = "Pisco Sour"
id = "piscosour"
result = "piscosour"
- required_reagents = list("winebrandy" = 1, "lemonjuice" = 1, "sugar" = 1)
+ required_reagents = list("winebrandy" = 1, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/coldfront
@@ -1162,7 +1162,7 @@
name = "Godka"
id = "godka"
result = "godka"
- required_reagents = list("vodka" = 1, "holywater" = 1, "ethanol" = 1, "carthatoline" = 1)
+ required_reagents = list("vodka" = 1, "holywater" = 1, REAGENT_ID_ETHANOL = 1, "carthatoline" = 1)
catalysts = list("enzyme" = 5, "holywater" = 5)
result_amount = 1
@@ -1234,14 +1234,14 @@
name = "Eggnog"
id = "eggnog"
result = "eggnog"
- required_reagents = list("milk" = 5, "cream" = 5, "sugar" = 5, "egg" = 3)
+ required_reagents = list("milk" = 5, "cream" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3)
result_amount = 15
/decl/chemical_reaction/instant/drinks/nuclearwaste_radium
name = "Nuclear Waste"
id = "nuclearwasterad"
result = "nuclearwaste"
- required_reagents = list("oilslick" = 1, "radium" = 1, "limejuice" = 1)
+ required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, "limejuice" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/nuclearwaste_uranium
@@ -1255,7 +1255,7 @@
name = "Soda Oil"
id = "sodaoil"
result = "sodaoil"
- required_reagents = list("cookingoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1)
+ required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, "tricordrazine" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fusionnaire
diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm
index b14549d3b1..cc221db1c8 100644
--- a/code/modules/reagents/reactions/instant/drinks_vr.dm
+++ b/code/modules/reagents/reactions/instant/drinks_vr.dm
@@ -2,9 +2,9 @@
/// Special drinks
/decl/chemical_reaction/instant/drinks/grubshake
name = "Grub protein drink"
- id = "grubshake"
- result = "grubshake"
- required_reagents = list("shockchem" = 5, "water" = 25)
+ id = REAGENT_ID_GRUBSHAKE
+ result = REAGENT_ID_GRUBSHAKE
+ required_reagents = list("shockchem" = 5, REAGENT_ID_WATER = 25)
result_amount = 30
/decl/chemical_reaction/instant/drinks/deathbell
@@ -15,227 +15,234 @@
result_amount = 3
/decl/chemical_reaction/instant/drinks/burnout
- name = "Burnout"
- id = "burnout"
- result = "burnout"
- required_reagents = list("antifreeze" = 1, "deathbell" = 1, "lovemaker" =1)
+ name = REAGENT_BURNOUT
+ id = REAGENT_ID_BURNOUT
+ result = REAGENT_ID_BURNOUT
+ required_reagents = list("antifreeze" = 1, "deathbell" = 1, REAGENT_ID_LOVEMAKER =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/monstertamer
- name = "Monster Tamer"
- id = "monstertamer"
- result = "monstertamer"
+ name = REAGENT_MONSTERTAMER
+ id = REAGENT_ID_MONSTERTAMER
+ result = REAGENT_ID_MONSTERTAMER
required_reagents = list("whiskey" = 1, "protein" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/bigbeer
- name = "Giant Beer"
- id = "bigbeer"
- result = "bigbeer"
+ name = REAGENT_BIGBEER
+ id = REAGENT_ID_BIGBEER
+ result = REAGENT_ID_BIGBEER
required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/sweettea
name = "Sweetened Tea"
- id = "sweettea"
- result = "sweettea"
- required_reagents = list("icetea" = 2, "sugar" = 1,)
+ id = REAGENT_ID_SWEETTEA
+ result = REAGENT_ID_SWEETTEA
+ required_reagents = list("icetea" = 2, REAGENT_ID_SUGAR = 1,)
result_amount = 3
/decl/chemical_reaction/instant/drinks/unsweettea
- name = "Unsweetened Tea"
- id = "unsweettea"
- result = "unsweettea"
- required_reagents = list("sweettea" = 3, REAGENT_ID_PHORON = 1)
+ name = REAGENT_UNSWEETTEA
+ id = REAGENT_ID_UNSWEETTEA
+ result = REAGENT_ID_UNSWEETTEA
+ required_reagents = list(REAGENT_ID_SWEETTEA = 3, REAGENT_ID_PHORON = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/galacticpanic
- name = "Galactic Panic Attack"
- id = "galacticpanic"
- result = "galacticpanic"
+ name = REAGENT_GALACTICPANIC
+ id = REAGENT_ID_GALACTICPANIC
+ result = REAGENT_ID_GALACTICPANIC
required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/bulldog
- name = "Space Bulldog"
- id = "bulldog"
- result = "bulldog"
+ name = REAGENT_BULLDOG
+ id = REAGENT_ID_BULLDOG
+ result = REAGENT_ID_BULLDOG
required_reagents = list("whiterussian" = 4, "cola" =1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/sbagliato
- name = "Negroni Sbagliato"
- id = "sbagliato"
- result = "sbagliato"
+ name = REAGENT_SBAGLIATO
+ id = REAGENT_ID_SBAGLIATO
+ result = REAGENT_ID_SBAGLIATO
required_reagents = list("redwine" = 1, "vermouth" = 1, "sodawater" =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/italiancrisis
- name = "Italian Crisis"
- id = "italiancrisis"
- result = "italiancrisis"
- required_reagents = list("bulldog" = 1, "sbagliato" = 1)
+ name = REAGENT_ITALIANCRISIS
+ id = REAGENT_ID_ITALIANCRISIS
+ result = REAGENT_ID_ITALIANCRISIS
+ required_reagents = list(REAGENT_ID_BULLDOG = 1, REAGENT_ID_SBAGLIATO = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/sugarrush
- name = "Sweet Rush"
- id = "sugarrush"
- result = "sugarrush"
- required_reagents = list("sugar" = 1, "sodawater" = 1, "vodka" =1)
+ name = REAGENT_SUGARRUSH
+ id = REAGENT_ID_SUGARRUSH
+ result = REAGENT_ID_SUGARRUSH
+ required_reagents = list(REAGENT_ID_SUGAR = 1, "sodawater" = 1, "vodka" =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/lotus
- name = "Lotus"
- id = "lotus"
- result = "lotus"
- required_reagents = list("sbagliato" = 1, "sugarrush" = 1)
+ name = REAGENT_LOTUS
+ id = REAGENT_ID_LOTUS
+ result = REAGENT_ID_LOTUS
+ required_reagents = list(REAGENT_ID_SBAGLIATO = 1, REAGENT_ID_SUGARRUSH = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/shroomjuice
- name = "Dumb Shroom Juice"
- id = "shroomjuice"
- result = "shroomjuice"
- required_reagents = list("psilocybin" = 1, "applejuice" = 1, "limejuice" =1)
+ name = REAGENT_SHROOMJUICE
+ id = REAGENT_ID_SHROOMJUICE
+ result = REAGENT_ID_SHROOMJUICE
+ required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "applejuice" = 1, "limejuice" =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/russianroulette
- name = "Russian Roulette"
- id = "russianroulette"
- result = "russianroulette"
- required_reagents = list("whiterussian" = 5, "iron" = 1)
+ name = REAGENT_RUSSIANROULETTE
+ id =REAGENT_ID_RUSSIANROULETTE
+ result =REAGENT_ID_RUSSIANROULETTE
+ required_reagents = list("whiterussian" = 5, REAGENT_ID_IRON = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lovemaker
- name = "The Love Maker"
- id = "lovemaker"
- result = "lovemaker"
+ name = REAGENT_LOVEMAKER
+ id = REAGENT_ID_LOVEMAKER
+ result = REAGENT_ID_LOVEMAKER
required_reagents = list("honey" = 1, "sexonthebeach" = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/honeyshot
- name = "Honey Shot"
- id = "honeyshot"
- result = "honeyshot"
+ name = REAGENT_HONEYSHOT
+ id = REAGENT_ID_HONEYSHOT
+ result = REAGENT_ID_HONEYSHOT
required_reagents = list("honey" = 1, "vodka" = 1, "grenadine" =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/appletini
- name = "Appletini"
- id = "appletini"
- result = "appletini"
+ name = REAGENT_APPLETINI
+ id = REAGENT_ID_APPLETINIT
+ result = REAGENT_ID_APPLETINIT
required_reagents = list("applejuice" = 2, "vodka" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/glowingappletini
- name = "Glowing Appletini"
- id = "glowingappletini"
- result = "glowingappletini"
- required_reagents = list("appletini" = 5, "uranium" = 1)
+ name = REAGENT_GLOWINGAPPLETINI
+ id = REAGENT_ID_GLOWINGAPPLETINI
+ result = REAGENT_ID_GLOWINGAPPLETINI
+ required_reagents = list(REAGENT_ID_APPLETINIT = 5, "uranium" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/scsatw
- name = "Slow Comfortable Screw Against the Wall"
- id = "scsatw"
- result = "scsatw"
+ name = REAGENT_SCSATW
+ id = REAGENT_ID_SCSATW
+ result = REAGENT_ID_SCSATW
required_reagents = list("screwdrivercocktail" = 3, "rum" =1, "whiskey" =1, "gin" =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/choccymilk
- name = "Choccy Milk"
- id = "choccymilk"
- result = "choccymilk"
+ name = REAGENT_CHOCCYMILK
+ id = REAGENT_ID_CHOCCYMILK
+ result = REAGENT_ID_CHOCCYMILK
inhibitors = list("enzyme" = 1)
required_reagents = list("milk" = 3, "coco" = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/redspaceflush
name = "Redspace Flush"
- id = "redspaceflush"
- result = "redspaceflush"
- required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, REAGENT_ID_PHORON =1)
+ id = REAGENT_ID_REDSPACEFLUSH
+ result = REAGENT_ID_REDSPACEFLUSH
+ required_reagents = list("rum" = 2, "whiskey" = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/graveyard
- name = "Graveyard"
- id = "graveyard"
- result = "graveyard"
+ name = REAGENT_GRAVEYARD
+ id = REAGENT_ID_GRAVEYARD
+ result = REAGENT_ID_GRAVEYARD
required_reagents = list("cola" = 1, "spacemountainwind" = 1, "dr_gibb" =1, "space_up" = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/hairoftherat
- name = "Hair of the Rat"
- id = "hairoftherat"
- result = "hairoftherat"
- required_reagents = list("monstertamer" = 2, "nutriment" = 1)
+ name = REAGENT_HAIROFTHERAT
+ id = REAGENT_ID_HAIROFTHERAT
+ result = REAGENT_ID_HAIROFTHERAT
+ required_reagents = list(REAGENT_ID_MONSTERTAMER = 2, REAGENT_ID_NUTRIMENT = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/pink_russian
- name = "Pink Russian"
- id = "pinkrussian"
- result = "pinkrussian"
+ name = REAGENT_PINKRUSSIAN
+ id = REAGENT_ID_PINKRUSSIAN
+ result = REAGENT_ID_PINKRUSSIAN
required_reagents = list("blackrussian" = 2, "berryshake" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/originalsin
- name = "Original Sin"
- id = "originalsin"
- result = "originalsin"
+ name = REAGENT_ORIGINALSIN
+ id = REAGENT_ID_ORIGINALSIN
+ result = REAGENT_ID_ORIGINALSIN
required_reagents = list("holywine" = 1)
catalysts = list("applejuice" = 1)
result_amount = 1
/decl/chemical_reaction/instant/drinks/windgarita
- name = "WND-Garita"
- id = "windgarita"
- result = "windgarita"
+ name = REAGENT_WINDGARITA
+ id = REAGENT_ID_WINDGARITA
+ result = REAGENT_ID_WINDGARITA
required_reagents = list("margarita" = 3, "spacemountainwind" = 2, "melonliquor" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/newyorksour
- name = "New York Sour"
- id = "newyorksour"
- result = "newyorksour"
+ name = REAGENT_NEWYORKSOUR
+ id = REAGENT_ID_NEWYORKSOUR
+ result = REAGENT_ID_NEWYORKSOUR
required_reagents = list("whiskeysour" = 3, "redwine" = 2, "egg" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mudslide
- name = "Mudslide"
- id = "mudslide"
- result = "mudslide"
+ name = REAGENT_MUDSLIDE
+ id = REAGENT_ID_MUDSLIDE
+ result = REAGENT_ID_MUDSLIDE
required_reagents = list("blackrussian" = 1, "irishcream" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/protein_shake
- name = "Protein Shake"
- id = "protein_shake"
- result = "protein_shake"
- required_reagents = list("water" = 5, "protein_powder" = 1)
+ name = REAGENT_PROTEINSHAKE
+ id = REAGENT_ID_PROTEINSHAKE
+ result = REAGENT_ID_PROTEINSHAKE
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_PROTEINPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/protein_shake/vanilla
- name = "Vanilla Protein Shake"
- id = "vanilla_protein_shake"
- result = "vanilla_protein_shake"
- required_reagents = list("water" = 5, "vanilla_protein_powder" = 1)
+ name = REAGENT_VANILLAPROTEINSHAKE
+ id = REAGENT_ID_VANILLAPROTEINSHAKER
+ result = REAGENT_ID_VANILLAPROTEINSHAKER
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VANILLAPROTEINPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/protein_shake/banana
- name = "Banana Protein Shake"
- id = "banana_protein_shake"
- result = "banana_protein_shake"
- required_reagents = list("water" = 5, "banana_protein_powder" = 1)
+ name = REAGENT_BANANAPROTEINSHAKE
+ id = REAGENT_ID_BANANAPROTEINSHAKE
+ result = REAGENT_ID_BANANAPROTEINSHAKE
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_BANANAPROTEINPOWDER = 1)
+ result_amount = 5
+
+/decl/chemical_reaction/instant/drinks/protein_shake/chocolate
+ name = REAGENT_CHOCOLATEPROTEINSHAKE
+ id = REAGENT_ID_CHOCOLATEPROTEINSHAKE
+ result = REAGENT_ID_CHOCOLATEPROTEINSHAKE
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_CHOCOLATEPROTEINPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/protein_shake/strawberry
- name = "Strawberry Protein Shake"
- id = "strawberry_protein_shake"
- result = "strawberry_protein_shake"
- required_reagents = list("water" = 5, "strawberry_protein_powder" = 1)
+ name = REAGENT_STRAWBERRYPROTEINSHAKE
+ id = REAGENT_ID_STRAWBERRYPROTEINSHAKE
+ result = REAGENT_ID_STRAWBERRYPROTEINSHAKE
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_STRAWBERRYPROTEINPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/manager_summoner
- name = "Manager Summoner"
- id = "manager_summoner"
- result = "manager_summoner"
+ name = REAGENT_MANAGERSUMMONER
+ id = REAGENT_ID_MANAGERSUMMONER
+ result = REAGENT_ID_MANAGERSUMMONER
required_reagents = list("margarita" = 1, "redwine" = 1, "essential_oil" = 1)
result_amount = 3
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index 8f28921586..5ac6b07569 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -2,7 +2,7 @@
name = "Hot Ramen"
id = "hot_ramen"
result = "hot_ramen"
- required_reagents = list("water" = 1, "dry_ramen" = 3)
+ required_reagents = list(REAGENT_ID_WATER = 1, "dry_ramen" = 3)
result_amount = 3
/decl/chemical_reaction/instant/food/hell_ramen
@@ -30,7 +30,7 @@
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
- required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
+ required_reagents = list("soymilk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2)
catalysts = list("enzyme" = 5)
result_amount = 1
@@ -44,7 +44,7 @@
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
- required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
+ required_reagents = list("milk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2)
catalysts = list("enzyme" = 5)
result_amount = 1
@@ -67,7 +67,7 @@
id = "cookingoilpeanut"
result = "cookingoil"
required_reagents = list("peanutoil" = 10)
- inhibitors = list("sugar" = 1, "sodiumchloride" = 1)
+ inhibitors = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1)
catalysts = list("enzyme" = 5)
result_amount = 10
@@ -75,28 +75,28 @@
name = "Soy Sauce"
id = "soysauce"
result = "soysauce"
- required_reagents = list("soymilk" = 4, "sacid" = 1)
+ required_reagents = list("soymilk" = 4, REAGENT_ID_SACID = 1)
result_amount = 5
/decl/chemical_reaction/instant/food/ketchup
name = "Ketchup"
id = "ketchup"
result = "ketchup"
- required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
+ required_reagents = list("tomatojuice" = 2, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
/decl/chemical_reaction/instant/food/barbecue
name = "Barbeque Sauce"
id = "barbecue"
result = "barbecue"
- required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1)
+ required_reagents = list("tomatojuice" = 2, "applejuice" = 1, REAGENT_ID_SUGAR = 1, "spacespice" = 1)
result_amount = 4
/decl/chemical_reaction/instant/food/peanutbutter
name = "Peanut Butter"
id = "peanutbutter"
result = "peanutbutter"
- required_reagents = list("peanutoil" = 2, "sugar" = 1, "sodiumchloride" = 1)
+ required_reagents = list("peanutoil" = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1)
catalysts = list("enzyme" = 5)
result_amount = 3
@@ -104,7 +104,7 @@
name = "mayonnaise"
id = "mayo"
result = "mayo"
- required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, "sodiumchloride" = 1)
+ required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 15
/decl/chemical_reaction/instant/food/cheesewheel
@@ -140,7 +140,7 @@
id = "dough"
result = null
required_reagents = list("egg" = 3, "flour" = 10)
- inhibitors = list("water" = 1, "beer" = 1, "sugar" = 1) //To prevent it messing with batter recipes
+ inhibitors = list(REAGENT_ID_WATER = 1, "beer" = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
result_amount = 1
/decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -153,7 +153,7 @@
name = "Syntiflesh"
id = "syntiflesh"
result = null
- required_reagents = list("blood" = 5, "clonexadone" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -172,39 +172,39 @@
name = "Batter"
id = "batter"
result = "batter"
- required_reagents = list("egg" = 3, "flour" = 10, "water" = 5, "sodiumchloride" = 2)
+ required_reagents = list("egg" = 3, "flour" = 10, REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/coating/beerbatter
name = "Beer Batter"
id = "beerbatter"
result = "beerbatter"
- required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, "sodiumchloride" = 2)
+ required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/browniemix
name = "Brownie Mix"
id = "browniemix"
result = "browniemix"
- required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5)
+ required_reagents = list("flour" = 5, "coco" = 5, REAGENT_ID_SUGAR = 5)
result_amount = 15
/decl/chemical_reaction/instant/food/cakebatter
name = "Cake Batter"
id = "cakebatter"
result = "cakebatter"
- required_reagents = list("flour" = 15, "milk" = 10, "sugar" = 15, "egg" = 3)
+ required_reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 15, "egg" = 3)
result_amount = 60
/decl/chemical_reaction/instant/food/butter
name = "Butter"
id = "butter"
result = null
- required_reagents = list("cream" = 20, "sodiumchloride" = 1)
+ required_reagents = list("cream" = 20, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 1
/decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/spreads/butter(location)
- return
\ No newline at end of file
+ return
diff --git a/code/modules/reagents/reactions/instant/food_vr.dm b/code/modules/reagents/reactions/instant/food_vr.dm
index 684c23e944..7c39b10a75 100644
--- a/code/modules/reagents/reactions/instant/food_vr.dm
+++ b/code/modules/reagents/reactions/instant/food_vr.dm
@@ -1,2 +1,2 @@
/decl/chemical_reaction/instant/food/syntiflesh
- required_reagents = list("blood" = 5, "clonexadone" = 1)
+ required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 1)
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 3664755e4d..7fbec5f420 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -7,21 +7,21 @@
name = "Inaprovaline"
id = "inaprovaline"
result = "inaprovaline"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, "carbon" = 1, "sugar" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/dylovene
name = "Dylovene"
id = "anti_toxin"
result = "anti_toxin"
- required_reagents = list("silicon" = 1, "potassium" = 1, REAGENT_ID_NITROGEN = 1)
+ required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/carthatoline
name = "Carthatoline"
id = "carthatoline"
result = "carthatoline"
- required_reagents = list("anti_toxin" = 1, "carbon" = 2, REAGENT_ID_PHORON = 0.1)
+ required_reagents = list("anti_toxin" = 1, REAGENT_ID_CARBON = 2, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 1)
result_amount = 2
@@ -29,21 +29,21 @@
name = "Paracetamol"
id = "paracetamol"
result = "paracetamol"
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, "water" = 1)
+ required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/tramadol
name = "Tramadol"
id = "tramadol"
result = "tramadol"
- required_reagents = list("paracetamol" = 1, "ethanol" = 1, REAGENT_ID_OXYGEN = 1)
+ required_reagents = list("paracetamol" = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/oxycodone
name = "Oxycodone"
id = "oxycodone"
result = "oxycodone"
- required_reagents = list("ethanol" = 1, "tramadol" = 1)
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, "tramadol" = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
@@ -51,91 +51,91 @@
name = "Sterilizine"
id = "sterilizine"
result = "sterilizine"
- required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1)
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, "anti_toxin" = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
/decl/chemical_reaction/instant/silicate
name = "Silicate"
id = "silicate"
result = "silicate"
- required_reagents = list("aluminum" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1)
+ required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/mutagen
name = "Unstable mutagen"
id = "mutagen"
result = "mutagen"
- required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
+ required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
/decl/chemical_reaction/instant/water
name = REAGENT_WATER
id = REAGENT_ID_WATER
result = REAGENT_ID_WATER
- required_reagents = list(REAGENT_ID_OXYGEN = 1, "hydrogen" = 2)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_HYDROGEN = 2)
result_amount = 1
/decl/chemical_reaction/instant/thermite
name = "Thermite"
id = "thermite"
result = "thermite"
- required_reagents = list("aluminum" = 1, "iron" = 1, REAGENT_ID_OXYGEN = 1)
+ required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_IRON = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/bliss
- name = "Bliss"
- id = "bliss"
- result = "bliss"
- required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
+ name = REAGENT_BLISS
+ id = REAGENT_ID_BLISS
+ result = REAGENT_ID_BLISS
+ required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/lube
name = "Space Lube"
id = "lube"
result = "lube"
- required_reagents = list("water" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1)
+ required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 4
/decl/chemical_reaction/instant/pacid
- name = "Polytrinic acid"
- id = "pacid"
- result = "pacid"
- required_reagents = list("sacid" = 1, "chlorine" = 1, "potassium" = 1)
+ name = REAGENT_PACID
+ id = REAGENT_ID_PACID
+ result = REAGENT_ID_PACID
+ required_reagents = list(REAGENT_ID_SACID = 1, REAGENT_ID_CHLORINE = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/synaptizine
name = "Synaptizine"
id = "synaptizine"
result = "synaptizine"
- required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1, REAGENT_ID_WATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/hyronalin
name = "Hyronalin"
id = "hyronalin"
result = "hyronalin"
- required_reagents = list("radium" = 1, "anti_toxin" = 1)
+ required_reagents = list(REAGENT_ID_RADIUM = 1, "anti_toxin" = 1)
result_amount = 2
/decl/chemical_reaction/instant/arithrazine
name = "Arithrazine"
id = "arithrazine"
result = "arithrazine"
- required_reagents = list("hyronalin" = 1, "hydrogen" = 1)
+ required_reagents = list("hyronalin" = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 2
/decl/chemical_reaction/instant/impedrezene
name = "Impedrezene"
id = "impedrezene"
result = "impedrezene"
- required_reagents = list("mercury" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1)
+ required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
/decl/chemical_reaction/instant/kelotane
name = "Kelotane"
id = "kelotane"
result = "kelotane"
- required_reagents = list("silicon" = 1, "carbon" = 1)
+ required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
log_is_important = 1
@@ -169,18 +169,18 @@
name = "Gastirodaxon"
id = "gastirodaxon"
result = "gastirodaxon"
- required_reagents = list("carthatoline" = 1, "biomass" = 2, "tungsten" = 2)
+ required_reagents = list("carthatoline" = 1, "biomass" = 2, REAGENT_ID_TUNGSTEN = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("lithium" = 1)
+ inhibitors = list(REAGENT_ID_LITHIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/hepanephrodaxon
name = "Hepanephrodaxon"
id = "hepanephrodaxon"
result = "hepanephrodaxon"
- required_reagents = list("carthatoline" = 2, "biomass" = 2, "lithium" = 1)
+ required_reagents = list("carthatoline" = 2, "biomass" = 2, REAGENT_ID_LITHIUM = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("tungsten" = 1)
+ inhibitors = list(REAGENT_ID_TUNGSTEN = 1)
result_amount = 2
/decl/chemical_reaction/instant/cordradaxon
@@ -196,14 +196,14 @@
name = "Virus Food"
id = "virusfood"
result = "virusfood"
- required_reagents = list("water" = 1, "milk" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 1, "milk" = 1)
result_amount = 5
/decl/chemical_reaction/instant/leporazine
name = "Leporazine"
id = "leporazine"
result = "leporazine"
- required_reagents = list("silicon" = 1, "copper" = 1)
+ required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_COPPER = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -211,7 +211,7 @@
name = "Cryptobiolin"
id = "cryptobiolin"
result = "cryptobiolin"
- required_reagents = list("potassium" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1)
+ required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/tricordrazine
@@ -225,7 +225,7 @@
name = "Alkysine"
id = "alkysine"
result = "alkysine"
- required_reagents = list("chlorine" = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1)
+ required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1)
result_amount = 2
/decl/chemical_reaction/instant/dexalin
@@ -234,72 +234,72 @@
result = "dexalin"
required_reagents = list(REAGENT_ID_OXYGEN = 2, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 1)
- inhibitors = list("water" = 1) // Messes with cryox
+ inhibitors = list(REAGENT_ID_WATER = 1) // Messes with cryox
result_amount = 1
/decl/chemical_reaction/instant/dermaline
name = "Dermaline"
id = "dermaline"
result = "dermaline"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, "phosphorus" = 1, "kelotane" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, "kelotane" = 1)
result_amount = 3
/decl/chemical_reaction/instant/dexalinp
name = "Dexalin Plus"
id = "dexalinp"
result = "dexalinp"
- required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1)
+ required_reagents = list("dexalin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1)
result_amount = 3
/decl/chemical_reaction/instant/bicaridine
name = "Bicaridine"
id = "bicaridine"
result = "bicaridine"
- required_reagents = list("inaprovaline" = 1, "carbon" = 1)
- inhibitors = list("sugar" = 1) // Messes up with inaprovaline
+ required_reagents = list("inaprovaline" = 1, REAGENT_ID_CARBON = 1)
+ inhibitors = list(REAGENT_ID_SUGAR = 1) // Messes up with inaprovaline
result_amount = 2
/decl/chemical_reaction/instant/myelamine
name = "Myelamine"
id = "myelamine"
result = "myelamine"
- required_reagents = list("bicaridine" = 1, "iron" = 2, "spidertoxin" = 1)
+ required_reagents = list("bicaridine" = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/hyperzine
name = "Hyperzine"
id = "hyperzine"
result = "hyperzine"
- required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_SULFUR = 1)
result_amount = 3
/decl/chemical_reaction/instant/stimm
name = "Stimm"
id = "stimm"
result = "stimm"
- required_reagents = list("left4zed" = 1, "fuel" = 1)
- catalysts = list("fuel" = 5)
+ required_reagents = list("left4zed" = 1, REAGENT_ID_FUEL = 1)
+ catalysts = list(REAGENT_ID_FUEL = 5)
result_amount = 2
/decl/chemical_reaction/instant/ryetalyn
name = "Ryetalyn"
id = "ryetalyn"
result = "ryetalyn"
- required_reagents = list("arithrazine" = 1, "carbon" = 1)
+ required_reagents = list("arithrazine" = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
/decl/chemical_reaction/instant/cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
result = "cryoxadone"
- required_reagents = list("dexalin" = 1, "water" = 1, REAGENT_ID_OXYGEN = 1)
+ required_reagents = list("dexalin" = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/clonexadone
name = "Clonexadone"
id = "clonexadone"
result = "clonexadone"
- required_reagents = list("cryoxadone" = 1, "sodium" = 1, REAGENT_ID_PHORON = 0.1)
+ required_reagents = list("cryoxadone" = 1, REAGENT_ID_SODIUM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -322,7 +322,7 @@
name = "Corophizine"
id = "corophizine"
result = "corophizine"
- required_reagents = list("spaceacillin" = 1, "carbon" = 1, REAGENT_ID_PHORON = 0.1)
+ required_reagents = list("spaceacillin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -330,7 +330,7 @@
name = "Immunosuprizine"
id = "immunosuprizine"
result = "immunosuprizine"
- required_reagents = list("corophizine" = 1, "tungsten" = 1, "sacid" = 1)
+ required_reagents = list("corophizine" = 1, REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_SACID = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -338,43 +338,43 @@
name = "imidazoline"
id = "imidazoline"
result = "imidazoline"
- required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+ required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
result_amount = 2
/decl/chemical_reaction/instant/ethylredoxrazine
name = "Ethylredoxrazine"
id = "ethylredoxrazine"
result = "ethylredoxrazine"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, "carbon" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
/decl/chemical_reaction/instant/calciumcarbonate
name = "Calcium Carbonate"
id = "calciumcarbonate"
result = "calciumcarbonate"
- required_reagents = list(REAGENT_ID_OXYGEN = 3, "calcium" = 1, "carbon" = 1)
+ required_reagents = list(REAGENT_ID_OXYGEN = 3, REAGENT_ID_CALCIUM = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
/decl/chemical_reaction/instant/soporific
name = "Soporific"
id = "stoxin"
result = "stoxin"
- required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
- inhibitors = list("phosphorus") // Messes with the smoke
+ required_reagents = list("chloralhydrate" = 1, REAGENT_ID_SUGAR = 4)
+ inhibitors = list(REAGENT_ID_PHOSPHORUS) // Messes with the smoke
result_amount = 5
/decl/chemical_reaction/instant/chloralhydrate
name = "Chloral Hydrate"
id = "chloralhydrate"
result = "chloralhydrate"
- required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_CHLORINE = 3, REAGENT_ID_WATER = 1)
result_amount = 1
/decl/chemical_reaction/instant/potassium_chloride
name = "Potassium Chloride"
id = "potassium_chloride"
result = "potassium_chloride"
- required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
+ required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 2
/decl/chemical_reaction/instant/potassium_chlorophoride
@@ -388,44 +388,44 @@
name = "Zombie Powder"
id = "zombiepowder"
result = "zombiepowder"
- required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5)
+ required_reagents = list("carpotoxin" = 5, "stoxin" = 5, REAGENT_ID_COPPER = 5)
result_amount = 2
/decl/chemical_reaction/instant/carpotoxin
name = "Carpotoxin"
id = "carpotoxin"
result = "carpotoxin"
- required_reagents = list("spidertoxin" = 2, "biomass" = 1, "sifsap" = 2)
+ required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, "biomass" = 1, "sifsap" = 2)
catalysts = list("sifsap" = 10)
- inhibitors = list("radium" = 1)
+ inhibitors = list(REAGENT_ID_RADIUM = 1)
result_amount = 2
/decl/chemical_reaction/instant/mindbreaker
name = "Mindbreaker Toxin"
id = "mindbreaker"
result = "mindbreaker"
- required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+ required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
result_amount = 3
/decl/chemical_reaction/instant/lipozine
name = "Lipozine"
id = "Lipozine"
result = "lipozine"
- required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1)
+ required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_RADIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/surfactant
name = "Foam surfactant"
id = "foam surfactant"
result = "fluorosurfactant"
- required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
+ 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"
- required_reagents = list("hydrogen" = 3, REAGENT_ID_NITROGEN = 1)
+ required_reagents = list(REAGENT_ID_HYDROGEN = 3, REAGENT_ID_NITROGEN = 1)
inhibitors = list(REAGENT_ID_PHORON = 1) // Messes with lexorin
result_amount = 3
@@ -433,7 +433,7 @@
name = "Diethylamine"
id = "diethylamine"
result = "diethylamine"
- required_reagents = list ("ammonia" = 1, "ethanol" = 1)
+ required_reagents = list ("ammonia" = 1, REAGENT_ID_ETHANOL = 1)
result_amount = 2
/decl/chemical_reaction/instant/left4zed
@@ -447,42 +447,42 @@
name = "RobustHarvest"
id = "robustharvest"
result = "robustharvest"
- required_reagents = list ("ammonia" = 1, "calcium" = 1, "neurotoxic_protein" = 1)
+ required_reagents = list ("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, "water" = 1)
+ required_reagents = list("ammonia" = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/plantbgone
name = "Plant-B-Gone"
id = "plantbgone"
result = "plantbgone"
- required_reagents = list("toxin" = 1, "water" = 4)
+ required_reagents = list("toxin" = 1, REAGENT_ID_WATER = 4)
result_amount = 5
/decl/chemical_reaction/instant/foaming_agent
name = "Foaming Agent"
id = "foaming_agent"
result = "foaming_agent"
- required_reagents = list("lithium" = 1, "hydrogen" = 1)
+ 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"
- required_reagents = list("cornoil" = 3, "sacid" = 1)
+ required_reagents = list("cornoil" = 3, REAGENT_ID_SACID = 1)
result_amount = 1
/decl/chemical_reaction/instant/sodiumchloride
name = "Sodium Chloride"
- id = "sodiumchloride"
- result = "sodiumchloride"
- required_reagents = list("sodium" = 1, "chlorine" = 1)
+ id = REAGENT_ID_SODIUMCHLORIDE
+ result = REAGENT_ID_SODIUMCHLORIDE
+ required_reagents = list(REAGENT_ID_SODIUM = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 2
/decl/chemical_reaction/instant/condensedcapsaicin
@@ -497,7 +497,7 @@
name = "Coolant"
id = "coolant"
result = "coolant"
- required_reagents = list("tungsten" = 1, REAGENT_ID_OXYGEN = 1, "water" = 1)
+ required_reagents = list(REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_WATER = 1)
result_amount = 3
log_is_important = 1
@@ -505,34 +505,34 @@
name = "Rezadone"
id = "rezadone"
result = "rezadone"
- required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
+ required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, REAGENT_ID_COPPER = 1)
result_amount = 3
/decl/chemical_reaction/instant/lexorin
name = "Lexorin"
id = "lexorin"
result = "lexorin"
- required_reagents = list(REAGENT_ID_PHORON = 1, "hydrogen" = 1, REAGENT_ID_NITROGEN = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/methylphenidate
- name = "Methylphenidate"
- id = "methylphenidate"
- result = "methylphenidate"
- required_reagents = list("mindbreaker" = 1, "hydrogen" = 1)
+ name = REAGENT_METHYLPHENIDATE
+ id = REAGENT_ID_METHYLPHENIDATE
+ result = REAGENT_ID_METHYLPHENIDATE
+ required_reagents = list("mindbreaker" = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/citalopram
- name = "Citalopram"
- id = "citalopram"
- result = "citalopram"
- required_reagents = list("mindbreaker" = 1, "carbon" = 1)
+ name = REAGENT_CITALOPRAM
+ id = REAGENT_ID_CITALOPRAM
+ result = REAGENT_ID_CITALOPRAM
+ required_reagents = list("mindbreaker" = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
/decl/chemical_reaction/instant/paroxetine
- name = "Paroxetine"
- id = "paroxetine"
- result = "paroxetine"
+ name = REAGENT_PAROXETINE
+ id = REAGENT_ID_PAROXETINE
+ result = REAGENT_ID_PAROXETINE
required_reagents = list("mindbreaker" = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
result_amount = 3
@@ -547,7 +547,7 @@
name = "Luminol"
id = "luminol"
result = "luminol"
- required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2)
+ required_reagents = list(REAGENT_ID_HYDROGEN = 2, REAGENT_ID_CARBON = 2, "ammonia" = 2)
result_amount = 6
/* Solidification */
@@ -556,7 +556,7 @@
name = "Solid Iron"
id = "solidiron"
result = null
- required_reagents = list("frostoil" = 5, "iron" = REAGENTS_PER_SHEET)
+ required_reagents = list("frostoil" = 5, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
result_amount = 1
var/sheet_to_give = /obj/item/stack/material/iron
@@ -603,7 +603,7 @@
/decl/chemical_reaction/instant/solidification/hydrogen
name = "Solid Hydrogen"
id = "solidhydrogen"
- required_reagents = list("frostoil" = 100, "hydrogen" = REAGENTS_PER_SHEET)
+ required_reagents = list("frostoil" = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/mhydrogen
@@ -626,7 +626,7 @@
name = "Plastic"
id = "solidplastic"
result = null
- required_reagents = list("pacid" = 1, "plasticide" = 2)
+ required_reagents = list(REAGENT_ID_PACID = 1, "plasticide" = 2)
result_amount = 1
/decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -692,7 +692,7 @@
/decl/chemical_reaction/instant/concrete
name = "Concrete"
id = "concretereagent"
- required_reagents = list("calcium" = 2, "silicate" = 2, "water" = 2)
+ required_reagents = list(REAGENT_ID_CALCIUM = 2, "silicate" = 2, REAGENT_ID_WATER = 2)
result_amount = 1
/decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -705,7 +705,7 @@
name = "Explosion"
id = "explosion_potassium"
result = null
- required_reagents = list("water" = 1, "potassium" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 2
mix_message = null
@@ -729,7 +729,7 @@
name = "Flash powder"
id = "flash_powder"
result = null
- required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
+ required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SULFUR = 1 )
result_amount = null
/decl/chemical_reaction/instant/flash_powder/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, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
+ 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
result_amount = 2
/decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -777,7 +777,7 @@
name = "Nitroglycerin"
id = "nitroglycerin"
result = "nitroglycerin"
- required_reagents = list("glycerol" = 1, "pacid" = 1, "sacid" = 1)
+ required_reagents = list("glycerol" = 1, REAGENT_ID_PACID = 1, REAGENT_ID_SACID = 1)
result_amount = 2
log_is_important = 1
@@ -802,7 +802,7 @@
name = "Napalm"
id = "napalm"
result = null
- required_reagents = list("aluminum" = 1, REAGENT_ID_PHORON = 1, "sacid" = 1 )
+ required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_SACID = 1 )
result_amount = 1
/decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -817,7 +817,7 @@
name = "Chemsmoke"
id = "chemsmoke"
result = null
- required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
+ required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1)
result_amount = 0.4
/decl/chemical_reaction/instant/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -838,7 +838,7 @@
name = "Foam"
id = "foam"
result = null
- required_reagents = list("fluorosurfactant" = 1, "water" = 1)
+ required_reagents = list("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("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1)
+ required_reagents = list(REAGENT_ID_ALUMINIUM = 3, "foaming_agent" = 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("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
+ required_reagents = list(REAGENT_ID_IRON = 3, "foaming_agent" = 1, REAGENT_ID_PACID = 1)
result_amount = 5
/decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -899,7 +899,7 @@
name = "Red paint"
id = "red_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_red" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_red" = 1)
result_amount = 5
/decl/chemical_reaction/instant/red_paint/send_data()
@@ -909,7 +909,7 @@
name = "Orange paint"
id = "orange_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_orange" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_orange" = 1)
result_amount = 5
/decl/chemical_reaction/instant/orange_paint/send_data()
@@ -919,7 +919,7 @@
name = "Yellow paint"
id = "yellow_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_yellow" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_yellow" = 1)
result_amount = 5
/decl/chemical_reaction/instant/yellow_paint/send_data()
@@ -929,7 +929,7 @@
name = "Green paint"
id = "green_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_green" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_green" = 1)
result_amount = 5
/decl/chemical_reaction/instant/green_paint/send_data()
@@ -939,7 +939,7 @@
name = "Blue paint"
id = "blue_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_blue" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_blue" = 1)
result_amount = 5
/decl/chemical_reaction/instant/blue_paint/send_data()
@@ -949,7 +949,7 @@
name = "Purple paint"
id = "purple_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_purple" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_purple" = 1)
result_amount = 5
/decl/chemical_reaction/instant/purple_paint/send_data()
@@ -959,7 +959,7 @@
name = "Grey paint"
id = "grey_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_grey" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_grey" = 1)
result_amount = 5
/decl/chemical_reaction/instant/grey_paint/send_data()
@@ -969,7 +969,7 @@
name = "Brown paint"
id = "brown_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_brown" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_brown" = 1)
result_amount = 5
/decl/chemical_reaction/instant/brown_paint/send_data()
@@ -979,11 +979,11 @@
name = "Blood paint"
id = "blood_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
result_amount = 5
/decl/chemical_reaction/instant/blood_paint/send_data(var/datum/reagents/T)
- var/t = T.get_data("blood")
+ var/t = T.get_data(REAGENT_ID_BLOOD)
if(t && t["blood_colour"])
return t["blood_colour"]
return "#FE191A" // Probably red
@@ -992,7 +992,7 @@
name = "Milk paint"
id = "milk_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "milk" = 5)
result_amount = 5
/decl/chemical_reaction/instant/milk_paint/send_data()
@@ -1002,7 +1002,7 @@
name = "Orange juice paint"
id = "orange_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/orange_juice_paint/send_data()
@@ -1012,7 +1012,7 @@
name = "Tomato juice paint"
id = "tomato_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/tomato_juice_paint/send_data()
@@ -1022,7 +1022,7 @@
name = "Lime juice paint"
id = "lime_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "limejuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/lime_juice_paint/send_data()
@@ -1032,7 +1032,7 @@
name = "Carrot juice paint"
id = "carrot_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/carrot_juice_paint/send_data()
@@ -1042,7 +1042,7 @@
name = "Berry juice paint"
id = "berry_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/berry_juice_paint/send_data()
@@ -1052,7 +1052,7 @@
name = "Grape juice paint"
id = "grape_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/grape_juice_paint/send_data()
@@ -1062,7 +1062,7 @@
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/poisonberry_juice_paint/send_data()
@@ -1072,7 +1072,7 @@
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/watermelon_juice_paint/send_data()
@@ -1082,7 +1082,7 @@
name = "Lemon juice paint"
id = "lemon_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/lemon_juice_paint/send_data()
@@ -1092,7 +1092,7 @@
name = "Banana juice paint"
id = "banana_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "banana" = 5)
result_amount = 5
/decl/chemical_reaction/instant/banana_juice_paint/send_data()
@@ -1102,7 +1102,7 @@
name = "Potato juice paint"
id = "potato_juice_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/potato_juice_paint/send_data()
@@ -1112,7 +1112,7 @@
name = "Carbon paint"
id = "carbon_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1)
result_amount = 5
/decl/chemical_reaction/instant/carbon_paint/send_data()
@@ -1122,7 +1122,7 @@
name = "Aluminum paint"
id = "aluminum_paint"
result = "paint"
- required_reagents = list("plasticide" = 1, "water" = 3, "aluminum" = 1)
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1)
result_amount = 5
/decl/chemical_reaction/instant/aluminum_paint/send_data()
@@ -1133,7 +1133,7 @@
name = "Black Carpet Dyeing"
id = "carpetdyeblack"
result = "liquidcarpetb"
- required_reagents = list("liquidcarpet" = 5, "carbon" = 1)
+ required_reagents = list("liquidcarpet" = 5, REAGENT_ID_CARBON = 1)
result_amount = 5
/decl/chemical_reaction/instant/carpetdye/blue
@@ -1146,7 +1146,7 @@
name = "Turqouise Carpet Dyeing"
id = "carpetdyetur"
result = "liquidcarpettur"
- required_reagents = list("liquidcarpet" = 5, "water" = 1)
+ required_reagents = list("liquidcarpet" = 5, REAGENT_ID_WATER = 1)
/decl/chemical_reaction/instant/carpetdye/sblu
name = "Silver Blue Carpet Dyeing"
@@ -1178,7 +1178,7 @@
name = "Hydrophoron"
id = "hydrophoron"
result = "hydrophoron"
- required_reagents = list("hydrogen" = 1, REAGENT_ID_PHORON = 1)
+ required_reagents = list(REAGENT_ID_HYDROGEN = 1, REAGENT_ID_PHORON = 1)
inhibitors = list(REAGENT_ID_NITROGEN = 1) //So it doesn't mess with lexorin
result_amount = 2
@@ -1186,29 +1186,29 @@
name = "Deuterium"
id = "deuterium"
result = "deuterium"
- required_reagents = list("hydrophoron" = 1, "water" = 2)
+ required_reagents = list("hydrophoron" = 1, REAGENT_ID_WATER = 2)
result_amount = 3
//Skrellian crap.
/decl/chemical_reaction/instant/talum_quem
- name = "Talum-quem"
- id = "talum_quem"
- result = "talum_quem"
- required_reagents = list("bliss" = 2, "sugar" = 1, "amatoxin" = 1)
+ name = REAGENT_TALUMQUEM
+ id = REAGENT_ID_TALUMQUEM
+ result = REAGENT_ID_TALUMQUEM
+ required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, "amatoxin" = 1)
result_amount = 4
/decl/chemical_reaction/instant/qerr_quem
- name = "Qerr-quem"
- id = "qerr_quem"
- result = "qerr_quem"
- required_reagents = list("nicotine" = 1, "carbon" = 1, "sugar" = 2)
+ name = REAGENT_QERRQUEM
+ id = REAGENT_ID_QERRQUEM
+ result = REAGENT_ID_QERRQUEM
+ required_reagents = list(REAGENT_ID_NICOTINE = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 2)
result_amount = 4
/decl/chemical_reaction/instant/malish_qualem
name = "Malish-Qualem"
id = "malish-qualem"
result = "malish-qualem"
- required_reagents = list("immunosuprizine" = 1, "qerr_quem" = 1, "inaprovaline" = 1)
+ required_reagents = list("immunosuprizine" = 1, REAGENT_ID_QERRQUEM = 1, "inaprovaline" = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -1217,7 +1217,7 @@
name = "Biomass"
id = "biomass"
result = "biomass"
- required_reagents = list("protein" = 1, "sugar" = 1, REAGENT_ID_PHORON = 1)
+ required_reagents = list("protein" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1)
result_amount = 1 // Roughly 20u per phoron sheet
// Neutralization.
@@ -1240,5 +1240,5 @@
name = "Neutralize Spidertoxin"
id = "spidertoxin_neutral"
result = "protein"
- required_reagents = list("enzyme" = 1, "spidertoxin" = 1, "sifsap" = 1)
+ required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, "sifsap" = 1)
result_amount = 1
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 6461ce909f..f9e1fdfbff 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -2,42 +2,42 @@
/// Micro/Macro chemicals
/decl/chemical_reaction/instant/sizeoxadone
- name = "sizeoxadone"
- id = "sizeoxadone"
- result = "sizeoxadone"
+ name = REAGENT_SIZEOXADONE
+ id = REAGENT_ID_SIZEOXADONE
+ result = REAGENT_ID_SIZEOXADONE
required_reagents = list("clonexadone" = 1, "tramadol" = 3, REAGENT_ID_PHORON = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 5
/decl/chemical_reaction/instant/macrocillin
- name = "Macrocillin"
- id = "macrocillin"
- result = "macrocillin"
+ name = REAGENT_MACROCILLIN
+ id = REAGENT_ID_MACROCILLIN
+ result = REAGENT_ID_MACROCILLIN
// POLARISTODO requires_heating = 1
- required_reagents = list("sizeoxadone" = 20, "diethylamine" = 20)
+ required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "diethylamine" = 20)
result_amount = 1
/decl/chemical_reaction/instant/microcillin
- name = "Microcillin"
- id = "microcillin"
- result = "microcillin"
+ name = REAGENT_MICROCILLIN
+ id = REAGENT_ID_MICROCILLIN
+ result = REAGENT_ID_MICROCILLIN
// POLARISTODO requires_heating = 1
- required_reagents = list("sizeoxadone" = 20, "sodiumchloride" = 20)
+ required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_SODIUMCHLORIDE = 20)
result_amount = 1
/decl/chemical_reaction/instant/normalcillin
- name = "Normalcillin"
- id = "normalcillin"
- result = "normalcillin"
+ name = REAGENT_NORMALCILLIN
+ id = REAGENT_ID_NORMALCILLIN
+ result = REAGENT_ID_NORMALCILLIN
// POLARISTODO requires_heating = 1
- required_reagents = list("sizeoxadone" = 20, "leporazine" = 20)
+ required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "leporazine" = 20)
result_amount = 1
/decl/chemical_reaction/instant/dontcrossthebeams
name = "Don't Cross The Beams"
id = "dontcrossthebeams"
result = null
- required_reagents = list("microcillin" = 1, "macrocillin" = 1)
+ required_reagents = list(REAGENT_ID_MICROCILLIN = 1, REAGENT_ID_MACROCILLIN = 1)
/decl/chemical_reaction/instant/dontcrossthebeams/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -50,53 +50,53 @@
///////////////////////////////////////////////////////////////////////////////////
/// TF chemicals
/decl/chemical_reaction/instant/amorphorovir
- name = "Amorphorovir"
- id = "amorphorovir"
- result = "amorphorovir"
+ name = REAGENT_AMORPHOROVIR
+ id = REAGENT_ID_AMORPHOROVIR
+ result = REAGENT_ID_AMORPHOROVIR
required_reagents = list("cryptobiolin" = 30, "biomass" = 30, "hyperzine" = 20)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
/decl/chemical_reaction/instant/androrovir
- name = "Androrovir"
- id = "androrovir"
- result = "androrovir"
- required_reagents = list("amorphorovir" = 1, "bicaridine" = 20, "iron" = 20, "ethanol" = 20)
+ name = REAGENT_ANDROROVIR
+ id = REAGENT_ID_ANDROROVIR
+ result = REAGENT_ID_ANDROROVIR
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "bicaridine" = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir
- name = "Gynorovir"
- id = "gynorovir"
- result = "gynorovir"
- required_reagents = list("amorphorovir" = 1, "inaprovaline" = 20, "silicon" = 20, "sugar" = 20)
+ name = REAGENT_GYNOROVIR
+ id = REAGENT_ID_GYNOROVIR
+ result = REAGENT_ID_GYNOROVIR
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "inaprovaline" = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir
- name = "Androgynorovir"
- id = "androgynorovir"
- result = "androgynorovir"
- required_reagents = list("amorphorovir" = 1, "anti_toxin" = 20, "fluorine" = 20, "tungsten" = 20)
+ name = REAGENT_ANDROGYNOROVIR
+ id = REAGENT_ID_ANDROGYNOROVIR
+ result = REAGENT_ID_ANDROGYNOROVIR
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "anti_toxin" = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/androrovir_bootleg
name = "Bootleg Androrovir"
id = "androrovir_bootleg"
- result = "androrovir"
- required_reagents = list("amorphorovir" = 1, "protein" = 10, "capsaicin" = 10)
+ result = REAGENT_ID_ANDROROVIR
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "protein" = 10, "capsaicin" = 10)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir_bootleg
name = "Bootleg Gynorovir"
id = "gynorovir_bootleg"
- result = "gynorovir"
- required_reagents = list("amorphorovir" = 1, "soymilk" = 10, "sugar" = 10)
+ result = REAGENT_ID_GYNOROVIR
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "soymilk" = 10, REAGENT_ID_SUGAR = 10)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir_bootleg
name = "Bootleg Androgynorovir"
id = "androgynorovir_bootleg"
- result = "androgynorovir"
- required_reagents = list("amorphorovir" = 1, "cola" = 10, "berryjuice" = 10)
+ result = REAGENT_ID_ANDROGYNOROVIR
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "cola" = 10, "berryjuice" = 10)
result_amount = 1
///////////////////////////////////////////////////////////////////////////////////
@@ -109,33 +109,33 @@
name = "Firefighting Foam"
id = "firefighting foam"
result = "firefoam"
- required_reagents = list("water" = 1)
- catalysts = list("fluorine" = 10)
+ required_reagents = list(REAGENT_ID_WATER = 1)
+ catalysts = list(REAGENT_ID_FLUORINE = 10)
result_amount = 1
/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"
- required_reagents = list("water" = 1)
+ required_reagents = list(REAGENT_ID_WATER = 1)
catalysts = list("firefoam" = 5)
- inhibitors = list("fluorine" = 0.01)
+ inhibitors = list(REAGENT_ID_FLUORINE = 0.01)
result_amount = 1
///////////////////////////////////////////////////////////////////////////////////
/// Vore Drugs
/decl/chemical_reaction/instant/ickypak
- name = "Ickypak"
- id = "ickypak"
- result = "ickypak"
+ name = REAGENT_ICKYPAK
+ id = REAGENT_ID_ICKYPAK
+ result = REAGENT_ID_ICKYPAK
required_reagents = list("hyperzine" = 4, "fluorosurfactant" = 1)
result_amount = 5
/decl/chemical_reaction/instant/unsorbitol
- name = "Unsorbitol"
- id = "unsorbitol"
- result = "unsorbitol"
+ name = REAGENT_UNSORBITOL
+ id = REAGENT_ID_UNSORBITOL
+ result = REAGENT_ID_UNSORBITOL
required_reagents = list("mutagen" = 3, "lipozine" = 2)
result_amount = 5
@@ -145,7 +145,7 @@
name = "Adranol"
id = "adranol"
result = "adranol"
- required_reagents = list("milk" = 2, "hydrogen" = 1, "potassium" = 1)
+ required_reagents = list("milk" = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/vermicetol
@@ -160,7 +160,7 @@
name = "Prussian Blue"
id = "prussian_blue"
result = "prussian_blue"
- required_reagents = list("carbon" = 3, "iron" = 1, REAGENT_ID_NITROGEN = 3)
+ required_reagents = list(REAGENT_ID_CARBON = 3, REAGENT_ID_IRON = 1, REAGENT_ID_NITROGEN = 3)
result_amount = 7
/decl/chemical_reaction/instant/lipozilase
@@ -174,23 +174,23 @@
name = "Lipostipo"
id = "Lipostipo"
result = "lipostipo"
- required_reagents = list("lipozine" = 1, "nutriment" = 1, "fluorine" = 1)
+ required_reagents = list("lipozine" = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1)
result_amount = 3
///////////////////////////////////////////////////////////////////////////////////
/// Reagent colonies.
/decl/chemical_reaction/instant/meatcolony
name = "protein"
- id = "meatcolony"
+ id = REAGENT_ID_MEATCOLONY
result = "protein"
- required_reagents = list("meatcolony" = 5, "virusfood" = 5)
+ required_reagents = list(REAGENT_ID_MEATCOLONY = 5, "virusfood" = 5)
result_amount = 60
/decl/chemical_reaction/instant/plantcolony
- name = "nutriment"
- id = "plantcolony"
- result = "nutriment"
- required_reagents = list("plantcolony" = 5, "virusfood" = 5)
+ name = REAGENT_ID_NUTRIMENT
+ id = REAGENT_ID_PLANTCOLONY
+ result = REAGENT_ID_NUTRIMENT
+ required_reagents = list(REAGENT_ID_PLANTCOLONY = 5, "virusfood" = 5)
result_amount = 60
///////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index d6bebd2769..dad34082dc 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -30,7 +30,7 @@
name = "sucrose agar"
id = "sugarvirusfood"
result = "sugarvirusfood"
- required_reagents = list("sugar" = 1, "mutagenvirusfood" = 1)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, "mutagenvirusfood" = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_mutagen_inaprovaline
@@ -44,7 +44,7 @@
name = "Mix Virus"
id = "mixvirus"
required_reagents = list("virusfood" = 1)
- catalysts = list("blood" = 1)
+ catalysts = list(REAGENT_ID_BLOOD = 1)
var/level_min = 0
var/level_max = 2
@@ -115,7 +115,7 @@
name = "Devolve Virus"
id = "remvirus"
required_reagents = list("adranol" = 1)
- catalysts = list("blood" = 1)
+ catalysts = list(REAGENT_ID_BLOOD = 1)
/decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
@@ -127,7 +127,7 @@
/decl/chemical_reaction/instant/antibodies
name = "Antibodies"
id = "antibodiesmix"
- result = "antibodies"
+ result = REAGENT_ID_ANTIBODIES
required_reagents = list("vaccine")
catalysts = list("inaprovaline" = 0.1)
result_amount = 0.5
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 3cbdb38f64..cbbb56b872 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -27,7 +27,7 @@
var/label_text = ""
var/blood_type = null
- var/reag_id = "blood"
+ var/reag_id = REAGENT_ID_BLOOD
/obj/item/reagent_containers/blood/Initialize()
. = ..()
@@ -98,11 +98,11 @@
/obj/item/reagent_containers/blood/synthplas
blood_type = "O-"
- reag_id = "synthblood_dilute"
+ reag_id = REAGENT_ID_SYNTHBLOOD_DILUTE
/obj/item/reagent_containers/blood/synthblood
blood_type = "O-"
- reag_id = "synthblood"
+ reag_id = REAGENT_ID_SYNTHBLOOD
/obj/item/reagent_containers/blood/empty
name = "Empty BloodPack"
diff --git a/code/modules/reagents/reagent_containers/blood_pack_vr.dm b/code/modules/reagents/reagent_containers/blood_pack_vr.dm
index 5beff9b498..b2c73a41b2 100644
--- a/code/modules/reagents/reagent_containers/blood_pack_vr.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack_vr.dm
@@ -4,7 +4,7 @@
var/remove_volume = volume* 0.1 //10% of what the bloodpack can hold.
var/reagent_to_remove = reagents.get_master_reagent_id()
switch(reagents.get_master_reagent_id())
- if("blood")
+ if(REAGENT_ID_BLOOD)
user.show_message(span_warning("You sink your fangs into \the [src] and suck the blood out of it!"))
user.visible_message(span_red("[user] sinks their fangs into \the [src] and drains it!"))
user.adjust_nutrition(remove_volume*5)
diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm
index a84ea7c7e5..08a01ba3c1 100644
--- a/code/modules/reagents/reagent_containers/borghypo.dm
+++ b/code/modules/reagents/reagent_containers/borghypo.dm
@@ -32,7 +32,7 @@
desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \
thick materials that other hyposprays would struggle with."
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
- reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood")
+ reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
@@ -165,14 +165,14 @@
"spacemountainwind",
"spacespice",
"specialwhiskey",
- "sugar",
+ REAGENT_ID_SUGAR,
"tea",
"tequilla",
"tomatojuice",
"tonic",
"vermouth",
"vodka",
- "water",
+ REAGENT_ID_WATER,
"watermelonjuice",
"whiskey")
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 0298998d7f..1e8447dc6d 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -285,7 +285,7 @@
prefill = list("cryoxadone" = 30)
/obj/item/reagent_containers/glass/beaker/sulphuric
- prefill = list("sacid" = 60)
+ prefill = list(REAGENT_ID_SACID = 60)
/obj/item/reagent_containers/glass/beaker/stopperedbottle
name = "stoppered bottle"
diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm
index 2249ddd764..6ecb0e2443 100644
--- a/code/modules/reagents/reagent_containers/glass_vr.dm
+++ b/code/modules/reagents/reagent_containers/glass_vr.dm
@@ -50,32 +50,32 @@
prefill = list("hyronalin" = 30)
/obj/item/reagent_containers/glass/beaker/vial/amorphorovir
- name = "vial (amorphorovir)"
- prefill = list("amorphorovir" = 1)
+ name = "vial (" + REAGENT_ID_AMORPHOROVIR + ")"
+ prefill = list(REAGENT_ID_AMORPHOROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/androrovir
- name = "vial (androrovir)"
- prefill = list("androrovir" = 1)
+ name = "vial (" + REAGENT_ID_ANDROROVIR + ")"
+ prefill = list(REAGENT_ID_ANDROROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/gynorovir
- name = "vial (gynorovir)"
- prefill = list("gynorovir" = 1)
+ name = "vial (" + REAGENT_ID_GYNOROVIR + ")"
+ prefill = list(REAGENT_ID_GYNOROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/androgynorovir
- name = "vial (androgynorovir)"
- prefill = list("androgynorovir" = 1)
+ name = "vial (" + REAGENT_ID_ANDROGYNOROVIR + ")"
+ prefill = list(REAGENT_ID_ANDROGYNOROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/macrocillin
- name = "vial (macrocillin)"
- prefill = list("macrocillin" = 1)
+ name = "vial (" + REAGENT_ID_MACROCILLIN + ")"
+ prefill = list(REAGENT_ID_MACROCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/microcillin
- name = "vial (microcillin)"
- prefill = list("microcillin" = 1)
+ name = "vial (" + REAGENT_ID_MICROCILLIN + ")"
+ prefill = list(REAGENT_ID_MICROCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/normalcillin
- name = "vial (normalcillin)"
- prefill = list("normalcillin" = 1)
+ name = "vial (" + REAGENT_ID_NORMALCILLIN + ")"
+ prefill = list(REAGENT_ID_NORMALCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/supermatter
name = "vial (supermatter)"
@@ -87,4 +87,4 @@
desc = "A measuring cup."
icon = 'icons/obj/chemical_vr.dmi'
icon_state = "measure_cup"
- item_state = "measure_cup"
\ No newline at end of file
+ item_state = "measure_cup"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 0ba2319418..14a7708260 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -312,7 +312,7 @@
name = "illicit injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one contains various illicit drugs, held inside a hypospray to make smuggling easier."
- filled_reagents = list("bliss" = 15)
+ filled_reagents = list(REAGENT_ID_BLISS = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin
name = "cryptobiolin injector"
@@ -339,7 +339,7 @@
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This has psilocybin inside, which is a strong psychotropic derived from certain species of mushroom. \
This autoinjector likely was made by criminal elements to avoid detection from casual inspection."
- filled_reagents = list("psilocybin" = 15)
+ filled_reagents = list(REAGENT_ID_PSILOCYBIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen
name = "unstable mutagen injector"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 88dde6b271..e23f019a36 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -206,7 +206,7 @@
/obj/item/reagent_containers/pill/methylphenidate/Initialize()
. = ..()
- reagents.add_reagent("methylphenidate", 15)
+ reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/citalopram
@@ -216,7 +216,7 @@
/obj/item/reagent_containers/pill/citalopram/Initialize()
. = ..()
- reagents.add_reagent("citalopram", 15)
+ reagents.add_reagent(REAGENT_ID_CITALOPRAM, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin
@@ -296,7 +296,7 @@
/obj/item/reagent_containers/pill/carbon/Initialize()
. = ..()
- reagents.add_reagent("carbon", 30) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_CARBON, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/iron
@@ -306,7 +306,7 @@
/obj/item/reagent_containers/pill/iron/Initialize()
. = ..()
- reagents.add_reagent("iron", 30) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_IRON, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/copper
@@ -316,7 +316,7 @@
/obj/item/reagent_containers/pill/copper/Initialize()
. = ..()
- reagents.add_reagent("copper", 30)
+ reagents.add_reagent(REAGENT_ID_COPPER, 30)
color = reagents.get_color()
//Not-quite-medicine
@@ -327,8 +327,8 @@
/obj/item/reagent_containers/pill/happy/Initialize()
. = ..()
- reagents.add_reagent("bliss", 15)
- reagents.add_reagent("sugar", 15)
+ reagents.add_reagent(REAGENT_ID_BLISS, 15)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/zoom
diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm
index 02ebdebe67..f9605b9290 100644
--- a/code/modules/reagents/reagent_containers/pill_vr.dm
+++ b/code/modules/reagents/reagent_containers/pill_vr.dm
@@ -5,7 +5,7 @@
/obj/item/reagent_containers/pill/nutriment/Initialize()
. = ..()
- reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
/obj/item/reagent_containers/pill/protein
name = "Protein (30u)"
@@ -155,4 +155,4 @@
/obj/item/reagent_containers/pill/airlock/New()
..()
reagents.add_reagent("anti_toxin", 15)
- reagents.add_reagent("paracetamol", 5)
\ No newline at end of file
+ reagents.add_reagent("paracetamol", 5)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index f51bc0b7f4..193e8c60d8 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -42,10 +42,10 @@
user.setClickCooldown(4)
- if(reagents.has_reagent("sacid"))
+ if(reagents.has_reagent(REAGENT_ID_SACID))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")
- if(reagents.has_reagent("pacid"))
+ 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"))
@@ -160,7 +160,7 @@
/obj/item/reagent_containers/spray/waterflower/Initialize()
. = ..()
- reagents.add_reagent("water", 10)
+ reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/spray/chemsprayer
name = "chem sprayer"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 7c5c3cc9c6..667ace2968 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -106,7 +106,7 @@
return
if(ismob(target))//Blood!
- if(reagents.has_reagent("blood"))
+ if(reagents.has_reagent(REAGENT_ID_BLOOD))
to_chat(user, span_notice("There is already a blood sample in this syringe."))
return
@@ -368,7 +368,7 @@
/obj/item/reagent_containers/syringe/drugs/Initialize()
. = ..()
- reagents.add_reagent("bliss", 5)
+ reagents.add_reagent(REAGENT_ID_BLISS, 5)
reagents.add_reagent("mindbreaker", 5)
reagents.add_reagent("cryptobiolin", 5)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
diff --git a/code/modules/reagents/reagent_containers/virology.dm b/code/modules/reagents/reagent_containers/virology.dm
index a1d4403900..f09c34a4aa 100644
--- a/code/modules/reagents/reagent_containers/virology.dm
+++ b/code/modules/reagents/reagent_containers/virology.dm
@@ -13,7 +13,7 @@
. = ..()
diseases += new /datum/disease/advance/cold
data["viruses"] = diseases
- reagents.add_reagent("blood", 10, data)
+ reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
/obj/item/reagent_containers/glass/bottle/culture/flu
name = "flu virus culture"
@@ -23,4 +23,4 @@
. = ..()
diseases += new /datum/disease/advance/flu
data["viruses"] = diseases
- reagents.add_reagent("blood", 10, data)
+ reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm
index dc014a44eb..44dc798feb 100644
--- a/code/modules/reagents/reagents/core.dm
+++ b/code/modules/reagents/reagents/core.dm
@@ -1,8 +1,8 @@
/datum/reagent/blood
- data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, "antibodies" = list())
- name = "Blood"
- id = "blood"
- taste_description = "iron"
+ data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, REAGENT_ID_ANTIBODIES = list())
+ name = REAGENT_BLOOD
+ id = REAGENT_ID_BLOOD
+ taste_description = REAGENT_ID_IRON
taste_mult = 1.3
reagent_state = LIQUID
metabolism = REM * 5
@@ -168,8 +168,8 @@
remove_self(volume)
/datum/reagent/blood/synthblood
- name = "synthetic blood"
- id = "synthblood"
+ name = REAGENT_SYNTHBLOOD
+ id = REAGENT_ID_SYNTHBLOOD
color = "#999966"
volume_mod = 2
@@ -182,24 +182,24 @@
return
/datum/reagent/blood/synthblood/dilute
- name = "synthetic plasma"
- id = "synthblood_dilute"
+ name = REAGENT_SYNTHBLOOD_DILUTE
+ id = REAGENT_ID_SYNTHBLOOD_DILUTE
color = "#cacaaf"
volume_mod = 1.2
// pure concentrated antibodies
/datum/reagent/antibodies
- data = list("antibodies"=list())
- name = "Antibodies"
+ data = list(REAGENT_ID_ANTIBODIES=list())
+ name = REAGENT_ANTIBODIES
taste_description = "slime"
- id = "antibodies"
+ id = REAGENT_ID_ANTIBODIES
reagent_state = LIQUID
color = "#0050F0"
mrate_static = TRUE
/datum/reagent/antibodies/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(src.data)
- M.antibodies |= src.data["antibodies"]
+ M.antibodies |= src.data[REAGENT_ID_ANTIBODIES]
..()
#define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
@@ -301,8 +301,8 @@
#undef WATER_LATENT_HEAT
/datum/reagent/fuel
- name = "Welding fuel"
- id = "fuel"
+ name = REAGENT_FUEL
+ id = REAGENT_ID_FUEL
description = "Required for welders. Flamable."
taste_description = "gross metal"
reagent_state = LIQUID
diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm
index 681860427c..cefc8627bb 100644
--- a/code/modules/reagents/reagents/dispenser.dm
+++ b/code/modules/reagents/reagents/dispenser.dm
@@ -1,6 +1,6 @@
/datum/reagent/aluminum
- name = "Aluminum"
- id = "aluminum"
+ name = REAGENT_ALUMINIUM
+ id = REAGENT_ID_ALUMINIUM
description = "A silvery white and ductile member of the boron group of chemical elements."
taste_description = "metal"
taste_mult = 1.1
@@ -8,8 +8,8 @@
color = "#A8A8A8"
/datum/reagent/calcium
- name = "Calcium"
- id = "calcium"
+ name = REAGENT_CALCIUM
+ id = REAGENT_ID_CALCIUM
description = "A chemical element, the building block of bones."
taste_description = "metallic chalk" // Apparently, calcium tastes like calcium.
taste_mult = 1.3
@@ -29,8 +29,8 @@
//VOREStation Edit End
/datum/reagent/carbon
- name = "Carbon"
- id = "carbon"
+ name = REAGENT_CARBON
+ id = REAGENT_ID_CARBON
description = "A chemical element, the building block of life."
taste_description = "sour chalk"
taste_mult = 1.5
@@ -59,8 +59,8 @@
dirtoverlay.alpha = min(dirtoverlay.alpha + volume * 30, 255)
/datum/reagent/chlorine
- name = "Chlorine"
- id = "chlorine"
+ name = REAGENT_CHLORINE
+ id = REAGENT_ID_CHLORINE
description = "A chemical element with a characteristic odour."
taste_description = "pool water"
reagent_state = GAS
@@ -73,15 +73,15 @@
M.take_organ_damage(1*REM, 0)
/datum/reagent/copper
- name = "Copper"
- id = "copper"
+ name = REAGENT_COPPER
+ id = REAGENT_ID_COPPER
description = "A highly ductile metal."
taste_description = "pennies"
color = "#6E3B08"
/datum/reagent/ethanol
- name = "Ethanol" //Parent class for all alcoholic reagents.
- id = "ethanol"
+ name = REAGENT_ETHANOL //Parent class for all alcoholic reagents.
+ id = REAGENT_ID_ETHANOL
description = "A well-known alcohol with a variety of applications."
taste_description = "pure alcohol"
reagent_state = LIQUID
@@ -98,7 +98,7 @@
var/targ_temp = 310
var/halluci = 0
- glass_name = "ethanol"
+ glass_name = REAGENT_ID_ETHANOL
glass_desc = "A well-known alcohol with a variety of applications."
allergen_factor = 1 //simulates mixed drinks containing less of the allergen, as they have only a single actual reagent unlike food
@@ -213,8 +213,8 @@
return
/datum/reagent/fluorine
- name = "Fluorine"
- id = "fluorine"
+ name = REAGENT_FLUORINE
+ id = REAGENT_ID_FLUORINE
description = "A highly-reactive chemical element."
taste_description = "acid"
reagent_state = GAS
@@ -227,24 +227,24 @@
M.adjustToxLoss(removed)
/datum/reagent/hydrogen
- name = "Hydrogen"
- id = "hydrogen"
+ name = REAGENT_HYDROGEN
+ id = REAGENT_ID_HYDROGEN
description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
taste_mult = 0 //no taste
reagent_state = GAS
color = "#808080"
/datum/reagent/iron
- name = "Iron"
- id = "iron"
+ name = REAGENT_IRON
+ id = REAGENT_ID_IRON
description = "Pure iron is a metal."
taste_description = "metal"
reagent_state = SOLID
color = "#353535"
/datum/reagent/lithium
- name = "Lithium"
- id = "lithium"
+ name = REAGENT_LITHIUM
+ id = REAGENT_ID_LITHIUM
description = "A chemical element, used as antidepressant."
taste_description = "metal"
reagent_state = SOLID
@@ -258,8 +258,8 @@
M.emote(pick("twitch", "drool", "moan"))
/datum/reagent/mercury
- name = "Mercury"
- id = "mercury"
+ name = REAGENT_MERCURY
+ id = REAGENT_ID_MERCURY
description = "A chemical element."
taste_mult = 0 //mercury apparently is tasteless. IDK
reagent_state = LIQUID
@@ -294,24 +294,24 @@
M.adjustToxLoss(removed * 3)
/datum/reagent/phosphorus
- name = "Phosphorus"
- id = "phosphorus"
+ name = REAGENT_PHOSPHORUS
+ id = REAGENT_ID_PHOSPHORUS
description = "A chemical element, the backbone of biological energy carriers."
taste_description = "vinegar"
reagent_state = SOLID
color = "#832828"
/datum/reagent/potassium
- name = "Potassium"
- id = "potassium"
+ name = REAGENT_POTASSIUM
+ id = REAGENT_ID_POTASSIUM
description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
taste_description = "sweetness" //potassium is bitter in higher doses but sweet in lower ones.
reagent_state = SOLID
color = "#A0A0A0"
/datum/reagent/radium
- name = "Radium"
- id = "radium"
+ name = REAGENT_RADIUM
+ id = REAGENT_ID_RADIUM
description = "Radium is an alkaline earth metal. It is extremely radioactive."
taste_mult = 0 //Apparently radium is tasteless
reagent_state = SOLID
@@ -331,8 +331,8 @@
return
/datum/reagent/acid
- name = "Sulphuric acid"
- id = "sacid"
+ name = REAGENT_SACID
+ id = REAGENT_ID_SACID
description = "A very corrosive mineral acid with the molecular formula H2SO4."
taste_description = "acid"
reagent_state = LIQUID
@@ -419,31 +419,31 @@
remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile
/datum/reagent/silicon
- name = "Silicon"
- id = "silicon"
+ name = REAGENT_SILICON
+ id = REAGENT_ID_SILICON
description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
taste_mult = 0
reagent_state = SOLID
color = "#A8A8A8"
/datum/reagent/sodium
- name = "Sodium"
- id = "sodium"
+ name = REAGENT_SODIUM
+ id = REAGENT_ID_SODIUM
description = "A chemical element, readily reacts with water."
taste_description = "salty metal"
reagent_state = SOLID
color = "#808080"
/datum/reagent/sugar
- name = "Sugar"
- id = "sugar"
+ name = REAGENT_SUGAR
+ id = REAGENT_ID_SUGAR
description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
taste_description = "sugar"
taste_mult = 1.8
reagent_state = SOLID
color = "#FFFFFF"
- glass_name = "sugar"
+ glass_name = REAGENT_ID_SUGAR
glass_desc = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
glass_icon = DRINK_ICON_NOISY
@@ -469,16 +469,16 @@
M.drowsyness = max(M.drowsyness, 60)
/datum/reagent/sulfur
- name = "Sulfur"
- id = "sulfur"
+ name = REAGENT_SULFUR
+ id = REAGENT_ID_SULFUR
description = "A chemical element with a pungent smell."
taste_description = "old eggs"
reagent_state = SOLID
color = "#BF8C00"
/datum/reagent/tungsten
- name = "Tungsten"
- id = "tungsten"
+ name = REAGENT_TUNGSTEN
+ id = REAGENT_ID_TUNGSTEN
description = "A chemical element, and a strong oxidising agent."
taste_description = "metal"
taste_mult = 0 //no taste
diff --git a/code/modules/reagents/reagents/drugs.dm b/code/modules/reagents/reagents/drugs.dm
index 8ce249cfe1..ee199f76a2 100644
--- a/code/modules/reagents/reagents/drugs.dm
+++ b/code/modules/reagents/reagents/drugs.dm
@@ -4,8 +4,8 @@
*/
/datum/reagent/drugs
- name = "generic drugs"
- id = "drugs"
+ name = REAGENT_DRUGS
+ id = REAGENT_ID_DRUGS
description = "Some generic drugs."
taste_description = "a bad investment"
taste_mult = 1.2 /// The overwhelming flavor of a good(?) time!
@@ -40,8 +40,8 @@
prob_proc = TRUE
/datum/reagent/drugs/bliss /// Replaces Space Drugs.
- name = "Bliss"
- id = "bliss"
+ name = REAGENT_BLISS
+ id = REAGENT_ID_BLISS
description = "Known for providing a euphoric high, this psychoactive drug is often used recreationally."
taste_description = "unpleasant bitterness"
taste_mult = 0.4
@@ -80,8 +80,8 @@
..()
/datum/reagent/drugs/ambrosia_extract
- name = "Ambrosia extract"
- id = "ambrosia_extract"
+ name = REAGENT_AMBROSIAEXTRACT
+ id = REAGENT_ID_AMBROSIAEXTRACT
description = "The extract from the plant family ambrosia, responsible for the more \"recreational\" effects."
taste_description = "a strong-tasting plant"
color = "#358f49"
@@ -120,8 +120,8 @@
prob_proc = FALSE
/datum/reagent/drugs/psilocybin
- name = "Psilocybin"
- id = "psilocybin"
+ name = REAGENT_PSILOCYBIN
+ id = REAGENT_ID_PSILOCYBIN
description = "A strong psycotropic derived from certain species of mushroom."
taste_description = "mushroom"
color = "#E700E7"
@@ -172,8 +172,8 @@
prob_proc = FALSE
/datum/reagent/drugs/talum_quem
- name = "Talum-quem"
- id = "talum_quem"
+ name = REAGENT_TALUMQUEM
+ id = REAGENT_ID_TALUMQUEM
description = " A very carefully tailored hallucinogen, for use of the Talum-Katish."
taste_description = "bubblegum"
taste_mult = 1.6
@@ -202,8 +202,8 @@
prob_proc = FALSE
/datum/reagent/drugs/nicotine
- name = "Nicotine"
- id = "nicotine"
+ name = REAGENT_NICOTINE
+ id = REAGENT_ID_NICOTINE
description = "A highly addictive stimulant extracted from the tobacco plant."
taste_description = "sour staleness"
color = "#181818"
@@ -215,8 +215,8 @@
/// Psychiatric drugs use similar mechanics and will go under "drugs". /////
*////////////////////////////////////////////////////////////////////////////
/datum/reagent/drugs/methylphenidate
- name = "Methylphenidate"
- id = "methylphenidate"
+ name = REAGENT_METHYLPHENIDATE
+ id = REAGENT_ID_METHYLPHENIDATE
description = "Improves the ability to concentrate."
taste_description = "mild grape" ///Referencing real life oral solutions for these meds.
color = "#BF80BF"
@@ -224,8 +224,8 @@
sober_message_list = list("It becomes harder to focus...", "You feel distractible.")
/datum/reagent/drugs/citalopram
- name = "Citalopram"
- id = "citalopram"
+ name = REAGENT_CITALOPRAM
+ id = REAGENT_ID_CITALOPRAM
description = "Stabilizes the mind a little."
taste_description = "mild peppermint"
color = "#FF80FF"
@@ -238,8 +238,8 @@
M.fear = max((M.fear - 3),0)
/datum/reagent/drugs/paroxetine
- name = "Paroxetine"
- id = "paroxetine"
+ name = REAGENT_PAROXETINE
+ id = REAGENT_ID_PAROXETINE
description = "Stabilizes the mind greatly, but has a chance of adverse effects."
taste_description = "mild oranges"
color = "#FF80BF"
@@ -256,8 +256,8 @@
prob_proc = FALSE
/datum/reagent/drugs/qerr_quem
- name = "Qerr-quem"
- id = "qerr_quem"
+ name = REAGENT_QERRQUEM
+ id = REAGENT_ID_QERRQUEM
description = "A potent sedative and anti-anxiety medication, made for the Qerr-Katish."
taste_description = "mint"
color = "#e6efe3"
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index 258d19b89d..0c170aac67 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -1,8 +1,8 @@
/* Food */
/datum/reagent/nutriment
- name = "Nutriment"
- id = "nutriment"
+ name = REAGENT_NUTRIMENT
+ id = REAGENT_ID_NUTRIMENT
description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
taste_mult = 4
reagent_state = SOLID
@@ -642,8 +642,8 @@
/* Non-food stuff like condiments */
/datum/reagent/sodiumchloride
- name = "Table Salt"
- id = "sodiumchloride"
+ name = REAGENT_SODIUMCHLORIDE
+ id = REAGENT_ID_SODIUMCHLORIDE
description = "A salt made of sodium chloride. Commonly used to season food."
taste_description = "salt"
reagent_state = SOLID
@@ -2412,13 +2412,13 @@
..()
if(alien == IS_DIONA)
return
- M.bloodstr.add_reagent("radium", 0.3)
+ M.bloodstr.add_reagent(REAGENT_ID_RADIUM, 0.3)
/datum/reagent/drink/nuclearwaste/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien == IS_DIONA)
return
- M.ingested.add_reagent("radium", 0.25)
+ M.ingested.add_reagent(REAGENT_ID_RADIUM, 0.25)
/datum/reagent/drink/sodaoil //Mixed with normal drinks to make a 'potable' version for Prometheans if mixed 1-1. Dilution is key.
name = "Soda Oil"
diff --git a/code/modules/reagents/reagents/food_drinks_vr.dm b/code/modules/reagents/reagents/food_drinks_vr.dm
index 3f245ac219..388031b2fe 100644
--- a/code/modules/reagents/reagents/food_drinks_vr.dm
+++ b/code/modules/reagents/reagents/food_drinks_vr.dm
@@ -2,8 +2,8 @@
nutriment_factor = 10
/datum/reagent/toxin/meatcolony
- name = "A colony of meat cells"
- id = "meatcolony"
+ name = REAGENT_MEATCOLONY
+ id = REAGENT_ID_MEATCOLONY
description = "Specialised cells designed to produce a large amount of meat once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous."
taste_description = "a fibrous mess"
reagent_state = LIQUID
@@ -11,8 +11,8 @@
strength = 10
/datum/reagent/toxin/plantcolony
- name = "A colony of plant cells"
- id = "plantcolony"
+ name = REAGENT_PLANTCOLONY
+ id = REAGENT_ID_PLANTCOLONY
description = "Specialised cells designed to produce a large amount of nutriment once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous."
taste_description = "a fibrous mess"
reagent_state = LIQUID
@@ -20,8 +20,8 @@
strength = 10
/datum/reagent/nutriment/grubshake
- name = "Grub shake"
- id = "grubshake"
+ name = REAGENT_GRUBSHAKE
+ id = REAGENT_ID_GRUBSHAKE
description = "An odd fluid made from grub guts, supposedly filling."
taste_description = "sparkles"
taste_mult = 1.3
@@ -32,8 +32,8 @@
M.adjust_nutrition(-20 * removed)
/datum/reagent/ethanol/burnout
- name = "Burnout"
- id = "burnout"
+ name = REAGENT_BURNOUT
+ id = REAGENT_ID_BURNOUT
description = "A bubbling orange alcoholic fluid that radiates a large amount of heat."
taste_description = "powerful alcoholic inferno"
color = "#cc5500"
@@ -42,7 +42,7 @@
adj_temp = 10
targ_temp = 380
- glass_name = "Burnout"
+ glass_name = REAGENT_BURNOUT
glass_desc = "A swirling brew of fluids that leaves even the glass itself hot to the touch."
/datum/reagent/ethanol/burnout/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -67,8 +67,8 @@
M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are burning!"), span_danger("You feel like your insides are on fire!"), span_danger("You feel like your belly is full of lava!")))
/datum/reagent/ethanol/monstertamer
- name = "Monster Tamer"
- id = "monstertamer"
+ name = REAGENT_MONSTERTAMER
+ id = REAGENT_ID_MONSTERTAMER
description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant."
taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey"
strength = 50
@@ -77,7 +77,7 @@
var/alt_nutriment_factor = 5 //half as much as protein since it's half protein.
//using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account
- glass_name = "Monster Tamer"
+ glass_name = REAGENT_MONSTERTAMER
glass_desc = "This looks like a vaguely-alcoholic slurry of meat. Gross."
/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -115,63 +115,63 @@
M.adjust_nutrition(alt_nutriment_factor * removed)
/datum/reagent/ethanol/pink_russian
- name = "Pink Russian"
- id = "pinkrussian"
+ name = REAGENT_PINKRUSSIAN
+ id = REAGENT_ID_PINKRUSSIAN
description = "Like a White Russian but with 100% more pink!"
taste_description = "strawberry icecream, with a coffee kick"
color = "#d789bd"
strength = 15
- glass_name = "Pink Russian"
+ glass_name = REAGENT_PINKRUSSIAN
glass_desc = "A very pink drink, yet with strong sense of power to it."
/datum/reagent/ethanol/originalsin
- name = "Original Sin"
- id = "originalsin"
+ name = REAGENT_ORIGINALSIN
+ id = REAGENT_ID_ORIGINALSIN
description = "Angel Ichor, entirely transformed by one drop of apple juice"
taste_description = "the apple Eve gave to Adam"
color = "#99CC35"
strength = 17
- glass_name = "Original Sin"
+ glass_name = REAGENT_ORIGINALSIN
glass_desc = "A drink so fine, you may just risk eternal damnation!"
/datum/reagent/ethanol/newyorksour
- name = "New York Sour"
- id = "newyorksour"
+ name = REAGENT_NEWYORKSOUR
+ id = REAGENT_ID_NEWYORKSOUR
description = "Whiskey sour, with a layer of wine and egg white."
taste_description = "refreshing lemoned whiskey, smoothed with wine"
color = "#FFBF3C"
strength = 17
- glass_name = "New York Sour"
+ glass_name = REAGENT_NEWYORKSOUR
glass_desc = "A carefully poured three layered drink"
/datum/reagent/ethanol/windgarita
- name = "WND-Garita"
- id = "windgarita"
+ name = REAGENT_WINDGARITA
+ id = REAGENT_ID_WINDGARITA
description = "A highly questionable combination of margarita and Space Mountain Wind"
taste_description = "like sin, and some tequilia"
color = "#90D93D"
strength = 15
- glass_name = "WND-Garita"
+ glass_name = REAGENT_WINDGARITA
glass_desc = "Who the hell comes up with these drinks?!"
/datum/reagent/ethanol/mudslide
- name = "Mudslide"
- id = "mudslide"
+ name = REAGENT_MUDSLIDE
+ id = REAGENT_ID_MUDSLIDE
description = "Vodka, Kahlua and Irish Cream together at last."
taste_description = "a mocha milkshake, with a splash of vodka."
color = "#8B6338"
strength = 13
- glass_name = "Mudslide"
+ glass_name = REAGENT_MUDSLIDE
glass_desc = "A richly coloured drink, comes with a chocolate garnish!"
/datum/reagent/ethanol/galacticpanic
- name = "Galactic Panic Attack"
- id = "galacticpanic"
+ name = REAGENT_GALACTICPANIC
+ id = REAGENT_ID_GALACTICPANIC
description = "The absolute worst thing you could ever put in your body."
taste_description = "an entire galaxy collasping in on itself"
strength = 10
@@ -180,7 +180,7 @@
var/adj_dizzy = 10
color = "#d3785d"
- glass_name = "Galactic Panic Attack"
+ glass_name = REAGENT_GALACTICPANIC
glass_desc = "Looking into this is like staring at the stars."
/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -197,30 +197,30 @@
M.slurring = max(M.slurring, 30)
/datum/reagent/ethanol/bulldog
- name = "Space Bulldog"
- id = "bulldog"
+ name = REAGENT_BULLDOG
+ id = REAGENT_ID_BULLDOG
description = "An inventive kahlua recipe."
taste_description = "fizzy, creamy, soda and coffee hell"
strength = 30
color = "#d3785d"
- glass_name = "Space Bulldog"
+ glass_name = REAGENT_BULLDOG
glass_desc = "It looks like someone poured cola in a cup of coffee."
/datum/reagent/ethanol/sbagliato
- name = "Negroni Sbagliato"
- id = "sbagliato"
+ name = REAGENT_SBAGLIATO
+ id = REAGENT_ID_SBAGLIATO
description = "A drink invented because a bartender was too drunk."
taste_description = "sweet bubbly wine and vermouth"
strength = 30
color = "#d3785d"
- glass_name = "Negroni Sbagliato"
+ glass_name = REAGENT_SBAGLIATO
glass_desc = "Bubbles constantly pop up to the surface with a quiet fizz."
/datum/reagent/ethanol/italiancrisis
- name = "Italian Crisis"
- id = "italiancrisis"
+ name = REAGENT_ITALIANCRISIS
+ id = REAGENT_ID_ITALIANCRISIS
description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123."
taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot"
strength = 20
@@ -229,34 +229,34 @@
var/adj_dizzy = 0
color = "#d3785d"
- glass_name = "Italian Crisis"
+ glass_name = REAGENT_ITALIANCRISIS
glass_desc = "This drink looks like it was a mistake."
/datum/reagent/ethanol/sugarrush
- name = "Sweet Rush"
- id = "sugarrush"
+ name = REAGENT_SUGARRUSH
+ id = REAGENT_ID_SUGARRUSH
description = "A favorite drink amongst poor bartenders living in Neo Detroit."
taste_description = "sweet bubblegum vodka"
strength = 30
color = "#d3785d"
- glass_name = "Sweet Rush"
+ glass_name = REAGENT_SUGARRUSH
glass_desc = "This looks like it might rot your teeth out."
/datum/reagent/ethanol/lotus
- name = "Lotus"
- id = "lotus"
+ name = REAGENT_LOTUS
+ id = REAGENT_ID_LOTUS
description = "The result of making one mistake after another and trying to cover it up with sugar."
taste_description = "rich, sweet fruit and even more sugar"
strength = 25
color = "#d3785d"
- glass_name = "Lotus"
+ glass_name = REAGENT_LOTUS
glass_desc = "A promotional drink for a movie that only ever played in Neo Detroit theatres."
/datum/reagent/ethanol/shroomjuice
- name = "Dumb Shroom Juice"
- id = "shroomjuice"
+ name = REAGENT_SHROOMJUICE
+ id = REAGENT_ID_SHROOMJUICE
description = "The mushroom farmer didn't sort through their stock very well."
taste_description = "sweet and sour citrus with a savory kick"
strength = 100
@@ -265,19 +265,19 @@
var/adj_dizzy = 30
color = "#d3785d"
- glass_name = "Dumb Shroom Juice"
+ glass_name = REAGENT_SHROOMJUICE
glass_desc = "Touch fuzzy, get dizzy."
/datum/reagent/ethanol/russianroulette
- name = "Russian Roulette"
- id = "russianroulette"
+ name = REAGENT_RUSSIANROULETTE
+ id = REAGENT_ID_RUSSIANROULETTE
description = "The perfect drink for wagering your liver on a game of cards."
taste_description = "coffee, vodka, cream, and a hot metal slug"
strength = 30
var/adj_dizzy = 30
color = "#d3785d"
- glass_name = "Russian Roulette"
+ glass_name = REAGENT_RUSSIANROULETTE
glass_desc = "A favorite drink amongst the Pan-Slavic speaking community."
/datum/reagent/ethanol/russianroulette/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -287,8 +287,8 @@
M.Stun(2)
/datum/reagent/ethanol/lovemaker
- name = "The Love Maker"
- id = "lovemaker"
+ name = REAGENT_LOVEMAKER
+ id = REAGENT_ID_LOVEMAKER
description = "A drink said to help one find true love."
taste_description = "sweet fruit and honey"
strength = 30
@@ -299,35 +299,35 @@
targ_temp = 360
color = "#d3785d"
- glass_name = "The Love Maker"
+ glass_name = REAGENT_LOVEMAKER
glass_desc = "A drink said to help one find the perfect fuck."
/datum/reagent/ethanol/honeyshot
- name = "Honey Shot"
- id = "honeyshot"
+ name = REAGENT_HONEYSHOT
+ id = REAGENT_ID_HONEYSHOT
description = "The perfect drink for bees."
taste_description = "sweet tart grenadine flavored with honey"
strength = 40
var/adj_dizzy = 10
color = "#d3785d"
- glass_name = "Honey shot"
+ glass_name = REAGENT_HONEYSHOT
glass_desc = "A glass of golden liquid."
/datum/reagent/ethanol/appletini
- name = "Appletini"
- id = "appletini"
+ name = REAGENT_APPLETINI
+ id = REAGENT_ID_APPLETINIT
description = "A classic cocktail using every grandma's favorite fruit."
taste_description = "green sour apple with a hint of alcohol"
strength = 45
color = "#d3785d"
- glass_name = "Appletini"
+ glass_name = REAGENT_APPLETINI
glass_desc = "The perfect fruit cocktail for a fancy night at the bar."
/datum/reagent/ethanol/glowingappletini
- name = "Glowing Appletini"
- id = "glowingappletini"
+ name = REAGENT_GLOWINGAPPLETINI
+ id = REAGENT_ID_GLOWINGAPPLETINI
description = "A new nuclear take on a pre-modern classic!"
taste_description = "overwhelmingly sour apples powered by a nuclear fission reactor"
strength = 30
@@ -335,12 +335,12 @@
var/adj_dizzy = 20
color = "#d3785d"
- glass_name = "Glowing Appletini"
+ glass_name = REAGENT_GLOWINGAPPLETINI
glass_desc = "The atomic option to fruity cocktails."
/datum/reagent/ethanol/scsatw
- name = "Slow Comfortable Screw Against the Wall"
- id = "scsatw"
+ name = REAGENT_SCSATW
+ id = REAGENT_ID_SCSATW
description = "The screwdriver's bigger cousin."
taste_description = "smooth, savory booze and tangy orange juice"
strength = 30
@@ -349,22 +349,22 @@
var/adj_dizzy = 0
color = "#d3785d"
- glass_name = "Slow Comfortable Screw Against the Wall"
+ glass_name = REAGENT_SCSATW
glass_desc = "The best accessory to daydrinking."
/datum/reagent/drink/choccymilk
- name = "Choccy Milk"
- id = "choccymilk"
+ name = REAGENT_CHOCCYMILK
+ id = REAGENT_ID_CHOCCYMILK
description = "Coco and milk, a timeless classic."
taste_description = "sophisticated bittersweet chocolate mixed with silky, creamy, whole milk"
color = "#d3785d"
- glass_name = "Choccy Milk"
+ glass_name = REAGENT_CHOCCYMILK
glass_desc = "The most iconic duo in the galaxy, chocolate, and milk."
/datum/reagent/ethanol/redspaceflush
- name = "Red Space Flush"
- id = "redspaceflush"
+ name = REAGENT_REDSPACEFLUSH
+ id = REAGENT_ID_REDSPACEFLUSH
description = "A drink made by imbueing the essence of redspace into the spirits."
taste_description = "whiskey and rum strung out through a hellish dimensional rift"
strength = 30
@@ -372,66 +372,66 @@
var/adj_dizzy = 10
color = "#d3785d"
- glass_name = "Redspace Flush"
+ glass_name = REAGENT_REDSPACEFLUSH
glass_desc = "A drink imbued with the very essence of Redspace."
/datum/reagent/drink/graveyard
- name = "Graveyard"
- id = "graveyard"
+ name = REAGENT_GRAVEYARD
+ id = REAGENT_ID_GRAVEYARD
description = "The result of taking a cup and filling it with all the drinks at the fountain."
taste_description = "sugar and fizz"
color = "#d3785d"
- glass_name = "Graveyard"
+ glass_name = REAGENT_GRAVEYARD
glass_desc = "Hahaha softdrink machine go pshshhhhh..."
/datum/reagent/ethanol/bigbeer
- name = "Giant Beer"
- id = "bigbeer"
+ name = REAGENT_BIGBEER
+ id = REAGENT_ID_BIGBEER
description = "Bars in Neo Detroit started to sell this drink when the city put mandatory drink limits in 2289."
taste_description = "beer, but bigger"
strength = 40
color = "#d3785d"
- glass_name = "Giant Beer"
+ glass_name = REAGENT_BIGBEER
glass_desc = "The Neo Detroit beer and ale cocktail, perfect for your average drunk."
/datum/reagent/ethanol/manager_summoner
- name = "Manager Summoner"
- id = "manager_summoner"
+ name = REAGENT_MANAGERSUMMONER
+ id = REAGENT_ID_MANAGERSUMMONER
description = "A horrifying cocktail for those who desperately want feel above their peers."
taste_description = "bitter and sweet, with a hint of superiority"
strength = 30
color = "#c9716b"
- glass_name = "Manager Summoner"
+ glass_name = REAGENT_MANAGERSUMMONER
glass_desc = "The dreaded red juice of those who insist on taking advantage of minor positions of power to make the lives of bar staff unbearable."
/datum/reagent/drink/sweettea
- name = "Sweet Tea"
- id = "sweettea"
+ name = REAGENT_SWEETTEA
+ id = REAGENT_ID_SWEETTEA
description = "Tea that is sweetened with some form of sweetener."
taste_description = "tea that is sweet"
color = "#d3785d"
- glass_name = "Sweet Tea"
+ glass_name = REAGENT_SWEETTEA
glass_desc = "A southern classic. Southern what? You know, southern."
/datum/reagent/ethanol/unsweettea
- name = "Unsweetened Tea"
- id = "unsweettea"
+ name = REAGENT_UNSWEETTEA
+ id = REAGENT_ID_UNSWEETTEA
description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this."
taste_description = "bland, slightly bitter, discount black tea"
strength = 80
druggy = 10
color = "#d3785d"
- glass_name = "Unsweetened Tea"
+ glass_name = REAGENT_UNSWEETTEA
glass_desc = "A drink with all the calories of sweet tea, but with none of the satisfaction. Slightly psychoactive."
/datum/reagent/ethanol/hairoftherat
- name = "Hair of the Rat"
- id = "hairoftherat"
+ name = REAGENT_HAIROFTHERAT
+ id = REAGENT_ID_HAIROFTHERAT
description = "A meatier version of the monster tamer, complete with extra meat."
taste_description = "meat, whiskey, ground meat, and more meat"
strength = 45
@@ -440,7 +440,7 @@
var/alt_nutriment_factor = 5 //half as much as protein since it's half protein.
//using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account
- glass_name = "Hair of the Rat"
+ glass_name = REAGENT_HAIROFTHERAT
glass_desc = "The alcoholic equivalent of saying your burger isn't cooked rare enough."
/datum/reagent/ethanol/hairoftherat/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -480,8 +480,8 @@
//////////////////////Bepis Drinks (04/29/2021)//////////////////////
/datum/reagent/drink/soda/bepis_cola
- name = "Bepis"
- id = "bepis"
+ name = REAGENT_BEPIS
+ id = REAGENT_ID_BEPIS
description = "A weird cola-like beverage."
taste_description = "bepsi"
reagent_state = LIQUID
@@ -489,13 +489,13 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Bepis Cola"
+ glass_name = REAGENT_BEPIS
glass_desc = "A glass of weird cola beverage."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/buzz_fuzz
- name = "Buzz Fuzz"
- id = "buzz_fuzz"
+ name = REAGENT_BUZZFUZZ
+ id = REAGENT_ID_BUZZFUZZ
description = "A delicious frontier beverage that's simply a Hive of Flavour!"
taste_description = "carbonated honey and pollen"
reagent_state = LIQUID
@@ -503,13 +503,13 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Buzz Fuzz"
+ glass_name = REAGENT_BUZZFUZZ
glass_desc = "A glass that's stinging with flavour."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/sprited_cranberry
- name = "Sprited Cranberry"
- id = "sprited_cranberry"
+ name = REAGENT_SPRITEDCRANBERRY
+ id = REAGENT_ID_SPRITEDCRANBERRY
description = "A winter spiced cranberry drink. Perfect for year-round consumption."
taste_description = "sweet spiced cranberry"
reagent_state = LIQUID
@@ -517,13 +517,13 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Sprited Cranberry"
+ glass_name = REAGENT_SPRITEDCRANBERRY
glass_desc = "A glass of sprited cranberry"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/shamblers
- name = "Shambler's Juice"
- id = "shamblers"
+ name = REAGENT_SHAMBLERS
+ id = REAGENT_ID_SHAMBLERS
description = "A strange off-brand beverage that's bursting with flavor."
taste_description = "carbonated metallic soda"
reagent_state = LIQUID
@@ -531,15 +531,15 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Shambler's Juice"
+ glass_name = REAGENT_SHAMBLERS
glass_desc = "A glass of something shambly"
glass_special = list(DRINK_FIZZ)
////////////////START BrainzSnax Reagents////////////////
/datum/reagent/nutriment/protein/brainzsnax
- name = "grey matter"
- id = "brain_protein"
+ name = REAGENT_BRAINPROTEIN
+ id = REAGENT_ID_BRAINPROTEIN
taste_description = "fatty, mushy meat and allspice"
color = "#caa3c9"
@@ -560,150 +560,150 @@
log_and_message_admins("is no longer feral.", H)
/datum/reagent/nutriment/protein/brainzsnax/red
- id = "red_brain_protein"
+ id = REAGENT_ID_REDBRAINPROTEIN
taste_description = "fatty, mushy meat and cheap tomato sauce"
color = "#a6898d"
////////////////END BrainzSnax Reagents////////////////
/datum/reagent/nutriment/protein_powder
- name = "Protein Powder"
- id = "protein_powder"
+ name = REAGENT_PROTEINPOWDER
+ id = REAGENT_ID_PROTEINPOWDER
description = "Pure, powdered protein commonly used as a meal supplement."
taste_description = "powdery protein"
color = "#f4e6dd"
/datum/reagent/nutriment/protein_shake
- name = "Protein Shake"
- id = "protein_shake"
+ name = REAGENT_PROTEINSHAKE
+ id = REAGENT_ID_PROTEINSHAKE
description = "A mixture of water and protein commonly used as a meal supplement."
taste_description = "pure protein"
color = "#ebd8cb"
/datum/reagent/nutriment/protein_powder/vanilla
- name = "Vanilla Protein Powder"
- id = "vanilla_protein_powder"
+ name = REAGENT_VANILLAPROTEINPOWDER
+ id = REAGENT_ID_VANILLAPROTEINPOWDER
description = "Pure, powdered protein commonly used as a meal supplement. This one has added vanilla flavoring."
taste_description = "powdery vanilla"
color = "#fff7d2"
/datum/reagent/nutriment/protein_shake/vanilla
- name = "Vanilla Protein Shake"
- id = "vanilla_protein_shake"
+ name = REAGENT_VANILLAPROTEINSHAKE
+ id = REAGENT_ID_VANILLAPROTEINSHAKER
description = "A mixture of water and protein commonly used as a meal supplement. This one has added vanilla flavoring."
taste_description = "vanilla"
color = "#faefbc"
/datum/reagent/nutriment/protein_powder/banana
- name = "Banana Protein Powder"
- id = "banana_protein_powder"
+ name = REAGENT_BANANAPROTEINPOWDER
+ id = REAGENT_ID_BANANAPROTEINPOWDER
description = "Pure, powdered protein commonly used as a meal supplement. This one has added banana flavoring."
taste_description = "powdery banana"
color = "#faefbc"
/datum/reagent/nutriment/protein_shake/banana
- name = "Banana Protein Powder"
- id = "banana_protein_shake"
+ name = REAGENT_BANANAPROTEINSHAKE
+ id = REAGENT_ID_BANANAPROTEINSHAKE
description = "A mixture of water and protein commonly used as a meal supplement. This one has added banana flavoring."
taste_description = "banana"
color = "#e6daa1"
/datum/reagent/nutriment/protein_powder/chocolate
- name = "Chocolate Protein Powder"
- id = "chocolate_protein_powder"
+ name = REAGENT_CHOCOLATEPROTEINPOWDER
+ id = REAGENT_ID_CHOCOLATEPROTEINPOWDER
description = "Pure, powdered protein commonly used as a meal supplement. This one has added chocolate flavoring."
taste_description = "powdery chocolate"
color = "#865b3e"
/datum/reagent/nutriment/protein_shake/chocolate
- name = "Chocolate Protein Shake"
- id = "chocolate_protein_shake"
+ name = REAGENT_CHOCOLATEPROTEINSHAKE
+ id = REAGENT_ID_CHOCOLATEPROTEINSHAKE
description = "A mixture of water and protein commonly used as a meal supplement. This one has added chocolate flavoring."
taste_description = "chocolate"
color = "#644730"
/datum/reagent/nutriment/protein_powder/strawberry
- name = "Strawberry Protein Powder"
- id = "strawberry_protein_powder"
+ name = REAGENT_STRAWBERRYPROTEINPOWDER
+ id = REAGENT_ID_STRAWBERRYPROTEINPOWDER
description = "Pure, powdered protein commonly used as a meal supplement. This one has added strawberry flavoring."
taste_description = "powdery strawberry"
color = "#eba1a1"
/datum/reagent/nutriment/protein_shake/strawberry
- name = "Strawberry Protein Shake"
- id = "strawberry_protein_shake"
+ name = REAGENT_STRAWBERRYPROTEINSHAKE
+ id = REAGENT_ID_STRAWBERRYPROTEINSHAKE
description = "A mixture of water and protein commonly used as a meal supplement. This one has added strawberry flavoring."
taste_description = "strawberry"
color = "#e28585"
//SOUPS. Don't use the base soup reagent.
/datum/reagent/drink/soup
- name = "Soup"
- id = "generic_soup"
+ name = REAGENT_SOUP
+ id = REAGENT_ID_SOUP
description = "An indistinct soupy mass of nominal goodness, but questionable flavour."
taste_description = "upsettingly bland soup"
color = "#9a9a9a"
nutrition = 30 //same as base nutriment
/datum/reagent/drink/soup/tomato
- name = "Tomato Soup"
- id = "tomato_soup"
+ name = REAGENT_TOMATOSOUP
+ id = REAGENT_ID_TOMATOSOUP
description = "A thick and creamy tomato soup. Delicious! Definitely not ketchup."
taste_description = "rich, creamy tomato"
color = "#e4612d"
allergen_type = ALLERGEN_FRUIT //tomatoes are fruit, etc. etc.
/datum/reagent/drink/soup/mushroom
- name = "Cream of Mushroom Soup"
- id = "mushroom_soup"
+ name = REAGENT_MUSHROOMSOUP
+ id = REAGENT_ID_MUSHROOMSOUP
description = "A rich, earthy mushroom soup."
taste_description = "earthy mushrooms"
color = "#a59a83"
allergen_type = ALLERGEN_FUNGI //shrooms!
/datum/reagent/drink/soup/chicken
- name = "Cream of Chicken Soup"
- id = "chicken_soup"
+ name = REAGENT_CHICKENSOUP
+ id = REAGENT_ID_CHICKENSOUP
description = "A fairly thick, warming chicken-based soup."
taste_description = "savoury chicken goodness"
color = "#d4c574"
allergen_type = ALLERGEN_MEAT //plain ol' chimken
/datum/reagent/drink/soup/chicken_noodle
- name = "Chicken Noodle Soup"
- id = "chicken_noodle_soup"
+ name = REAGENT_CHICKENNOODLESOUP
+ id = REAGENT_ID_CHICKENNOODLESOUP
description = "A thin chicken broth with added noodles. If you're lucky there might be some chunks of chicken and veggies in there! Maybe."
taste_description = "savoury chicken-noodle goodness"
color = "#a27a41"
allergen_type = ALLERGEN_MEAT|ALLERGEN_GRAINS|ALLERGEN_VEGETABLE //chicken + grain-based noodles + veggie chunks
/datum/reagent/drink/soup/onion
- name = "Onion Soup"
- id = "onion_soup"
+ name = REAGENT_ONIONSOUP
+ id = REAGENT_ID_ONIONSOUP
description = "A humble staple of humanity throughout the centuries."
taste_description = "caramelized onions"
color = "#5d3918"
allergen_type = ALLERGEN_VEGETABLE //onions are veg, right?
/datum/reagent/drink/soup/vegetable
- name = "Vegetable Soup"
- id = "vegetable_soup"
+ name = REAGENT_VEGETABLESOUP
+ id = REAGENT_ID_VEGETABLESOUP
description = "A mix of various kinds of tasty vegetables, in soup format!"
taste_description = "mixed vegetables"
color = "#824005"
allergen_type = ALLERGEN_VEGETABLE //mixed veg
/datum/reagent/drink/soup/beet
- name = "Beet Soup"
- id = "beet_soup"
+ name = REAGENT_BEETSOUP
+ id = REAGENT_ID_BEETSOUP
description = "A hearty mix of tomatoes and beets, with a meat stock base."
taste_description = "sour tomatoes and some killer beets"
color = "#471b1c"
allergen_type = ALLERGEN_MEAT|ALLERGEN_FRUIT|ALLERGEN_VEGETABLE //meat stock, tomatoes, and beets
/datum/reagent/drink/soup/hot_and_sour
- name = "Hot & Sour Soup"
- id = "hot_n_sour_soup"
+ name = REAGENT_HOTNSOURSOUP
+ id = REAGENT_ID_HOTNSOURSOUP
description = "A spicy tofu-based soup."
taste_description = "spicy, sour tofu"
color = "#5f1b06"
@@ -713,8 +713,8 @@
/datum/reagent/drink/coffee/nukie
- name = "Nukie"
- id = "nukie"
+ name = REAGENT_NUKIE
+ id = REAGENT_ID_NUKIE
description = "An extremely concentrated caffinated drink."
color = "#102838"
adj_temp = 0
@@ -722,70 +722,70 @@
adj_drowsy = -5
adj_sleepy = -10
- glass_name = "nukie"
+ glass_name = REAGENT_ID_NUKIE
glass_desc = "A drink to perk you up and refresh you!"
overdose = 30
taste_description = "flavourless energy"
/datum/reagent/drink/coffee/nukie/peach
- name = "Nukie Peach"
- id = "nukie_peach"
+ name = REAGENT_NUKIEPEACH
+ id = REAGENT_ID_NUKIEPEACH
color = "#ffc76e"
taste_description = "battery acid with a hint of artificial peach"
/datum/reagent/drink/coffee/nukie/pear
- name = "Nukie Pear"
- id = "nukie_pear"
+ name = REAGENT_NUKIEPEAR
+ id = REAGENT_ID_NUKIEPEAR
color = "#d4c03d"
taste_description = "electrostimulation with a hint of artificial pear"
/datum/reagent/drink/coffee/nukie/cherry
- name = "Nukie Cherry"
- id = "nukie_cherry"
+ name = REAGENT_NUKIECHERRY
+ id = REAGENT_ID_NUKIECHERRY
color = "#b00707"
taste_description = "the rapid acceleration of tooth decay with a hint of artificial cherry"
/datum/reagent/drink/coffee/nukie/melon
- name = "Nukie Melon"
- id = "nukie_melon"
+ name = REAGENT_NUKIEMELON
+ id = REAGENT_ID_NUKIEMELON
color = "#00bf06"
taste_description = "something is crawling under your skin with a hint of artificial melon"
/datum/reagent/drink/coffee/nukie/banana
- name = "Nukie Banana"
- id = "nukie_banana"
+ name = REAGENT_NUKIEBANANA
+ id = REAGENT_ID_NUKIEBANANA
color = "#ffee00"
taste_description = "imminent cardiac arrest with a hint of something that doesn't really taste like banana at all but is clearly intending to be banana"
/datum/reagent/drink/coffee/nukie/rose
- name = "Nukie Rose"
- id = "nukie_rose"
+ name = REAGENT_NUKIEROSE
+ id = REAGENT_ID_NUKIEROSE
color = "#ff7df4"
taste_description = "paint stripper, space cleaner and some sort of cheap perfume"
/datum/reagent/drink/coffee/nukie/lemon
- name = "Nukie Lemon"
- id = "nukie_lemon"
+ name = REAGENT_NUKIELEMON
+ id = REAGENT_ID_NUKIELEMON
color = "#c3ff00"
taste_description = "something that once resembled lemon mixed thoroughly with literal toxic waste"
/datum/reagent/drink/coffee/nukie/fruit
- name = "Nukie Fruit"
- id = "nukie_fruit"
+ name = REAGENT_NUKIEFRUIT
+ id = REAGENT_ID_NUKIEFRUIT
color = "#b300ff"
taste_description = "the colour purple"
/datum/reagent/drink/coffee/nukie/special
- name = "Nukie Limited Edition"
- id = "nukie_special"
+ name = REAGENT_NUKIESPECIAL
+ id = REAGENT_ID_NUKIESPECIAL
color = "#ffffff"
taste_description = "sitting in your college dorm one week before your exams start, staring at a screen without anything particularly interesting on, knowing that you should really be studying, but you can put it off for another day right? Plus your friends are gonna be getting on soon and there's an event starting that you need to prep for"
/datum/reagent/drink/coffee/nukie/mega
- name = "Mega Nukie"
- id = "nukie_mega"
+ name = REAGENT_NUKIEMEGA
+ id = REAGENT_ID_NUKIEMEGA
description = "An extremely dangerously concentrated caffinated drink."
color = "#102838"
adj_temp = 0
@@ -793,15 +793,15 @@
adj_drowsy = -5
adj_sleepy = -10
- glass_name = "nukie"
+ glass_name = REAGENT_ID_NUKIE
glass_desc = "A drink that might just explode your heart!"
overdose = 5
taste_description = "flavourless energy"
/datum/reagent/drink/coffee/nukie/mega/sight
- name = "Nukie Mega Plum"
- id = "nukie_mega_sight"
+ name = REAGENT_NUKIEMEGASIGHT
+ id = REAGENT_ID_NUKIEMEGASIGHT
color = "#f4fc03"
taste_description = "seeing beyond the margins of this world"
@@ -819,8 +819,8 @@
M.add_chemical_effect(CE_DARKSIGHT, 1)
/datum/reagent/drink/coffee/nukie/mega/heart //Heals you pretty damn well but damages your heart
- name = "Nukie Mega Juice"
- id = "nukie_mega_heart"
+ name = REAGENT_NUKIEMEGAHEART
+ id = REAGENT_ID_NUKIEMEGAHEART
color = "#fc03e7"
taste_description = "the end is rapidly approaching, yet remains forever far"
@@ -840,8 +840,8 @@
..()
/datum/reagent/drink/coffee/nukie/mega/nega //Makes you both jittery and sleepy
- name = "Nukie Nega"
- id = "nukie_mega_sleep"
+ name = REAGENT_NUKIEMEGASLEEP
+ id = REAGENT_ID_NUKIEMEGASLEEP
color = "#00dded"
taste_description = "the void encompassing you"
adj_drowsy = 0
@@ -854,8 +854,8 @@
..()
/datum/reagent/drink/coffee/nukie/mega/shock //Rapidly fills you up and even repairs your NIF, unless you don't have one in which case you'll be confused.
- name = "Nukie Mega Shock"
- id = "nukie_mega_shock"
+ name = REAGENT_NUKIEMEGASHOCK
+ id = REAGENT_ID_NUKIEMEGASHOCK
color = "#ede500"
taste_description = "a thousand volts running down your spine"
@@ -875,8 +875,8 @@
/datum/reagent/drink/coffee/nukie/mega/fast //Like hyperzine, but instead of overdosing, it occassionally burns you
- name = "Nukie Mega Rapid"
- id = "nukie_mega_fast"
+ name = REAGENT_NUKIEMEGAFAST
+ id = REAGENT_ID_NUKIEMEGAFAST
color = "#000000"
taste_description = "more, more, now, quick, get yourself some more, don't stop"
@@ -888,8 +888,8 @@
M.add_chemical_effect(CE_SPEEDBOOST, 1)
/datum/reagent/drink/coffee/nukie/mega/high //Simultaneously makes you high and hungry
- name = "Nukie Mega Sky"
- id = "nukie_mega_high"
+ name = REAGENT_NUKIEMEGAHIGH
+ id = REAGENT_ID_NUKIEMEGAHIGH
color = "#fafafa"
taste_description = "moreishness, you could really go for a proper snack right now"
@@ -931,8 +931,8 @@
M.emote(pick("twitch", "giggle"))
/datum/reagent/drink/coffee/nukie/mega/shrink //Basically microcillin but for ingesting
- name = "Nukie Mega Shrink"
- id = "nukie_mega_shrink"
+ name = REAGENT_NUKIEMEGASHRINK
+ id = REAGENT_ID_NUKIEMEGASHRINK
color = "#15ff00"
taste_description = "a plastic bag floating gently on the breeze"
@@ -941,8 +941,8 @@
M.resize((M.size_multiplier - 0.01), uncapped = M.has_large_resize_bounds(), aura_animation = FALSE)
/datum/reagent/drink/coffee/nukie/mega/grow //Basically macrocillin but for ingesting
- name = "Nukie Mega Growth"
- id = "nukie_mega_growth"
+ name = REAGENT_NUKIEMEGAGROWTH
+ id = REAGENT_ID_NUKIEMEGAGROWTH
color = "#90ed87"
taste_description = "absurd hugeness"
diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm
index 3bf60711ca..d99f8217f8 100644
--- a/code/modules/reagents/reagents/other.dm
+++ b/code/modules/reagents/reagents/other.dm
@@ -383,7 +383,7 @@
name = "Diethylamine"
id = "diethylamine"
description = "A secondary amine, mildly corrosive."
- taste_description = "iron"
+ taste_description = REAGENT_ID_IRON
reagent_state = LIQUID
color = "#604030"
@@ -576,10 +576,10 @@
var/datum/reagent/blood/coolant = H.get_blood(H.vessel)
if(coolant)
- H.vessel.add_reagent("blood", removed, coolant.data)
+ H.vessel.add_reagent(REAGENT_ID_BLOOD, removed, coolant.data)
else
- H.vessel.add_reagent("blood", removed)
+ H.vessel.add_reagent(REAGENT_ID_BLOOD, removed)
H.fixblood()
else
diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm
index 9046ce5cfa..be61b6da43 100644
--- a/code/modules/reagents/reagents/toxins.dm
+++ b/code/modules/reagents/reagents/toxins.dm
@@ -466,8 +466,8 @@
affect_blood(M, alien, removed * 0.7)
/datum/reagent/acid/polyacid
- name = "Polytrinic acid"
- id = "pacid"
+ name = REAGENT_PACID
+ id = REAGENT_ID_PACID
description = "Polytrinic acid is a an extremely corrosive chemical substance."
taste_description = "acid"
reagent_state = LIQUID
diff --git a/code/modules/reagents/reagents/vore_vr.dm b/code/modules/reagents/reagents/vore_vr.dm
index 936f555cbc..ef28e716fe 100644
--- a/code/modules/reagents/reagents/vore_vr.dm
+++ b/code/modules/reagents/reagents/vore_vr.dm
@@ -4,8 +4,8 @@
////////////////////////////
/datum/reagent/macrocillin
- name = "Macrocillin"
- id = "macrocillin"
+ name = REAGENT_MACROCILLIN
+ id = REAGENT_ID_MACROCILLIN
description = "Glowing yellow liquid."
reagent_state = LIQUID
color = "#FFFF00" // rgb: 255, 255, 0
@@ -17,8 +17,8 @@
return
/datum/reagent/microcillin
- name = "Microcillin"
- id = "microcillin"
+ name = REAGENT_MICROCILLIN
+ id = REAGENT_ID_MICROCILLIN
description = "Murky purple liquid."
reagent_state = LIQUID
color = "#800080"
@@ -31,8 +31,8 @@
/datum/reagent/normalcillin
- name = "Normalcillin"
- id = "normalcillin"
+ name = REAGENT_NORMALCILLIN
+ id = REAGENT_ID_NORMALCILLIN
description = "Translucent cyan liquid."
reagent_state = LIQUID
color = "#00FFFF"
@@ -48,8 +48,8 @@
/datum/reagent/sizeoxadone
- name = "Sizeoxadone"
- id = "sizeoxadone"
+ name = REAGENT_SIZEOXADONE
+ id = REAGENT_ID_SIZEOXADONE
description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed."
reagent_state = LIQUID
color = "#1E90FF"
@@ -65,8 +65,8 @@
////////////////////////// Anti-Noms Drugs //////////////////////////
/datum/reagent/ickypak
- name = "Ickypak"
- id = "ickypak"
+ name = REAGENT_ICKYPAK
+ id = REAGENT_ID_ICKYPAK
description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
reagent_state = LIQUID
color = "#0E900E"
@@ -87,8 +87,8 @@
B.release_specific_contents(A)
/datum/reagent/unsorbitol
- name = "Unsorbitol"
- id = "unsorbitol"
+ name = REAGENT_UNSORBITOL
+ id = REAGENT_ID_UNSORBITOL
description = "A frothy pink liquid, for causing cellular-level hetrogenous structure separation."
reagent_state = LIQUID
color = "#EF77E5"
@@ -118,15 +118,15 @@
////////////////////////// TF Drugs //////////////////////////
/datum/reagent/amorphorovir
- name = "Amorphorovir"
- id = "amorphorovir"
+ name = REAGENT_AMORPHOROVIR
+ id = REAGENT_ID_AMORPHOROVIR
description = "A base medical concoction, capable of rapidly altering genetic and physical structure of the body. Requires extra processing to allow for a targeted transformation."
reagent_state = LIQUID
color = "#AAAAAA"
/datum/reagent/androrovir
- name = "Androrovir"
- id = "androrovir"
+ name = REAGENT_ANDROROVIR
+ id = REAGENT_ID_ANDROROVIR
description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be male."
reagent_state = LIQUID
color = "#00BBFF"
@@ -136,7 +136,7 @@
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androgynorovir"))
+ if(M.reagents.has_reagent(REAGENT_ID_GYNOROVIR) || M.reagents.has_reagent(REAGENT_ID_ANDROGYNOROVIR))
H.Confuse(1)
else
if(!(H.gender == MALE))
@@ -146,8 +146,8 @@
span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became male."))
/datum/reagent/gynorovir
- name = "Gynorovir"
- id = "gynorovir"
+ name = REAGENT_GYNOROVIR
+ id = REAGENT_ID_GYNOROVIR
description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be female."
reagent_state = LIQUID
color = "#FF00AA"
@@ -157,7 +157,7 @@
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(M.reagents.has_reagent("androrovir") || M.reagents.has_reagent("androgynorovir"))
+ if(M.reagents.has_reagent(REAGENT_ID_ANDROROVIR) || M.reagents.has_reagent(REAGENT_ID_ANDROGYNOROVIR))
H.Confuse(1)
else
if(!(H.gender == FEMALE))
@@ -167,8 +167,8 @@
span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became female."))
/datum/reagent/androgynorovir
- name = "Androgynorovir"
- id = "androgynorovir"
+ name = REAGENT_ANDROGYNOROVIR
+ id = REAGENT_ID_ANDROGYNOROVIR
description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be mixed."
reagent_state = LIQUID
color = "#6600FF"
@@ -178,7 +178,7 @@
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androrovir"))
+ if(M.reagents.has_reagent(REAGENT_ID_GYNOROVIR) || M.reagents.has_reagent(REAGENT_ID_ANDROROVIR))
H.Confuse(1)
else
if(!(H.gender == PLURAL))
@@ -191,8 +191,8 @@
////////////////////////// Misc Drugs //////////////////////////
/datum/reagent/drugs/rainbow_toxin /// Replaces Space Drugs.
- name = "Rainbow Toxin"
- id = "rainbowtoxin"
+ name = REAGENT_RAINBOWTOXIN
+ id = REAGENT_ID_RAINBOWTOXIN
description = "Known for providing a euphoric high, this psychoactive drug is often injected into unknowing prey by serpents and other fanged beasts. Highly valuable and frequently sought after by hypno-enthusiasts and party-goers."
taste_description = "mixed euphoria"
taste_mult = 0.8 //You ARE going to taste this!
@@ -212,8 +212,8 @@
..()
/datum/reagent/paralysis_toxin
- name = "Tetrodotoxin"
- id = "paralysistoxin"
+ name = REAGENT_PARALYSISTOXIN
+ id = REAGENT_ID_PARALYSISTOXIN
description = "A potent toxin commonly found in a plethora of species. When exposed to the toxin, causes extreme, paralysis for a prolonged period, with only essential functions of the body being unhindered. Commonly used by covert operatives and used as a crowd control tool."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -227,8 +227,8 @@
M.AdjustWeakened(5) //Stand in for paralyze so you can still talk/emote/see
/datum/reagent/pain_enzyme
- name = "Pain Enzyme"
- id = "painenzyme"
+ name = REAGENT_PAINENZYME
+ id = REAGENT_ID_PAINENZYME
description = "An enzyme found in a variety of species. When exposed to the toxin, will cause severe, agonizing pain. The effects can last for hours depending on the dose. Only known cure is an equally strong painkiller or dialysis."
taste_description = "sourness"
reagent_state = LIQUID
diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm
index 972ee1b159..113bf9aaef 100644
--- a/code/modules/research/designs/circuits/circuits.dm
+++ b/code/modules/research/designs/circuits/circuits.dm
@@ -6,7 +6,7 @@ CIRCUITS BELOW
build_type = IMPRINTER
req_tech = list(TECH_DATA = 2)
materials = list(MAT_GLASS = 2000)
- chemicals = list("sacid" = 20)
+ chemicals = list(REAGENT_ID_SACID = 20)
time = 5
/datum/design/circuit/AssembleDesignName()
@@ -515,7 +515,7 @@ CIRCUITS BELOW
id = "durand_main"
req_tech = list(TECH_DATA = 4)
materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250)
- chemicals = list("sacid" = 20)
+ chemicals = list(REAGENT_ID_SACID = 20)
build_path = /obj/item/circuitboard/mecha/durand/main
sort_string = "NAADA"
@@ -524,7 +524,7 @@ CIRCUITS BELOW
id = "durand_peri"
req_tech = list(TECH_DATA = 4)
materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250)
- chemicals = list("sacid" = 20)
+ chemicals = list(REAGENT_ID_SACID = 20)
build_path = /obj/item/circuitboard/mecha/durand/peripherals
sort_string = "NAADB"
@@ -533,7 +533,7 @@ CIRCUITS BELOW
id = "durand_targ"
req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250)
- chemicals = list("sacid" = 20)
+ chemicals = list(REAGENT_ID_SACID = 20)
build_path = /obj/item/circuitboard/mecha/durand/targeting
sort_string = "NAADC"
diff --git a/code/modules/research/designs/circuits/disks.dm b/code/modules/research/designs/circuits/disks.dm
index a386479cb9..21a17f5fcd 100644
--- a/code/modules/research/designs/circuits/disks.dm
+++ b/code/modules/research/designs/circuits/disks.dm
@@ -3,7 +3,7 @@
build_type = IMPRINTER
req_tech = list(TECH_DATA = 3)
materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 1000)
- chemicals = list("pacid" = 10)
+ chemicals = list(REAGENT_ID_PACID = 10)
time = 5
/datum/design/circuit/disk/AssembleDesignName()
diff --git a/code/modules/research/designs/uncommented.dm b/code/modules/research/designs/uncommented.dm
index 68b3a2c70c..f537bd2cd5 100644
--- a/code/modules/research/designs/uncommented.dm
+++ b/code/modules/research/designs/uncommented.dm
@@ -19,7 +19,7 @@
id = "rust_core_control"
req_tech = list("programming" = 4, "engineering" = 4)
build_type = IMPRINTER
- materials = list(MAT_GLASS = 2000, "sacid" = 20)
+ materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20)
build_path = "/obj/item/circuitboard/rust_core_control"
/datum/design/rust_fuel_control
@@ -28,7 +28,7 @@
id = "rust_fuel_control"
req_tech = list("programming" = 4, "engineering" = 4)
build_type = IMPRINTER
- materials = list(MAT_GLASS = 2000, "sacid" = 20)
+ materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20)
build_path = "/obj/item/circuitboard/rust_fuel_control"
/datum/design/rust_fuel_port
@@ -37,7 +37,7 @@
id = "rust_fuel_port"
req_tech = list("engineering" = 4, "materials" = 5)
build_type = IMPRINTER
- materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_URANIUM = 3000)
+ materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_URANIUM = 3000)
build_path = "/obj/item/module/rust_fuel_port"
/datum/design/rust_fuel_compressor
@@ -46,7 +46,7 @@
id = "rust_fuel_compressor"
req_tech = list("materials" = 6, "phorontech" = 4)
build_type = IMPRINTER
- materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_DIAMOND = 1000)
+ materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_PHORON = 3000, MAT_DIAMOND = 1000)
build_path = "/obj/item/module/rust_fuel_compressor"
/datum/design/rust_core
@@ -55,7 +55,7 @@
id = "pacman"
req_tech = list(bluespace = 3, phorontech = 4, magnets = 5, powerstorage = 6)
build_type = IMPRINTER
- materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_DIAMOND = 2000)
+ materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_PHORON = 3000, MAT_DIAMOND = 2000)
build_path = "/obj/item/circuitboard/rust_core"
/datum/design/rust_injector
@@ -64,6 +64,6 @@
id = "pacman"
req_tech = list(powerstorage = 3, engineering = 4, phorontech = 4, materials = 6)
build_type = IMPRINTER
- materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_URANIUM = 2000)
+ materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_PHORON = 3000, MAT_URANIUM = 2000)
build_path = "/obj/item/circuitboard/rust_core"
*/
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index bbd4e10832..e4b0825ba3 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -1046,7 +1046,7 @@
var/list/rock_munch = list(
MAT_URANIUM = list("nutrition" = 30, "remark" = "Crunching [O] in your jaws almost makes you wince, a horribly tangy and sour flavour radiating through your mouth. It goes down all the same.", "WTF" = FALSE),
"hematite" = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
- "carbon" = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE),
+ REAGENT_ID_CARBON = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE),
"marble" = list("nutrition" = 40, "remark" = "A fitting dessert, the sweet and savoury [O] lingers on the palate and satisfies your hunger.", "WTF" = FALSE),
"sand" = list("nutrition" = 0, "remark" = "You crunch on [O] but its texture is almost gag-inducing. Stifling a cough, you somehow manage to swallow both [O] and your regrets.", "WTF" = FALSE),
MAT_PHORON = list("nutrition" = 30, "remark" = "Crunching [O] to dust between your jaw you find pleasant, comforting warmth filling your mouth that briefly spreads down the throat to your chest as you swallow.", "WTF" = FALSE),
diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm
index 1ad8493b1d..608b326ca4 100644
--- a/code/modules/vore/fluffstuff/custom_implants_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm
@@ -468,7 +468,7 @@
/obj/item/reagent_containers/food/snacks/chocolateegg/roiz/New()
..()
- reagents.add_reagent("sugar", 6)
+ reagents.add_reagent(REAGENT_ID_SUGAR, 6)
reagents.add_reagent("coco", 6)
reagents.add_reagent("milk", 2)
bitesize = 2
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index c9283e774f..6c0da1fe9c 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1396,7 +1396,7 @@
desc = "A small bottle of finely ground poppyseed and mixed dried berries."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
- prefill = list("bicaridine" = 30, "nutriment" = 30)
+ prefill = list("bicaridine" = 30, REAGENT_ID_NUTRIMENT = 30)
/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize()
. = ..()
diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm
index eca90161f5..7e43c79a21 100644
--- a/code/modules/vore/smoleworld/smoleworld_vr.dm
+++ b/code/modules/vore/smoleworld/smoleworld_vr.dm
@@ -423,7 +423,7 @@
icon_state = "sp_moon"
bitesize = 1
nutriment_amt = 2
- nutriment_desc = list("sugar" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 2)
drop_sound = 'sound/items/drop/basketball.ogg'
/obj/item/reagent_containers/food/snacks/snackplanet/virgo3b
diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm
index fb7798ab50..1bfed91ff7 100644
--- a/code/modules/xenoarcheaology/effect_master.dm
+++ b/code/modules/xenoarcheaology/effect_master.dm
@@ -296,10 +296,10 @@
for(var/datum/artifact_effect/my_effect in my_effects)
if (istype(W, /obj/item/reagent_containers))
- if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1))
+ 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("sacid", 1) || W.reagents.has_reagent("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("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))
@@ -327,8 +327,8 @@
/datum/component/artifact_master/proc/on_reagent()
var/datum/reagent/Touching = args[2]
- var/list/water = list("hydrogen", "water")
- var/list/acid = list("sacid", "pacid", "diethylamine")
+ 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/toxic = list("toxin","cyanide","amatoxin","neurotoxin")
diff --git a/code/modules/xenoarcheaology/effects/heal.dm b/code/modules/xenoarcheaology/effects/heal.dm
index db0cf9d05e..6b6ea9b259 100644
--- a/code/modules/xenoarcheaology/effects/heal.dm
+++ b/code/modules/xenoarcheaology/effects/heal.dm
@@ -1,5 +1,5 @@
/datum/artifact_effect/heal
- name = "heal"
+ name = XENO_CHEM_HEAL
effect_type = EFFECT_ORGANIC
effect_color = "#4649ff"
@@ -17,7 +17,7 @@
if(affecting && istype(affecting))
affecting.heal_damage(25 * weakness, 25 * weakness)
//H:heal_organ_damage(25, 25)
- H.vessel.add_reagent("blood",5)
+ H.vessel.add_reagent(REAGENT_ID_BLOOD,5)
H.adjust_nutrition(50 * weakness)
H.adjustBrainLoss(-25 * weakness)
H.radiation -= min(H.radiation, 25 * weakness)
diff --git a/code/modules/xenoarcheaology/finds/finds_defines.dm b/code/modules/xenoarcheaology/finds/finds_defines.dm
index 132d741937..d02022eb7e 100644
--- a/code/modules/xenoarcheaology/finds/finds_defines.dm
+++ b/code/modules/xenoarcheaology/finds/finds_defines.dm
@@ -1,12 +1,12 @@
var/global/list/responsive_carriers = list(
- "carbon",
- "potassium",
- "hydrogen",
+ REAGENT_ID_CARBON,
+ REAGENT_ID_POTASSIUM,
+ REAGENT_ID_HYDROGEN,
REAGENT_ID_NITROGEN,
- "mercury",
- "iron",
- "chlorine",
- "phosphorus",
+ REAGENT_ID_MERCURY,
+ REAGENT_ID_IRON,
+ REAGENT_ID_CHLORINE,
+ REAGENT_ID_PHOSPHORUS,
REAGENT_ID_PHORON)
var/global/list/finds_as_strings = list(
@@ -23,15 +23,15 @@ var/global/list/finds_as_strings = list(
/proc/get_responsive_reagent(var/find_type)
switch(find_type)
if(ARCHAEO_BOWL, ARCHAEO_URN, ARCHAEO_CUTLERY, ARCHAEO_STATUETTE, ARCHAEO_INSTRUMENT, ARCHAEO_HANDCUFFS, ARCHAEO_BEARTRAP, ARCHAEO_LIGHTER, ARCHAEO_BOX, ARCHAEO_GASTANK, ARCHAEO_PEN, ARCHAEO_UNKNOWN)
- return "mercury"
+ return REAGENT_ID_MERCURY
if(ARCHAEO_COIN, ARCHAEO_KNIFE, ARCHAEO_TOOL, ARCHAEO_METAL, ARCHAEO_CLAYMORE, ARCHAEO_RODS, ARCHAEO_KATANA, ARCHAEO_LASER, ARCHAEO_GUN)
- return "iron"
+ return REAGENT_ID_IRON
if(ARCHAEO_CRYSTAL, ARCHAEO_SHARD, ARCHAEO_SOULSTONE)
return REAGENT_ID_NITROGEN
if(ARCHAEO_CULTBLADE, ARCHAEO_TELEBEACON, ARCHAEO_CULTROBES, ARCHAEO_STOCKPARTS)
- return "potassium"
+ return REAGENT_ID_POTASSIUM
if(ARCHAEO_FOSSIL, ARCHAEO_SHELL, ARCHAEO_PLANT, ARCHAEO_REMAINS_HUMANOID, ARCHAEO_REMAINS_ROBOT, ARCHAEO_REMAINS_XENO, ARCHAEO_GASMASK)
- return "carbon"
+ return REAGENT_ID_CARBON
return REAGENT_ID_PHORON
/proc/get_random_digsite_type()
diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm
index 0abe25ca7f..0a4a8689a7 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("blood","holywater","lube","stoxin","ethanol","ice","glycerol","fuel","cleaner")
+ spawning_id = pick(REAGENT_ID_BLOOD,"holywater","lube","stoxin",REAGENT_ID_ETHANOL,"ice","glycerol",REAGENT_ID_FUEL,"cleaner")
/obj/item/reagent_containers/glass/replenishing/process()
reagents.add_reagent(spawning_id, 0.3)
diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm
index d00e86bd8d..1a224238a1 100644
--- a/code/modules/xenoarcheaology/sampling.dm
+++ b/code/modules/xenoarcheaology/sampling.dm
@@ -19,7 +19,7 @@
var/age_billion = 0
var/artifact_id = ""
var/artifact_distance = -1
- var/source_mineral = "chlorine"
+ var/source_mineral = REAGENT_ID_CHLORINE
var/list/find_presence = list()
/datum/geosample/New(var/turf/simulated/mineral/container)
@@ -47,10 +47,10 @@
source_mineral = container.mineral.xarch_source_mineral
if(prob(75))
- find_presence["phosphorus"] = rand(1, 500) / 100
+ find_presence[REAGENT_ID_PHOSPHORUS] = rand(1, 500) / 100
if(prob(25))
- find_presence["mercury"] = rand(1, 500) / 100
- find_presence["chlorine"] = rand(500, 2500) / 100
+ find_presence[REAGENT_ID_MERCURY] = rand(1, 500) / 100
+ find_presence[REAGENT_ID_CHLORINE] = rand(500, 2500) / 100
for(var/datum/find/F in container.finds)
var/responsive_reagent = get_responsive_reagent(F.find_type)
diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
index 5e8065ab9b..90493bd4d8 100644
--- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
@@ -46,7 +46,7 @@
/obj/machinery/radiocarbon_spectrometer/New()
..()
create_reagents(500)
- coolant_reagents_purity["water"] = 0.5
+ coolant_reagents_purity[REAGENT_ID_WATER] = 0.5
coolant_reagents_purity["icecoffee"] = 0.6
coolant_reagents_purity["icetea"] = 0.6
coolant_reagents_purity["milkshake"] = 0.6
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index ed275edeef..6f23ce3cf2 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -86,7 +86,7 @@
name = "Slime Monkey"
id = "m_monkey"
result = null
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/grey
@@ -150,8 +150,8 @@
/decl/chemical_reaction/instant/metamorphic/iron
name = "Morph into Iron"
id = "morph_iron"
- required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "iron" = REAGENTS_PER_SHEET)
- result = "iron"
+ required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
+ result = REAGENT_ID_IRON
/decl/chemical_reaction/instant/metamorphic/silver
@@ -193,7 +193,7 @@
/decl/chemical_reaction/instant/slime/metal_binding
name = "Slime Binding"
id = "m_binding"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result = "binding"
result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal.
required = /obj/item/slime_extract/metal
@@ -221,7 +221,7 @@
name = "Bind into Steel"
id = "bind_steel"
result = "steel"
- required_reagents = list("binding" = REAGENTS_PER_SHEET, "iron" = REAGENTS_PER_SHEET, "carbon" = REAGENTS_PER_SHEET)
+ required_reagents = list("binding" = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET, REAGENT_ID_CARBON = REAGENTS_PER_SHEET)
result_amount = REAGENTS_PER_SHEET
/datum/reagent/steel
@@ -272,7 +272,7 @@
/decl/chemical_reaction/instant/slime/blue_stability
name = "Slime Stability"
id = "m_stability"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/blue
@@ -355,7 +355,7 @@
/decl/chemical_reaction/instant/slime/yellow_emp
name = "Slime EMP"
id = "m_emp"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -385,7 +385,7 @@
/decl/chemical_reaction/instant/slime/yellow_flashlight
name = "Slime Flashlight"
id = "m_flashlight"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -446,7 +446,7 @@
name = "Slime Phoron"
id = "m_phoron_harvest"
result = REAGENT_ID_PHORON
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = REAGENTS_PER_SHEET * 2
required = /obj/item/slime_extract/dark_purple
@@ -549,7 +549,7 @@
/decl/chemical_reaction/instant/slime/red_enrage
name = "Slime Enrage"
id = "m_enrage"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/red
@@ -626,7 +626,7 @@
name = "Slime Clotting Med"
id = "m_clotting"
result = "slime_bleed_fixer"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -644,7 +644,7 @@
name = "Slime Organ Med"
id = "m_organ_fixer"
result = "slime_organ_fixer"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -685,7 +685,7 @@
/decl/chemical_reaction/instant/slime/oil_griff
name = "Slime Explosion"
id = "m_boom"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/oil
@@ -723,7 +723,7 @@
/decl/chemical_reaction/instant/slime/bluespace_lesser
name = "Slime Lesser Tele"
id = "m_tele_lesser"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
@@ -791,7 +791,7 @@
/decl/chemical_reaction/instant/slime/amber_peoplefood
name = "Slime Food"
id = "m_people_food"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
@@ -863,7 +863,7 @@
/decl/chemical_reaction/instant/slime/ruby_loyalty
name = "Slime Loyalty"
id = "m_strength"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
@@ -921,7 +921,7 @@
/decl/chemical_reaction/instant/slime/light_pink_docility
name = "Slime Docility"
id = "m_docile"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
@@ -981,7 +981,7 @@
/decl/chemical_reaction/instant/slime/rainbow_unity
name = "Slime Unity"
id = "m_unity"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index 77d7aab8e6..9c6a53d8ac 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -94,7 +94,7 @@
name = "Slime Monkey"
id = "m_grey_monkey"
result = null
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/grey
@@ -108,7 +108,7 @@
name = "Slime Jelly"
id = "m_grey_jelly"
result = "slimejelly"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/grey
@@ -142,7 +142,7 @@
/decl/chemical_reaction/instant/slime/metal_materials_adv
name = "Slime Advanced Construction Materials"
id = "m_metal_adv"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
@@ -156,7 +156,7 @@
/decl/chemical_reaction/instant/slime/metal_materials_weird
name = "Slime Weird Construction Materials"
id = "m_metal_weird"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
@@ -202,7 +202,7 @@
/decl/chemical_reaction/instant/slime/blue_stability
name = "Slime Stability"
id = "m_blue_stability"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/blue
@@ -214,7 +214,7 @@
/decl/chemical_reaction/instant/slime/blue_calm
name = "Slime Calm"
id = "m_blue_calm"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/blue
@@ -280,7 +280,7 @@
/decl/chemical_reaction/instant/slime/purple_infertility
name = "Slime Infetility"
id = "m_purple_infertility"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
@@ -292,7 +292,7 @@
/decl/chemical_reaction/instant/slime/purple_shrink
name = "Slime Shrink"
id = "m_purple_shrink"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
@@ -354,7 +354,7 @@
/decl/chemical_reaction/instant/slime/orange_heatwave
name = "Slime Heat Wave"
id = "m_orange_heatwave"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
@@ -410,7 +410,7 @@
/decl/chemical_reaction/instant/slime/orange_smoke
name = "Slime Smoke"
id = "m_orange_smoke"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/orange
@@ -465,7 +465,7 @@
/decl/chemical_reaction/instant/slime/yellow_flashlight
name = "Slime Flashlight"
id = "m_yellow_flashlight"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -477,7 +477,7 @@
/decl/chemical_reaction/instant/slime/yellow_emp
name = "Slime EMP"
id = "m_yellow_emp"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -544,7 +544,7 @@
/decl/chemical_reaction/instant/slime/gold_hostile_mob
name = "Slime Hostile Mob"
id = "m_gold_hostile_mob"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
@@ -560,7 +560,7 @@
/decl/chemical_reaction/instant/slime/gold_safe_mob
name = "Slime Safe Mob"
id = "m_gold_safe_mob"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
@@ -616,7 +616,7 @@
/decl/chemical_reaction/instant/slime/silver_materials_adv
name = "Slime Advanced Science Materials"
id = "m_silver_adv"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
@@ -629,7 +629,7 @@
/decl/chemical_reaction/instant/slime/silver_materials_random
name = "Slime Random Materials"
id = "m_silver_random"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
@@ -677,7 +677,7 @@
name = "Slime Phoron"
id = "m_darkpurple_phoron"
result = REAGENT_ID_PHORON
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/dark_purple
@@ -685,7 +685,7 @@
/decl/chemical_reaction/instant/slime/dark_purple_blood
name = "Slime Blood"
id = "m_darkpurple_blood"
- result = "blood"
+ result = REAGENT_ID_BLOOD
required_reagents = list("slimejelly" = 5)
result_amount = 30
required = /obj/item/slime_extract/dark_purple
@@ -775,7 +775,7 @@
/decl/chemical_reaction/instant/slime/dark_blue_temp_resist
name = "Slime Temperature Resistance"
id = "m_darkblue_temperature_resist"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/dark_blue
@@ -802,7 +802,7 @@
name = "Slime Ice"
id = "m_darkblue_ice"
result = "ice"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 5
required = /obj/item/slime_extract/dark_blue
@@ -846,7 +846,7 @@
/decl/chemical_reaction/instant/slime/red_enrage
name = "Slime Enrage"
id = "m_red_enrage"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/red
@@ -882,7 +882,7 @@
name = "Slime Hot Sauce"
id = "m_red_hotsauce"
result = "capsaicin"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/red
@@ -929,7 +929,7 @@
/decl/chemical_reaction/instant/slime/green_emitter
name = "Slime Radiation Emitter"
id = "m_green_emitter"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/green
@@ -942,8 +942,8 @@
/decl/chemical_reaction/instant/slime/green_radium
name = "Slime Radium"
id = "m_green_radium"
- result = "radium"
- required_reagents = list("water" = 5)
+ result = REAGENT_ID_RADIUM
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/green
@@ -984,7 +984,7 @@
name = "Slime Clotting Med"
id = "m_pink_clotting"
result = "slime_bleed_fixer"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -993,7 +993,7 @@
name = "Slime Organ Med"
id = "m_pink_organ_fixer"
result = "slime_organ_fixer"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -1032,7 +1032,7 @@
/decl/chemical_reaction/instant/slime/oil_fuel
name = "Slime Fuel"
id = "m_oil_fuel"
- result = "fuel"
+ result = REAGENT_ID_FUEL
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/oil
@@ -1042,7 +1042,7 @@
name = "Slime Oil"
id = "m_oil_oil"
result = "cookingoil"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/oil
@@ -1050,7 +1050,7 @@
/decl/chemical_reaction/instant/slime/oil_fakesplosion
name = "Slime Fake Explosion"
id = "m_oil_fakeboom"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/oil
@@ -1114,7 +1114,7 @@
/decl/chemical_reaction/instant/slime/bluespace_pouch
name = "Slime Bluespace Pouch"
id = "m_bs_pouch"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
@@ -1126,7 +1126,7 @@
/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele
name = "Slime Bluespace Chaos"
id = "m_bs_chaos"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
@@ -1187,7 +1187,7 @@
/decl/chemical_reaction/instant/slime/cerulean_reinvigoration
name = "Slime Reinvigoration"
id = "m_cerulean_reinvigoration"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
@@ -1199,7 +1199,7 @@
/decl/chemical_reaction/instant/slime/cerulean_potion_mimic
name = "Slime Potion Mimic"
id = "m_cerulean_potion_mimic"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
@@ -1247,7 +1247,7 @@
/decl/chemical_reaction/instant/slime/amber_random_food
name = "Slime Random Food"
id = "m_amber_random_food"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
@@ -1270,7 +1270,7 @@
/decl/chemical_reaction/instant/slime/amber_snack
name = "Slime Snack"
id = "m_amber_snack"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/amber
@@ -1317,7 +1317,7 @@
name = "Slime Mutation Toxins"
id = "m_sapphire_mutation_tox"
result = "mutationtoxin"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/sapphire
@@ -1325,7 +1325,7 @@
/decl/chemical_reaction/instant/slime/sapphire_plushies
name = "Slime Plushies"
id = "m_sapphire_plushies"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
@@ -1392,7 +1392,7 @@
/decl/chemical_reaction/instant/slime/ruby_pull
name = "Slime Pull"
id = "m_ruby_pull"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
@@ -1409,7 +1409,7 @@
name = "Slime Brute Juice"
id = "m_ruby_brute_juice"
result = "berserkmed"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/ruby
@@ -1480,7 +1480,7 @@
/decl/chemical_reaction/instant/slime/emerald_speed
name = "Slime Speed"
id = "m_emerald_speed"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
@@ -1505,7 +1505,7 @@
name = "Slime Hyperzine"
id = "m_emerald_hyperzine"
result = "hyperzine"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/emerald
@@ -1554,7 +1554,7 @@
/decl/chemical_reaction/instant/slime/light_pink_loyalty
name = "Slime Loyalty"
id = "m_lightpink_loyalty"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
@@ -1566,7 +1566,7 @@
/decl/chemical_reaction/instant/slime/light_pink_docility
name = "Slime Docility"
id = "m_lightpink_docility"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
@@ -1626,7 +1626,7 @@
/decl/chemical_reaction/instant/slime/rainbow_random_extract
name = "Slime Random Extract"
id = "m_rainow_random_extract"
- required_reagents = list("blood" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
@@ -1639,7 +1639,7 @@
/decl/chemical_reaction/instant/slime/rainbow_colors
name = "Slime Colors"
id = "m_rainbow_colors"
- required_reagents = list("water" = 5)
+ required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm
index b1530755b4..47b394624e 100644
--- a/code/modules/xenobio/items/slime_objects.dm
+++ b/code/modules/xenobio/items/slime_objects.dm
@@ -120,7 +120,7 @@
filling_color = "#FFBB00"
center_of_mass = list("x"=17, "y"=10)
nutriment_amt = 25 // Very filling.
- nutriment_desc = list("slime" = 10, "sweetness" = 10, "bliss" = 5)
+ nutriment_desc = list("slime" = 10, "sweetness" = 10, REAGENT_ID_BLISS = 5)
/obj/item/reagent_containers/food/snacks/slime/Initialize()
. = ..()
diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm
index a57e6adad1..b82d70f86d 100644
--- a/code/modules/xenobio2/_xeno_setup.dm
+++ b/code/modules/xenobio2/_xeno_setup.dm
@@ -49,24 +49,24 @@
#define MIN_MALEABLE 0
var/global/list/xenoChemList = list("mutationtoxin",
- "psilocybin",
+ REAGENT_ID_PSILOCYBIN,
"mindbreaker",
"impedrezene",
"cryptobiolin",
- "bliss",
+ REAGENT_ID_BLISS,
"chloralhydrate",
"stoxin",
"mutagen",
"lexorin",
- "pacid",
+ REAGENT_ID_PACID,
"cyanide",
REAGENT_ID_PHORON,
"plasticide",
"amatoxin",
- "carbon",
- "radium",
- "sacid",
- "sugar",
+ REAGENT_ID_CARBON,
+ REAGENT_ID_RADIUM,
+ REAGENT_ID_SACID,
+ REAGENT_ID_SUGAR,
"kelotane",
"dermaline",
"anti_toxin",
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index ae17b1b733..36f4767a9e 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -17,15 +17,15 @@
xenoChemList += "spaceacillin"
xenoChemList += "sterilizine"
xenoChemList += "leporazine"
- xenoChemList += "methylphenidate"
- xenoChemList += "citalopram"
- xenoChemList += "paroxetine"
- xenoChemList += "macrocillin"
- xenoChemList += "microcillin"
- xenoChemList += "normalcillin"
- xenoChemList += "sizeoxadone"
- xenoChemList += "ickypak"
- xenoChemList += "unsorbitol"
+ xenoChemList += REAGENT_ID_METHYLPHENIDATE
+ xenoChemList += REAGENT_ID_CITALOPRAM
+ xenoChemList += REAGENT_ID_PAROXETINE
+ xenoChemList += REAGENT_ID_MACROCILLIN
+ xenoChemList += REAGENT_ID_MICROCILLIN
+ xenoChemList += REAGENT_ID_NORMALCILLIN
+ xenoChemList += REAGENT_ID_SIZEOXADONE
+ xenoChemList += REAGENT_ID_ICKYPAK
+ xenoChemList += REAGENT_ID_UNSORBITOL
xenoChemList += "toxin"
xenoChemList += "carpotoxin"
xenoChemList += "potassium_chloride"
@@ -37,7 +37,7 @@
xenoChemList += "robustharvest"
xenoChemList += "plantbgone"
xenoChemList += "serotrotium"
- xenoChemList += "nicotine"
+ xenoChemList += REAGENT_ID_NICOTINE
xenoChemList += "uranium"
xenoChemList += "silver"
xenoChemList += "gold"
@@ -54,12 +54,12 @@
xenoChemList += "glycerol"
xenoChemList += "coolant"
xenoChemList += "luminol"
- xenoChemList += "nutriment"
+ xenoChemList += REAGENT_ID_NUTRIMENT
xenoChemList += "cornoil"
xenoChemList += "lipozine"
- xenoChemList += "sodiumchloride"
+ xenoChemList += REAGENT_ID_SODIUMCHLORIDE
xenoChemList += "frostoil"
xenoChemList += "capsaicin"
xenoChemList += "condensedcapsaicin"
xenoChemList += "neurotoxin"
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index 9abd7d9593..d5ddbd9f01 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -46,39 +46,39 @@ Slime definitions, Life and New live here.
//Overlay information
var/overlay = 1 // 1 = normal lighting, 0 = shiny, 2 = too shiny, -1 = no overlay
- chemreact = list( "nutriment" = list("nutr" = 0.5),
- "radium" = list("toxic" = 0.3, "mut" = 1),
- "mutagen" = list("nutr" = 0.4, "mut" = 2),
- "water" = list("nutr" = -0.1),
- "milk" = list("nutr" = 0.3),
- "sacid" = list("toxic" = 1),
- "pacid" = list("toxic" = 2),
- "chlorine" = list("toxic" = 0.5),
- "ammonia" = list("toxic" = 0.5),
- "sodawater" = list("toxic" = 0.1, "nutr" = -0.1),
- "beer" = list("nutr" = 0.6),
- "diethylamine" = list("nutr" = 0.9),
- "sugar" = list("toxic" = 0.4, "nutr" = 0.2),
- "eznutrient" = list("nutr" = 0.8),
- "cryoxadone" = list("toxic" = 0.4),
- "flourine" = list("toxic" = 0.1),
- "robustharvest" = list("nutr" = 1.5),
- "glucose" = list("nutr" = 0.5),
- "blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45),
- "fuel" = list("toxic" = 0.4),
- "toxin" = list("toxic" = 0.5),
- "carpotoxin" = list("toxic" = 1, "mut" = 1.5),
- REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03),
- "virusfood" = list("nutr" = 1.5, "mut" = 0.32),
- "cyanide" = list("toxic" = 3.5),
- "slimejelly" = list("nutr" = 0.5),
- "amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3),
- "mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5),
- "gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3),
- "uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2),
- "glycerol" = list("nutr" = 0.6),
- "woodpulp" = list("heal" = 0.1, "nutr" = 0.7),
- "docilitytoxin" = list("nutr" = 0.3) )
+ chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5),
+ REAGENT_ID_RADIUM = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
+ "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
+ REAGENT_ID_WATER = list(XENO_CHEM_NUTRI = -0.1),
+ "milk" = list(XENO_CHEM_NUTRI = 0.3),
+ 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),
+ "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_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),
+ "flourine" = list(XENO_CHEM_TOXIC = 0.1),
+ "robustharvest" = list(XENO_CHEM_NUTRI = 1.5),
+ "glucose" = list(XENO_CHEM_NUTRI = 0.5),
+ REAGENT_ID_BLOOD = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
+ REAGENT_ID_FUEL = list(XENO_CHEM_TOXIC = 0.4),
+ "toxin" = list(XENO_CHEM_TOXIC = 0.5),
+ "carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
+ REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
+ "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
+ "cyanide" = list(XENO_CHEM_TOXIC = 3.5),
+ "slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
+ "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),
+ "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),
+ "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) )
/mob/living/simple_mob/xeno/slime/New()
..()
diff --git a/code/modules/xenobio2/mob/xeno procs.dm b/code/modules/xenobio2/mob/xeno procs.dm
index f2b48b8091..e01b18ade6 100644
--- a/code/modules/xenobio2/mob/xeno procs.dm
+++ b/code/modules/xenobio2/mob/xeno procs.dm
@@ -68,17 +68,17 @@ Divergence proc, used in mutation to make unique datums.
if(!reagent_response)
continue // just skip this reagent, rather than clearing the whole thing
- if(reagent_response["toxic"])
- adjustToxLoss(reagent_response["toxic"] * reagent_total)
+ if(reagent_response[XENO_CHEM_TOXIC])
+ adjustToxLoss(reagent_response[XENO_CHEM_TOXIC] * reagent_total)
- if(reagent_response["heal"])
- heal_overall_damage(reagent_response["heal"] * reagent_total)
+ if(reagent_response[XENO_CHEM_HEAL])
+ heal_overall_damage(reagent_response[XENO_CHEM_HEAL] * reagent_total)
- if(reagent_response["nutr"])
- adjust_nutrition(reagent_response["nutr"] * reagent_total)
+ if(reagent_response[XENO_CHEM_NUTRI])
+ adjust_nutrition(reagent_response[XENO_CHEM_NUTRI] * reagent_total)
- if(reagent_response["mut"])
- mut_level += reagent_response["mut"] * reagent_total
+ if(reagent_response[XENO_CHEM_MUT])
+ mut_level += reagent_response[XENO_CHEM_MUT] * reagent_total
temp_chem_holder.reagents.clear_reagents()
diff --git a/maps/stellar_delight/stellar_delight_turfs.dm b/maps/stellar_delight/stellar_delight_turfs.dm
index 6e8e86fb33..8a5454d18e 100644
--- a/maps/stellar_delight/stellar_delight_turfs.dm
+++ b/maps/stellar_delight/stellar_delight_turfs.dm
@@ -52,30 +52,30 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks)
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
- "marble" = 7,
- "uranium" = 10,
- "platinum" = 10,
- "hematite" = 10,
- "carbon" = 10,
- "diamond" = 4,
- "gold" = 15,
- "silver" = 15,
- "lead" = 5,
- "verdantium" = 2,
- "rutile" = 10))
+ ORE_MARBLE = 7,
+ ORE_URANIUM = 10,
+ ORE_PLATINUM = 10,
+ ORE_HEMATITE = 10,
+ ORE_CARBON = 10,
+ ORE_DIAMOND = 4,
+ ORE_GOLD = 15,
+ ORE_SILVER = 15,
+ ORE_LEAD = 5,
+ ORE_VERDANTIUM = 2,
+ ORE_RUTILE = 10))
else
mineral_name = pickweight(list(
- "marble" = 5,
- "uranium" = 7,
- "platinum" = 7,
- "hematite" = 28,
- "carbon" = 28,
- "diamond" = 2,
- "gold" = 7,
- "silver" = 7,
- "lead" = 4,
- "verdantium" = 1,
- "rutile" = 10))
+ ORE_MARBLE = 5,
+ ORE_URANIUM = 7,
+ ORE_PLATINUM = 7,
+ ORE_HEMATITE = 28,
+ ORE_CARBON = 28,
+ ORE_DIAMOND = 2,
+ ORE_GOLD = 7,
+ ORE_SILVER = 7,
+ ORE_LEAD = 4,
+ ORE_VERDANTIUM = 1,
+ ORE_RUTILE = 10))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
UpdateMineral()
From e0972e83256a2d76c739da941ff06777ecab1147 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 6 Dec 2024 22:12:35 +0100
Subject: [PATCH 03/29] virology
---
code/__defines/reagents.dm | 17 ++++++
code/game/machinery/pandemic.dm | 4 +-
.../reagents/reactions/instant/virology.dm | 60 +++++++++----------
code/modules/reagents/reagents/virology.dm | 28 ++++-----
4 files changed, 63 insertions(+), 46 deletions(-)
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
index 6d3efe468e..98c4261635 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -149,6 +149,23 @@
#define REAGENT_ID_LEAD "lead"
+// Virology
+#define REAGENT_VACCINE "Vaccine"
+#define REAGENT_ID_VACCINE "vaccine"
+#define REAGENT_MUTAGENVIRUSFOOD "Mutagenic agar"
+#define REAGENT_ID_MUTAGENVIRUSFOOD "mutagenvirusfood"
+#define REAGENT_SUGARVIRUSFOOD "Sucrose agar"
+#define REAGENT_ID_SUGARVIRUSFOOD "sugarvirusfood"
+#define REAGENT_ADRANOLVIRUSFOOD "Virus rations"
+#define REAGENT_ID_ADRANOLVIRUSFOOD "adranolvirusfood"
+#define REAGENT_PHORONVIRUSFOOD "Phoronic virus food"
+#define REAGENT_ID_PHORONVIRUSFOOD "phoronvirusfood"
+#define REAGENT_WEAKPHORONVIRUSFOOD "Weakened phoronic virus food"
+#define REAGENT_ID_WEAKPHORONVIRUSFOOD "weakphoronvirusfood"
+#define REAGENT_SIZEVIRUSFOOD "Sizeoxadone virus food"
+#define REAGENT_ID_SIZEVIRUSFOOD "sizevirusfood"
+
+
// Food and Drinks
#define REAGENT_MEATCOLONY "A colony of meat cells"
#define REAGENT_ID_MEATCOLONY "meatcolony"
diff --git a/code/game/machinery/pandemic.dm b/code/game/machinery/pandemic.dm
index 24ab4e1f6e..ea490d10ca 100644
--- a/code/game/machinery/pandemic.dm
+++ b/code/game/machinery/pandemic.dm
@@ -146,8 +146,8 @@
atom_say("Unable to synthesize requested antibody.")
return
- var/obj/item/reagent_containers/glass/bottle/B = create_culture(vaccine_name, "vaccine", 200)
- B.reagents.add_reagent("vaccine", 15, list(vaccine_type))
+ var/obj/item/reagent_containers/glass/bottle/B = create_culture(vaccine_name, REAGENT_ID_VACCINE, 200)
+ B.reagents.add_reagent(REAGENT_ID_VACCINE, 15, list(vaccine_type))
if("eject_beaker")
eject_beaker()
update_tgui_static_data(ui.user)
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index cf7db63893..f5abd26dab 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -1,50 +1,50 @@
/decl/chemical_reaction/instant/virus_food_mutagen
- name = "mutagenic agar"
- id = "mutagenvirusfood"
- result = "mutagenvirusfood"
+ name = REAGENT_MUTAGENVIRUSFOOD
+ id = REAGENT_ID_MUTAGENVIRUSFOOD
+ result = REAGENT_ID_MUTAGENVIRUSFOOD
required_reagents = list("mutagen" = 1, "virusfood" = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_adranol
- name = "virus rations"
- id = "adranolvirusfood"
- result = "adranolvirusfood"
+ name = REAGENT_ADRANOLVIRUSFOOD
+ id = REAGENT_ID_ADRANOLVIRUSFOOD
+ result = REAGENT_ID_ADRANOLVIRUSFOOD
required_reagents = list("adranol" = 1, "virusfood" = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_phoron
- name = "phoronic virus food"
- id = "phoronvirusfood"
- result = "phoronvirusfood"
+ name = REAGENT_ADRANOLVIRUSFOOD
+ id = REAGENT_ID_PHORONVIRUSFOOD
+ result = REAGENT_ID_PHORONVIRUSFOOD
required_reagents = list(REAGENT_ID_PHORON = 1, "virusfood" = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_phoron_adranol
- name = "weakened phoronic virus food"
- id = "weakphoronvirusfood"
- result = "weakphoronvirusfood"
- required_reagents = list("adranol" = 1, "phoronvirusfood" = 1)
+ name = REAGENT_WEAKPHORONVIRUSFOOD
+ id = REAGENT_ID_WEAKPHORONVIRUSFOOD
+ result = REAGENT_ID_WEAKPHORONVIRUSFOOD
+ required_reagents = list("adranol" = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_mutagen_sugar
- name = "sucrose agar"
- id = "sugarvirusfood"
- result = "sugarvirusfood"
- required_reagents = list(REAGENT_ID_SUGAR = 1, "mutagenvirusfood" = 1)
+ name = REAGENT_SUGARVIRUSFOOD
+ id = REAGENT_ID_SUGARVIRUSFOOD
+ result = REAGENT_ID_SUGARVIRUSFOOD
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_mutagen_inaprovaline
- name = "sucrose agar"
+ name = REAGENT_SUGARVIRUSFOOD
id = "inaprovalinevirusfood"
- result = "sugarvirusfood"
- required_reagents = list("inaprovaline" = 1, "mutagenvirusfood" = 1)
+ result = REAGENT_ID_SUGARVIRUSFOOD
+ required_reagents = list("inaprovaline" = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_size
- name = "sizeoxadone virus food"
+ name = REAGENT_SIZEVIRUSFOOD
id = "sizeoxadonevirusfood"
- result = "sizevirusfood"
- required_reagents = list("sizeoxadone" = 1, "phoronvirusfood" = 1)
+ result = REAGENT_ID_SIZEVIRUSFOOD
+ required_reagents = list("sizeoxadone" = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/mix_virus
@@ -96,42 +96,42 @@
/decl/chemical_reaction/instant/mix_virus/mix_virus_5
name = "Mix Virus 5"
id = "mixvirus5"
- required_reagents = list("mutagenvirusfood" = 1)
+ required_reagents = list(REAGENT_ID_MUTAGENVIRUSFOOD = 1)
level_min = 3
level_max = 3
/decl/chemical_reaction/instant/mix_virus/mix_virus_6
name = "Mix Virus 6"
id = "mixvirus6"
- required_reagents = list("sugarvirusfood" = 1)
+ required_reagents = list(REAGENT_ID_SUGARVIRUSFOOD = 1)
level_min = 4
level_max = 4
/decl/chemical_reaction/instant/mix_virus/mix_virus_7
name = "Mix Virus 7"
id = "mixvirus7"
- required_reagents = list("weakphoronvirusfood" = 1)
+ required_reagents = list(REAGENT_ID_WEAKPHORONVIRUSFOOD = 1)
level_min = 5
level_max = 5
/decl/chemical_reaction/instant/mix_virus/mix_virus_8
name = "Mix Virus 8"
id = "mixvirus8"
- required_reagents = list("phoronvirusfood" = 1)
+ required_reagents = list(REAGENT_ID_PHORONVIRUSFOOD = 1)
level_min = 6
level_max = 6
/decl/chemical_reaction/instant/mix_virus/mix_virus_9
name = "Mix Virus 9"
id = "mixvirus9"
- required_reagents = list("adranolvirusfood" = 1)
+ required_reagents = list(REAGENT_ID_ADRANOLVIRUSFOOD = 1)
level_min = 1
level_max = 1
/decl/chemical_reaction/instant/mix_virus/picky/size
name = "Mix Virus Size"
id = "mixvirussize"
- required_reagents = list("sizevirusfood" = 1)
+ required_reagents = list(REAGENT_ID_SIZEVIRUSFOOD = 1)
symptoms = list(
/datum/symptom/macrophage,
/datum/symptom/size,
@@ -156,6 +156,6 @@
name = "Antibodies"
id = "antibodiesmix"
result = REAGENT_ID_ANTIBODIES
- required_reagents = list("vaccine")
+ required_reagents = list(REAGENT_ID_VACCINE)
catalysts = list("inaprovaline" = 0.1)
result_amount = 0.5
diff --git a/code/modules/reagents/reagents/virology.dm b/code/modules/reagents/reagents/virology.dm
index 95badd9851..9a582bec19 100644
--- a/code/modules/reagents/reagents/virology.dm
+++ b/code/modules/reagents/reagents/virology.dm
@@ -1,6 +1,6 @@
/datum/reagent/vaccine
- name = "Vaccine"
- id = "vaccine"
+ name = REAGENT_VACCINE
+ id = REAGENT_ID_VACCINE
color = "#C81040"
taste_description = "antibodies"
@@ -18,37 +18,37 @@
data |= newdatalist.Copy()
/datum/reagent/mutagen/mutagenvirusfood
- name = "Mutagenic agar"
- id = "mutagenvirusfood"
+ name = REAGENT_MUTAGENVIRUSFOOD
+ id = REAGENT_ID_MUTAGENVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems rather alright."
color = "#A3C00F"
/datum/reagent/mutagen/mutagenvirusfood/sugar
- name = "Sucrose agar"
- id = "sugarvirusfood"
+ name = REAGENT_SUGARVIRUSFOOD
+ id = REAGENT_ID_SUGARVIRUSFOOD
color = "#41B0C0"
taste_mult = 1.5
/datum/reagent/medicine/adranol/adranolvirusfood
- name = "Virus rations"
- id = "adranolvirusfood"
+ name = REAGENT_ADRANOLVIRUSFOOD
+ id = REAGENT_ID_ADRANOLVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems rather weak."
color = "#D18AA5"
/datum/reagent/toxin/phoron/phoronvirusfood
- name = "Phoronic virus food"
- id = "phoronvirusfood"
+ name = REAGENT_ADRANOLVIRUSFOOD
+ id = REAGENT_ID_PHORONVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems to be the strongest."
color = "#A69DA9"
/datum/reagent/toxin/phoron/phoronvirusfood/weak
- name = "Weakened phoronic virus food"
- id = "weakphoronvirusfood"
+ name = REAGENT_WEAKPHORONVIRUSFOOD
+ id = REAGENT_ID_WEAKPHORONVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems to have been weakened, but still strong."
color = "#CEC3C6"
/datum/reagent/toxin/phoron/phoronvirusfood/sizevirusfood
- name = "Sizeoxadone virus food"
- id = "sizevirusfood"
+ name = REAGENT_SIZEVIRUSFOOD
+ id = REAGENT_ID_SIZEVIRUSFOOD
description = "Mutates virus when mixed in blood. This is a strange size mix..."
color = "#88AFDD"
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 04/29] 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 98c4261635..5fcf7d9fe8 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 ad133bab2f..508e7a221f 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 aa0ea8aac4..2265d43fdd 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 80f3e19404..352b367a30 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 a4cf0adfd6..56d831db4d 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 2394143a13..501b00fe76 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 0bdbe75d86..4d2782a877 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 8cecbf1977..0c7792e279 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 5e1fea294b..5bc84036f7 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 9d6edf9e89..d83a64551c 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 db9606c346..61bf3aa6f8 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 3ad75cc46c..408ec193d5 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 a233d624aa..8d179b8721 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 7e77348a87..1f372798be 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 cc221db1c8..c86da351df 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 f9e1fdfbff..3e3e7eb9cc 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 16ba25db54..5b8f0614cb 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 287f181056..7d51aa4315 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 9c6a53d8ac..96d8356f03 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 9b50527bda..ffd6acc4b0 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 3cb4bfdc4f..c423ed2b82 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 c5cd942855..623ca32f48 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
From c64a2515044a0fbfb2bcc155dd9c22809187a6b9 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 6 Dec 2024 22:47:10 +0100
Subject: [PATCH 05/29] mecdicine_vr
---
code/__defines/reagents.dm | 297 ++----------------
code/datums/diseases/choreomania.dm | 4 +-
code/datums/diseases/fake_gbs.dm | 2 +-
code/datums/diseases/gbs.dm | 2 +-
.../game/objects/structures/tank_dispenser.dm | 4 +-
code/modules/food/glass/bottle_potion.dm | 8 +-
code/modules/food/glass/bottle_vr.dm | 2 +-
code/modules/mob/living/carbon/human/life.dm | 4 +-
.../carbon/human/species/species_attack_vr.dm | 12 +-
.../species/station/traits_vr/neutral.dm | 2 +-
code/modules/nifsoft/software/10_combat.dm | 2 +-
.../reagents/reactions/instant/instant_vr.dm | 30 +-
.../reagents/reactions/instant/virology.dm | 6 +-
.../reagents/reagent_containers/hypospray.dm | 2 +-
.../reagents/reagent_containers/pill_vr.dm | 4 +-
code/modules/reagents/reagents/medicine_vr.dm | 36 +--
code/modules/vore/eating/belly_obj_vr.dm | 2 +-
code/modules/vore/eating/bellymodes_vr.dm | 4 +-
.../tgui/interfaces/TankDispenser.tsx | 14 +-
19 files changed, 92 insertions(+), 345 deletions(-)
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
index 5fcf7d9fe8..4de8863dd1 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -158,6 +158,27 @@
#define REAGENT_ID_LEAD "lead"
+// Medicines
+#define REAGENT_ADRANOL "Adranol"
+#define REAGENT_ID_ADRANOL "adranol"
+#define REAGENT_NUMBENZYME "Numbing Enzyme"
+#define REAGENT_ID_NUMBENZYME "numbenzyme"
+#define REAGENT_VERMICETOL "Vermicetol"
+#define REAGENT_ID_VERMICETOL "vermicetol"
+#define REAGENT_SLEEVINGCURE "Kitsuhanan Cure"
+#define REAGENT_ID_SLEEVINGCURE "sleevingcure"
+#define REAGENT_PRUSSIANBLUE "Prussian Blue"
+#define REAGENT_ID_PRUSSIANBLUE "prussian_blue"
+#define REAGENT_LIPOZILASE "Lipozilase"
+#define REAGENT_ID_LIPOZILASE "lipozilase"
+#define REAGENT_LIPOSTIPO "Lipostipo"
+#define REAGENT_ID_LIPOSTIPO "lipostipo"
+#define REAGENT_POLYMORPH "Transforitine"
+#define REAGENT_ID_POLYMORPH "polymorph"
+#define REAGENT_GLAMOUR "Glamour"
+#define REAGENT_ID_GLAMOUR "glamour"
+
+
// Virology
#define REAGENT_VACCINE "Vaccine"
#define REAGENT_ID_VACCINE "vaccine"
@@ -375,7 +396,7 @@
-Files left: food_drinks.dm, medicine.dm, medicine_vr.dm, other.dm, toxins.dm
+Files left: food_drinks.dm, medicine.dm, other.dm, toxins.dm
includes: .dm
excludes: reagents.dm,ores.dm,materials.dm,mre.dm
@@ -409,277 +430,3 @@ excludes: reagents.dm,ores.dm,materials.dm,mre.dm
#define REAGENT_ID_URANIUM "uranium"
#define REAGENT_ID_PLATINUM "platinum"
#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
-
-todos
-defective_nanites
-coco
-mold
-left4zed
- var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
- var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
- var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
-
-
-
-
-
- xenoChemList += "inaprovaline"
- xenoChemList += "bicaridine"
- xenoChemList += "dylovene"
- xenoChemList += "dexalinp"
- xenoChemList += "tricordrazine"
- xenoChemList += "cryoxadone"
- xenoChemList += "clonexadone"
- xenoChemList += "paracetamol"
- xenoChemList += "tramadol"
- xenoChemList += "oxycodone"
- xenoChemList += "ryetalyn"
- xenoChemList += "hyperzine"
- xenoChemList += "ethylredoxrazine"
- xenoChemList += "hyronalin"
- xenoChemList += "arithrazine"
- xenoChemList += "spaceacillin"
- xenoChemList += "sterilizine"
- xenoChemList += "leporazine"
- xenoChemList += "methylphenidate"
- xenoChemList += "citalopram"
- xenoChemList += "paroxetine"
- xenoChemList += "macrocillin"
- xenoChemList += "microcillin"
- xenoChemList += "normalcillin"
- xenoChemList += "sizeoxadone"
- xenoChemList += "ickypak"
- xenoChemList += "unsorbitol"
- xenoChemList += "toxin"
- xenoChemList += "carpotoxin"
- xenoChemList += "potassium_chloride"
- xenoChemList += "potassium_chlorophoride"
- xenoChemList += "zombiepowder"
- xenoChemList += "fertilizer"
- xenoChemList += "eznutrient"
- xenoChemList += "left4zed"
- xenoChemList += "robustharvest"
- xenoChemList += "plantbgone"
- xenoChemList += "serotrotium"
- xenoChemList += "nicotine"
- xenoChemList += "uranium"
- xenoChemList += "silver"
- xenoChemList += "gold"
- xenoChemList += "adrenaline"
- xenoChemList += "holywater"
- xenoChemList += "ammonia"
- xenoChemList += "diethylamine"
- xenoChemList += "fluorosurfactant"
- xenoChemList += "foaming_agent"
- xenoChemList += "thermite"
- xenoChemList += "cleaner"
- xenoChemList += "lube"
- xenoChemList += "glycerol"
- xenoChemList += "coolant"
- xenoChemList += "luminol"
- xenoChemList += "cornoil"
- xenoChemList += "lipozine"
- xenoChemList += "sodiumchloride"
- xenoChemList += "frostoil"
- xenoChemList += "capsaicin"
- xenoChemList += "condensedcapsaicin"
- xenoChemList += "neurotoxin"
-
-
-supermatter
-mydrogen
-silicon
-
-deuterium
-tritium
-helium-3
-boron
- "adminordrazine",
- REAGENT_ID_NUTRIMENT,
- "macrocillin",
- "microcillin",
- "normalcillin",
- "magicdust"
- kitchen_tag = "lime"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
-
-/datum/seed/citrus/New()
- ..()
- set_trait(TRAIT_HARVEST_REPEAT,1)
- set_trait(TRAIT_JUICY,1)
- set_trait(TRAIT_MATURATION,6)
- set_trait(TRAIT_PRODUCTION,6)
- set_trait(TRAIT_YIELD,4)
- set_trait(TRAIT_POTENCY,15)
- set_trait(TRAIT_PRODUCT_ICON,"treefruit")
- set_trait(TRAIT_PRODUCT_COLOUR,"#3AF026")
- set_trait(TRAIT_PLANT_ICON,"tree")
- set_trait(TRAIT_FLESH_COLOUR,"#3AF026")
-
-/datum/seed/citrus/lemon
- name = "lemon"
- seed_name = "lemon"
- display_name = "lemon trees"
- kitchen_tag = "lemon"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
-
-/datum/seed/citrus/lemon/New()
- ..()
- set_trait(TRAIT_PRODUCES_POWER,1)
- set_trait(TRAIT_PRODUCT_ICON,"lemon")
- set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226")
- set_trait(TRAIT_FLESH_COLOUR,"#F0E226")
- set_trait(TRAIT_IDEAL_LIGHT, 6)
-
-/datum/seed/citrus/orange
- name = "orange"
- seed_name = "orange"
- display_name = "orange trees"
- kitchen_tag = "orange"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
- list("zombiepowder" = list(1,10),"condensedcapsaicin""imidazoline" = list(3,5), "carrotjuice" = list(10,20))
- chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5),
- "radium" = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
- "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
- "water" = list(XENO_CHEM_NUTRI = -0.1),
- "milk" = list(XENO_CHEM_NUTRI = 0.3),
- "sacid" = list(XENO_CHEM_TOXIC = 1),
- "pacid" = list(XENO_CHEM_TOXIC = 2),
- "chlorine" = list(XENO_CHEM_TOXIC = 0.5),
- "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),
- "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),
- "flourine" = list(XENO_CHEM_TOXIC = 0.1),
- "robustharvest" = list(XENO_CHEM_NUTRI = 1.5),
- "glucose" = list(XENO_CHEM_NUTRI = 0.5),
- "blood" = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
- "fuel" = list(XENO_CHEM_TOXIC = 0.4),
- "toxin" = list(XENO_CHEM_TOXIC = 0.5),
- "carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
- REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
- "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
- "cyanide" = list(XENO_CHEM_TOXIC = 3.5),
- "slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
- "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),
- "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),
- "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) )
-re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
-liquid_protean
-peanutoil
-cornoil
-durianpaste
- if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
- descriptors |= "sweet"
- if(reagents.has_reagent("anti_toxin"))
- descriptors |= "astringent"
- if(reagents.has_reagent("frostoil"))
- descriptors |= "numbing"
- if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
- descriptors |= "nutritious"
- if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
- descriptors |= "spicy"
- if(reagents.has_reagent("coco"))
- descriptors |= "bitter"
- if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
- descriptors |= "sweet-sour"
- if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
- descriptors |= "radioactive"
- if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
- descriptors |= "poisonous"
- if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
- descriptors |= "hallucinogenic"
- if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
- descriptors |= "medicinal"
- if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood"))
- descriptors |= "shiny"
- if(reagents.has_reagent("lube"))
- descriptors |= "slippery"
- if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
- descriptors |= "acidic"
-
- var/static/list/toxic_reagents = list(
- "anti_toxin" = -2,
- "toxin" = 2,
- REAGENT_ID_FLUORINE = 2.5,
- "chlorine" = 1.5,
- "sacid" = 1.5,
- "pacid" = 3,
- "plantbgone" = 3,
- "cryoxadone" = -3,
- "radium" = 2
- )
- var/static/list/nutrient_reagents = list(
- "milk" = 0.1,
- "beer" = 0.25,
- "phosphorus" = 0.1,
- "sugar" = 0.1,
- "sodawater" = 0.1,
- "ammonia" = 1,
- "diethylamine" = 2,
- REAGENT_ID_NUTRIMENT = 1,
- "adminordrazine" = 1,
- "eznutrient" = 1,
- "robustharvest" = 1,
- "left4zed" = 1
- )
- var/static/list/weedkiller_reagents = list(
- REAGENT_ID_FLUORINE = -4,
- "chlorine" = -3,
- "phosphorus" = -2,
- "sugar" = 2,
- "sacid" = -2,
- "pacid" = -4,
- "plantbgone" = -8,
- "adminordrazine" = -5
- )
- var/static/list/pestkiller_reagents = list(
- "sugar" = 2,
- "diethylamine" = -2,
- "adminordrazine" = -5
- )
- var/static/list/water_reagents = list(
- "water" = 1,
- "adminordrazine" = 1,
- "milk" = 0.9,
- "beer" = 0.7,
- REAGENT_ID_FLUORINE = -0.5,
- "chlorine" = -0.5,
- "phosphorus" = -0.5,
- "water" = 1,
- "sodawater" = 1,
- )
-
- // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
- var/static/list/beneficial_reagents = list(
- "beer" = list( -0.05, 0, 0 ),
- REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
- "chlorine" = list( -1, 0, 0 ),
- "phosphorus" = list( -0.75, 0, 0 ),
- "sodawater" = list( 0.1, 0, 0 ),
- "sacid" = list( -1, 0, 0 ),
- "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_NUTRIMENT = list( 0.5, 0.1, 0 ),
- "radium" = list( -1.5, 0, 0.2),
- "adminordrazine" = list( 1, 1, 1 ),
- "robustharvest" = list( 0, 0.2, 0 ),
- "left4zed" = list( 0, 0, 0.2)
- )
-
- // Mutagen list specifies minimum value for the mutation to take place, rather
- // than a bound as the lists above specify.
- var/static/list/mutagenic_reagents = list(
- "radium" = 8,
- "mutagen" = 15
- )
diff --git a/code/datums/diseases/choreomania.dm b/code/datums/diseases/choreomania.dm
index 9fd41c4cd6..01802a7801 100644
--- a/code/datums/diseases/choreomania.dm
+++ b/code/datums/diseases/choreomania.dm
@@ -2,8 +2,8 @@
name = "Choreomania"
max_stages = 3
spread_text = "Airborne"
- cure_text = "Adranol"
- cures = list("adranol")
+ cure_text = REAGENT_ADRANOL
+ cures = list(REAGENT_ID_ADRANOL)
cure_chance = 10
agent = "TAP-DAnC3"
viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm
index ca36f57d87..5edce81b0f 100644
--- a/code/datums/diseases/fake_gbs.dm
+++ b/code/datums/diseases/fake_gbs.dm
@@ -4,7 +4,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Adranol & Sulfur"
- cures = list("adranol", "sulfur")
+ cures = list(REAGENT_ID_ADRANOL, "sulfur")
agent = "Gravitokinetic Bipotential SADS-"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "if left untreated death will occur."
diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index ea2c755e27..d223274576 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -4,7 +4,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Adranol & Sulfur"
- cures = list("adranol", "sulfur")
+ cures = list(REAGENT_ID_ADRANOL, "sulfur")
cure_chance = 15
agent = "Gravitokinetic Bipotential SADS+"
viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 678513ec03..7e63f890b2 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -57,7 +57,7 @@
/obj/structure/dispenser/tgui_data(mob/user)
var/list/data = list()
data["oxygen"] = oxygentanks
- data["plasma"] = phorontanks
+ data["phoron"] = phorontanks
return data
@@ -102,7 +102,7 @@
if(..())
return
switch(action)
- if("plasma")
+ if("phoron")
var/obj/item/tank/phoron/tank = locate() in src
if(tank && Adjacent(ui.user))
ui.user.put_in_hands(tank)
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index 6efeffcbc0..c854c14d19 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -10,7 +10,7 @@
/obj/item/reagent_containers/glass/bottle/potion/greater_healing
name = "greater healing potion"
desc = "A small green bottle containing some thick red liquid that claims to rapidly heal injuries."
- prefill = list("vermicetol" = 30)
+ prefill = list(REAGENT_ID_VERMICETOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/fire_resist
name = "fire resistance potion"
@@ -110,12 +110,12 @@
/obj/item/reagent_containers/glass/bottle/potion/truepolymorph
name = "polymorph potion"
desc = "A small green bottle containing some strange purple liquid that claims to transform the drinker."
- prefill = list("polymorph" = 1)
+ prefill = list(REAGENT_ID_POLYMORPH = 1)
/obj/item/reagent_containers/glass/bottle/potion/glamour
name = "glamour potion"
desc = "A small white potion, the perfectly white liquid inside moves in an almost gaseous manner, yet appears to produce reflections perfectly."
- prefill = list("glamour" = 1)
+ prefill = list(REAGENT_ID_GLAMOUR = 1)
//Failed potions
@@ -147,7 +147,7 @@
/obj/item/reagent_containers/glass/bottle/potion/lipostipo
name = "thick potion"
desc = "A small green bottle containing some thick viscous liquid."
- prefill = list("lipostipo" = 30)
+ prefill = list(REAGENT_ID_LIPOSTIPO = 30)
/obj/item/reagent_containers/glass/bottle/potion/phoron
name = "volatile potion"
diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm
index 0a3c4c11a6..8179250b7a 100644
--- a/code/modules/food/glass/bottle_vr.dm
+++ b/code/modules/food/glass/bottle_vr.dm
@@ -10,7 +10,7 @@
desc = "A small bottle. Vermicetol is an powerful analgesic medication and can be used to treat blunt trauma."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("vermicetol" = 60)
+ prefill = list(REAGENT_ID_VERMICETOL = 60)
/obj/item/reagent_containers/glass/bottle/keloderm
name = "keloderm bottle"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 3a1fee4a88..98a52fe444 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -307,7 +307,7 @@
return
//VOREStation Addition end: shadekin
- if(reagents.has_reagent("prussian_blue")) //Prussian Blue temporarily stops radiation effects.
+ if(reagents.has_reagent(REAGENT_ID_PRUSSIANBLUE)) //Prussian Blue temporarily stops radiation effects.
return
var/damage = 0
@@ -452,7 +452,7 @@
// Begin long-term radiation effects
// Loss of taste occurs at 100 (2Gy) and is handled in taste.dm
// These are all done one after another, so duplication is not required. Someone at 400rads will have the 100&400 effects.
- if(!radiation && accumulated_rads >= 100 && !reagents.has_reagent("prussian_blue")) //Let's not hit them with long term effects when they're actively being hit with rads.
+ if(!radiation && accumulated_rads >= 100 && !reagents.has_reagent(REAGENT_ID_PRUSSIANBLUE)) //Let's not hit them with long term effects when they're actively being hit with rads.
if(!isSynthetic())
I = internal_organs_by_name[O_EYES]
if(I) //Eye stuff
diff --git a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm
index 3027ae0b33..8942672c33 100644
--- a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm
@@ -20,30 +20,30 @@
if(1 to 2)
user.visible_message(span_danger("[user]'s fangs scrape across [target]'s cheek!"))
to_chat(target, span_danger("Your face feels tingly!"))
- target.bloodstr.add_reagent("numbenzyme",attack_damage) //Have to add this here, otherwise the swtich fails.
+ target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) //Have to add this here, otherwise the swtich fails.
if(3 to 4)
user.visible_message(span_danger("[user]'s fangs pierce into [target]'s neck at an odd, awkward angle!"))
to_chat(target, span_danger("Your neck feels like it's on fire before going numb!"))
- target.bloodstr.add_reagent("numbenzyme",attack_damage)
+ target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage)
if(5)
user.visible_message(span_danger("[user] sinks \his [pick(attack_noun)] deep into [target]'s neck, causing the vein to bulge outwards at some type of chemical is pumped into it!"))
to_chat(target, span_danger("Your neck feels like it's going to burst! Moments later, you simply can't feel your neck any longer, the numbness beginning to spread throughout your body!"))
- target.bloodstr.add_reagent("numbenzyme",attack_damage)
+ target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage)
else
// ----- BODY ----- //
switch(attack_damage)
if(1 to 2)
user.visible_message(span_danger("[user]'s fangs scrape across [target]'s [affecting.name]!"))
to_chat(target, span_danger("Your [affecting.name] feels tingly!"))
- target.bloodstr.add_reagent("numbenzyme",attack_damage)
+ target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage)
if(3 to 4)
user.visible_message(span_danger("[user]'s fangs pierce [pick("", "", "the side of")] [target]'s [affecting.name]!"))
to_chat(target, span_danger("Your [affecting.name] feels like it's on fire before going numb!"))
- target.bloodstr.add_reagent("numbenzyme",attack_damage)
+ target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage)
if(5)
user.visible_message(span_danger("[user]'s fangs sink deep into [target]'s [affecting.name], one of their veins bulging outwards from the sudden fluid pumped into it!"))
to_chat(target, span_danger("Your [affecting.name] feels like it's going to burst! Moments later, you simply can't feel your [affecting.name] any longer, the numbness slowly spreading throughout your body!"))
- target.bloodstr.add_reagent("numbenzyme",attack_damage)
+ target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage)
/datum/unarmed_attack/claws/shadekin
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index bb17f937a6..4df56e47b0 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -173,7 +173,7 @@
H.trait_injection_reagents += REAGENT_ID_MICROCILLIN // get small
H.trait_injection_reagents += REAGENT_ID_MACROCILLIN // get BIG
H.trait_injection_reagents += REAGENT_ID_NORMALCILLIN // normal
- H.trait_injection_reagents += "numbenzyme" // no feelings
+ H.trait_injection_reagents += REAGENT_ID_NUMBENZYME // no feelings
H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE
H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE
H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL
diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm
index 9ce840b612..dd0bc6f50f 100644
--- a/code/modules/nifsoft/software/10_combat.dm
+++ b/code/modules/nifsoft/software/10_combat.dm
@@ -35,7 +35,7 @@
/datum/nifsoft/painkillers/life()
if((. = ..()))
var/mob/living/carbon/human/H = nif.human
- H.bloodstr.add_reagent("numbenzyme",0.5)
+ H.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,0.5)
/datum/nifsoft/hardclaws
name = "Bloodletters"
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 3e3e7eb9cc..2edf1d4d9c 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -142,38 +142,38 @@
///////////////////////////////////////////////////////////////////////////////////
/// Other Drugs
/decl/chemical_reaction/instant/adranol
- name = "Adranol"
- id = "adranol"
- result = "adranol"
+ name = REAGENT_ADRANOL
+ id = REAGENT_ID_ADRANOL
+ result = REAGENT_ID_ADRANOL
required_reagents = list("milk" = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/vermicetol
- name = "Vermicetol"
- id = "vermicetol"
- result = "vermicetol"
+ name = REAGENT_VERMICETOL
+ id = REAGENT_ID_VERMICETOL
+ result = REAGENT_ID_VERMICETOL
required_reagents = list("bicaridine" = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 3
/decl/chemical_reaction/instant/prussian_blue
- name = "Prussian Blue"
- id = "prussian_blue"
- result = "prussian_blue"
+ name = REAGENT_PRUSSIANBLUE
+ id = REAGENT_ID_PRUSSIANBLUE
+ result = REAGENT_ID_PRUSSIANBLUE
required_reagents = list(REAGENT_ID_CARBON = 3, REAGENT_ID_IRON = 1, REAGENT_ID_NITROGEN = 3)
result_amount = 7
/decl/chemical_reaction/instant/lipozilase
- name = "Lipozilase"
- id = "Lipozilase"
- result = "lipozilase"
+ name = REAGENT_LIPOZILASE
+ id = REAGENT_ID_LIPOZILASE
+ result = REAGENT_ID_LIPOZILASE
required_reagents = list("lipozine" = 1, "diethylamine" = 1)
result_amount = 2
/decl/chemical_reaction/instant/lipostipo
- name = "Lipostipo"
- id = "Lipostipo"
- result = "lipostipo"
+ name = REAGENT_LIPOSTIPO
+ id = REAGENT_ID_LIPOSTIPO
+ result = REAGENT_ID_LIPOSTIPO
required_reagents = list("lipozine" = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1)
result_amount = 3
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index f5abd26dab..36783e4f61 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -9,7 +9,7 @@
name = REAGENT_ADRANOLVIRUSFOOD
id = REAGENT_ID_ADRANOLVIRUSFOOD
result = REAGENT_ID_ADRANOLVIRUSFOOD
- required_reagents = list("adranol" = 1, "virusfood" = 1)
+ required_reagents = list(REAGENT_ID_ADRANOL = 1, "virusfood" = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_phoron
@@ -23,7 +23,7 @@
name = REAGENT_WEAKPHORONVIRUSFOOD
id = REAGENT_ID_WEAKPHORONVIRUSFOOD
result = REAGENT_ID_WEAKPHORONVIRUSFOOD
- required_reagents = list("adranol" = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
+ required_reagents = list(REAGENT_ID_ADRANOL = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_mutagen_sugar
@@ -142,7 +142,7 @@
/decl/chemical_reaction/instant/mix_virus/rem_virus
name = "Devolve Virus"
id = "remvirus"
- required_reagents = list("adranol" = 1)
+ required_reagents = list(REAGENT_ID_ADRANOL = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
/decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 14a7708260..4944a18e63 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -249,7 +249,7 @@
name = "purity hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \
resolving viruses, infections, radiation, and genetic maladies."
- filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, "prussian_blue" = 5, "ryetalyn" = 1)
+ filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, REAGENT_ID_PRUSSIANBLUE = 5, "ryetalyn" = 1)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain
name = "pain hypo"
diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm
index f9605b9290..3a4fadc2f7 100644
--- a/code/modules/reagents/reagent_containers/pill_vr.dm
+++ b/code/modules/reagents/reagent_containers/pill_vr.dm
@@ -124,7 +124,7 @@
/obj/item/reagent_containers/pill/vermicetol/Initialize()
. = ..()
- reagents.add_reagent("vermicetol", 15)
+ reagents.add_reagent(REAGENT_ID_VERMICETOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/healing_nanites
@@ -144,7 +144,7 @@
/obj/item/reagent_containers/pill/sleevingcure/Initialize()
. = ..()
- reagents.add_reagent("sleevingcure", 1)
+ reagents.add_reagent(REAGENT_ID_SLEEVINGCURE, 1)
color = reagents.get_color()
/obj/item/reagent_containers/pill/airlock
diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm
index ffffacd0a3..7cff09ee0c 100644
--- a/code/modules/reagents/reagents/medicine_vr.dm
+++ b/code/modules/reagents/reagents/medicine_vr.dm
@@ -1,6 +1,6 @@
/datum/reagent/adranol
- name = "Adranol"
- id = "adranol"
+ name = REAGENT_ADRANOL
+ id = REAGENT_ID_ADRANOL
description = "A mild sedative that calms the nerves and relaxes the patient."
taste_description = "milk"
reagent_state = LIQUID
@@ -18,8 +18,8 @@
M.make_jittery(min(-25*removed,0))
/datum/reagent/numbing_enzyme
- name = "Numbing Enzyme"
- id = "numbenzyme"
+ name = REAGENT_NUMBENZYME
+ id = REAGENT_ID_NUMBENZYME
description = "Some sort of organic painkiller."
taste_description = "sourness"
reagent_state = LIQUID
@@ -61,8 +61,8 @@
H.stuttering += 20
/datum/reagent/vermicetol
- name = "Vermicetol"
- id = "vermicetol"
+ name = REAGENT_VERMICETOL
+ id = REAGENT_ID_VERMICETOL
description = "A potent chemical that treats physical damage at an exceptional rate."
taste_description = "sparkles"
taste_mult = 3
@@ -79,8 +79,8 @@
M.heal_organ_damage(8 * removed * chem_effective, 0)
/datum/reagent/sleevingcure
- name = "Kitsuhanan Cure"
- id = "sleevingcure"
+ name = REAGENT_SLEEVINGCURE
+ id = REAGENT_ID_SLEEVINGCURE
description = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
taste_description = "chocolate peanut butter"
taste_mult = 2
@@ -96,8 +96,8 @@
/datum/reagent/prussian_blue //We don't have iodine, so prussian blue we go.
- name = "Prussian Blue"
- id = "prussian_blue"
+ name = REAGENT_PRUSSIANBLUE
+ id = REAGENT_ID_PRUSSIANBLUE
description = "Prussian Blue is an medication used to temporarily pause the effects of radiation poisoning to allow for treatment. Does not treat radiation sickness on its own."
taste_description = "salt"
reagent_state = SOLID
@@ -113,8 +113,8 @@
M.adjustToxLoss(-10 * removed)
/datum/reagent/lipozilase // The anti-nutriment that rapidly removes weight.
- name = "Lipozilase"
- id = "lipozilase"
+ name = REAGENT_LIPOZILASE
+ id = REAGENT_ID_LIPOZILASE
description = "A chemical compound that causes a dangerously powerful fat-burning reaction."
taste_description = "blandness"
reagent_state = LIQUID
@@ -127,8 +127,8 @@
M.weight -= 0.3
/datum/reagent/lipostipo // The drug that rapidly increases weight.
- name = "Lipostipo"
- id = "lipostipo"
+ name = REAGENT_LIPOSTIPO
+ id = REAGENT_ID_LIPOSTIPO
description = "A chemical compound that causes a dangerously powerful fat-adding reaction."
taste_description = "blubber"
reagent_state = LIQUID
@@ -141,8 +141,8 @@
M.weight += 0.3
/datum/reagent/polymorph
- name = "Transforitine"
- id = "polymorph"
+ name = REAGENT_POLYMORPH
+ id = REAGENT_ID_POLYMORPH
description = "A chemical that instantly transforms the consumer into another creature."
taste_description = "luck"
reagent_state = LIQUID
@@ -315,8 +315,8 @@
return new_mob
/datum/reagent/glamour
- name = "Glamour"
- id = "glamour"
+ name = REAGENT_GLAMOUR
+ id = REAGENT_ID_GLAMOUR
description = "This material is from somewhere else, just being near produces changes."
taste_description = "change"
reagent_state = LIQUID
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 562052241a..3c8dabaeca 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -626,7 +626,7 @@
var/mob/living/carbon/human/Pred = owner
if(ishuman(M))
var/mob/living/carbon/human/Prey = M
- Prey.bloodstr.del_reagent("numbenzyme")
+ Prey.bloodstr.del_reagent(REAGENT_ID_NUMBENZYME)
Prey.bloodstr.trans_to_holder(Pred.bloodstr, Prey.bloodstr.total_volume, 0.5, TRUE) // Copy=TRUE because we're deleted anyway
Prey.ingested.trans_to_holder(Pred.bloodstr, Prey.ingested.total_volume, 0.5, TRUE) // Therefore don't bother spending cpu
Prey.touching.trans_to_holder(Pred.bloodstr, Prey.touching.total_volume, 0.5, TRUE) // On updating the prey's reagents
diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm
index 95ee35c879..a866b3a805 100644
--- a/code/modules/vore/eating/bellymodes_vr.dm
+++ b/code/modules/vore/eating/bellymodes_vr.dm
@@ -164,8 +164,8 @@
//Numbing flag
if(mode_flags & DM_FLAG_NUMBING)
- if(H.bloodstr.get_reagent_amount("numbenzyme") < 2)
- H.bloodstr.add_reagent("numbenzyme",4)
+ if(H.bloodstr.get_reagent_amount(REAGENT_ID_NUMBENZYME) < 2)
+ H.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,4)
//Thickbelly flag
if((mode_flags & DM_FLAG_THICKBELLY) && !H.muffled)
diff --git a/tgui/packages/tgui/interfaces/TankDispenser.tsx b/tgui/packages/tgui/interfaces/TankDispenser.tsx
index 580407c6f1..8346776a84 100644
--- a/tgui/packages/tgui/interfaces/TankDispenser.tsx
+++ b/tgui/packages/tgui/interfaces/TankDispenser.tsx
@@ -3,13 +3,13 @@ import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';
type Data = {
- plasma;
- oxygen;
+ phoron: number;
+ oxygen: number;
};
export const TankDispenser = (props) => {
const { act, data } = useBackend();
- const { plasma, oxygen } = data;
+ const { phoron, oxygen } = data;
return (
@@ -19,15 +19,15 @@ export const TankDispenser = (props) => {
label="Phoron"
buttons={
}
>
- {plasma}
+ {phoron}
Date: Fri, 6 Dec 2024 23:29:36 +0100
Subject: [PATCH 06/29] bunch of fixes
---
code/__defines/reagents.dm | 108 +++++++++++++-----
code/datums/diseases/advance/advance.dm | 2 +-
code/game/machinery/doors/airlock.dm | 10 +-
code/game/objects/items/crayons.dm | 4 +-
.../objects/items/weapons/material/bats.dm | 10 +-
code/game/objects/items/weapons/paint.dm | 2 +-
code/modules/food/food/condiment.dm | 18 +--
code/modules/food/food/snacks.dm | 2 +-
code/modules/food/glass/bottle.dm | 2 +-
code/modules/hydroponics/grown.dm | 2 +-
code/modules/hydroponics/seed.dm | 2 +-
code/modules/hydroponics/seedtypes/apples.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 10 +-
code/modules/mining/alloys_vr.dm | 18 +--
code/modules/reagents/machinery/grinder.dm | 18 +--
.../reagents/reactions/instant/drinks.dm | 6 +-
.../reagents/reactions/instant/instant.dm | 68 +++++------
.../reagents/reagent_containers/pill.dm | 2 +-
code/modules/reagents/reagents/other.dm | 96 ++++++++--------
.../research/designs/bag_of_holding.dm | 11 +-
code/modules/vore/eating/living_vr.dm | 36 +++---
.../tools/geosample_scanner.dm | 2 +-
code/modules/xenobio/items/extracts.dm | 18 +--
code/modules/xenobio2/_xeno_setup_vr.dm | 4 +-
code/modules/xenobio2/mob/slime/slime.dm | 2 +-
25 files changed, 251 insertions(+), 204 deletions(-)
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
index 4de8863dd1..547e65aa34 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -207,6 +207,83 @@
#define REAGENT_ID_LIQUIDPROTEAN "liquid_protean"
#define REAGENT_SHOCKCHEM "200 V"
#define REAGENT_ID_SHOCKCHEM "shockchem"
+#define REAGENT_CRAYONDUST "Crayon dust"
+#define REAGENT_ID_CRAYONDUST "crayon_dust"
+#define REAGENT_CRAYONDUSTRED "Red crayon dust"
+#define REAGENT_ID_CRAYONDUSTRED "crayon_dust_red"
+#define REAGENT_CRAYONDUSTORANGE "Orange crayon dust"
+#define REAGENT_ID_CRAYONDUSTORANGE "crayon_dust_orange"
+#define REAGENT_CRAYONDUSTYELLOW "Yellow crayon dust"
+#define REAGENT_ID_CRAYONDUSTYELLOW "crayon_dust_yellow"
+#define REAGENT_CRAYONDUSTGREEN "Green crayon dust"
+#define REAGENT_ID_CRAYONDUSTGREEN "crayon_dust_green"
+#define REAGENT_CRAYONDUSTBLUE "Blue crayon dust"
+#define REAGENT_ID_CRAYONDUSTBLUE "crayon_dust_blue"
+#define REAGENT_CRAYONDUSTPURPLE "Purple crayon dust"
+#define REAGENT_ID_CRAYONDUSTPURPLE "crayon_dust_purple"
+#define REAGENT_CRAYONDUSTGREY "Grey crayon dust"
+#define REAGENT_ID_CRAYONDUSTGREY "crayon_dust_grey"
+#define REAGENT_CRAYONDUSTBROWN "Brown crayon dust"
+#define REAGENT_ID_CRAYONDUSTBROWN "crayon_dust_brown"
+#define REAGENT_MARKERINK "Marker ink"
+#define REAGENT_ID_MARKERINK "marker_ink"
+#define REAGENT_MARKERINKBLACK "Black marker ink"
+#define REAGENT_ID_MARKERINKBLACK "marker_ink_black"
+#define REAGENT_MARKERINKRED "Red marker ink"
+#define REAGENT_ID_MARKERINKRED "marker_ink_red"
+#define REAGENT_MARKERINKORANGE "Orange marker ink"
+#define REAGENT_ID_MARKERINKORANGE "marker_ink_orange"
+#define REAGENT_MARKERINKYELLOW "Yellow marker ink"
+#define REAGENT_ID_MARKERINKYELLOW "marker_ink_yellow"
+#define REAGENT_MARKERINKGREEN "Green marker ink"
+#define REAGENT_ID_MARKERINKGREEN "marker_ink_green"
+#define REAGENT_MARKERINKBLUE "Blue marker ink"
+#define REAGENT_ID_MARKERINKBLUE "marker_ink_blue"
+#define REAGENT_MARKERINKPURPLE "Purple marker ink"
+#define REAGENT_ID_MARKERINKPURPLE "marker_ink_purple"
+#define REAGENT_MARKERINKGREY "Grey marker ink"
+#define REAGENT_ID_MARKERINKGREY "marker_ink_grey"
+#define REAGENT_MARKERINKBROWN "Brown marker ink"
+#define REAGENT_ID_MARKERINKBROWN "marker_ink_brown"
+#define REAGENT_PAINT "Paint"
+#define REAGENT_ID_PAINT "paint"
+#define REAGENT_GOLD "Gold"
+#define REAGENT_ID_GOLD "gold"
+#define REAGENT_SILVER "Silver"
+#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_ID_URANIUM "uranium"
+#define REAGENT_ID_PLATINUM "platinum"
+#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
+
+
+#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"
+#define REAGENT_ID_ADMINORDRAZINE "adminordrazine"
// Food and Drinks
@@ -400,33 +477,4 @@ Files left: food_drinks.dm, medicine.dm, other.dm, toxins.dm
includes: .dm
excludes: reagents.dm,ores.dm,materials.dm,mre.dm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#define REAGENT_SILVER "Silver"
-#define REAGENT_ID_SILVER "silver"
-#define REAGENT_GOLD "Gold"
-#define REAGENT_ID_GOLD "gold"
-#define REAGENT_SLIMEJELLY "Slimejelly"
-#define REAGENT_ID_SLIMEJELLY "slimejelly"
-
-
-#define REAGENT_ID_SILICATE "silicate"
-#define REAGENT_ID_URANIUM "uranium"
-#define REAGENT_ID_PLATINUM "platinum"
-#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
+ id = "lemon_juice_paint"
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 364a9a0ea0..16852e73ec 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -4,7 +4,7 @@ GLOBAL_LIST_INIT(advance_cures, list(
REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
"spaceacillin", "glucose", REAGENT_ID_ETHANOL,
"leporazine", "impedrezene", "hepanephrodaxon",
- "silver", "gold"
+ REAGENT_ID_SILVER, REAGENT_ID_GOLD
))
/datum/disease/advance
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 00af173947..54eda82f72 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -480,23 +480,23 @@
/obj/machinery/door/airlock/gold
name = "Gold Airlock"
icon = 'icons/obj/doors/Doorgold.dmi'
- mineral = "gold"
+ mineral = MAT_GOLD
/obj/machinery/door/airlock/silver
name = "Silver Airlock"
icon = 'icons/obj/doors/Doorsilver.dmi'
- mineral = "silver"
+ mineral = MAT_SILVER
/obj/machinery/door/airlock/diamond
name = "Diamond Airlock"
icon = 'icons/obj/doors/Doordiamond.dmi'
- mineral = "diamond"
+ mineral = MAT_DIAMOND
/obj/machinery/door/airlock/uranium
name = "Uranium Airlock"
desc = "And they said I was crazy."
icon = 'icons/obj/doors/Dooruranium.dmi'
- mineral = "uranium"
+ mineral = MAT_URANIUM
var/last_event = 0
var/rad_power = 7.5
@@ -549,7 +549,7 @@
/obj/machinery/door/airlock/sandstone
name = "Sandstone Airlock"
icon = 'icons/obj/doors/Doorsand.dmi'
- mineral = "sandstone"
+ mineral = MAT_SANDSTONE
/obj/machinery/door/airlock/science
name = "Research Airlock"
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index de7ca97e88..da33428642 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -115,7 +115,7 @@
if(M == user)
to_chat(user, "You take a bite of the crayon and swallow it.")
user.nutrition += 1
- user.reagents.add_reagent("crayon_dust",min(5,uses)/3)
+ user.reagents.add_reagent(REAGENT_ID_CRAYONDUST,min(5,uses)/3)
if(uses)
uses -= 5
if(uses <= 0)
@@ -201,7 +201,7 @@
if(M == user)
to_chat(user, "You take a bite of the marker and swallow it.")
user.nutrition += 1
- user.reagents.add_reagent("marker_ink",6)
+ user.reagents.add_reagent(REAGENT_ID_MARKERINK,6)
if(uses)
uses -= 5
if(uses <= 0)
diff --git a/code/game/objects/items/weapons/material/bats.dm b/code/game/objects/items/weapons/material/bats.dm
index 4e8c599ab1..df011116a6 100644
--- a/code/game/objects/items/weapons/material/bats.dm
+++ b/code/game/objects/items/weapons/material/bats.dm
@@ -14,16 +14,16 @@
//Predefined materials go here.
/obj/item/material/twohanded/baseballbat/metal/New(var/newloc)
- ..(newloc,"steel")
+ ..(newloc,MAT_STEEL)
/obj/item/material/twohanded/baseballbat/uranium/New(var/newloc)
- ..(newloc,"uranium")
+ ..(newloc,MAT_URANIUM)
/obj/item/material/twohanded/baseballbat/gold/New(var/newloc)
- ..(newloc,"gold")
+ ..(newloc,MAT_GOLD)
/obj/item/material/twohanded/baseballbat/platinum/New(var/newloc)
- ..(newloc,"platinum")
+ ..(newloc,MAT_PLATINUM)
/obj/item/material/twohanded/baseballbat/diamond/New(var/newloc)
- ..(newloc,"diamond")
\ No newline at end of file
+ ..(newloc,MAT_DIAMOND)
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index 628b0f3694..23ba57513a 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -29,7 +29,7 @@ var/global/list/cached_icons = list()
/obj/item/reagent_containers/glass/paint/Initialize()
.=..()
if(paint_type)
- reagents.add_reagent("paint", volume, paint_type)
+ reagents.add_reagent(REAGENT_ID_PAINT, volume, paint_type)
/obj/item/reagent_containers/glass/paint/red
icon_state = "paint_red"
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index 35974d7095..fd10a97bd7 100644
--- a/code/modules/food/food/condiment.dm
+++ b/code/modules/food/food/condiment.dm
@@ -432,31 +432,31 @@
volume = 10
/obj/item/reagent_containers/food/condiment/small/packet/crayon/generic/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUST, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/red/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_red", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTRED, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/orange/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_orange", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTORANGE, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_yellow", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTYELLOW, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/green/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_green", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTGREEN, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/blue/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_blue", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTBLUE, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/purple/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_purple", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTPURPLE, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/grey/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_grey", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTGREY, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/brown/Initialize()
. = ..()
- reagents.add_reagent("crayon_dust_brown", 10)
+ reagents.add_reagent(REAGENT_ID_CRAYONDUSTBROWN, 10)
//End of MRE stuff.
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 9674d5cf55..961a1e8c51 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -2412,7 +2412,7 @@
/obj/item/reagent_containers/food/snacks/appletart/Initialize()
. = ..()
- reagents.add_reagent("gold", 5)
+ reagents.add_reagent(REAGENT_ID_GOLD, 5)
///////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////Soups/////////////////////////////////////////////////
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index 1c1fffe6a5..42f20a2527 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -154,7 +154,7 @@
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"
- prefill = list("adminordrazine" = 60)
+ prefill = list(REAGENT_ID_ADMINORDRAZINE = 60)
/obj/item/reagent_containers/glass/bottle/capsaicin
name = "capsaicin bottle"
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index ac4e2083b2..8f83e0b47d 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -92,7 +92,7 @@
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
- if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent("earthsblood"))
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 733b0c933a..6a49d3c725 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -462,7 +462,7 @@
if(additional_chems)
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
- "adminordrazine",
+ REAGENT_ID_ADMINORDRAZINE,
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm
index ff909ff146..ccabfacca7 100644
--- a/code/modules/hydroponics/seedtypes/apples.dm
+++ b/code/modules/hydroponics/seedtypes/apples.dm
@@ -31,7 +31,7 @@
display_name = "gold apple tree"
kitchen_tag = "goldapple"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_GOLD = list(1,5))
/datum/seed/apple/gold/New()
..()
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index f10585a8e9..e29c122f23 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -74,7 +74,7 @@
"ammonia" = 1,
"diethylamine" = 2,
REAGENT_ID_NUTRIMENT = 1,
- "adminordrazine" = 1,
+ REAGENT_ID_ADMINORDRAZINE = 1,
"eznutrient" = 1,
"robustharvest" = 1,
"left4zed" = 1
@@ -87,16 +87,16 @@
REAGENT_ID_SACID = -2,
REAGENT_ID_PACID = -4,
"plantbgone" = -8,
- "adminordrazine" = -5
+ REAGENT_ID_ADMINORDRAZINE = -5
)
var/static/list/pestkiller_reagents = list(
REAGENT_ID_SUGAR = 2,
"diethylamine" = -2,
- "adminordrazine" = -5
+ REAGENT_ID_ADMINORDRAZINE = -5
)
var/static/list/water_reagents = list(
REAGENT_ID_WATER = 1,
- "adminordrazine" = 1,
+ REAGENT_ID_ADMINORDRAZINE = 1,
"milk" = 0.9,
"beer" = 0.7,
REAGENT_ID_FLUORINE = -0.5,
@@ -121,7 +121,7 @@
"diethylamine" = list( 1, 0, 0 ),
REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
REAGENT_ID_RADIUM = list( -1.5, 0, 0.2),
- "adminordrazine" = list( 1, 1, 1 ),
+ REAGENT_ID_ADMINORDRAZINE = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2)
)
diff --git a/code/modules/mining/alloys_vr.dm b/code/modules/mining/alloys_vr.dm
index b04f5d197e..a32d5ff6c3 100644
--- a/code/modules/mining/alloys_vr.dm
+++ b/code/modules/mining/alloys_vr.dm
@@ -1,9 +1,9 @@
/datum/alloy/plastitanium
metaltag = MAT_PLASTITANIUM
requires = list(
- "rutile" = 1,
- "platinum" = 1,
- REAGENT_ID_CARBON = 2,
+ ORE_RUTILE = 1,
+ ORE_PLATINUM = 1,
+ ORE_CARBON = 2,
)
product_mod = 0.3
product = /obj/item/stack/material/plastitanium
@@ -11,8 +11,8 @@
/datum/alloy/tiglass
metaltag = MAT_TITANIUMGLASS
requires = list(
- "rutile" = 1,
- "sand" = 2
+ ORE_RUTILE = 1,
+ ORE_SAND = 2
)
product_mod = 1
product = /obj/item/stack/material/glass/titanium
@@ -20,10 +20,10 @@
/datum/alloy/plastiglass
metaltag = MAT_PLASTITANIUMGLASS
requires = list(
- "rutile" = 1,
- "sand" = 2,
- "platinum" = 1,
- REAGENT_ID_CARBON = 2,
+ ORE_RUTILE = 1,
+ ORE_SAND = 2,
+ ORE_PLATINUM = 1,
+ ORE_CARBON = 2,
)
product_mod = 1
product = /obj/item/stack/material/glass/plastitanium
diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm
index 240a1d564a..4861b42171 100644
--- a/code/modules/reagents/machinery/grinder.dm
+++ b/code/modules/reagents/machinery/grinder.dm
@@ -16,21 +16,21 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
/obj/item/stack/material/deuterium = list(REAGENT_ID_HYDROGEN),
/obj/item/stack/material/glass/phoronrglass = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_PHORON,REAGENT_ID_PHORON),
/obj/item/stack/material/diamond = list(REAGENT_ID_CARBON),
- /obj/item/stack/material/durasteel = list(REAGENT_ID_IRON,REAGENT_ID_IRON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"platinum"),
+ /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/phoron = list(REAGENT_ID_PHORON),
- /obj/item/stack/material/gold = list("gold"),
- /obj/item/stack/material/silver = list("silver"),
- /obj/item/stack/material/platinum = list("platinum"),
+ /obj/item/stack/material/gold = list(REAGENT_ID_GOLD),
+ /obj/item/stack/material/silver = list(REAGENT_ID_SILVER),
+ /obj/item/stack/material/platinum = list(REAGENT_ID_PLATINUM),
/obj/item/stack/material/mhydrogen = list(REAGENT_ID_HYDROGEN),
/obj/item/stack/material/steel = list(REAGENT_ID_IRON, REAGENT_ID_CARBON),
- /obj/item/stack/material/plasteel = list(REAGENT_ID_IRON, REAGENT_ID_IRON, REAGENT_ID_CARBON, REAGENT_ID_CARBON, "platinum"), //8 iron, 8 carbon, 4 platinum,
+ /obj/item/stack/material/plasteel = list(REAGENT_ID_IRON, REAGENT_ID_IRON, REAGENT_ID_CARBON, REAGENT_ID_CARBON, REAGENT_ID_PLATINUM), //8 iron, 8 carbon, 4 platinum,
/obj/item/stack/material/snow = list(REAGENT_ID_WATER),
/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("platinum", REAGENT_ID_SILICON, REAGENT_ID_SILICON, REAGENT_ID_SILICON), //5 platinum, 15 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")
)
var/global/list/ore_reagents = list( //have a number of reageents divisible by REAGENTS_PER_ORE (default 20) unless you like decimals.
@@ -38,12 +38,12 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
/obj/item/ore/iron = list(REAGENT_ID_IRON),
/obj/item/ore/coal = list(REAGENT_ID_CARBON),
/obj/item/ore/phoron = list(REAGENT_ID_PHORON),
- /obj/item/ore/silver = list("silver"),
- /obj/item/ore/gold = list("gold"),
+ /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/diamond = list(REAGENT_ID_CARBON),
- /obj/item/ore/osmium = list("platinum"), // should contain osmium
+ /obj/item/ore/osmium = list(REAGENT_ID_PLATINUM), // should contain osmium
/obj/item/ore/lead = list(REAGENT_ID_LEAD),
/obj/item/ore/hydrogen = list(REAGENT_ID_HYDROGEN),
/obj/item/ore/verdantium = list(REAGENT_ID_RADIUM,REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,REAGENT_ID_PHOSPHORUS,REAGENT_ID_SODIUM), // Some fun stuff to be useful with
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 19ce0d2c2b..a982f23083 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -51,14 +51,14 @@
name = "Goldschlager"
id = "goldschlager"
result = "goldschlager"
- required_reagents = list("vodka" = 10, "gold" = 1)
+ required_reagents = list("vodka" = 10, REAGENT_ID_GOLD = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/patron
name = "Patron"
id = "patron"
result = "patron"
- required_reagents = list("tequilla" = 10, "silver" = 1)
+ required_reagents = list("tequilla" = 10, REAGENT_ID_SILVER = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/bilk
@@ -1254,7 +1254,7 @@
name = "Angel Ichor"
id = "holywine"
result = "holywine"
- required_reagents = list("grapejuice" = 5, "gold" = 5)
+ required_reagents = list("grapejuice" = 5, REAGENT_ID_GOLD = 5)
catalysts = list("holywater" = 5)
result_amount = 10
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 7fbec5f420..78ff290c7c 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -575,21 +575,21 @@
/decl/chemical_reaction/instant/solidification/silver
name = "Solid Silver"
id = "solidsilver"
- required_reagents = list("frostoil" = 5, "silver" = REAGENTS_PER_SHEET)
+ required_reagents = list("frostoil" = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/silver
/decl/chemical_reaction/instant/solidification/gold
name = "Solid Gold"
id = "solidgold"
- required_reagents = list("frostoil" = 5, "gold" = REAGENTS_PER_SHEET)
+ required_reagents = list("frostoil" = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/gold
/decl/chemical_reaction/instant/solidification/platinum
name = "Solid Platinum"
id = "solidplatinum"
- required_reagents = list("frostoil" = 5, "platinum" = REAGENTS_PER_SHEET)
+ required_reagents = list("frostoil" = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/platinum
@@ -898,8 +898,8 @@
/decl/chemical_reaction/instant/red_paint
name = "Red paint"
id = "red_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_red" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1)
result_amount = 5
/decl/chemical_reaction/instant/red_paint/send_data()
@@ -908,8 +908,8 @@
/decl/chemical_reaction/instant/orange_paint
name = "Orange paint"
id = "orange_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_orange" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1)
result_amount = 5
/decl/chemical_reaction/instant/orange_paint/send_data()
@@ -918,8 +918,8 @@
/decl/chemical_reaction/instant/yellow_paint
name = "Yellow paint"
id = "yellow_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_yellow" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1)
result_amount = 5
/decl/chemical_reaction/instant/yellow_paint/send_data()
@@ -928,8 +928,8 @@
/decl/chemical_reaction/instant/green_paint
name = "Green paint"
id = "green_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_green" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1)
result_amount = 5
/decl/chemical_reaction/instant/green_paint/send_data()
@@ -938,8 +938,8 @@
/decl/chemical_reaction/instant/blue_paint
name = "Blue paint"
id = "blue_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_blue" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1)
result_amount = 5
/decl/chemical_reaction/instant/blue_paint/send_data()
@@ -948,8 +948,8 @@
/decl/chemical_reaction/instant/purple_paint
name = "Purple paint"
id = "purple_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_purple" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1)
result_amount = 5
/decl/chemical_reaction/instant/purple_paint/send_data()
@@ -958,8 +958,8 @@
/decl/chemical_reaction/instant/grey_paint //mime
name = "Grey paint"
id = "grey_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_grey" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1)
result_amount = 5
/decl/chemical_reaction/instant/grey_paint/send_data()
@@ -968,8 +968,8 @@
/decl/chemical_reaction/instant/brown_paint
name = "Brown paint"
id = "brown_paint"
- result = "paint"
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_brown" = 1)
+ result = REAGENT_ID_PAINT
+ required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1)
result_amount = 5
/decl/chemical_reaction/instant/brown_paint/send_data()
@@ -978,7 +978,7 @@
/decl/chemical_reaction/instant/blood_paint
name = "Blood paint"
id = "blood_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
result_amount = 5
@@ -991,7 +991,7 @@
/decl/chemical_reaction/instant/milk_paint
name = "Milk paint"
id = "milk_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "milk" = 5)
result_amount = 5
@@ -1001,7 +1001,7 @@
/decl/chemical_reaction/instant/orange_juice_paint
name = "Orange juice paint"
id = "orange_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5)
result_amount = 5
@@ -1011,7 +1011,7 @@
/decl/chemical_reaction/instant/tomato_juice_paint
name = "Tomato juice paint"
id = "tomato_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5)
result_amount = 5
@@ -1021,7 +1021,7 @@
/decl/chemical_reaction/instant/lime_juice_paint
name = "Lime juice paint"
id = "lime_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "limejuice" = 5)
result_amount = 5
@@ -1031,7 +1031,7 @@
/decl/chemical_reaction/instant/carrot_juice_paint
name = "Carrot juice paint"
id = "carrot_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5)
result_amount = 5
@@ -1041,7 +1041,7 @@
/decl/chemical_reaction/instant/berry_juice_paint
name = "Berry juice paint"
id = "berry_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5)
result_amount = 5
@@ -1051,7 +1051,7 @@
/decl/chemical_reaction/instant/grape_juice_paint
name = "Grape juice paint"
id = "grape_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5)
result_amount = 5
@@ -1061,7 +1061,7 @@
/decl/chemical_reaction/instant/poisonberry_juice_paint
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5)
result_amount = 5
@@ -1071,7 +1071,7 @@
/decl/chemical_reaction/instant/watermelon_juice_paint
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5)
result_amount = 5
@@ -1081,7 +1081,7 @@
/decl/chemical_reaction/instant/lemon_juice_paint
name = "Lemon juice paint"
id = "lemon_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5)
result_amount = 5
@@ -1091,7 +1091,7 @@
/decl/chemical_reaction/instant/banana_juice_paint
name = "Banana juice paint"
id = "banana_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "banana" = 5)
result_amount = 5
@@ -1101,7 +1101,7 @@
/decl/chemical_reaction/instant/potato_juice_paint
name = "Potato juice paint"
id = "potato_juice_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5)
result_amount = 5
@@ -1111,7 +1111,7 @@
/decl/chemical_reaction/instant/carbon_paint
name = "Carbon paint"
id = "carbon_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1)
result_amount = 5
@@ -1121,7 +1121,7 @@
/decl/chemical_reaction/instant/aluminum_paint
name = "Aluminum paint"
id = "aluminum_paint"
- result = "paint"
+ result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1)
result_amount = 5
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index e23f019a36..4e50bf488c 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -156,7 +156,7 @@
/obj/item/reagent_containers/pill/adminordrazine/Initialize()
. = ..()
- reagents.add_reagent("adminordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_ADMINORDRAZINE, 5)
/obj/item/reagent_containers/pill/stox
diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm
index d99f8217f8..e673679c1b 100644
--- a/code/modules/reagents/reagents/other.dm
+++ b/code/modules/reagents/reagents/other.dm
@@ -1,8 +1,8 @@
/* Paint and crayons */
/datum/reagent/crayon_dust
- name = "Crayon dust"
- id = "crayon_dust"
+ name = REAGENT_CRAYONDUST
+ id = REAGENT_ID_CRAYONDUST
description = "Intensely coloured powder obtained by grinding crayons."
taste_description = "powdered wax"
reagent_state = LIQUID
@@ -10,48 +10,48 @@
overdose = 5
/datum/reagent/crayon_dust/red
- name = "Red crayon dust"
- id = "crayon_dust_red"
+ name = REAGENT_CRAYONDUSTRED
+ id = REAGENT_ID_CRAYONDUSTRED
color = "#FE191A"
/datum/reagent/crayon_dust/orange
- name = "Orange crayon dust"
- id = "crayon_dust_orange"
+ name = REAGENT_CRAYONDUSTORANGE
+ id = REAGENT_ID_CRAYONDUSTORANGE
color = "#FFBE4F"
/datum/reagent/crayon_dust/yellow
- name = "Yellow crayon dust"
- id = "crayon_dust_yellow"
+ name = REAGENT_CRAYONDUSTYELLOW
+ id = REAGENT_ID_CRAYONDUSTYELLOW
color = "#FDFE7D"
/datum/reagent/crayon_dust/green
- name = "Green crayon dust"
- id = "crayon_dust_green"
+ name = REAGENT_CRAYONDUSTGREEN
+ id = REAGENT_ID_CRAYONDUSTGREEN
color = "#18A31A"
/datum/reagent/crayon_dust/blue
- name = "Blue crayon dust"
- id = "crayon_dust_blue"
+ name = REAGENT_CRAYONDUSTBLUE
+ id = REAGENT_ID_CRAYONDUSTBLUE
color = "#247CFF"
/datum/reagent/crayon_dust/purple
- name = "Purple crayon dust"
- id = "crayon_dust_purple"
+ name = REAGENT_CRAYONDUSTPURPLE
+ id = REAGENT_ID_CRAYONDUSTPURPLE
color = "#CC0099"
/datum/reagent/crayon_dust/grey //Mime
- name = "Grey crayon dust"
- id = "crayon_dust_grey"
+ name = REAGENT_CRAYONDUSTGREY
+ id = REAGENT_ID_CRAYONDUSTGREY
color = "#808080"
/datum/reagent/crayon_dust/brown //Rainbow
- name = "Brown crayon dust"
- id = "crayon_dust_brown"
+ name = REAGENT_CRAYONDUSTBROWN
+ id = REAGENT_ID_CRAYONDUSTBROWN
color = "#846F35"
/datum/reagent/marker_ink
- name = "Marker ink"
- id = "marker_ink"
+ name = REAGENT_MARKERINK
+ id = REAGENT_ID_MARKERINK
description = "Intensely coloured ink used in markers."
taste_description = "extremely bitter"
reagent_state = LIQUID
@@ -59,53 +59,53 @@
overdose = 5
/datum/reagent/marker_ink/black
- name = "Black marker ink"
- id = "marker_ink_black"
+ name = REAGENT_MARKERINKBLACK
+ id = REAGENT_ID_MARKERINKBLACK
color = "#000000"
/datum/reagent/marker_ink/red
- name = "Red marker ink"
- id = "marker_ink_red"
+ name = REAGENT_MARKERINKRED
+ id = REAGENT_ID_MARKERINKRED
color = "#FE191A"
/datum/reagent/marker_ink/orange
- name = "Orange marker ink"
- id = "marker_ink_orange"
+ name = REAGENT_MARKERINKORANGE
+ id = REAGENT_ID_MARKERINKORANGE
color = "#FFBE4F"
/datum/reagent/marker_ink/yellow
- name = "Yellow marker ink"
- id = "marker_ink_yellow"
+ name = REAGENT_MARKERINKYELLOW
+ id = REAGENT_ID_MARKERINKYELLOW
color = "#FDFE7D"
/datum/reagent/marker_ink/green
- name = "Green marker ink"
- id = "marker_ink_green"
+ name = REAGENT_MARKERINKGREEN
+ id = REAGENT_ID_MARKERINKGREEN
color = "#18A31A"
/datum/reagent/marker_ink/blue
- name = "Blue marker ink"
- id = "marker_ink_blue"
+ name = REAGENT_MARKERINKBLUE
+ id = REAGENT_ID_MARKERINKBLUE
color = "#247CFF"
/datum/reagent/marker_ink/purple
- name = "Purple marker ink"
- id = "marker_ink_purple"
+ name = REAGENT_MARKERINKPURPLE
+ id = REAGENT_ID_MARKERINKPURPLE
color = "#CC0099"
/datum/reagent/marker_ink/grey //Mime
- name = "Grey marker ink"
- id = "marker_ink_grey"
+ name = REAGENT_MARKERINKGREY
+ id = REAGENT_ID_MARKERINKGREY
color = "#808080"
/datum/reagent/marker_ink/brown //Rainbow
- name = "Brown marker ink"
- id = "marker_ink_brown"
+ name = REAGENT_MARKERINKBROWN
+ id = REAGENT_ID_MARKERINKBROWN
color = "#846F35"
/datum/reagent/paint
- name = "Paint"
- id = "paint"
+ name = REAGENT_PAINT
+ id = REAGENT_ID_PAINT
description = "This paint will stick to almost any object."
taste_description = "chalk"
reagent_state = LIQUID
@@ -164,8 +164,8 @@
/* Things that didn't fit anywhere else */
/datum/reagent/adminordrazine //An OP chemical for admins
- name = "Adminordrazine"
- id = "adminordrazine"
+ name = REAGENT_ADMINORDRAZINE
+ id = REAGENT_ID_ADMINORDRAZINE
description = "It's magic. We don't have to explain it."
taste_description = "bwoink"
reagent_state = LIQUID
@@ -232,24 +232,24 @@
O.wounds -= W
/datum/reagent/gold
- name = "Gold"
- id = "gold"
+ name = REAGENT_GOLD
+ id = REAGENT_ID_GOLD
description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
taste_description = "metal"
reagent_state = SOLID
color = "#F7C430"
/datum/reagent/silver
- name = "Silver"
- id = "silver"
+ name = REAGENT_SILVER
+ id = REAGENT_ID_SILVER
description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
taste_description = "metal"
reagent_state = SOLID
color = "#D0D0D0"
/datum/reagent/platinum
- name = "Platinum"
- id = "platinum"
+ name = REAGENT_PLATINUM
+ id = REAGENT_ID_PLATINUM
description = "Platinum is a dense, malleable, ductile, highly unreactive, precious, gray-white transition metal. It is very resistant to corrosion."
taste_description = "metal"
reagent_state = SOLID
diff --git a/code/modules/research/designs/bag_of_holding.dm b/code/modules/research/designs/bag_of_holding.dm
index 7fcb67a04a..da4935a21b 100644
--- a/code/modules/research/designs/bag_of_holding.dm
+++ b/code/modules/research/designs/bag_of_holding.dm
@@ -36,7 +36,7 @@
desc = "Considerably more utilitarian than the Bag of Holding, the Trashbag of Holding is a janitor's best friend."
id = "trashbag_holding"
req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5)
- materials = list("gold" = 2000, "diamond" = 1000, "uranium" = 250)
+ materials = list(MAT_GOLD = 2000, MAT_DIAMOND = 1000, MAT_URANIUM = 250)
build_path = /obj/item/storage/bag/trash/holding
sort_string = "QAAAC"
@@ -45,17 +45,17 @@
desc = "Somehow compresses the storage of a backpack into a pouch-sized container!"
id = "pouch_holding"
req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5)
- materials = list("gold" = 3000, "diamond" = 2000, "uranium" = 250)
+ materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_URANIUM = 250)
build_path = /obj/item/storage/pouch/holding
sort_string = "QAAAD"
-
+
/datum/design/item/boh/belt_holding_med
name = "Medical Belt of Holding"
desc = "A belt that uses localized bluespace pockets to hold more items than expected!"
id = "belt_holding_med"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
- materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500)
+ materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_TITANIUM = 500)
build_path = /obj/item/storage/belt/medical/holding
sort_string = "QAAAE"
@@ -64,7 +64,6 @@
desc = "A belt that uses localized bluespace pockets to hold more items than expected!"
id = "belt_holding_utility"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
- materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500)
+ materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_TITANIUM = 500)
build_path = /obj/item/storage/belt/utility/holding
sort_string = "QAAAF"
-
\ No newline at end of file
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index e4b0825ba3..26e266ee0c 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -1044,20 +1044,20 @@
//List in list, define by material property of ore in code/mining/modules/ore.dm.
//50 nutrition = 5 ore to get 250 nutrition. 250 is the beginning of the 'well fed' range.
var/list/rock_munch = list(
- MAT_URANIUM = list("nutrition" = 30, "remark" = "Crunching [O] in your jaws almost makes you wince, a horribly tangy and sour flavour radiating through your mouth. It goes down all the same.", "WTF" = FALSE),
- "hematite" = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
- REAGENT_ID_CARBON = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE),
- "marble" = list("nutrition" = 40, "remark" = "A fitting dessert, the sweet and savoury [O] lingers on the palate and satisfies your hunger.", "WTF" = FALSE),
- "sand" = list("nutrition" = 0, "remark" = "You crunch on [O] but its texture is almost gag-inducing. Stifling a cough, you somehow manage to swallow both [O] and your regrets.", "WTF" = FALSE),
- MAT_PHORON = list("nutrition" = 30, "remark" = "Crunching [O] to dust between your jaw you find pleasant, comforting warmth filling your mouth that briefly spreads down the throat to your chest as you swallow.", "WTF" = FALSE),
- MAT_SILVER = list("nutrition" = 40, "remark" = "[O] tastes quite nice indeed as you munch on it. A little tarnished, but that's just fine aging.", "WTF" = FALSE),
- MAT_GOLD = list("nutrition" = 40, "remark" = "You taste supreme richness that exceeds expectations and satisfies your hunger.", "WTF" = FALSE),
- MAT_DIAMOND = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly.", "WTF" = FALSE),
- "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
- MAT_METALHYDROGEN = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE),
- "rutile" = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly.", "WTF" = FALSE),
- MAT_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
- MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE)
+ ORE_URANIUM = list("nutrition" = 30, "remark" = "Crunching [O] in your jaws almost makes you wince, a horribly tangy and sour flavour radiating through your mouth. It goes down all the same.", "WTF" = FALSE),
+ ORE_HEMATITE = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
+ ORE_CARBON = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE),
+ ORE_MARBLE = list("nutrition" = 40, "remark" = "A fitting dessert, the sweet and savoury [O] lingers on the palate and satisfies your hunger.", "WTF" = FALSE),
+ ORE_SAND = list("nutrition" = 0, "remark" = "You crunch on [O] but its texture is almost gag-inducing. Stifling a cough, you somehow manage to swallow both [O] and your regrets.", "WTF" = FALSE),
+ ORE_PHORON = list("nutrition" = 30, "remark" = "Crunching [O] to dust between your jaw you find pleasant, comforting warmth filling your mouth that briefly spreads down the throat to your chest as you swallow.", "WTF" = FALSE),
+ ORE_SILVER = list("nutrition" = 40, "remark" = "[O] tastes quite nice indeed as you munch on it. A little tarnished, but that's just fine aging.", "WTF" = FALSE),
+ ORE_GOLD = list("nutrition" = 40, "remark" = "You taste supreme richness that exceeds expectations and satisfies your hunger.", "WTF" = FALSE),
+ ORE_DIAMOND = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly.", "WTF" = FALSE),
+ ORE_PLATINUM = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
+ ORE_MHYDROGEN = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE),
+ ORE_RUTILE = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly.", "WTF" = FALSE),
+ ORE_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
+ ORE_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE)
)
if(O.material in rock_munch)
nom = rock_munch[O.material]
@@ -1085,18 +1085,18 @@
MAT_PLASTITANIUM = list("nutrition" = 60, "remark" = "A glorious marriage of richness and mildly sour with cool refreshing finish. [O] practically begs to be savoured, lingering on the palate long enough to tempt another bite.", "WTF" = FALSE),
MAT_PLASTITANIUMGLASS = list("nutrition" = 25, "remark" = "After some work, you grind [O] down with a satisfying crunch to unleash a sublime mixture of mildly sour richness and cooling refreshment. It readily entices you for another bite.", "WTF" = FALSE),
MAT_GLASS = list("nutrition" = 0, "remark" = "All crunch and nothing more, you effortlessly grind [O] down to find it only wets your appetite and dries the throat.", "WTF" = FALSE),
- "rglass" = list("nutrition" = 5, "remark" = "With a satisfying crunch, you grind [O] down with ease. It is barely palatable with a subtle metallic tang.", "WTF" = FALSE),
+ MAT_RGLASS = list("nutrition" = 5, "remark" = "With a satisfying crunch, you grind [O] down with ease. It is barely palatable with a subtle metallic tang.", "WTF" = FALSE),
MAT_BOROSILICATE = list("nutrition" = 10, "remark" = "With a satisfying crunch, you grind [O] down with ease and find it somewhat palatable due to a subtle but familiar rush of phoronic warmth.", "WTF" = FALSE),
- "reinforced borosilicate glass" = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE),
+ MAT_RPGLASS = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE),
MAT_GRAPHITE = list("nutrition" = 30, "remark" = "Satisfyingly metallic with a mildly savoury tartness, you chew [O] until its flavour is no more but are left longing for another.", "WTF" = FALSE),
MAT_OSMIUM = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectable.", "WTF" = FALSE),
MAT_METALHYDROGEN = list("nutrition" = 35, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE),
- "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
+ MAT_PLATINUM = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
MAT_IRON = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE),
MAT_VERDANTIUM = list("nutrition" = 55, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
MAT_MORPHIUM = list("nutrition" = 75, "remark" = "The question, the answer and the taste: It all floods your mouth and your mind to momentarily overwhelm the senses. What the hell was that? Your mouth and throat are left tingling for a while.", "WTF" = 10),
- "alienalloy" = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15)
+ MAT_ALIENALLOY = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15)
)
if(O.default_type in refined_taste)
var/obj/item/stack/material/stack = O.split(1) //A little off the top.
diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
index 90493bd4d8..f01b9b5a3f 100644
--- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
@@ -57,7 +57,7 @@
coolant_reagents_purity["hyperzine"] = 0.8
coolant_reagents_purity["cryoxadone"] = 0.9
coolant_reagents_purity["coolant"] = 1
- coolant_reagents_purity["adminordrazine"] = 2
+ coolant_reagents_purity[REAGENT_ID_ADMINORDRAZINE] = 2
/obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob)
if(scanning)
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index 6f23ce3cf2..a564f0205a 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -157,22 +157,22 @@
/decl/chemical_reaction/instant/metamorphic/silver
name = "Morph into Silver"
id = "morph_silver"
- required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "silver" = REAGENTS_PER_SHEET)
- result = "silver"
+ required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
+ result = REAGENT_ID_SILVER
/decl/chemical_reaction/instant/metamorphic/gold
name = "Morph into Gold"
id = "morph_gold"
- required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "gold" = REAGENTS_PER_SHEET)
- result = "gold"
+ required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
+ result = REAGENT_ID_GOLD
/decl/chemical_reaction/instant/metamorphic/platinum
name = "Morph into Platinum"
id = "morph_platinum"
- required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "platinum" = REAGENTS_PER_SHEET)
- result = "platinum"
+ required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
+ result = REAGENT_ID_PLATINUM
/decl/chemical_reaction/instant/metamorphic/uranium
@@ -236,7 +236,7 @@
/decl/chemical_reaction/instant/binding/plasteel // Two parts 'steel', one part platnium matches the smelter alloy recipe.
name = "Bind into Plasteel"
id = "bind_plasteel"
- required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, "platinum" = REAGENTS_PER_SHEET)
+ required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = "plasteel"
/datum/reagent/plasteel
@@ -406,7 +406,7 @@
/decl/chemical_reaction/instant/slime/gold_gold
name = "Slime Gold"
id = "m_gold"
- result = "gold"
+ result = REAGENT_ID_GOLD
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/gold
@@ -425,7 +425,7 @@
/decl/chemical_reaction/instant/slime/silver_silver
name = "Slime Silver"
id = "m_silver"
- result = "silver"
+ result = REAGENT_ID_SILVER
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/silver
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index 36f4767a9e..532ef7dd6c 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -39,8 +39,8 @@
xenoChemList += "serotrotium"
xenoChemList += REAGENT_ID_NICOTINE
xenoChemList += "uranium"
- xenoChemList += "silver"
- xenoChemList += "gold"
+ xenoChemList += REAGENT_ID_SILVER
+ xenoChemList += REAGENT_ID_GOLD
xenoChemList += "adrenaline"
xenoChemList += "holywater"
xenoChemList += "ammonia"
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index d5ddbd9f01..989fb3b306 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -74,7 +74,7 @@ Slime definitions, Life and New live here.
"slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
"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),
- "gold" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3),
+ 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),
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 07/29] 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()
From a12a4d2d5ef6d63c8daeae1f8047c768fc73c7fe Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sat, 7 Dec 2024 01:03:25 +0100
Subject: [PATCH 08/29] toxins.dm
---
code/__defines/chemistry.dm | 6 +-
code/__defines/reagents.dm | 178 ++++++++++-----
code/datums/diseases/advance/advance.dm | 2 +-
code/datums/diseases/food_poisoning.dm | 2 +-
.../changeling/powers/death_sting.dm | 2 +-
.../changeling/powers/epinephrine_overdose.dm | 2 +-
code/game/gamemodes/newobjective.dm | 10 +-
code/game/machinery/Sleeper.dm | 6 +-
code/game/mecha/combat/combat.dm | 16 +-
code/game/mecha/micro/micro.dm | 16 +-
code/game/objects/items/contraband.dm | 8 +-
code/game/objects/items/devices/flashlight.dm | 2 +-
.../items/weapons/grenades/chem_grenade.dm | 2 +-
code/modules/blob2/core_chunk.dm | 2 +-
.../blob2/overmind/types/blazing_oil.dm | 4 +-
code/modules/clothing/accessories/rings.dm | 2 +-
code/modules/food/food/snacks.dm | 60 +++---
code/modules/food/food/snacks_vr.dm | 2 +-
code/modules/food/food/superfoods.dm | 18 +-
code/modules/food/glass/bottle.dm | 16 +-
code/modules/food/glass/bottle_potion.dm | 4 +-
code/modules/food/kitchen/microwave.dm | 2 +-
code/modules/food/recipes_fryer.dm | 2 +-
code/modules/food/recipes_grill.dm | 2 +-
code/modules/food/recipes_microwave.dm | 12 +-
code/modules/food/recipes_oven.dm | 2 +-
code/modules/hydroponics/backtank.dm | 2 +-
code/modules/hydroponics/grown.dm | 2 +-
code/modules/hydroponics/seedtypes/amauri.dm | 2 +-
.../modules/hydroponics/seedtypes/ambrosia.dm | 2 +-
code/modules/hydroponics/seedtypes/apples.dm | 4 +-
code/modules/hydroponics/seedtypes/berries.dm | 4 +-
code/modules/hydroponics/seedtypes/flowers.dm | 4 +-
code/modules/hydroponics/seedtypes/gelthi.dm | 2 +-
code/modules/hydroponics/seedtypes/jurlmah.dm | 2 +-
.../hydroponics/seedtypes/mushrooms.dm | 12 +-
code/modules/hydroponics/seedtypes/surik.dm | 2 +-
code/modules/hydroponics/seedtypes/wabback.dm | 2 +-
.../hydroponics/spreading/spreading_growth.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 20 +-
code/modules/mob/living/bot/medbot.dm | 2 +-
code/modules/mob/living/carbon/human/life.dm | 2 +-
.../carbon/human/species/station/alraune.dm | 2 +-
.../human/species/station/prometheans.dm | 2 +-
.../species/station/traits_vr/neutral.dm | 2 +-
.../mob/living/carbon/metroid/items.dm | 4 +-
.../silicon/robot/robot_modules/station.dm | 4 +-
.../animal/giant_spider/broodmother.dm | 2 +-
.../subtypes/animal/giant_spider/carrier.dm | 2 +-
.../subtypes/animal/giant_spider/electric.dm | 2 +-
.../subtypes/animal/giant_spider/lurker.dm | 2 +-
.../subtypes/animal/giant_spider/nurse.dm | 2 +-
.../subtypes/animal/giant_spider/pepper.dm | 4 +-
.../subtypes/animal/giant_spider/thermic.dm | 2 +-
.../subtypes/animal/giant_spider/tunneler.dm | 2 +-
.../subtypes/animal/passive/fish_vr.dm | 8 +-
.../subtypes/animal/sif/grafadreka.dm | 2 +-
.../simple_mob/subtypes/animal/sif/leech.dm | 2 +-
.../subtypes/mechanical/disbot_vr.dm | 2 +-
.../subtypes/slime/xenobio/subtypes.dm | 2 +-
.../simple_mob/subtypes/vore/oregrub.dm | 2 +-
code/modules/organs/blood.dm | 2 +-
code/modules/organs/internal/stomach.dm | 2 +-
code/modules/organs/organ.dm | 2 +-
code/modules/paperwork/pen.dm | 8 +-
code/modules/projectiles/projectile/arc.dm | 4 +-
code/modules/projectiles/projectile/blob.dm | 8 +-
.../machinery/dispenser/cartridge_presets.dm | 4 +-
.../dispenser/cartridge_presets_vr.dm | 4 +-
.../machinery/dispenser/dispenser2_energy.dm | 2 +-
.../dispenser/dispenser_presets_vr.dm | 2 +-
.../reactions/distilling/distilling.dm | 8 +-
.../reagents/reactions/instant/drinks.dm | 2 +-
.../reagents/reactions/instant/instant.dm | 202 +++++++++---------
.../reagents/reactions/instant/instant_vr.dm | 6 +-
.../reagents/reactions/instant/virology.dm | 4 +-
.../reagents/reagent_containers/hypospray.dm | 20 +-
.../reagents/reagent_containers/pill.dm | 12 +-
.../reagents/reagent_containers/spray.dm | 4 +-
.../reagents/reagent_containers/syringes.dm | 6 +-
code/modules/reagents/reagents/core.dm | 2 +-
code/modules/reagents/reagents/food_drinks.dm | 2 +-
code/modules/reagents/reagents/medicine.dm | 6 +-
code/modules/reagents/reagents/toxins.dm | 164 +++++++-------
code/modules/xenoarcheaology/effect_master.dm | 4 +-
code/modules/xenoarcheaology/finds/special.dm | 2 +-
code/modules/xenobio/items/extracts.dm | 4 +-
code/modules/xenobio/items/extracts_vr.dm | 50 ++---
code/modules/xenobio2/_xeno_setup.dm | 26 +--
code/modules/xenobio2/_xeno_setup_vr.dm | 22 +-
.../modules/xenobio2/mob/slime/slime procs.dm | 6 +-
code/modules/xenobio2/mob/slime/slime.dm | 20 +-
92 files changed, 592 insertions(+), 514 deletions(-)
diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index 5a8667f18c..fa1831e488 100644
--- a/code/__defines/chemistry.dm
+++ b/code/__defines/chemistry.dm
@@ -50,9 +50,9 @@
// Chemistry lists.
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
+var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
+var/list/heartstopper = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart.
+var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE) // This stops the heart when overdose is met. -- c = conditional
#define MAX_PILL_SPRITE 24 //max icon state of the pill sprites
#define MAX_BOTTLE_SPRITE 4 //max icon state of the pill sprites
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
index bf48611cf0..6924c51c0c 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -147,17 +147,6 @@
#define REAGENT_ID_VATSTABILIZER "vatstabilizer"
-// Toxins
-#define REAGENT_PACID "Polytrinic acid"
-#define REAGENT_ID_PACID "pacid"
-#define REAGEMT_PHORON "Phoron"
-#define REAGENT_ID_PHORON "phoron"
-#define REAGENT_SPIDERTOXIN "Spidertoxin"
-#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
-#define REAGENT_LEAD "Lead"
-#define REAGENT_ID_LEAD "lead"
-
-
// Medicines
#define REAGENT_ADRANOL "Adranol"
#define REAGENT_ID_ADRANOL "adranol"
@@ -179,6 +168,40 @@
#define REAGENT_ID_GLAMOUR "glamour"
+
+
+#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_
+#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_
+#define REAGENT_
+#define REAGENT_ID_
+
+
+#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
+
+
+
+
+
+
+
// Virology
#define REAGENT_VACCINE "Vaccine"
#define REAGENT_ID_VACCINE "vaccine"
@@ -327,7 +350,6 @@
#define REAGENT_ID_ESSENTIALOIL "essential_oil"
-
// Admin chems
#define REAGENT_ADMINORDRAZINE "Adminordrazine"
#define REAGENT_ID_ADMINORDRAZINE "adminordrazine"
@@ -488,49 +510,105 @@
-
-
-
-
-#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_
-#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_
-#define REAGENT_
-#define REAGENT_ID_
-
-
-
-
-
-
-
-#define REAGENT_SLIMEJELLY "Slimejelly"
+// Toxins
+#define REAGENT_TOXIN "Toxin"
+#define REAGENT_ID_TOXIN "toxin"
+#define REAGENT_PACID "Polytrinic acid"
+#define REAGENT_ID_PACID "pacid"
+#define REAGEMT_PHORON "Phoron"
+#define REAGENT_ID_PHORON "phoron"
+#define REAGENT_SPIDERTOXIN "Spidertoxin"
+#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
+#define REAGENT_LEAD "Lead"
+#define REAGENT_ID_LEAD "lead"
+#define REAGENT_PLASTICIDE "Plasticide"
+#define REAGENT_ID_PLASTICIDE "plasticide"
+#define REAGENT_AMATOXIN "Amatoxin"
+#define REAGENT_ID_AMATOXIN "amatoxin"
+#define REAGENT_CARPOTOXIN "Carpotoxin"
+#define REAGENT_ID_CARPOTOXIN "carpotoxin"
+#define REAGENT_NEUROTOXIC_PROTEIN "toxic protein"
+#define REAGENT_ID_NEUROTOXIC_PROTEIN "neurotoxic_protein"
+#define REAGENT_HYDROPHORON "Hydrophoron"
+#define REAGENT_ID_HYDROPHORON "hydrophoron"
+#define REAGENT_CYANIDE "Cyanide"
+#define REAGENT_ID_CYANIDE "cyanide"
+#define REAGENT_MOLD "Mold"
+#define REAGENT_ID_MOLD "mold"
+#define REAGENT_EXPIREDMEDICINE "Expired Medicine"
+#define REAGENT_ID_EXPIREDMEDICINE "expired_medicine"
+#define REAGENT_STIMM "Stimm"
+#define REAGENT_ID_STIMM "stimm"
+#define REAGENT_POTASSIUMCHLORIDE "Potassium Chloride"
+#define REAGENT_ID_POTASSIUMCHLORIDE "potassium_chloride"
+#define REAGENT_POTASSIUMCHLOROPHORIDE "Potassium Chlorophoride"
+#define REAGENT_ID_POTASSIUMCHLOROPHORIDE "potassium_chlorophoride"
+#define REAGENT_ZOMBIEPOWDER "Zombie Powder"
+#define REAGENT_ID_ZOMBIEPOWDER "zombiepowder"
+#define REAGENT_LICHPOWDER "Lich Powder"
+#define REAGENT_ID_LICHPOWDER "lichpowder"
+#define REAGENT_FERTILIZER "Fertilizer"
+#define REAGENT_ID_FERTILIZER "fertilizer"
+#define REAGENT_EZNUTRIENT "EZ Nutrient"
+#define REAGENT_ID_EZNUTRIENT "eznutrient"
+#define REAGENT_LEFT4ZED "Left-4-Zed"
+#define REAGENT_ID_LEFT4ZED "left4zed"
+#define REAGENT_ROBUSTHARVEST "Robust Harvest"
+#define REAGENT_ID_ROBUSTHARVEST "robustharvest"
+#define REAGENT_TANNIN "Tannin"
+#define REAGENT_ID_TANNIN "tannin"
+#define REAGENT_PLANTBGONE "Plant-B-Gone"
+#define REAGENT_ID_PLANTBGONE "plantbgone"
+#define REAGENT_SIFSAP "Sivian Sap"
+#define REAGENT_ID_SIFSAP "sifsap"
+#define REAGENT_STOMACID "Digestive acid"
+#define REAGENT_ID_STOMACID "stomacid"
+#define REAGENT_THERMITEV "Pyrotoxin"
+#define REAGENT_ID_THERMITEV "thermite_v"
+#define REAGENT_CONDENSEDCAPSAICINV "Irritant toxin"
+#define REAGENT_ID_CONDENSEDCAPSAICINV "condensedcapsaicin_v"
+#define REAGENT_LEXORIN "Lexorin"
+#define REAGENT_ID_LEXORIN "lexorin"
+#define REAGENT_MUTAGEN "Unstable mutagen"
+#define REAGENT_ID_MUTAGEN "mutagen"
+#define REAGENT_SLIMEJELLY "Slime Jelly"
#define REAGENT_ID_SLIMEJELLY "slimejelly"
-
-
-#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
+#define REAGENT_STOXIN "Soporific"
+#define REAGENT_ID_STOXIN "stoxin"
+#define REAGENT_CHLORALHYDRATE "Chloral Hydrate"
+#define REAGENT_ID_CHLORALHYDRATE "chloralhydrate"
+#define REAGENT_BEER2 REAGENT_BEER
+#define REAGENT_ID_BEER2 "beer2"
+#define REAGENT_SEROTROTIUM "Serotrotium"
+#define REAGENT_ID_SEROTROTIUM "serotrotium"
+#define REAGENT_SEROTROTIUMV "Serotropic venom"
+#define REAGENT_ID_SEROTROTIUMV "serotrotium_v"
+#define REAGENT_CRYPTOBIOLIN "Cryptobiolin"
+#define REAGENT_ID_CRYPTOBIOLIN "cryptobiolin"
+#define REAGENT_IMPEDREZENE "Impedrezene"
+#define REAGENT_ID_IMPEDREZENE "impedrezene"
+#define REAGENT_MINDBREAKER "Mindbreaker Toxin"
+#define REAGENT_ID_MINDBREAKER "mindbreaker"
+#define REAGENT_MUTATIONTOXIN "Mutation Toxin"
+#define REAGENT_ID_MUTATIONTOXIN "mutationtoxin"
+#define REAGENT_DOCILITYTOXIN "Docility Toxin"
+#define REAGENT_ID_DOCILITYTOXIN "docilitytoxin"
+#define REAGENT_SHREDDINGNANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_ID_SHREDDINGNANITES "shredding_nanites"
+#define REAGENT_IRRADIATEDNANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_ID_IRRADIATEDNANITES "irradiated_nanites"
+#define REAGENT_NEUROPHAGENANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites"
+#define REAGENT_SALMONELLA "Salmonella"
+#define REAGENT_ID_SALMONELLA "salmonella"
-Files left: food_drinks.dm, medicine.dm, toxins.dm
+
+
+
+Files left: food_drinks.dm, medicine.dm
includes: .dm
excludes: reagents.dm,ores.dm,materials.dm,mre.dm
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 16852e73ec..117a86892e 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
"spaceacillin", "glucose", REAGENT_ID_ETHANOL,
- "leporazine", "impedrezene", "hepanephrodaxon",
+ "leporazine", REAGENT_ID_IMPEDREZENE, "hepanephrodaxon",
REAGENT_ID_SILVER, REAGENT_ID_GOLD
))
diff --git a/code/datums/diseases/food_poisoning.dm b/code/datums/diseases/food_poisoning.dm
index 4c7f0eabf8..1cd43b25f2 100644
--- a/code/datums/diseases/food_poisoning.dm
+++ b/code/datums/diseases/food_poisoning.dm
@@ -5,7 +5,7 @@
spread_text = "Non-Contagious"
spread_flags = NON_CONTAGIOUS
cure_text = "Sleep"
- agent = "Salmonella"
+ agent = REAGENT_SALMONELLA
cures = list(REAGENT_ID_CHICKENSOUP)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/game/gamemodes/changeling/powers/death_sting.dm b/code/game/gamemodes/changeling/powers/death_sting.dm
index 9acb09e8b2..ed82ec0b35 100644
--- a/code/game/gamemodes/changeling/powers/death_sting.dm
+++ b/code/game/gamemodes/changeling/powers/death_sting.dm
@@ -18,6 +18,6 @@
T.silent = 10
T.Paralyse(10)
T.make_jittery(100)
- if(T.reagents) T.reagents.add_reagent("lexorin", 40)
+ if(T.reagents) T.reagents.add_reagent(REAGENT_ID_LEXORIN, 40)
feedback_add_details("changeling_powers","DTHS")
return 1
diff --git a/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm b/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm
index f2e2175dfa..47afecedee 100644
--- a/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm
+++ b/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm
@@ -35,7 +35,7 @@
C.SetWeakened(0)
C.lying = 0
C.update_canmove()
-// C.reagents.add_reagent("toxin", 10)
+// C.reagents.add_reagent(REAGENT_ID_TOXIN, 10)
C.reagents.add_reagent("epinephrine", 20)
if(src.mind.changeling.recursive_enhancement)
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 670f7dd0c3..897846fccf 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -1143,8 +1143,8 @@ datum
var/target_name
New(var/text,var/joba)
..()
- var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, "Unstable mutagen",\
- "Leporazine", "Cryptobiolin", "Lexorin ",\
+ var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\
+ "Leporazine", REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\
"Kelotane", "Dexalin", "Tricordrazine")
target_name = pick(items)
switch(target_name)
@@ -1154,13 +1154,13 @@ datum
steal_target = /datum/reagent/pacid
if(REAGENT_LUBE)
steal_target = /datum/reagent/lube
- if("Unstable mutagen")
+ if(REAGENT_MUTAGEN)
steal_target = /datum/reagent/mutagen
if("Leporazine")
steal_target = /datum/reagent/leporazine
- if("Cryptobiolin")
+ if(REAGENT_CRYPTOBIOLIN)
steal_target =/datum/reagent/cryptobiolin
- if("Lexorin")
+ if(REAGENT_LEXORIN)
steal_target = /datum/reagent/lexorin
if("Kelotane")
steal_target = /datum/reagent/kelotane
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index ee418024f8..e0a146a820 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -150,9 +150,9 @@
if(man_rating >= 4) // Alien tech.
var/reag_ID = pickweight(list(
"healing_nanites" = 10,
- "shredding_nanites" = 5,
- "irradiated_nanites" = 5,
- "neurophage_nanites" = 2)
+ REAGENT_ID_SHREDDINGNANITES = 5,
+ REAGENT_ID_IRRADIATEDNANITES = 5,
+ REAGENT_ID_NEUROPHAGENANITES = 2)
)
new_chemicals[reag_ID] = "Nanite"
if(man_rating >= 3) // Anomalous tech.
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index a1f2d214e0..49363929a5 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -69,10 +69,10 @@
update |= temp.take_damage(0, rand(force/2, force))
if("tox")
if(H.reagents)
- if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2)
- H.reagents.add_reagent("carpotoxin", force)
- if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
- H.reagents.add_reagent("cryptobiolin", force)
+ if(H.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+ H.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+ if(H.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+ H.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
if("halloss")
H.stun_effect_act(1, force / 2, BP_TORSO, src)
else
@@ -89,10 +89,10 @@
M.take_overall_damage(0, rand(force/2, force))
if("tox")
if(M.reagents)
- if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2)
- M.reagents.add_reagent("carpotoxin", force)
- if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
- M.reagents.add_reagent("cryptobiolin", force)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+ M.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+ M.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
else
return
M.updatehealth()
diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm
index f4d1b6ffe4..f28663c044 100644
--- a/code/game/mecha/micro/micro.dm
+++ b/code/game/mecha/micro/micro.dm
@@ -55,10 +55,10 @@
update |= temp.take_damage(0, rand(force/2, force))
if("tox")
if(H.reagents)
- if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2)
- H.reagents.add_reagent("carpotoxin", force)
- if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
- H.reagents.add_reagent("cryptobiolin", force)
+ if(H.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+ H.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+ if(H.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+ H.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
else
return
if(update) H.UpdateDamageIcon()
@@ -73,10 +73,10 @@
M.take_overall_damage(0, rand(force/2, force))
if("tox")
if(M.reagents)
- if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2)
- M.reagents.add_reagent("carpotoxin", force)
- if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
- M.reagents.add_reagent("cryptobiolin", force)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+ M.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+ M.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
else
return
M.updatehealth()
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index d423ab76a4..2311d092bb 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -21,10 +21,10 @@
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
- list("mindbreaker" = 10, REAGENT_ID_BLISS = 20) = 3,
- list("carpotoxin" = 15) = 2,
- list("impedrezene" = 15) = 2,
- list("zombiepowder" = 10) = 1)
+ list(REAGENT_ID_MINDBREAKER = 10, REAGENT_ID_BLISS = 20) = 3,
+ list(REAGENT_ID_CARPOTOXIN = 15) = 2,
+ list(REAGENT_ID_IMPEDREZENE = 15) = 2,
+ list(REAGENT_ID_ZOMBIEPOWDER = 10) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/Initialize()
. = ..()
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 4b520e4ace..3a0bd663d9 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -150,7 +150,7 @@
to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
- var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,"mindbreaker"=1)
+ var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,REAGENT_ID_MINDBREAKER=1)
if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating))
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index e8e7bdfa79..03801310ac 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -258,7 +258,7 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
- B1.reagents.add_reagent("plantbgone", 25)
+ B1.reagents.add_reagent(REAGENT_ID_PLANTBGONE, 25)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 25)
B2.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 25)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 25)
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index ec9c69d2ac..242a99f8a5 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -142,7 +142,7 @@
name = "Allied Blob Revival"
id = "blob_friend"
result = null
- required_reagents = list("hydrophoron" = 40, "peridaxon" = 20, "mutagen" = 20)
+ required_reagents = list(REAGENT_ID_HYDROPHORON = 40, "peridaxon" = 20, REAGENT_ID_MUTAGEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)
diff --git a/code/modules/blob2/overmind/types/blazing_oil.dm b/code/modules/blob2/overmind/types/blazing_oil.dm
index 5ceef2e643..0f3020fe33 100644
--- a/code/modules/blob2/overmind/types/blazing_oil.dm
+++ b/code/modules/blob2/overmind/types/blazing_oil.dm
@@ -33,7 +33,7 @@
env.add_thermal_energy(10 * 1000)
/datum/blob_type/blazing_oil/on_chunk_tick(obj/item/blobcore_chunk/B)
- B.reagents.add_reagent("thermite_v", 0.5)
+ B.reagents.add_reagent(REAGENT_ID_THERMITEV, 0.5)
var/turf/T = get_turf(B)
if(!T)
@@ -44,4 +44,4 @@
/datum/blob_type/blazing_oil/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user)
user.add_modifier(/datum/modifier/exothermic, 5 MINUTES)
- return
\ No newline at end of file
+ return
diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm
index 361c87c854..828402da13 100644
--- a/code/modules/clothing/accessories/rings.dm
+++ b/code/modules/clothing/accessories/rings.dm
@@ -73,7 +73,7 @@
/obj/item/clothing/accessory/ring/reagent/sleepy/Initialize()
. = ..()
- reagents.add_reagent("chloralhydrate", 15) // Less than a sleepy-pen, but still enough to knock someone out
+ reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 15) // Less than a sleepy-pen, but still enough to knock someone out
/////////////////////////////////////////
//Seals and Signet Rings
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 4167cdf798..6502e04ec4 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -801,7 +801,7 @@
if(6)
reagents.add_reagent("coco", 3)
if(7)
- reagents.add_reagent("slimejelly", 3)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 3)
if(8)
reagents.add_reagent("banana", 3)
if(9)
@@ -821,7 +821,7 @@
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize()
. = ..()
- reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly
filling_color = "#ED1169"
@@ -934,7 +934,7 @@
/obj/item/reagent_containers/food/snacks/organ/Initialize()
. = ..()
reagents.add_reagent("protein", rand(3,5))
- reagents.add_reagent("toxin", rand(1,3))
+ reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,3))
/obj/item/reagent_containers/food/snacks/tofu
name = "Tofu"
@@ -974,7 +974,7 @@
center_of_mass = list("x"=17, "y"=13)
bitesize = 6
- var/toxin_type = "carpotoxin"
+ var/toxin_type = REAGENT_ID_CARPOTOXIN
var/toxin_amount = 3
/obj/item/reagent_containers/food/snacks/carpmeat/Initialize()
@@ -994,7 +994,7 @@
/obj/item/reagent_containers/food/snacks/carpmeat/ray
desc = "A fillet of space ray meat."
- toxin_type = "stoxin"
+ toxin_type = REAGENT_ID_STOXIN
/obj/item/reagent_containers/food/snacks/carpmeat/gnat
desc = "A paltry sample of space-gnat meat. It looks pretty stringy and unpleasant, honestly."
@@ -1517,7 +1517,7 @@
/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize()
. = ..()
- reagents.add_reagent("amatoxin", 3)
+ reagents.add_reagent(REAGENT_ID_AMATOXIN, 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1)
/obj/item/reagent_containers/food/snacks/plump_pie
@@ -1785,7 +1785,7 @@
/obj/item/reagent_containers/food/snacks/badrecipe/Initialize()
. = ..()
- reagents.add_reagent("toxin", 1)
+ reagents.add_reagent(REAGENT_ID_TOXIN, 1)
reagents.add_reagent(REAGENT_ID_CARBON, 3)
/obj/item/reagent_containers/food/snacks/meatsteak
@@ -1831,7 +1831,7 @@
/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize()
. = ..()
- reagents.add_reagent("amatoxin", 6)
+ reagents.add_reagent(REAGENT_ID_AMATOXIN, 6)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/poppypretzel
@@ -2043,7 +2043,7 @@
/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize()
. = ..()
- reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/honeytoast
name = "Honeyed Toast"
@@ -2077,7 +2077,7 @@
/obj/item/reagent_containers/food/snacks/jellyburger/slime/Initialize()
. = ..()
- reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize()
. = ..()
@@ -2317,7 +2317,7 @@
/obj/item/reagent_containers/food/snacks/jellysandwich/slime/Initialize()
. = ..()
- reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize()
. = ..()
@@ -2341,7 +2341,7 @@
/obj/item/reagent_containers/food/snacks/boiledslimecore/Initialize()
. = ..()
- reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
@@ -2443,7 +2443,7 @@
/obj/item/reagent_containers/food/snacks/slimesoup/Initialize()
. = ..()
- reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/bloodsoup
@@ -2547,11 +2547,11 @@
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
if(7)
- reagents.add_reagent("slimejelly", 10)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(8)
reagents.add_reagent(REAGENT_ID_CARBON, 10)
- reagents.add_reagent("toxin", 10)
+ reagents.add_reagent(REAGENT_ID_TOXIN, 10)
if(9)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent("tomatojuice", 10)
@@ -3438,7 +3438,7 @@
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
reagents.add_reagent("bicaridine", 1)
reagents.add_reagent("kelotane", 1)
- reagents.add_reagent("toxin", 1)
+ reagents.add_reagent(REAGENT_ID_TOXIN, 1)
/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice
name = "cosmic brownie"
@@ -3824,7 +3824,7 @@
. = ..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("mold", 8)
+ reagents.add_reagent(REAGENT_ID_MOLD, 8)
/obj/item/reagent_containers/food/snacks/slice/oldpizza
name = "moldy pizza slice"
@@ -4219,7 +4219,7 @@
//
///obj/item/reagent_containers/food/snacks/hotdog/old/Initialize()
// . = ..()
-// reagents.add_reagent("mold", 6)
+// reagents.add_reagent(REAGENT_ID_MOLD, 6)
/obj/item/reagent_containers/food/snacks/flatbread
name = "flatbread"
@@ -4280,7 +4280,7 @@
set_light(1, 1, "#5dadcf")
reagents.add_reagent("oxycodone", 1)
- reagents.add_reagent("sifsap", 5)
+ reagents.add_reagent(REAGENT_ID_SIFSAP, 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
/obj/item/reagent_containers/food/snacks/bellefritter
@@ -4569,7 +4569,7 @@
/obj/item/reagent_containers/food/snacks/rosesalad/Initialize()
. = ..()
- reagents.add_reagent("stoxin", 2)
+ reagents.add_reagent(REAGENT_ID_STOXIN, 2)
/obj/item/reagent_containers/food/snacks/eggbowl
name = "egg bowl"
@@ -4682,7 +4682,7 @@
/obj/item/reagent_containers/food/snacks/siffruit/Initialize()
. = ..()
- reagents.add_reagent("sifsap", 2)
+ reagents.add_reagent(REAGENT_ID_SIFSAP, 2)
/obj/item/reagent_containers/food/snacks/siffruit/afterattack(obj/O as obj, mob/user as mob, proximity)
if(istype(O,/obj/machinery/microwave))
@@ -4916,13 +4916,13 @@
var/composition_reagent_quantity
///mob/living/simple_mob/adultslime //The literal only thing in the game that uses this is commented out, so I comment out this too
-// composition_reagent = "slimejelly"
+// composition_reagent = REAGENT_ID_SLIMEJELLY
/mob/living/carbon/alien/diona
composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein
/mob/living/simple_mob/slime
- composition_reagent = "slimejelly"
+ composition_reagent = REAGENT_ID_SLIMEJELLY
allow_mind_transfer = TRUE
/mob/living/simple_mob
@@ -6929,7 +6929,7 @@
name = "master old-food"
desc = "they're all inedible and potentially dangerous items"
center_of_mass = list ("x"=15, "y"=9)
- nutriment_desc = list("rot" = 5, "mold" = 5)
+ nutriment_desc = list("rot" = 5, REAGENT_ID_MOLD = 5)
nutriment_amt = 10
bitesize = 3
filling_color = "#336b42"
@@ -6937,12 +6937,12 @@
.=..()
reagents.add_reagent(pick(list(
REAGENT_ID_FUEL,
- "amatoxin",
- "carpotoxin",
- "zombiepowder",
- "cryptobiolin",
+ REAGENT_ID_AMATOXIN,
+ REAGENT_ID_CARPOTOXIN,
+ REAGENT_ID_ZOMBIEPOWDER,
+ REAGENT_ID_CRYPTOBIOLIN,
REAGENT_ID_PSILOCYBIN)), 5)
- reagents.add_reagent("salmonella", 5)
+ reagents.add_reagent(REAGENT_ID_SALMONELLA, 5)
/obj/item/reagent_containers/food/snacks/old/pizza
name = "\improper Pizza!"
@@ -7077,7 +7077,7 @@
/obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize()
. = ..()
reagents.add_reagent("seafood", 4)
- reagents.add_reagent("carpotoxin", 1)
+ reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 1)
/obj/item/reagent_containers/food/snacks/canned/maps
name = "\improper MAPS"
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 9df2fedfc3..47f5c8b145 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -777,7 +777,7 @@
/obj/item/reagent_containers/food/snacks/donkpocket/ascended/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_URANIUM, 3)
- reagents.add_reagent("thermite_v", 3)
+ reagents.add_reagent(REAGENT_ID_THERMITEV, 3)
// Altevian Foobs
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index d83a64551c..7e7e86bb19 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -190,21 +190,21 @@
name = "Slice Of Evil" //Pretty damn poisonous, takes a lot of work to make safe for consumption, useful for medical.
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(REAGENT_ID_NEUROTOXIC_PROTEIN, 2)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 2)
- reagents.add_reagent("amatoxin", 2)
- reagents.add_reagent("carpotoxin", 2)
+ reagents.add_reagent(REAGENT_ID_AMATOXIN, 2)
+ reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 2)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2)
bitesize = 7
if(2)
name = "Slice Of Evil" //A bad trip
desc = "A mysterious slice, coated in purple frosting that smells like grapes."
nutriment_desc = list("The desire to show off an party" = 10)
- reagents.add_reagent("stoxin", 2)
+ reagents.add_reagent(REAGENT_ID_STOXIN, 2)
reagents.add_reagent(REAGENT_ID_BLISS, 10)
- reagents.add_reagent("serotrotium", 4)
- reagents.add_reagent("cryptobiolin", 8)
- reagents.add_reagent("mindbreaker", 10)
+ reagents.add_reagent(REAGENT_ID_SEROTROTIUM, 4)
+ reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 8)
+ reagents.add_reagent(REAGENT_ID_MINDBREAKER, 10)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10)
bitesize = 30 //even a single bite won't make you escape fate.
if(3)
@@ -212,8 +212,8 @@
desc = "A menacing slice, smelling clearly of copper, blood clots float on top."
nutriment_desc = list("Infernal Rage" = 10)
reagents.add_reagent(REAGENT_ID_BLOOD, 20)
- reagents.add_reagent("stomacid", 10)
- reagents.add_reagent("mutagen", 4)
+ reagents.add_reagent(REAGENT_ID_STOMACID, 10)
+ reagents.add_reagent(REAGENT_ID_MUTAGEN, 4)
reagents.add_reagent("thirteenloko", 20)
reagents.add_reagent("hyperzine", 10)
bitesize = 30
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index 2a00397800..640edfbefc 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -70,28 +70,28 @@
desc = "A small bottle of toxins. Do not drink, it is poisonous."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
- prefill = list("toxin" = 60)
+ prefill = list(REAGENT_ID_TOXIN = 60)
/obj/item/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
- prefill = list("cyanide" = 30) //volume changed to match chloral
+ prefill = list(REAGENT_ID_CYANIDE = 30) //volume changed to match chloral
/obj/item/reagent_containers/glass/bottle/stoxin
name = "soporific bottle"
desc = "A small bottle of soporific. Just the fumes make you sleepy."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
- prefill = list("stoxin" = 60)
+ prefill = list(REAGENT_ID_STOXIN = 60)
/obj/item/reagent_containers/glass/bottle/chloralhydrate
name = "chloral hydrate bottle"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
- prefill = list("chloralhydrate" = 30) //Intentionally low since it is so strong. Still enough to knock someone out.
+ prefill = list(REAGENT_ID_CHLORALHYDRATE = 30) //Intentionally low since it is so strong. Still enough to knock someone out.
/obj/item/reagent_containers/glass/bottle/antitoxin
name = "dylovene bottle"
@@ -105,7 +105,7 @@
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-1"
- prefill = list("mutagen" = 60)
+ prefill = list(REAGENT_ID_MUTAGEN = 60)
/obj/item/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
@@ -119,21 +119,21 @@
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("eznutrient" = 60)
+ prefill = list(REAGENT_ID_EZNUTRIENT = 60)
/obj/item/reagent_containers/glass/bottle/left4zed
name = "\improper Left-4-Zed bottle"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("left4zed" = 60)
+ prefill = list(REAGENT_ID_LEFT4ZED = 60)
/obj/item/reagent_containers/glass/bottle/robustharvest
name = "\improper Robust Harvest"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("robustharvest" = 60)
+ prefill = list(REAGENT_ID_ROBUSTHARVEST = 60)
/obj/item/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index c854c14d19..e6e0cc236a 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -100,7 +100,7 @@
/obj/item/reagent_containers/glass/bottle/potion/badpolymorph
name = "unstable polymorph potion"
desc = "A small green bottle containing some uncomfortably green liquid that claims to transform the drinker wildly."
- prefill = list("mutagen" = 30)
+ prefill = list(REAGENT_ID_MUTAGEN = 30)
/obj/item/reagent_containers/glass/bottle/potion/bonerepair
name = "mending potion"
@@ -142,7 +142,7 @@
/obj/item/reagent_containers/glass/bottle/potion/soporific
name = "still potion"
desc = "A small green bottle containing some calm blue liquid."
- prefill = list("stoxin" = 30)
+ prefill = list(REAGENT_ID_STOXIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/lipostipo
name = "thick potion"
diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index 0f239316a2..8b712a044f 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -553,7 +553,7 @@
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount)
- ffuu.reagents.add_reagent("toxin", amount/10)
+ ffuu.reagents.add_reagent(REAGENT_ID_TOXIN, amount/10)
return ffuu
/obj/machinery/microwave/verb/Eject()
diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm
index c288a140bb..a73fb2e1bc 100644
--- a/code/modules/food/recipes_fryer.dm
+++ b/code/modules/food/recipes_fryer.dm
@@ -143,7 +143,7 @@
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry
/datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies.
- reagents = list("slimejelly" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_SLIMEJELLY = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly
/datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies.
diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm
index ce0e0e6bbe..eda4541ba0 100644
--- a/code/modules/food/recipes_grill.dm
+++ b/code/modules/food/recipes_grill.dm
@@ -198,7 +198,7 @@
/datum/recipe/slimeburger
appliance = GRILL
- reagents = list("slimejelly" = 5)
+ reagents = list(REAGENT_ID_SLIMEJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index f2b7399431..0ce5cde979 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -174,13 +174,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
- reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_AMATOXIN = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
. = ..(container)
for(var/obj/item/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
- being_cooked.reagents.del_reagent("amatoxin")
+ being_cooked.reagents.del_reagent(REAGENT_ID_AMATOXIN)
/datum/recipe/meatballsoup
fruit = list("carrot" = 1, "potato" = 1)
@@ -269,7 +269,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/stew
/datum/recipe/slimetoast
- reagents = list("slimejelly" = 5)
+ reagents = list(REAGENT_ID_SLIMEJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
)
@@ -360,7 +360,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/twobread
/datum/recipe/slimesandwich
- reagents = list("slimejelly" = 5)
+ reagents = list(REAGENT_ID_SLIMEJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
@@ -380,7 +380,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bloodsoup
/datum/recipe/slimesoup
- reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5)
+ reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_SLIMEJELLY = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/slimesoup
@@ -484,7 +484,7 @@ I said no!
/datum/recipe/validsalad/make_food(var/obj/container as obj)
. = ..(container)
for (var/obj/item/reagent_containers/food/snacks/validsalad/being_cooked in .)
- being_cooked.reagents.del_reagent("toxin")
+ being_cooked.reagents.del_reagent(REAGENT_ID_TOXIN)
/datum/recipe/stuffing
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index 6c6e3ab2aa..d08f88b8e4 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -243,7 +243,7 @@
/datum/recipe/amanita_pie
appliance = OVEN
- reagents = list("amatoxin" = 5)
+ reagents = list(REAGENT_ID_AMATOXIN = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/amanita_pie
diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm
index 6ff4308733..d3cbc4d390 100644
--- a/code/modules/hydroponics/backtank.dm
+++ b/code/modules/hydroponics/backtank.dm
@@ -234,7 +234,7 @@
/obj/item/watertank/op/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_FUEL, 500)
- reagents.add_reagent("cryptobiolin", 500)
+ reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 500)
reagents.add_reagent(REAGENT_ID_PHORON, 500)
reagents.add_reagent("condensedcapsaicin", 500)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 23deaabc25..431075c0c6 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -86,7 +86,7 @@
descriptors |= "sweet-sour"
if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent(REAGENT_ID_URANIUM))
descriptors |= "radioactive"
- if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
+ if(reagents.has_reagent(REAGENT_ID_AMATOXIN) || reagents.has_reagent(REAGENT_ID_TOXIN))
descriptors |= "poisonous"
if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
descriptors |= "hallucinogenic"
diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm
index 4a0f3567b4..4e9126df1a 100644
--- a/code/modules/hydroponics/seedtypes/amauri.dm
+++ b/code/modules/hydroponics/seedtypes/amauri.dm
@@ -3,7 +3,7 @@
seed_name = "amauri"
display_name = "amauri plant"
kitchen_tag = "amauri"
- chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm
index 5e1e65a153..b55b63af2b 100644
--- a/code/modules/hydroponics/seedtypes/ambrosia.dm
+++ b/code/modules/hydroponics/seedtypes/ambrosia.dm
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm
index ccabfacca7..15d223ae36 100644
--- a/code/modules/hydroponics/seedtypes/apples.dm
+++ b/code/modules/hydroponics/seedtypes/apples.dm
@@ -23,7 +23,7 @@
/datum/seed/apple/poison
name = "poisonapple"
mutants = null
- chems = list("cyanide" = list(1,5))
+ chems = list(REAGENT_ID_CYANIDE = list(1,5))
/datum/seed/apple/gold
name = "goldapple"
@@ -46,7 +46,7 @@
seed_name = "sivian pod"
display_name = "sivian pod"
kitchen_tag = "apple"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5),REAGENT_ID_SIFSAP = list(10,20))
/datum/seed/apple/sif/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm
index 1f3f8ee83c..75c98883ad 100644
--- a/code/modules/hydroponics/seedtypes/berries.dm
+++ b/code/modules/hydroponics/seedtypes/berries.dm
@@ -47,7 +47,7 @@
kitchen_tag = "poisonberries"
display_name = "poison berry bush"
mutants = list("deathberries")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), "poisonberryjuice" = list(10,5))
/datum/seed/berry/poison/New()
..()
@@ -60,7 +60,7 @@
seed_name = "death berry"
display_name = "death berry bush"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,3), REAGENT_ID_LEXORIN = list(1,5))
/datum/seed/berry/poison/death/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm
index 076179df38..39faaf4a3f 100644
--- a/code/modules/hydroponics/seedtypes/flowers.dm
+++ b/code/modules/hydroponics/seedtypes/flowers.dm
@@ -79,7 +79,7 @@
display_name = "rose"
kitchen_tag = "rose"
mutants = list("bloodrose")
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(0,2))
/datum/seed/flower/rose/New()
..()
@@ -99,7 +99,7 @@
name = "bloodrose"
display_name = "bleeding rose"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(1,5), REAGENT_ID_BLOOD = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(1,5), REAGENT_ID_BLOOD = list(0,2))
/datum/seed/flower/rose/blood/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm
index 6232408f6c..3ced3c0e67 100644
--- a/code/modules/hydroponics/seedtypes/gelthi.dm
+++ b/code/modules/hydroponics/seedtypes/gelthi.dm
@@ -3,7 +3,7 @@
seed_name = "gelthi"
display_name = "gelthi plant"
kitchen_tag = "gelthi"
- chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_STOXIN = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/gelthi/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/jurlmah.dm b/code/modules/hydroponics/seedtypes/jurlmah.dm
index 32d197764c..7eee154904 100644
--- a/code/modules/hydroponics/seedtypes/jurlmah.dm
+++ b/code/modules/hydroponics/seedtypes/jurlmah.dm
@@ -3,7 +3,7 @@
seed_name = "jurl'mah"
display_name = "jurl'mah reeds"
kitchen_tag = "jurlmah"
- chems = list("serotrotium" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_SEROTROTIUM = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/jurlmah/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm
index b1c28c2a74..147c5712bb 100644
--- a/code/modules/hydroponics/seedtypes/mushrooms.dm
+++ b/code/modules/hydroponics/seedtypes/mushrooms.dm
@@ -80,7 +80,7 @@
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1), "stoxin" = list(3,3), REAGENT_ID_BLISS = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_STOXIN = list(3,3), REAGENT_ID_BLISS = list(1,25))
/datum/seed/mushroom/hallucinogenic/strong/New()
..()
@@ -96,7 +96,7 @@
seed_name = "fly amanita"
display_name = "fly amanita mushrooms"
mutants = list("destroyingangel","plastic")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), "amatoxin" = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMATOXIN = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/New()
..()
@@ -114,7 +114,7 @@
seed_name = "destroying angel"
display_name = "destroying angel mushrooms"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "amatoxin" = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_AMATOXIN = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/death/New()
..()
@@ -146,7 +146,7 @@
name = "redcap"
seed_name = "red cap"
display_name = "red caps"
- chems = list(REAGENT_ID_WOODPULP = list(10,1), "tannin" = list(1,10))
+ chems = list(REAGENT_ID_WOODPULP = list(10,1), REAGENT_ID_TANNIN = list(1,10))
mutants = null
has_item_product = null
@@ -179,7 +179,7 @@
seed_name = "plastellium"
display_name = "plastellium"
mutants = null
- chems = list("plasticide" = list(1,10))
+ chems = list(REAGENT_ID_PLASTICIDE = list(1,10))
/datum/seed/mushroom/plastic/New()
..()
@@ -197,7 +197,7 @@
seed_name = "corpellian"
display_name = "corpellian"
mutants = null
- chems = list("serotrotium" = list(5,10), "mold" = list(1,10))
+ chems = list(REAGENT_ID_SEROTROTIUM = list(5,10), REAGENT_ID_MOLD = list(1,10))
/datum/seed/mushroom/spore/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm
index dfc0cafc71..c9a3b9e86c 100644
--- a/code/modules/hydroponics/seedtypes/surik.dm
+++ b/code/modules/hydroponics/seedtypes/surik.dm
@@ -3,7 +3,7 @@
seed_name = "surik"
display_name = "surik vine"
kitchen_tag = "surik"
- chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm
index f2293c6133..db3dde13f9 100644
--- a/code/modules/hydroponics/seedtypes/wabback.dm
+++ b/code/modules/hydroponics/seedtypes/wabback.dm
@@ -31,7 +31,7 @@
seed_name = "black wabback"
display_name = "black wabback"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), REAGENT_ID_SEROTROTIUMV = list(0,1))
/datum/seed/wabback/vine/New()
..()
diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm
index 6536b88efd..1a28408475 100644
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -51,7 +51,7 @@
return 0
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
- if(smoke.reagents.has_reagent("plantbgone"))
+ if(smoke.reagents.has_reagent(REAGENT_ID_PLANTBGONE))
die_off()
return
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 7342661bf2..1c307da029 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -56,12 +56,12 @@
// with cycle information under 'mechanical concerns' at some point.
var/static/list/toxic_reagents = list(
"anti_toxin" = -2,
- "toxin" = 2,
+ REAGENT_ID_TOXIN = 2,
REAGENT_ID_FLUORINE = 2.5,
REAGENT_ID_CHLORINE = 1.5,
REAGENT_ID_SACID = 1.5,
REAGENT_ID_PACID = 3,
- "plantbgone" = 3,
+ REAGENT_ID_PLANTBGONE = 3,
"cryoxadone" = -3,
REAGENT_ID_RADIUM = 2
)
@@ -75,9 +75,9 @@
REAGENT_ID_DIETHYLAMINE = 2,
REAGENT_ID_NUTRIMENT = 1,
REAGENT_ID_ADMINORDRAZINE = 1,
- "eznutrient" = 1,
- "robustharvest" = 1,
- "left4zed" = 1
+ REAGENT_ID_EZNUTRIENT = 1,
+ REAGENT_ID_ROBUSTHARVEST = 1,
+ REAGENT_ID_LEFT4ZED = 1
)
var/static/list/weedkiller_reagents = list(
REAGENT_ID_FLUORINE = -4,
@@ -86,7 +86,7 @@
REAGENT_ID_SUGAR = 2,
REAGENT_ID_SACID = -2,
REAGENT_ID_PACID = -4,
- "plantbgone" = -8,
+ REAGENT_ID_PLANTBGONE = -8,
REAGENT_ID_ADMINORDRAZINE = -5
)
var/static/list/pestkiller_reagents = list(
@@ -115,22 +115,22 @@
"sodawater" = list( 0.1, 0, 0 ),
REAGENT_ID_SACID = list( -1, 0, 0 ),
REAGENT_ID_PACID = list( -2, 0, 0 ),
- "plantbgone" = list( -2, 0, 0.2),
+ REAGENT_ID_PLANTBGONE = list( -2, 0, 0.2),
"cryoxadone" = list( 3, 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 ),
- "robustharvest" = list( 0, 0.2, 0 ),
- "left4zed" = list( 0, 0, 0.2)
+ REAGENT_ID_ROBUSTHARVEST = list( 0, 0.2, 0 ),
+ REAGENT_ID_LEFT4ZED = list( 0, 0, 0.2)
)
// Mutagen list specifies minimum value for the mutation to take place, rather
// than a bound as the lists above specify.
var/static/list/mutagenic_reagents = list(
REAGENT_ID_RADIUM = 8,
- "mutagen" = 15
+ REAGENT_ID_MUTAGEN = 15
)
/obj/machinery/portable_atmospherics/hydroponics/AltClick(var/mob/living/user)
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 205952f0a0..c7834148d4 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -36,7 +36,7 @@
var/treatment_fire = "tricordrazine"
var/treatment_tox = "tricordrazine"
var/treatment_virus = "spaceacillin"
- var/treatment_emag = "toxin"
+ var/treatment_emag = REAGENT_ID_TOXIN
var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
// Are we tipped over?
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 98a52fe444..d65398003e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -695,7 +695,7 @@
if(toxins_pp > safe_toxins_max)
var/ratio = (poison/safe_toxins_max) * 10
if(reagents)
- reagents.add_reagent("toxin", CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
+ reagents.add_reagent(REAGENT_ID_TOXIN, CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
breath.adjust_gas(poison_type, -poison/6, update = 0) //update after
throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
else
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index 60bbc3ac10..fd1148d8db 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -221,7 +221,7 @@
if(toxins_pp > safe_toxins_max)
var/ratio = (poison/safe_toxins_max) * 10
if(H.reagents)
- H.reagents.add_reagent("toxin", CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
+ H.reagents.add_reagent(REAGENT_ID_TOXIN, CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
breath.adjust_gas(poison_type, -poison/6, update = 0) //update after
H.throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
else
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index 371824d209..25a6064ee9 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -36,7 +36,7 @@ var/datum/species/shapeshifter/promethean/prometheans
assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) // Prometheans are weird, let's just assume they can use basically any language.
blood_name = "gelatinous ooze"
- blood_reagents = "slimejelly"
+ blood_reagents = REAGENT_ID_SLIMEJELLY
breath_type = null
poison_type = null
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index 4df56e47b0..5933c53a57 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -177,7 +177,7 @@
H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE
H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE
H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL
- H.trait_injection_reagents += "stoxin" // night night chem
+ H.trait_injection_reagents += REAGENT_ID_STOXIN // night night chem
H.trait_injection_reagents += REAGENT_ID_RAINBOWTOXIN // Funny flashing lights.
H.trait_injection_reagents += REAGENT_ID_PARALYSISTOXIN // Paralysis!
H.trait_injection_reagents += REAGENT_ID_PAINENZYME // Pain INCREASER
diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm
index 3564a2c5a9..c33f119eb2 100644
--- a/code/modules/mob/living/carbon/metroid/items.dm
+++ b/code/modules/mob/living/carbon/metroid/items.dm
@@ -29,7 +29,7 @@
/obj/item/slime_extract/New()
..()
create_reagents(5)
-// reagents.add_reagent("slimejelly", 30)
+// reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 30)
/obj/item/slime_extract/grey
name = "grey slime extract"
@@ -359,7 +359,7 @@
/obj/item/reagent_containers/food/snacks/egg/slime/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4)
- reagents.add_reagent("slimejelly", 1)
+ reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 1)
addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS))
/obj/item/reagent_containers/food/snacks/egg/slime/proc/Grow()
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 b5c0f47cbc..2d438d1abd 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -634,7 +634,7 @@ var/global/list/robot_modules = list(
var/datum/reagents/R = new/datum/reagents(50)
PB.reagents = R
R.my_atom = PB
- R.add_reagent("beer2", 50)
+ R.add_reagent(REAGENT_ID_BEER2, 50)
PB.name = "Auntie Hong's Final Sip"
PB.desc = "A bottle of very special mix of alcohol and poison. Some may argue that there's alcohol to die for, but Auntie Hong took it to next level."
@@ -645,7 +645,7 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/robot/clerical/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/reagent_containers/food/drinks/bottle/small/beer/PB = locate() in src.emag
if(PB)
- PB.reagents.add_reagent("beer2", 2 * amount)
+ PB.reagents.add_reagent(REAGENT_ID_BEER2, 2 * amount)
/obj/item/robot_module/robot/clerical/general
name = "clerical robot module"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm
index 18428ab3e7..5027ed4a26 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm
@@ -59,7 +59,7 @@
special_attack_cooldown = 6 SECONDS
ai_holder_type = /datum/ai_holder/simple_mob/intentional/giant_spider_broodmother
poison_per_bite = 2
- poison_type = "cyanide"
+ poison_type = REAGENT_ID_CYANIDE
loot_list = list(/obj/item/royal_spider_egg = 100)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm
index bc2cb46ab5..3811839158 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm
@@ -27,7 +27,7 @@
melee_damage_upper = 25
poison_per_bite = 3
- poison_type = "chloralhydrate"
+ poison_type = REAGENT_ID_CHLORALHYDRATE
movement_cooldown = 2
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm
index 397c48efb5..937b1d8ce2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm
@@ -39,7 +39,7 @@
poison_chance = 15
poison_per_bite = 3
- poison_type = "stimm"
+ poison_type = REAGENT_ID_STIMM
shock_resist = 0.75
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm
index bcdeedef00..89019b727f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm
@@ -38,7 +38,7 @@
melee_damage_lower = 10
melee_damage_upper = 10
poison_chance = 30
- poison_type = "cryptobiolin"
+ poison_type = REAGENT_ID_CRYPTOBIOLIN
poison_per_bite = 1
player_msg = "You have an imperfect, but automatic stealth. If you attack something while 'hidden', then \
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
index 27211f3b82..00b380b2ec 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
@@ -38,7 +38,7 @@
melee_damage_lower = 5 // Doesn't do a lot of damage, since the goal is to make more spiders with egg attacks.
melee_damage_upper = 10
poison_per_bite = 5
- poison_type = "stoxin"
+ poison_type = REAGENT_ID_STOXIN
player_msg = "You can spin webs on an adjacent tile, or cocoon an object by clicking on it.
\
You can also cocoon a dying or dead entity by clicking on them, and you will gain charges for egg-laying.
\
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm
index b0481c0097..8626170c99 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm
@@ -27,8 +27,8 @@
poison_chance = 20
poison_per_bite = 5
- poison_type = "condensedcapsaicin_v"
+ poison_type = REAGENT_ID_CONDENSEDCAPSAICINV
/mob/living/simple_mob/animal/giant_spider/pepper/Initialize()
adjust_scale(1.1)
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm
index d51f6422fe..4f64a01585 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm
@@ -35,4 +35,4 @@
poison_chance = 30
poison_per_bite = 1
- poison_type = "thermite_v"
+ poison_type = REAGENT_ID_THERMITEV
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm
index 3b025bc2d7..4c0ea17260 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm
@@ -40,7 +40,7 @@
poison_chance = 15
poison_per_bite = 3
- poison_type = "serotrotium_v"
+ poison_type = REAGENT_ID_SEROTROTIUMV
// ai_holder_type = /datum/ai_holder/simple_mob/melee/tunneler
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
index 1b1cc2b063..800236dec2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
@@ -7,8 +7,8 @@
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize()
. = ..()
create_reagents(60)
- reagents.add_reagent("toxin", 45)
- reagents.add_reagent("impedrezene", 15)
+ reagents.add_reagent(REAGENT_ID_TOXIN, 45)
+ reagents.add_reagent(REAGENT_ID_IMPEDREZENE, 15)
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Life()
..()
@@ -56,8 +56,8 @@
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/proc/sting(var/mob/living/M)
if(!M.reagents)
return 0
- M.reagents.add_reagent("toxin", 2)
- M.reagents.add_reagent("impedrezene", 1)
+ M.reagents.add_reagent(REAGENT_ID_TOXIN, 2)
+ M.reagents.add_reagent(REAGENT_ID_IMPEDREZENE, 1)
return 1
/mob/living/simple_mob/animal/passive/fish/measelshark
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
index 3d05b68abb..4897c12503 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
@@ -493,7 +493,7 @@ var/global/list/wounds_being_tended_by_drakes = list()
for(var/obj/item/organ/external/E in H.organs)
if(E.status & ORGAN_BLEEDING)
E.organ_clamp()
- H.bloodstr.add_reagent("sifsap", rand(1,2))
+ H.bloodstr.add_reagent(REAGENT_ID_SIFSAP, rand(1,2))
for(var/datum/wound/W in E.wounds)
W.salve()
W.disinfect()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index 4917eeff5a..ed4cea05b0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -49,7 +49,7 @@
var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
var/infest_target = BP_TORSO // The currently chosen bodypart to infest.
var/mob/living/carbon/host // Our humble host.
- var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
+ var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm
index 48babbe51a..e925674468 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm
@@ -47,7 +47,7 @@
var/poison_chance = 100
var/poison_per_bite = 10
- var/poison_type = "expired_medicine"
+ var/poison_type = REAGENT_ID_EXPIREDMEDICINE
/datum/say_list/disbot
speak = list("ATTEMPTING TO CONTACT A.R.K, ATTEMPT 1e26+3","DIRT SAMPLE COLLECTED, DIRT QUOTA 124871/155 CONFIRMED.")
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
index a23102b717..5dd0edb14d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -8,7 +8,7 @@
color = "#CC23FF"
slime_color = "purple"
coretype = /obj/item/slime_extract/purple
- reagent_injected = "toxin"
+ reagent_injected = REAGENT_ID_TOXIN
description_info = "This slime spreads a toxin when it attacks. A biosuit or other thick armor can protect from the toxic attack."
player_msg = "You inject a harmful toxin when attacking."
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
index 2ae22c5d3c..889e8e857b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
@@ -52,7 +52,7 @@
say_list_type = /datum/say_list/oregrub
var/poison_per_bite = 2.5
- var/poison_type = "thermite_v" //burn baby burn
+ var/poison_type = REAGENT_ID_THERMITEV //burn baby burn
var/poison_chance = 50
var/min_ore = 4
diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index efd5db1e7d..ac28193cc9 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -340,7 +340,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"],injected.data["species"],our.data["species"]) )
- reagents.add_reagent("toxin",amount * 0.5)
+ reagents.add_reagent(REAGENT_ID_TOXIN,amount * 0.5)
reagents.update_total()
else
vessel.add_reagent(REAGENT_ID_BLOOD, amount, injected.data)
diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm
index 48d0b87472..6dc7e6d506 100644
--- a/code/modules/organs/internal/stomach.dm
+++ b/code/modules/organs/internal/stomach.dm
@@ -6,7 +6,7 @@
unacidable = TRUE // Don't melt when holding your acid, dangit.
- var/acidtype = "stomacid" // Incase you want some stomach organ with, say, polyacid instead, or sulphuric.
+ var/acidtype = REAGENT_ID_STOMACID // Incase you want some stomach organ with, say, polyacid instead, or sulphuric.
var/max_acid_volume = 30
var/deadly_hold = TRUE // Does the stomach do damage to mobs eaten by its owner? Xenos should probably have this FALSE.
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 083b197307..1f20130e83 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -275,7 +275,7 @@ var/list/organ_cache = list()
adjust_germ_level(rand(2,3))
if(501 to INFINITY)
adjust_germ_level(rand(3,5))
- owner.reagents.add_reagent("toxin", rand(1,2))
+ owner.reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,2))
/obj/item/organ/proc/receive_chem(chemical as obj)
return 0
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 16c0b697e0..07ac7665f4 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -249,8 +249,8 @@
/obj/item/pen/reagent/sleepy/New()
..()
- reagents.add_reagent("chloralhydrate", 1) //VOREStation Edit
- reagents.add_reagent("stoxin", 14) //VOREStation Add
+ reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 1) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_STOXIN, 14) //VOREStation Add
/*
@@ -261,8 +261,8 @@
/obj/item/pen/reagent/paralysis/New()
..()
- reagents.add_reagent("zombiepowder", 5)
- reagents.add_reagent("cryptobiolin", 10)
+ reagents.add_reagent(REAGENT_ID_ZOMBIEPOWDER, 5)
+ reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 10)
/*
* Chameleon Pen
diff --git a/code/modules/projectiles/projectile/arc.dm b/code/modules/projectiles/projectile/arc.dm
index 271e5f2576..d4d383bd14 100644
--- a/code/modules/projectiles/projectile/arc.dm
+++ b/code/modules/projectiles/projectile/arc.dm
@@ -189,7 +189,7 @@
spawn()
var/obj/effect/effect/water/splash = new(T)
splash.create_reagents(15)
- splash.reagents.add_reagent("stomacid", 5)
+ splash.reagents.add_reagent(REAGENT_ID_STOMACID, 5)
splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = "#ec4940"))
splash.set_color()
@@ -198,5 +198,5 @@
var/obj/effect/decal/cleanable/chemcoating/acid = locate() in T
if(!istype(acid))
acid = new(T)
- acid.reagents.add_reagent("stomacid", 5)
+ acid.reagents.add_reagent(REAGENT_ID_STOMACID, 5)
acid.update_icon()
diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm
index a20adf0df9..752e70cd4a 100644
--- a/code/modules/projectiles/projectile/blob.dm
+++ b/code/modules/projectiles/projectile/blob.dm
@@ -9,7 +9,7 @@
fire_sound = 'sound/effects/slime_squish.ogg'
var/splatter = FALSE // Will this make a cloud of reagents?
var/splatter_volume = 5 // The volume of its chemical container, for said cloud of reagents.
- var/list/my_chems = list("mold")
+ var/list/my_chems = list(REAGENT_ID_MOLD)
/obj/item/projectile/energy/blob/splattering
splatter = TRUE
@@ -45,7 +45,7 @@
/obj/item/projectile/energy/blob/toxic
damage_type = TOX
check_armour = "bio"
- my_chems = list("amatoxin")
+ my_chems = list(REAGENT_ID_AMATOXIN)
/obj/item/projectile/energy/blob/toxic/splattering
splatter = TRUE
@@ -53,7 +53,7 @@
/obj/item/projectile/energy/blob/acid
damage_type = BURN
check_armour = "bio"
- my_chems = list(REAGENT_ID_SACID, "mold")
+ my_chems = list(REAGENT_ID_SACID, REAGENT_ID_MOLD)
/obj/item/projectile/energy/blob/acid/splattering
splatter = TRUE
@@ -61,7 +61,7 @@
/obj/item/projectile/energy/blob/combustible
splatter = TRUE
flammability = 0.25
- my_chems = list(REAGENT_ID_FUEL, "mold")
+ my_chems = list(REAGENT_ID_FUEL, REAGENT_ID_MOLD)
/obj/item/projectile/energy/blob/freezing
my_chems = list("frostoil")
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index b33a08899d..725eb699b5 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -244,9 +244,9 @@
/obj/item/reagent_containers/chem_disp_cartridge/ethylredox
spawn_reagent = "ethylredoxrazine"
/obj/item/reagent_containers/chem_disp_cartridge/sleeptox
- spawn_reagent = "stoxin"
+ spawn_reagent = REAGENT_ID_STOXIN
/obj/item/reagent_containers/chem_disp_cartridge/chloral
- spawn_reagent = "chloralhydrate"
+ spawn_reagent = REAGENT_ID_CHLORALHYDRATE
/obj/item/reagent_containers/chem_disp_cartridge/cryoxadone
spawn_reagent = "cryoxadone"
/obj/item/reagent_containers/chem_disp_cartridge/clonexadone
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
index 4114508d5c..2115dca67d 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
@@ -2,8 +2,8 @@
//Xenoflora
ammonia spawn_reagent = REAGENT_ID_AMMONIA
diethylamine spawn_reagent = REAGENT_ID_DIETHYLAMINE
- plantbgone spawn_reagent = "plantbgone"
- mutagen spawn_reagent = "mutagen"
+ plantbgone spawn_reagent = REAGENT_ID_PLANTBGONE
+ mutagen spawn_reagent = REAGENT_ID_MUTAGEN
//Biochem
nutriment spawn_reagent = REAGENT_ID_NUTRIMENT
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index 9bf8775351..db299f8ebc 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -40,7 +40,7 @@
"inaprovaline", "ryetalyn", "paracetamol", "tramadol", "oxycodone", "sterilizine", "leporazine",
"kelotane", "dermaline", "dexalin", "dexalinp", "tricordrazine", "anti_toxin", "synaptizine",
"hyronalin", "arithrazine", "alkysine", "imidazoline", "peridaxon", "bicaridine", "hyperzine",
- "rezadone", "spaceacillin", "ethylredoxrazine", "stoxin", "chloralhydrate", "cryoxadone",
+ "rezadone", "spaceacillin", "ethylredoxrazine", REAGENT_ID_STOXIN, REAGENT_ID_CHLORALHYDRATE, "cryoxadone",
"clonexadone"
)
diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
index 431da2f57b..3a9ae7e7ed 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, REAGENT_ID_AMMONIA, REAGENT_ID_DIETHYLAMINE, "plantbgone", "mutagen", REAGENT_ID_CALCIUM
+ REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, REAGENT_ID_AMMONIA, REAGENT_ID_DIETHYLAMINE, REAGENT_ID_PLANTBGONE, REAGENT_ID_MUTAGEN, REAGENT_ID_CALCIUM
)
/obj/machinery/chemical_dispenser/xenoflora/full
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index b2c422c78e..bcd14cfd74 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -174,7 +174,7 @@
name = "Distilling Cryogellatin"
id = "distill_cryoslurry"
result = REAGENT_ID_CRYOSLURRY
- required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, REAGENT_ID_FOAMINGAGENT = 2)
+ required_reagents = list("frostoil" = 7, "enzyme" = 3, REAGENT_ID_PLASTICIDE = 3, REAGENT_ID_FOAMINGAGENT = 2)
inhibitors = list(REAGENT_ID_WATER = 5)
result_amount = 1
@@ -194,8 +194,8 @@
/decl/chemical_reaction/distilling/lichpowder
name = "Distilling Lichpowder"
id = "distill_lichpowder"
- result = "lichpowder"
- required_reagents = list("zombiepowder" = 2, "leporazine" = 1)
+ result = REAGENT_ID_LICHPOWDER
+ required_reagents = list(REAGENT_ID_ZOMBIEPOWDER = 2, "leporazine" = 1)
result_amount = 2
reaction_rate = HALF_LIFE(8)
@@ -206,7 +206,7 @@
name = "Distilling Necroxadone"
id = "distill_necroxadone"
result = "necroxadone"
- required_reagents = list("lichpowder" = 1, "cryoxadone" = 1, "carthatoline" = 1)
+ required_reagents = list(REAGENT_ID_LICHPOWDER = 1, "cryoxadone" = 1, "carthatoline" = 1)
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 4b392020e5..1647d8d551 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -1155,7 +1155,7 @@
name = "Named Bullet"
id = "slimeshot"
result = "slimeshot"
- required_reagents = list("slimejelly" = 4, "vodka" = 1)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, "vodka" = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/negroni
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index a80acaac78..365a9fa276 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -62,9 +62,9 @@
result_amount = 3
/decl/chemical_reaction/instant/mutagen
- name = "Unstable mutagen"
- id = "mutagen"
- result = "mutagen"
+ name = REAGENT_MUTAGEN
+ id = REAGENT_ID_MUTAGEN
+ result = REAGENT_ID_MUTAGEN
required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
@@ -125,9 +125,9 @@
result_amount = 2
/decl/chemical_reaction/instant/impedrezene
- name = "Impedrezene"
- id = "impedrezene"
- result = "impedrezene"
+ name = REAGENT_IMPEDREZENE
+ id = REAGENT_ID_IMPEDREZENE
+ result = REAGENT_ID_IMPEDREZENE
required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
@@ -151,7 +151,7 @@
name = "Osteodaxon"
id = "osteodaxon"
result = "osteodaxon"
- required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, "carpotoxin" = 1)
+ required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, REAGENT_ID_CARPOTOXIN = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("clonexadone" = 1) // Messes with cryox
result_amount = 2
@@ -187,7 +187,7 @@
name = "Cordradaxon"
id = "cordradaxon"
result = "cordradaxon"
- required_reagents = list("potassium_chlorophoride" = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2)
+ required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list("clonexadone" = 1)
result_amount = 2
@@ -208,9 +208,9 @@
result_amount = 2
/decl/chemical_reaction/instant/cryptobiolin
- name = "Cryptobiolin"
- id = "cryptobiolin"
- result = "cryptobiolin"
+ name = REAGENT_CRYPTOBIOLIN
+ id = REAGENT_ID_CRYPTOBIOLIN
+ result = REAGENT_ID_CRYPTOBIOLIN
required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
@@ -274,10 +274,10 @@
result_amount = 3
/decl/chemical_reaction/instant/stimm
- name = "Stimm"
- id = "stimm"
- result = "stimm"
- required_reagents = list("left4zed" = 1, REAGENT_ID_FUEL = 1)
+ name = REAGENT_STIMM
+ id = REAGENT_ID_STIMM
+ result = REAGENT_ID_STIMM
+ required_reagents = list(REAGENT_ID_LEFT4ZED = 1, REAGENT_ID_FUEL = 1)
catalysts = list(REAGENT_ID_FUEL = 5)
result_amount = 2
@@ -307,7 +307,7 @@
name = "Mortiferin"
id = "mortiferin"
result = "mortiferin"
- required_reagents = list("cryptobiolin" = 1, "clonexadone" = 1, "corophizine" = 1)
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "clonexadone" = 1, "corophizine" = 1)
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
@@ -315,7 +315,7 @@
name = "Spaceacillin"
id = "spaceacillin"
result = "spaceacillin"
- required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1)
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "inaprovaline" = 1)
result_amount = 2
/decl/chemical_reaction/instant/corophizine
@@ -356,54 +356,54 @@
result_amount = 2
/decl/chemical_reaction/instant/soporific
- name = "Soporific"
- id = "stoxin"
- result = "stoxin"
- required_reagents = list("chloralhydrate" = 1, REAGENT_ID_SUGAR = 4)
+ name = REAGENT_STOXIN
+ id = REAGENT_ID_STOXIN
+ result = REAGENT_ID_STOXIN
+ required_reagents = list(REAGENT_ID_CHLORALHYDRATE = 1, REAGENT_ID_SUGAR = 4)
inhibitors = list(REAGENT_ID_PHOSPHORUS) // Messes with the smoke
result_amount = 5
/decl/chemical_reaction/instant/chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- result = "chloralhydrate"
+ name = REAGENT_CHLORALHYDRATE
+ id = REAGENT_ID_CHLORALHYDRATE
+ result = REAGENT_ID_CHLORALHYDRATE
required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_CHLORINE = 3, REAGENT_ID_WATER = 1)
result_amount = 1
/decl/chemical_reaction/instant/potassium_chloride
- name = "Potassium Chloride"
- id = "potassium_chloride"
- result = "potassium_chloride"
+ name = REAGENT_POTASSIUMCHLORIDE
+ id = REAGENT_ID_POTASSIUMCHLORIDE
+ result = REAGENT_ID_POTASSIUMCHLORIDE
required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 2
/decl/chemical_reaction/instant/potassium_chlorophoride
- name = "Potassium Chlorophoride"
- id = "potassium_chlorophoride"
- result = "potassium_chlorophoride"
- required_reagents = list("potassium_chloride" = 1, REAGENT_ID_PHORON = 1, "chloralhydrate" = 1)
+ name = REAGENT_POTASSIUMCHLOROPHORIDE
+ id = REAGENT_ID_POTASSIUMCHLOROPHORIDE
+ result = REAGENT_ID_POTASSIUMCHLOROPHORIDE
+ required_reagents = list(REAGENT_ID_POTASSIUMCHLORIDE = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_CHLORALHYDRATE = 1)
result_amount = 4
/decl/chemical_reaction/instant/zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
- result = "zombiepowder"
- required_reagents = list("carpotoxin" = 5, "stoxin" = 5, REAGENT_ID_COPPER = 5)
+ name = REAGENT_ZOMBIEPOWDER
+ id = REAGENT_ID_ZOMBIEPOWDER
+ result = REAGENT_ID_ZOMBIEPOWDER
+ required_reagents = list(REAGENT_ID_CARPOTOXIN = 5, REAGENT_ID_STOXIN = 5, REAGENT_ID_COPPER = 5)
result_amount = 2
/decl/chemical_reaction/instant/carpotoxin
- name = "Carpotoxin"
- id = "carpotoxin"
- result = "carpotoxin"
- required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, REAGENT_ID_BIOMASS = 1, "sifsap" = 2)
- catalysts = list("sifsap" = 10)
+ name = REAGENT_CARPOTOXIN
+ id = REAGENT_ID_CARPOTOXIN
+ result = REAGENT_ID_CARPOTOXIN
+ required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, REAGENT_ID_BIOMASS = 1, REAGENT_ID_SIFSAP = 2)
+ catalysts = list(REAGENT_ID_SIFSAP = 10)
inhibitors = list(REAGENT_ID_RADIUM = 1)
result_amount = 2
/decl/chemical_reaction/instant/mindbreaker
- name = "Mindbreaker Toxin"
- id = "mindbreaker"
- result = "mindbreaker"
+ name = REAGENT_MINDBREAKER
+ id = REAGENT_ID_MINDBREAKER
+ result = REAGENT_ID_MINDBREAKER
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
result_amount = 3
@@ -438,16 +438,16 @@
/decl/chemical_reaction/instant/left4zed
name = "Left4Zed"
- id = "left4zed"
- result = "left4zed"
- required_reagents = list (REAGENT_ID_DIETHYLAMINE = 2, "mutagen" = 1)
+ id = REAGENT_ID_LEFT4ZED
+ result = REAGENT_ID_LEFT4ZED
+ required_reagents = list (REAGENT_ID_DIETHYLAMINE = 2, REAGENT_ID_MUTAGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/robustharvest
name = "RobustHarvest"
- id = "robustharvest"
- result = "robustharvest"
- required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_CALCIUM = 1, "neurotoxic_protein" = 1)
+ id = REAGENT_ID_ROBUSTHARVEST
+ result = REAGENT_ID_ROBUSTHARVEST
+ required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_CALCIUM = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 1)
result_amount = 3
/decl/chemical_reaction/instant/space_cleaner
@@ -458,10 +458,10 @@
result_amount = 2
/decl/chemical_reaction/instant/plantbgone
- name = "Plant-B-Gone"
- id = "plantbgone"
- result = "plantbgone"
- required_reagents = list("toxin" = 1, REAGENT_ID_WATER = 4)
+ name = REAGENT_PLANTBGONE
+ id = REAGENT_ID_PLANTBGONE
+ result = REAGENT_ID_PLANTBGONE
+ required_reagents = list(REAGENT_ID_TOXIN = 1, REAGENT_ID_WATER = 4)
result_amount = 5
/decl/chemical_reaction/instant/foaming_agent
@@ -505,13 +505,13 @@
name = "Rezadone"
id = "rezadone"
result = "rezadone"
- required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, REAGENT_ID_COPPER = 1)
+ required_reagents = list(REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_COPPER = 1)
result_amount = 3
/decl/chemical_reaction/instant/lexorin
- name = "Lexorin"
- id = "lexorin"
- result = "lexorin"
+ name = REAGENT_LEXORIN
+ id = REAGENT_ID_LEXORIN
+ result = REAGENT_ID_LEXORIN
required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
@@ -519,28 +519,28 @@
name = REAGENT_METHYLPHENIDATE
id = REAGENT_ID_METHYLPHENIDATE
result = REAGENT_ID_METHYLPHENIDATE
- required_reagents = list("mindbreaker" = 1, REAGENT_ID_HYDROGEN = 1)
+ required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/citalopram
name = REAGENT_CITALOPRAM
id = REAGENT_ID_CITALOPRAM
result = REAGENT_ID_CITALOPRAM
- required_reagents = list("mindbreaker" = 1, REAGENT_ID_CARBON = 1)
+ required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
/decl/chemical_reaction/instant/paroxetine
name = REAGENT_PAROXETINE
id = REAGENT_ID_PAROXETINE
result = REAGENT_ID_PAROXETINE
- required_reagents = list("mindbreaker" = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
+ required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
result_amount = 3
/decl/chemical_reaction/instant/neurotoxin
name = "Neurotoxin"
id = "neurotoxin"
result = "neurotoxin"
- required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
+ required_reagents = list("gargleblaster" = 1, REAGENT_ID_STOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/luminol
@@ -626,7 +626,7 @@
name = "Plastic"
id = "solidplastic"
result = null
- required_reagents = list(REAGENT_ID_PACID = 1, "plasticide" = 2)
+ required_reagents = list(REAGENT_ID_PACID = 1, REAGENT_ID_PLASTICIDE = 2)
result_amount = 1
/decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -639,7 +639,7 @@
name = "Carpet"
id = "redcarpet"
result = null
- required_reagents = list(REAGENT_ID_LIQUIDCARPET = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPET = 2, REAGENT_ID_PLASTICIDE = 1)
result_amount = 2
var/carpet_type = /obj/item/stack/tile/carpet
@@ -650,43 +650,43 @@
/decl/chemical_reaction/instant/carpetify/bcarpet
name = "Black Carpet"
id = "blackcarpet"
- required_reagents = list(REAGENT_ID_LIQUIDCARPETB = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPETB = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/bcarpet
/decl/chemical_reaction/instant/carpetify/blucarpet
name = "Blue Carpet"
id = "bluecarpet"
- required_reagents = list (REAGENT_ID_LIQUIDCARPETBLU = 2, "plasticide" = 1)
+ required_reagents = list (REAGENT_ID_LIQUIDCARPETBLU = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/blucarpet
/decl/chemical_reaction/instant/carpetify/turcarpet
name = "Turquise Carpet"
id = "turcarpet"
- required_reagents = list(REAGENT_ID_LIQUIDCARPETTUR = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPETTUR = 2, REAGENT_ID_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(REAGENT_ID_LIQUIDCARPETSBLU = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPETSBLU = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/sblucarpet
/decl/chemical_reaction/instant/carpetify/clowncarpet
name = "Clown Carpet"
id = "clowncarpet"
- required_reagents = list(REAGENT_ID_LIQUIDCARPETC = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPETC = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/gaycarpet
/decl/chemical_reaction/instant/carpetify/pcarpet
name = "Purple Carpet"
id = "Purplecarpet"
- required_reagents = list(REAGENT_ID_LIQUIDCARPETP = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPETP = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/purcarpet
/decl/chemical_reaction/instant/carpetify/ocarpet
name = "Orange Carpet"
id = "orangecarpet"
- required_reagents = list(REAGENT_ID_LIQUIDCARPETO = 2, "plasticide" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPETO = 2, REAGENT_ID_PLASTICIDE = 1)
carpet_type = /obj/item/stack/tile/carpet/oracarpet
/decl/chemical_reaction/instant/concrete
@@ -899,7 +899,7 @@
name = "Red paint"
id = "red_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1)
result_amount = 5
/decl/chemical_reaction/instant/red_paint/send_data()
@@ -909,7 +909,7 @@
name = "Orange paint"
id = "orange_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1)
result_amount = 5
/decl/chemical_reaction/instant/orange_paint/send_data()
@@ -919,7 +919,7 @@
name = "Yellow paint"
id = "yellow_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1)
result_amount = 5
/decl/chemical_reaction/instant/yellow_paint/send_data()
@@ -929,7 +929,7 @@
name = "Green paint"
id = "green_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1)
result_amount = 5
/decl/chemical_reaction/instant/green_paint/send_data()
@@ -939,7 +939,7 @@
name = "Blue paint"
id = "blue_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1)
result_amount = 5
/decl/chemical_reaction/instant/blue_paint/send_data()
@@ -949,7 +949,7 @@
name = "Purple paint"
id = "purple_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1)
result_amount = 5
/decl/chemical_reaction/instant/purple_paint/send_data()
@@ -959,7 +959,7 @@
name = "Grey paint"
id = "grey_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1)
result_amount = 5
/decl/chemical_reaction/instant/grey_paint/send_data()
@@ -969,7 +969,7 @@
name = "Brown paint"
id = "brown_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1)
result_amount = 5
/decl/chemical_reaction/instant/brown_paint/send_data()
@@ -979,7 +979,7 @@
name = "Blood paint"
id = "blood_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
result_amount = 5
/decl/chemical_reaction/instant/blood_paint/send_data(var/datum/reagents/T)
@@ -992,7 +992,7 @@
name = "Milk paint"
id = "milk_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "milk" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "milk" = 5)
result_amount = 5
/decl/chemical_reaction/instant/milk_paint/send_data()
@@ -1002,7 +1002,7 @@
name = "Orange juice paint"
id = "orange_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/orange_juice_paint/send_data()
@@ -1012,7 +1012,7 @@
name = "Tomato juice paint"
id = "tomato_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/tomato_juice_paint/send_data()
@@ -1022,7 +1022,7 @@
name = "Lime juice paint"
id = "lime_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "limejuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "limejuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/lime_juice_paint/send_data()
@@ -1032,7 +1032,7 @@
name = "Carrot juice paint"
id = "carrot_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/carrot_juice_paint/send_data()
@@ -1042,7 +1042,7 @@
name = "Berry juice paint"
id = "berry_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/berry_juice_paint/send_data()
@@ -1052,7 +1052,7 @@
name = "Grape juice paint"
id = "grape_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/grape_juice_paint/send_data()
@@ -1062,7 +1062,7 @@
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/poisonberry_juice_paint/send_data()
@@ -1072,7 +1072,7 @@
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/watermelon_juice_paint/send_data()
@@ -1082,7 +1082,7 @@
name = "Lemon juice paint"
id = "lemon_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/lemon_juice_paint/send_data()
@@ -1092,7 +1092,7 @@
name = "Banana juice paint"
id = "banana_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "banana" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "banana" = 5)
result_amount = 5
/decl/chemical_reaction/instant/banana_juice_paint/send_data()
@@ -1102,7 +1102,7 @@
name = "Potato juice paint"
id = "potato_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5)
result_amount = 5
/decl/chemical_reaction/instant/potato_juice_paint/send_data()
@@ -1112,7 +1112,7 @@
name = "Carbon paint"
id = "carbon_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1)
result_amount = 5
/decl/chemical_reaction/instant/carbon_paint/send_data()
@@ -1122,7 +1122,7 @@
name = "Aluminum paint"
id = "aluminum_paint"
result = REAGENT_ID_PAINT
- required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1)
result_amount = 5
/decl/chemical_reaction/instant/aluminum_paint/send_data()
@@ -1175,9 +1175,9 @@
//R-UST Port
/decl/chemical_reaction/instant/hydrophoron
- name = "Hydrophoron"
- id = "hydrophoron"
- result = "hydrophoron"
+ name = REAGENT_HYDROPHORON
+ id = REAGENT_ID_HYDROPHORON
+ result = REAGENT_ID_HYDROPHORON
required_reagents = list(REAGENT_ID_HYDROGEN = 1, REAGENT_ID_PHORON = 1)
inhibitors = list(REAGENT_ID_NITROGEN = 1) //So it doesn't mess with lexorin
result_amount = 2
@@ -1186,7 +1186,7 @@
name = REAGENT_DEUTERIUM
id = REAGENT_ID_DEUTERIUM
result = REAGENT_ID_DEUTERIUM
- required_reagents = list("hydrophoron" = 1, REAGENT_ID_WATER = 2)
+ required_reagents = list(REAGENT_ID_HYDROPHORON = 1, REAGENT_ID_WATER = 2)
result_amount = 3
//Skrellian crap.
@@ -1194,7 +1194,7 @@
name = REAGENT_TALUMQUEM
id = REAGENT_ID_TALUMQUEM
result = REAGENT_ID_TALUMQUEM
- required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, "amatoxin" = 1)
+ required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_AMATOXIN = 1)
result_amount = 4
/decl/chemical_reaction/instant/qerr_quem
@@ -1226,19 +1226,19 @@
name = "Neutralize Toxic Proteins"
id = "neurotoxic_protein_neutral"
result = "protein"
- required_reagents = list("anti_toxin" = 1, "neurotoxic_protein" = 2)
+ required_reagents = list("anti_toxin" = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
result_amount = 2
/decl/chemical_reaction/instant/neutralize_carpotoxin
name = "Neutralize Carpotoxin"
id = "carpotoxin_neutral"
result = "protein"
- required_reagents = list("enzyme" = 1, "carpotoxin" = 1, "sifsap" = 1)
+ required_reagents = list("enzyme" = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1)
result_amount = 1
/decl/chemical_reaction/instant/neutralize_spidertoxin
name = "Neutralize Spidertoxin"
id = "spidertoxin_neutral"
result = "protein"
- required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, "sifsap" = 1)
+ required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1)
result_amount = 1
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index e2eaca2818..02f612893d 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -53,7 +53,7 @@
name = REAGENT_AMORPHOROVIR
id = REAGENT_ID_AMORPHOROVIR
result = REAGENT_ID_AMORPHOROVIR
- required_reagents = list("cryptobiolin" = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20)
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
@@ -136,7 +136,7 @@
name = REAGENT_UNSORBITOL
id = REAGENT_ID_UNSORBITOL
result = REAGENT_ID_UNSORBITOL
- required_reagents = list("mutagen" = 3, "lipozine" = 2)
+ required_reagents = list(REAGENT_ID_MUTAGEN = 3, "lipozine" = 2)
result_amount = 5
///////////////////////////////////////////////////////////////////////////////////
@@ -205,5 +205,5 @@
name = REAGENT_ADVMUTATIONTOXIN
id = "advmutationtoxin2"
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.
+ required_reagents = list(REAGENT_ID_PHORON = 15, REAGENT_ID_SLIMEJELLY = 15, REAGENT_ID_MUTATIONTOXIN = 15) //In case a xenobiologist wants to become a fully fledged slime person.
result_amount = 1
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index fdfc8798f8..adda682adb 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -2,7 +2,7 @@
name = REAGENT_MUTAGENVIRUSFOOD
id = REAGENT_ID_MUTAGENVIRUSFOOD
result = REAGENT_ID_MUTAGENVIRUSFOOD
- required_reagents = list("mutagen" = 1, "virusfood" = 1)
+ required_reagents = list(REAGENT_ID_MUTAGEN = 1, "virusfood" = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_adranol
@@ -75,7 +75,7 @@
/decl/chemical_reaction/instant/mix_virus/mix_virus_2
name = "Mix Virus 2"
id = "mixvirus2"
- required_reagents = list("mutagen" = 1)
+ required_reagents = list(REAGENT_ID_MUTAGEN = 1)
level_min = 2
level_max = 4
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 81148ffcc2..d8152f9759 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -282,31 +282,31 @@
name = "stimm injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one is filled with a home-made stimulant, with some serious side-effects."
- filled_reagents = list("stimm" = 10) // More than 10u will OD.
+ filled_reagents = list(REAGENT_ID_STIMM = 10) // More than 10u will OD.
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired
name = "expired injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one has had its contents expire a long time ago, using it now will probably make someone sick, or worse."
- filled_reagents = list("expired_medicine" = 15)
+ filled_reagents = list(REAGENT_ID_EXPIREDMEDICINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific
name = "soporific injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one is sometimes used by orderlies, as it has soporifics, which make someone tired and fall asleep."
- filled_reagents = list("stoxin" = 15)
+ filled_reagents = list(REAGENT_ID_STOXIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide
name = "cyanide injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one contains cyanide, a lethal poison. It being inside a medical autoinjector has certain unsettling implications."
- filled_reagents = list("cyanide" = 15)
+ filled_reagents = list(REAGENT_ID_CYANIDE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium
name = "serotrotium injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one is filled with serotrotium, which causes concentrated production of the serotonin neurotransmitter in humans."
- filled_reagents = list("serotrotium" = 15)
+ filled_reagents = list(REAGENT_ID_SEROTROTIUM = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss
name = "illicit injector"
@@ -318,21 +318,21 @@
name = "cryptobiolin injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one contains cryptobiolin, which causes confusion."
- filled_reagents = list("cryptobiolin" = 15)
+ filled_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene
name = "impedrezene injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one has impedrezene inside, a narcotic that impairs higher brain functioning. \
This autoinjector is almost certainly created illegitimately."
- filled_reagents = list("impedrezene" = 15)
+ filled_reagents = list(REAGENT_ID_IMPEDREZENE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker
name = "mindbreaker injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one stores the dangerous hallucinogen called 'Mindbreaker', likely put in place \
by illicit groups hoping to hide their product."
- filled_reagents = list("mindbreaker" = 15)
+ filled_reagents = list(REAGENT_ID_MINDBREAKER = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin
name = "psilocybin injector"
@@ -346,14 +346,14 @@
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This contains unstable mutagen, which makes using this a very bad idea. It will either \
ruin your genetic health, turn you into a Five Points violation, or both!"
- filled_reagents = list("mutagen" = 15)
+ filled_reagents = list(REAGENT_ID_MUTAGEN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/lexorin
name = "lexorin injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This contains lexorin, a dangerous toxin that stops respiration, and has been \
implicated in several high-profile assassinations in the past."
- filled_reagents = list("lexorin" = 15)
+ filled_reagents = list(REAGENT_ID_LEXORIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites
name = "medical nanite injector"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 4e50bf488c..202f454fc6 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -136,7 +136,7 @@
/obj/item/reagent_containers/pill/tox/Initialize()
. = ..()
- reagents.add_reagent("toxin", 50)
+ reagents.add_reagent(REAGENT_ID_TOXIN, 50)
color = reagents.get_color()
/obj/item/reagent_containers/pill/cyanide
@@ -146,7 +146,7 @@
/obj/item/reagent_containers/pill/cyanide/Initialize()
. = ..()
- reagents.add_reagent("cyanide", 50)
+ reagents.add_reagent(REAGENT_ID_CYANIDE, 50)
/obj/item/reagent_containers/pill/adminordrazine
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/pill/stox/Initialize()
. = ..()
- reagents.add_reagent("stoxin", 15)
+ reagents.add_reagent(REAGENT_ID_STOXIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/kelotane
@@ -339,9 +339,9 @@
/obj/item/reagent_containers/pill/zoom/Initialize()
. = ..()
if(prob(50)) //VOREStation edit begin: Zoom pill adjustments
- reagents.add_reagent("mold", 2) //Chance to be more dangerous
- reagents.add_reagent("expired_medicine", 5)
- reagents.add_reagent("stimm", 5) //VOREStation edit end: Zoom pill adjustments
+ reagents.add_reagent(REAGENT_ID_MOLD, 2) //Chance to be more dangerous
+ reagents.add_reagent(REAGENT_ID_EXPIREDMEDICINE, 5)
+ reagents.add_reagent(REAGENT_ID_STIMM, 5) //VOREStation edit end: Zoom pill adjustments
color = reagents.get_color()
/obj/item/reagent_containers/pill/diet
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index ea4561c333..c89015e3e2 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -198,7 +198,7 @@
return
/obj/item/reagent_containers/spray/plantbgone
- name = "Plant-B-Gone"
+ name = REAGENT_PLANTBGONE
desc = "Kills those pesky weeds!"
icon = 'icons/obj/hydroponics_machines.dmi'
icon_state = "plantbgone"
@@ -207,7 +207,7 @@
/obj/item/reagent_containers/spray/plantbgone/Initialize()
. = ..()
- reagents.add_reagent("plantbgone", 100)
+ reagents.add_reagent(REAGENT_ID_PLANTBGONE, 100)
/obj/item/reagent_containers/spray/chemsprayer/hosed
name = "hose nozzle"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 2cbd869d08..20d6485b8c 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -369,14 +369,14 @@
/obj/item/reagent_containers/syringe/drugs/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_BLISS, 5)
- reagents.add_reagent("mindbreaker", 5)
- reagents.add_reagent("cryptobiolin", 5)
+ reagents.add_reagent(REAGENT_ID_MINDBREAKER, 5)
+ reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 5)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize()
. = ..()
- reagents.add_reagent("chloralhydrate", 50)
+ reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 50)
mode = SYRINGE_INJECT
update_icon()
diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm
index 44dc798feb..58ce6fe69a 100644
--- a/code/modules/reagents/reagents/core.dm
+++ b/code/modules/reagents/reagents/core.dm
@@ -160,7 +160,7 @@
H.inject_blood(src, removed * volume_mod)
if(!H.isSynthetic() && data["species"] == "synthetic") // Remember not to inject oil into your veins, it's bad for you.
- H.reagents.add_reagent("toxin", removed * 1.5)
+ H.reagents.add_reagent(REAGENT_ID_TOXIN, removed * 1.5)
return
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index 423ac02e23..b4e5e23429 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -4622,7 +4622,7 @@
..()
if(alien == IS_DIONA)
return
- M.reagents.add_reagent("slimejelly", 0.25)
+ M.reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 0.25)
/datum/reagent/ethanol/cloverclub
name = "Clover Club"
diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm
index 9e3255100c..7df322752b 100644
--- a/code/modules/reagents/reagents/medicine.dm
+++ b/code/modules/reagents/reagents/medicine.dm
@@ -267,7 +267,7 @@
else if(alien != IS_DIONA)
M.adjustOxyLoss(-15 * removed * M.species.chem_strength_heal)
- holder.remove_reagent("lexorin", 8 * removed) //VOREStation Edit
+ holder.remove_reagent(REAGENT_ID_LEXORIN, 8 * removed) //VOREStation Edit
/datum/reagent/dexalinp
name = "Dexalin Plus"
@@ -292,7 +292,7 @@
else if(alien != IS_DIONA)
M.adjustOxyLoss(-150 * removed * M.species.chem_strength_heal)
- holder.remove_reagent("lexorin", 3 * removed)
+ holder.remove_reagent(REAGENT_ID_LEXORIN, 3 * removed)
/datum/reagent/tricordrazine
name = "Tricordrazine"
@@ -584,7 +584,7 @@
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
- holder.remove_reagent("mindbreaker", 5)
+ holder.remove_reagent(REAGENT_ID_MINDBREAKER, 5)
M.hallucination = max(0, M.hallucination - 10)
M.adjustToxLoss(10 * removed * chem_effective) // It used to be incredibly deadly due to an oversight. Not anymore!
M.add_chemical_effect(CE_PAINKILLER, 20 * chem_effective * M.species.chem_strength_pain)
diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm
index be61b6da43..444e1b7a28 100644
--- a/code/modules/reagents/reagents/toxins.dm
+++ b/code/modules/reagents/reagents/toxins.dm
@@ -1,8 +1,8 @@
/* Toxins, poisons, venoms */
/datum/reagent/toxin
- name = "toxin"
- id = "toxin"
+ name = REAGENT_TOXIN
+ id = REAGENT_ID_TOXIN
description = "A toxic chemical."
taste_description = "bitterness"
taste_mult = 1.2
@@ -29,8 +29,8 @@
affect_blood(M, alien, removed * 0.2)
/datum/reagent/toxin/plasticide
- name = "Plasticide"
- id = "plasticide"
+ name = REAGENT_PLASTICIDE
+ id = REAGENT_ID_PLASTICIDE
description = "Liquid plastic, do not eat."
taste_description = "plastic"
reagent_state = LIQUID
@@ -38,8 +38,8 @@
strength = 5
/datum/reagent/toxin/amatoxin
- name = "Amatoxin"
- id = "amatoxin"
+ name = REAGENT_AMATOXIN
+ id = REAGENT_ID_AMATOXIN
description = "A powerful poison derived from certain species of mushroom."
taste_description = "mushroom"
reagent_state = LIQUID
@@ -52,8 +52,8 @@
M.adjustToxLoss(max_dose * strength * removed / (max_dose * 0.2))
/datum/reagent/toxin/carpotoxin
- name = "Carpotoxin"
- id = "carpotoxin"
+ name = REAGENT_CARPOTOXIN
+ id = REAGENT_ID_CARPOTOXIN
description = "A deadly neurotoxin produced by the dreaded space carp."
taste_description = "fish"
reagent_state = LIQUID
@@ -65,8 +65,8 @@
M.adjustBrainLoss(strength / 4 * removed)
/datum/reagent/toxin/neurotoxic_protein
- name = "toxic protein"
- id = "neurotoxic_protein"
+ name = REAGENT_NEUROTOXIC_PROTEIN
+ id = REAGENT_ID_NEUROTOXIC_PROTEIN
description = "A weak neurotoxic chemical."
taste_description = "fish"
reagent_state = LIQUID
@@ -89,8 +89,8 @@
//R-UST port
// Produced during deuterium synthesis. Super poisonous, SUPER flammable (doesn't need oxygen to burn).
/datum/reagent/toxin/hydrophoron
- name = "Hydrophoron"
- id = "hydrophoron"
+ name = REAGENT_HYDROPHORON
+ id = REAGENT_ID_HYDROPHORON
description = "An exceptionally flammable molecule formed from deuterium synthesis."
strength = 80
var/fire_mult = 30
@@ -179,8 +179,8 @@
remove_self(amount)
/datum/reagent/toxin/cyanide //Fast and Lethal
- name = "Cyanide"
- id = "cyanide"
+ name = REAGENT_CYANIDE
+ id = REAGENT_ID_CYANIDE
description = "A highly toxic chemical."
taste_description = "almond"
taste_mult = 0.6
@@ -195,8 +195,8 @@
M.Sleeping(1)
/datum/reagent/toxin/mold
- name = "Mold"
- id = "mold"
+ name = REAGENT_MOLD
+ id = REAGENT_ID_MOLD
description = "A mold is a fungus that causes biodegradation of natural materials. This variant contains mycotoxins, and is dangerous to humans."
taste_description = "mold"
reagent_state = SOLID
@@ -208,8 +208,8 @@
M.vomit()
/datum/reagent/toxin/expired_medicine
- name = "Expired Medicine"
- id = "expired_medicine"
+ name = REAGENT_EXPIREDMEDICINE
+ id = REAGENT_ID_EXPIREDMEDICINE
description = "Some form of liquid medicine that is well beyond its shelf date. Administering it now would cause illness."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -226,8 +226,8 @@
/datum/reagent/toxin/stimm //Homemade Hyperzine
- name = "Stimm"
- id = "stimm"
+ name = REAGENT_STIMM
+ id = REAGENT_ID_STIMM
description = "A homemade stimulant with some serious side-effects."
taste_description = "sweetness"
taste_mult = 1.8
@@ -257,8 +257,8 @@
to_chat(M, span_warning("Huh... Is this what a heart attack feels like?"))
/datum/reagent/toxin/potassium_chloride
- name = "Potassium Chloride"
- id = "potassium_chloride"
+ name = REAGENT_POTASSIUMCHLORIDE
+ id = REAGENT_ID_POTASSIUMCHLORIDE
description = "A delicious salt that stops the heart when injected into cardiac muscle."
taste_description = "salt"
reagent_state = SOLID
@@ -283,8 +283,8 @@
H.Weaken(10)
/datum/reagent/toxin/potassium_chlorophoride
- name = "Potassium Chlorophoride"
- id = "potassium_chlorophoride"
+ name = REAGENT_POTASSIUMCHLOROPHORIDE
+ id = REAGENT_ID_POTASSIUMCHLOROPHORIDE
description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
taste_description = "salt"
reagent_state = SOLID
@@ -306,8 +306,8 @@
M.adjustFireLoss(removed * 3)
/datum/reagent/toxin/zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
+ name = REAGENT_ZOMBIEPOWDER
+ id = REAGENT_ID_ZOMBIEPOWDER
description = "A strong neurotoxin that puts the subject into a death-like state."
taste_description = "numbness"
reagent_state = SOLID
@@ -333,8 +333,8 @@
return ..()
/datum/reagent/toxin/lichpowder
- name = "Lich Powder"
- id = "lichpowder"
+ name = REAGENT_LICHPOWDER
+ id = REAGENT_ID_LICHPOWDER
description = "A stablized nerve agent that puts the subject into a strange state of un-death."
reagent_state = SOLID
color = "#666666"
@@ -362,8 +362,8 @@
return ..()
/datum/reagent/toxin/fertilizer //Reagents used for plant fertilizers.
- name = "fertilizer"
- id = "fertilizer"
+ name = REAGENT_FERTILIZER
+ id = REAGENT_ID_FERTILIZER
description = "A chemical mix good for growing plants with."
taste_description = "plant food"
taste_mult = 0.5
@@ -372,20 +372,20 @@
color = "#664330"
/datum/reagent/toxin/fertilizer/eznutrient
- name = "EZ Nutrient"
- id = "eznutrient"
+ name = REAGENT_EZNUTRIENT
+ id = REAGENT_ID_EZNUTRIENT
/datum/reagent/toxin/fertilizer/left4zed
- name = "Left-4-Zed"
- id = "left4zed"
+ name = REAGENT_LEFT4ZED
+ id = REAGENT_ID_LEFT4ZED
/datum/reagent/toxin/fertilizer/robustharvest
- name = "Robust Harvest"
- id = "robustharvest"
+ name = REAGENT_ROBUSTHARVEST
+ id = REAGENT_ID_ROBUSTHARVEST
/datum/reagent/toxin/fertilizer/tannin
- name = "tannin"
- id = "tannin"
+ name = REAGENT_TANNIN
+ id = REAGENT_ID_TANNIN
description = "A chemical found in some plants as a natural pesticide. It may also aid in regulating growth."
taste_description = "puckering"
taste_mult = 1.2
@@ -401,8 +401,8 @@
..()
/datum/reagent/toxin/plantbgone
- name = "Plant-B-Gone"
- id = "plantbgone"
+ name = REAGENT_PLANTBGONE
+ id = REAGENT_ID_PLANTBGONE
description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
taste_mult = 1
reagent_state = LIQUID
@@ -436,8 +436,8 @@
M.adjustToxLoss(50 * removed)
/datum/reagent/toxin/sifslurry
- name = "Sivian Sap"
- id = "sifsap"
+ name = REAGENT_SIFSAP
+ id = REAGENT_ID_SIFSAP
description = "A natural slurry comprised of fluorescent bacteria native to Sif, in the Vir system."
taste_description = "sour"
reagent_state = LIQUID
@@ -476,8 +476,8 @@
meltdose = 4
/datum/reagent/acid/digestive
- name = "Digestive acid"
- id = "stomacid"
+ name = REAGENT_STOMACID
+ id = REAGENT_ID_STOMACID
description = "Some form of digestive slurry."
taste_description = "vomit"
reagent_state = LIQUID
@@ -486,8 +486,8 @@
meltdose = 30
/datum/reagent/thermite/venom
- name = "Pyrotoxin"
- id = "thermite_v"
+ name = REAGENT_THERMITEV
+ id = REAGENT_ID_THERMITEV
description = "A biologically produced compound capable of melting steel or other metals, similarly to thermite."
taste_description = "sweet chalk"
reagent_state = SOLID
@@ -508,8 +508,8 @@
to_chat(M, span_critical("Some of your veins rupture, the exposed blood igniting!"))
/datum/reagent/condensedcapsaicin/venom
- name = "Irritant toxin"
- id = "condensedcapsaicin_v"
+ name = REAGENT_CONDENSEDCAPSAICINV
+ id = REAGENT_ID_CONDENSEDCAPSAICINV
description = "A biological agent that acts similarly to pepperspray. This compound seems to be particularly cruel, however, capable of permeating the barriers of blood vessels."
taste_description = "fire"
color = "#B31008"
@@ -530,8 +530,8 @@
M.eye_blurry = max(M.eye_blurry, 10)
/datum/reagent/lexorin
- name = "Lexorin"
- id = "lexorin"
+ name = REAGENT_LEXORIN
+ id = REAGENT_ID_LEXORIN
description = "Lexorin temporarily stops respiration. Causes tissue damage."
taste_description = "acid"
reagent_state = LIQUID
@@ -558,8 +558,8 @@
M.AdjustLosebreath(1)
/datum/reagent/mutagen
- name = "Unstable mutagen"
- id = "mutagen"
+ name = REAGENT_MUTAGEN
+ id = REAGENT_ID_MUTAGEN
description = "Might cause unpredictable mutations. Keep away from children."
taste_description = "slime"
taste_mult = 0.9
@@ -627,8 +627,8 @@
M.apply_effect(10 * removed, IRRADIATE, 0)
/datum/reagent/slimejelly
- name = "Slime Jelly"
- id = "slimejelly"
+ name = REAGENT_SLIMEJELLY
+ id = REAGENT_ID_SLIMEJELLY
description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
taste_description = "slime"
taste_mult = 1.3
@@ -652,8 +652,8 @@
M.heal_organ_damage(25 * removed, 0)
/datum/reagent/soporific
- name = "Soporific"
- id = "stoxin"
+ name = REAGENT_STOXIN
+ id = REAGENT_ID_STOXIN
description = "An effective hypnotic used to treat insomnia."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -699,8 +699,8 @@
M.drowsyness = max(M.drowsyness, 60)
/datum/reagent/chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
+ name = REAGENT_CHLORALHYDRATE
+ id = REAGENT_ID_CHLORALHYDRATE
description = "A powerful sedative."
taste_description = "bitterness"
reagent_state = SOLID
@@ -750,8 +750,8 @@
M.adjustOxyLoss(removed * overdose_mod)
/datum/reagent/chloralhydrate/beer2 //disguised as normal beer for use by emagged brobots
- name = "Beer"
- id = "beer2"
+ name = REAGENT_BEER2
+ id = REAGENT_ID_BEER2
description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong.
taste_description = "beer"
reagent_state = LIQUID
@@ -763,8 +763,8 @@
/* Drugs */
/datum/reagent/serotrotium
- name = "Serotrotium"
- id = "serotrotium"
+ name = REAGENT_SEROTROTIUM
+ id = REAGENT_ID_SEROTROTIUM
description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -780,8 +780,8 @@
return
/datum/reagent/serotrotium/venom
- name = "Serotropic venom"
- id = "serotrotium_v"
+ name = REAGENT_SEROTROTIUMV
+ id = REAGENT_ID_SEROTROTIUMV
description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans. This appears to be a biologically produced form, resulting in a specifically toxic nature."
taste_description = "chalky bitterness"
filtered_organs = list(O_SPLEEN)
@@ -796,8 +796,8 @@
return ..()
/datum/reagent/cryptobiolin
- name = "Cryptobiolin"
- id = "cryptobiolin"
+ name = REAGENT_CRYPTOBIOLIN
+ id = REAGENT_ID_CRYPTOBIOLIN
description = "Cryptobiolin causes confusion and dizzyness."
taste_description = "sourness"
reagent_state = LIQUID
@@ -820,8 +820,8 @@
M.Confuse(drug_strength * 5)
/datum/reagent/impedrezene
- name = "Impedrezene"
- id = "impedrezene"
+ name = REAGENT_IMPEDREZENE
+ id = REAGENT_ID_IMPEDREZENE
description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
taste_description = "numbness"
reagent_state = LIQUID
@@ -841,8 +841,8 @@
M.emote("drool")
/datum/reagent/mindbreaker
- name = "Mindbreaker Toxin"
- id = "mindbreaker"
+ name = REAGENT_MINDBREAKER
+ id = REAGENT_ID_MINDBREAKER
description = "A powerful hallucinogen, it can cause fatal effects in users."
taste_description = "sourness"
reagent_state = LIQUID
@@ -867,8 +867,8 @@
/* Transformations */
/datum/reagent/slimetoxin
- name = "Mutation Toxin"
- id = "mutationtoxin"
+ name = REAGENT_MUTATIONTOXIN
+ id = REAGENT_ID_MUTATIONTOXIN
description = "A corruptive toxin produced by slimes."
taste_description = "sludge"
reagent_state = LIQUID
@@ -897,8 +897,8 @@
M.apply_effect(16 * removed, IRRADIATE, 0)
/datum/reagent/aslimetoxin
- name = "Docility Toxin"
- id = "docilitytoxin"
+ name = REAGENT_DOCILITYTOXIN
+ id = REAGENT_ID_DOCILITYTOXIN
description = "A corruptive toxin produced by slimes."
taste_description = "sludge"
reagent_state = LIQUID
@@ -932,8 +932,8 @@
*/
/datum/reagent/shredding_nanites
- name = "Restorative Nanites"
- id = "shredding_nanites"
+ name = REAGENT_SHREDDINGNANITES
+ id = REAGENT_ID_SHREDDINGNANITES
description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be malfunctioning."
taste_description = "metal"
reagent_state = SOLID
@@ -946,8 +946,8 @@
M.adjustOxyLoss(4 * removed)
/datum/reagent/irradiated_nanites
- name = "Restorative Nanites"
- id = "irradiated_nanites"
+ name = REAGENT_IRRADIATEDNANITES
+ id = REAGENT_ID_IRRADIATEDNANITES
description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be malfunctioning."
taste_description = "metal"
reagent_state = SOLID
@@ -960,8 +960,8 @@
M.radiation = max(M.radiation + 5 * removed, 0) // Irradiate you. Because it's inside you.
/datum/reagent/neurophage_nanites
- name = "Restorative Nanites"
- id = "neurophage_nanites"
+ name = REAGENT_NEUROPHAGENANITES
+ id = REAGENT_ID_NEUROPHAGENANITES
description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be completely hostile."
taste_description = "metal"
reagent_state = SOLID
@@ -975,8 +975,8 @@
M.adjustBruteLoss(2 * removed)
/datum/reagent/salmonella
- name = "Salmonella"
- id = "salmonella"
+ name = REAGENT_SALMONELLA
+ id = REAGENT_ID_SALMONELLA
description = "A nasty bacteria found in spoiled food."
reagent_state = LIQUID
color = "#1E4600"
diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm
index 7bfd9f9965..00455f05e5 100644
--- a/code/modules/xenoarcheaology/effect_master.dm
+++ b/code/modules/xenoarcheaology/effect_master.dm
@@ -305,7 +305,7 @@
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))
+ else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent("neurotoxin", 1))
if(my_effect.trigger == TRIGGER_TOXIN)
my_effect.ToggleActivate()
else if(istype(W,/obj/item/melee/baton) && W:status ||\
@@ -330,7 +330,7 @@
var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER)
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")
+ var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,"neurotoxin")
for(var/datum/artifact_effect/my_effect in my_effects)
if(Touching.id in water)
diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm
index 9c2385e43c..e6b476c7bd 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,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,"stoxin",REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER)
+ spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_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/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index 9c06e5db82..73f9f04e7e 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -96,9 +96,9 @@
..()
/decl/chemical_reaction/instant/slime/grey_slimejelly
- name = "Slime Jelly"
+ name = REAGENT_SLIMEJELLY
id = "m_jelly"
- result = "slimejelly"
+ result = REAGENT_ID_SLIMEJELLY
required_reagents = list("peridaxon" = 5)
result_amount = 15
required = /obj/item/slime_extract/grey
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index 96d8356f03..f70a98e702 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -105,9 +105,9 @@
/decl/chemical_reaction/instant/slime/grey_slimejelly
- name = "Slime Jelly"
+ name = REAGENT_SLIMEJELLY
id = "m_grey_jelly"
- result = "slimejelly"
+ result = REAGENT_ID_SLIMEJELLY
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/grey
@@ -170,7 +170,7 @@
/decl/chemical_reaction/instant/slime/metal_materials_steel
name = "Slime Weird Construction Materials"
id = "m_metal_steel"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/metal
@@ -248,7 +248,7 @@
name = "Slime Cryotoxin"
id = "m_blue_cryotoxin"
result = "cryotoxin"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 30
required = /obj/item/slime_extract/blue
@@ -304,7 +304,7 @@
/decl/chemical_reaction/instant/slime/purple_fertility
name = "Slime Fetility"
id = "m_purple_fertility"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/purple
@@ -428,8 +428,8 @@
/decl/chemical_reaction/instant/slime/orange_pyrotoxin
name = "Slime Pyrotoxin"
id = "m_orange_pyrotoxin"
- result = "thermite_v"
- required_reagents = list("slimejelly" = 5)
+ result = REAGENT_ID_THERMITEV
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 30
required = /obj/item/slime_extract/orange
@@ -495,7 +495,7 @@
/decl/chemical_reaction/instant/slime/yellow_battery
name = "Slime Cell"
id = "m_yellow_cell"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/yellow
@@ -579,7 +579,7 @@
/decl/chemical_reaction/instant/slime/gold_materials_gold
name = "Slime Gold"
id = "m_gold_gold"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/gold
@@ -654,7 +654,7 @@
/decl/chemical_reaction/instant/slime/silver_materials_silver
name = "Slime Silver"
id = "m_silver_silver"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/silver
@@ -686,7 +686,7 @@
name = "Slime Blood"
id = "m_darkpurple_blood"
result = REAGENT_ID_BLOOD
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 30
required = /obj/item/slime_extract/dark_purple
@@ -810,7 +810,7 @@
/decl/chemical_reaction/instant/slime/dark_blue_death
name = "Slime Death"
id = "m_darkblue_death"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/dark_blue
@@ -890,7 +890,7 @@
/decl/chemical_reaction/instant/slime/red_ferality
name = "Slime Ferality"
id = "m_red_ferality"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/red
@@ -951,7 +951,7 @@
/decl/chemical_reaction/instant/slime/green_uranium
name = "Slime Uranium"
id = "m_green_uranium"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/green
@@ -1001,7 +1001,7 @@
/decl/chemical_reaction/instant/slime/pink_heal_pulse
name = "Slime Heal Pulse"
id = "m_pink_heal_pulse"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/pink
@@ -1063,7 +1063,7 @@
/decl/chemical_reaction/instant/slime/oil_explosion
name = "Slime Explosion"
id = "m_oil_boom"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/oil
@@ -1151,7 +1151,7 @@
/decl/chemical_reaction/instant/slime/bluespace_teleporter
name = "Slime Bluespace Teleporter"
id = "m_bs_teleporter"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/bluespace
@@ -1211,7 +1211,7 @@
/decl/chemical_reaction/instant/slime/cerulean_random_potion
name = "Slime Random Potion"
id = "m_cerulean_random_potion"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/cerulean
@@ -1284,7 +1284,7 @@
name = "Slime Goop"
id = "m_amber_goop"
result = "slime_goop"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 30
required = /obj/item/slime_extract/amber
@@ -1316,7 +1316,7 @@
/decl/chemical_reaction/instant/slime/sapphire_mutation
name = "Slime Mutation Toxins"
id = "m_sapphire_mutation_tox"
- result = "mutationtoxin"
+ result = REAGENT_ID_MUTATIONTOXIN
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/sapphire
@@ -1343,7 +1343,7 @@
/decl/chemical_reaction/instant/slime/sapphire_sapience
name = "Slime Sapience"
id = "m_sapphire_sapience"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/sapphire
@@ -1417,7 +1417,7 @@
/decl/chemical_reaction/instant/slime/ruby_push
name = "Slime Push"
id = "m_ruby_push"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/ruby
@@ -1513,7 +1513,7 @@
/decl/chemical_reaction/instant/slime/emerald_hell
name = "Slime Hell"
id = "m_emerald_hell"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/emerald
@@ -1578,7 +1578,7 @@
/decl/chemical_reaction/instant/slime/light_pink_obedience
name = "Slime Obedience"
id = "m_lightpink_obedience"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/light_pink
@@ -1652,7 +1652,7 @@
/decl/chemical_reaction/instant/slime/rainbow_unity
name = "Slime Unity"
id = "m_rainbow_unity"
- required_reagents = list("slimejelly" = 5)
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 1
required = /obj/item/slime_extract/rainbow
diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm
index b82d70f86d..f821f024cd 100644
--- a/code/modules/xenobio2/_xeno_setup.dm
+++ b/code/modules/xenobio2/_xeno_setup.dm
@@ -48,21 +48,21 @@
#define MINOR_MALEABLE 1
#define MIN_MALEABLE 0
-var/global/list/xenoChemList = list("mutationtoxin",
+var/global/list/xenoChemList = list(REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_PSILOCYBIN,
- "mindbreaker",
- "impedrezene",
- "cryptobiolin",
+ REAGENT_ID_MINDBREAKER,
+ REAGENT_ID_IMPEDREZENE,
+ REAGENT_ID_CRYPTOBIOLIN,
REAGENT_ID_BLISS,
- "chloralhydrate",
- "stoxin",
- "mutagen",
- "lexorin",
+ REAGENT_ID_CHLORALHYDRATE,
+ REAGENT_ID_STOXIN,
+ REAGENT_ID_MUTAGEN,
+ REAGENT_ID_LEXORIN,
REAGENT_ID_PACID,
- "cyanide",
+ REAGENT_ID_CYANIDE,
REAGENT_ID_PHORON,
- "plasticide",
- "amatoxin",
+ REAGENT_ID_PLASTICIDE,
+ REAGENT_ID_AMATOXIN,
REAGENT_ID_CARBON,
REAGENT_ID_RADIUM,
REAGENT_ID_SACID,
@@ -76,8 +76,8 @@ var/global/list/xenoChemList = list("mutationtoxin",
"imidazoline",
"peridaxon",
"rezadone",
- "mutationtoxin",
- "docilitytoxin")
+ REAGENT_ID_MUTATIONTOXIN,
+ REAGENT_ID_MUTATIONTOXIN)
/datum/xeno/traits
var/list/traits = list()
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index f093290d5e..4d199afdaf 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -26,17 +26,17 @@
xenoChemList += REAGENT_ID_SIZEOXADONE
xenoChemList += REAGENT_ID_ICKYPAK
xenoChemList += REAGENT_ID_UNSORBITOL
- xenoChemList += "toxin"
- xenoChemList += "carpotoxin"
- xenoChemList += "potassium_chloride"
- xenoChemList += "potassium_chlorophoride"
- xenoChemList += "zombiepowder"
- xenoChemList += "fertilizer"
- xenoChemList += "eznutrient"
- xenoChemList += "left4zed"
- xenoChemList += "robustharvest"
- xenoChemList += "plantbgone"
- xenoChemList += "serotrotium"
+ xenoChemList += REAGENT_ID_TOXIN
+ xenoChemList += REAGENT_ID_CARPOTOXIN
+ xenoChemList += REAGENT_ID_POTASSIUMCHLORIDE
+ xenoChemList += REAGENT_ID_POTASSIUMCHLOROPHORIDE
+ xenoChemList += REAGENT_ID_ZOMBIEPOWDER
+ xenoChemList += REAGENT_ID_FERTILIZER
+ xenoChemList += REAGENT_ID_EZNUTRIENT
+ xenoChemList += REAGENT_ID_LEFT4ZED
+ xenoChemList += REAGENT_ID_ROBUSTHARVEST
+ xenoChemList += REAGENT_ID_PLANTBGONE
+ xenoChemList += REAGENT_ID_SEROTROTIUM
xenoChemList += REAGENT_ID_NICOTINE
xenoChemList += REAGENT_ID_URANIUM
xenoChemList += REAGENT_ID_SILVER
diff --git a/code/modules/xenobio2/mob/slime/slime procs.dm b/code/modules/xenobio2/mob/slime/slime procs.dm
index 2bd5912958..91fc793e51 100644
--- a/code/modules/xenobio2/mob/slime/slime procs.dm
+++ b/code/modules/xenobio2/mob/slime/slime procs.dm
@@ -29,7 +29,7 @@ Slime specific procs go here.
if(prob(40))
var/hasMutToxin
for(var/R in traitdat.chems)
- if(R == "mutationtoxin")
+ if(R == REAGENT_ID_MUTATIONTOXIN)
hasMutToxin = 1
var/chemamount
if(hasMutToxin)
@@ -40,7 +40,7 @@ Slime specific procs go here.
traitdat.chems[chemtype] = chemamount
else
chemamount = rand(1,5)
- traitdat.chems["mutationtoxin"] = chemamount
+ traitdat.chems[REAGENT_ID_MUTATIONTOXIN] = chemamount
/mob/living/simple_mob/xeno/slime/proc/GrowUp()
GenerateAdult()
@@ -115,7 +115,7 @@ Slime specific procs go here.
return
if(reagents.total_volume <= 0)
return
- if(reagents.has_reagent("docilitytoxin")) //Toxin that makes them docile? Good for quelling angry mobs.
+ if(reagents.has_reagent(REAGENT_ID_MUTATIONTOXIN)) //Toxin that makes them docile? Good for quelling angry mobs.
hostile = 0
traitdat.traits[TRAIT_XENO_HOSTILE] = 0
..()
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index 4831b54136..b501624fb7 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -21,7 +21,7 @@ Slime definitions, Life and New live here.
var/growthpoint = 25 //At what point they grow up.
var/shiny = 0
move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
- default_chems = list("slimejelly" = 5)
+ default_chems = list(REAGENT_ID_SLIMEJELLY = 5)
attacktext = list("absorbed some of")
response_help = "pats"
response_disarm = "tries to stop"
@@ -48,7 +48,7 @@ Slime definitions, Life and New live here.
chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5),
REAGENT_ID_RADIUM = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
- "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
+ REAGENT_ID_MUTAGEN = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
REAGENT_ID_WATER = list(XENO_CHEM_NUTRI = -0.1),
"milk" = list(XENO_CHEM_NUTRI = 0.3),
REAGENT_ID_SACID = list(XENO_CHEM_TOXIC = 1),
@@ -59,26 +59,26 @@ Slime definitions, Life and New live here.
"beer" = list(XENO_CHEM_NUTRI = 0.6),
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),
+ REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),
"cryoxadone" = list(XENO_CHEM_TOXIC = 0.4),
"flourine" = list(XENO_CHEM_TOXIC = 0.1),
- "robustharvest" = list(XENO_CHEM_NUTRI = 1.5),
+ REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5),
"glucose" = list(XENO_CHEM_NUTRI = 0.5),
REAGENT_ID_BLOOD = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
REAGENT_ID_FUEL = list(XENO_CHEM_TOXIC = 0.4),
- "toxin" = list(XENO_CHEM_TOXIC = 0.5),
- "carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
+ REAGENT_ID_TOXIN = list(XENO_CHEM_TOXIC = 0.5),
+ REAGENT_ID_CARPOTOXIN = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
"virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
- "cyanide" = list(XENO_CHEM_TOXIC = 3.5),
- "slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
+ REAGENT_ID_CYANIDE = list(XENO_CHEM_TOXIC = 3.5),
+ REAGENT_ID_SLIMEJELLY = list(XENO_CHEM_NUTRI = 0.5),
"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_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),
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) )
+ REAGENT_ID_MUTATIONTOXIN = list(XENO_CHEM_NUTRI = 0.3) )
/mob/living/simple_mob/xeno/slime/New()
..()
From 1d8d5b34b5f2590171e3936d0eea2dec48cb7e7d Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sat, 7 Dec 2024 02:10:10 +0100
Subject: [PATCH 09/29] medicine.dm
---
code/__defines/chemistry.dm | 4 +-
code/__defines/reagents.dm | 165 +++++++---
code/datums/diseases/_disease.dm | 2 +-
code/datums/diseases/advance/advance.dm | 4 +-
.../diseases/advance/symptoms/oxygen.dm | 4 +-
.../diseases/advance/symptoms/sensory.dm | 8 +-
.../diseases/advance/symptoms/stimulant.dm | 4 +-
code/datums/diseases/brainrot.dm | 4 +-
code/datums/diseases/cold.dm | 2 +-
code/datums/diseases/cold9.dm | 4 +-
code/datums/diseases/flu.dm | 4 +-
code/datums/diseases/gbs.dm | 4 +-
code/datums/diseases/roanoake.dm | 4 +-
code/game/gamemodes/newobjective.dm | 16 +-
code/game/machinery/Sleeper.dm | 10 +-
code/game/machinery/cloning.dm | 4 +-
code/game/machinery/cryo.dm | 4 +-
code/game/mecha/equipment/tools/sleeper.dm | 4 +-
.../game/mecha/equipment/tools/syringe_gun.dm | 2 +-
code/game/objects/items/devices/flashlight.dm | 2 +-
.../objects/items/devices/scanners/health.dm | 4 +-
code/game/objects/items/weapons/ecigs.dm | 2 +-
.../items/weapons/storage/uplink_kits.dm | 2 +-
code/modules/blob2/core_chunk.dm | 2 +-
code/modules/blob2/overmind/types/classic.dm | 2 +-
.../rig/modules/specific/chem_dispenser.dm | 66 ++--
.../rig/modules/specific/rescue_pharm_vr.dm | 8 +-
.../spacesuits/rig/modules/utility.dm | 52 +--
code/modules/food/food/snacks.dm | 48 +--
code/modules/food/food/snacks/meat.dm | 4 +-
code/modules/food/food/snacks_vr.dm | 2 +-
code/modules/food/food/superfoods.dm | 16 +-
code/modules/food/glass/bottle.dm | 4 +-
code/modules/food/glass/bottle/robot.dm | 8 +-
code/modules/food/glass/bottle_potion.dm | 24 +-
code/modules/food/glass/bottle_vr.dm | 36 +--
code/modules/genetics/side_effects.dm | 6 +-
code/modules/hydroponics/grown.dm | 8 +-
.../modules/hydroponics/seedtypes/ambrosia.dm | 8 +-
code/modules/hydroponics/seedtypes/carrots.dm | 2 +-
code/modules/hydroponics/seedtypes/flowers.dm | 4 +-
code/modules/hydroponics/seedtypes/grapes.dm | 2 +-
code/modules/hydroponics/seedtypes/kudzu.dm | 2 +-
code/modules/hydroponics/seedtypes/lettuce.dm | 2 +-
.../hydroponics/seedtypes/malanitear.dm | 4 +-
.../hydroponics/seedtypes/selemhand.dm | 4 +-
code/modules/hydroponics/seedtypes/surik.dm | 2 +-
code/modules/hydroponics/seedtypes/tobacco.dm | 2 +-
code/modules/hydroponics/seedtypes/vale.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 6 +-
code/modules/mob/living/bot/medbot.dm | 18 +-
.../living/carbon/human/MedicalSideEffects.dm | 14 +-
.../living/carbon/human/chem_side_effects.dm | 14 +-
.../silicon/robot/dogborg/dog_modules_vr.dm | 6 +-
.../silicon/robot/dogborg/dog_sleeper_vr.dm | 16 +-
.../subtypes/animal/alien animals/stardog.dm | 2 +-
.../subtypes/animal/borer/borer_powers.dm | 2 +-
.../simple_mob/subtypes/animal/sif/leech.dm | 22 +-
.../simple_mob/subtypes/vore/bigdragon.dm | 2 +-
code/modules/organs/internal/liver.dm | 4 +-
code/modules/organs/internal/spleen.dm | 4 +-
code/modules/organs/misc.dm | 4 +-
code/modules/organs/organ_external.dm | 6 +-
.../machinery/dispenser/cartridge_presets.dm | 52 +--
.../dispenser/cartridge_presets_vr.dm | 8 +-
.../machinery/dispenser/dispenser2_energy.dm | 10 +-
.../reactions/distilling/distilling.dm | 30 +-
.../reagents/reactions/instant/drinks.dm | 6 +-
.../reagents/reactions/instant/food.dm | 2 +-
.../reagents/reactions/instant/food_vr.dm | 2 +-
.../reagents/reactions/instant/instant.dm | 296 +++++++++---------
.../reagents/reactions/instant/instant_vr.dm | 16 +-
.../reagents/reactions/instant/virology.dm | 4 +-
.../reagents/reagent_containers/borghypo.dm | 10 +-
.../reagents/reagent_containers/glass.dm | 2 +-
.../reagents/reagent_containers/glass_vr.dm | 24 +-
.../reagents/reagent_containers/hypospray.dm | 30 +-
.../reagent_containers/hypospray_vr.dm | 8 +-
.../reagents/reagent_containers/pill.dm | 60 ++--
.../reagents/reagent_containers/pill_vr.dm | 72 ++---
.../reagents/reagent_containers/spray.dm | 4 +-
.../reagents/reagent_containers/syringes.dm | 8 +-
code/modules/reagents/reagents/food_drinks.dm | 2 +-
code/modules/reagents/reagents/medicine.dm | 239 +++++++-------
code/modules/resleeving/machines.dm | 4 +-
code/modules/surgery/other.dm | 2 +-
.../vore/fluffstuff/custom_items_vr.dm | 2 +-
.../tools/geosample_scanner.dm | 12 +-
code/modules/xenobio/items/extracts.dm | 2 +-
code/modules/xenobio/items/extracts_vr.dm | 2 +-
code/modules/xenobio2/_xeno_setup.dm | 18 +-
code/modules/xenobio2/_xeno_setup_vr.dm | 36 +--
code/modules/xenobio2/mob/slime/slime.dm | 2 +-
maps/expedition_vr/alienship/_alienship.dm | 2 +-
94 files changed, 881 insertions(+), 789 deletions(-)
diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index fa1831e488..a730c1a449 100644
--- a/code/__defines/chemistry.dm
+++ b/code/__defines/chemistry.dm
@@ -49,8 +49,8 @@
#define ANTIBIO_SUPER 3
// Chemistry lists.
-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, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
+var/list/tachycardics = list("coffee", REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
+var/list/bradycardics = list("neurotoxin", REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
var/list/heartstopper = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart.
var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE) // This stops the heart when overdose is met. -- c = conditional
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
index 6924c51c0c..32e6df659b 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -166,40 +166,100 @@
#define REAGENT_ID_POLYMORPH "polymorph"
#define REAGENT_GLAMOUR "Glamour"
#define REAGENT_ID_GLAMOUR "glamour"
-
-
-
-
-#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_
-#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_
-#define REAGENT_
-#define REAGENT_ID_
-
-
+#define REAGENT_INAPROVALINE "Inaprovaline"
+#define REAGENT_ID_INAPROVALINE "inaprovaline"
+#define REAGENT_INAPROVALAZE "Inaprovalaze"
+#define REAGENT_ID_INAPROVALAZE "inaprovalaze"
+#define REAGENT_BICARIDINE "Bicaridine"
+#define REAGENT_ID_BICARIDINE "bicaridine"
+#define REAGENT_BICARIDAZE "Bicaridaze"
+#define REAGENT_ID_BICARIDAZE "bicaridaze"
+#define REAGENT_CALCIUMCARBONATE "calcium carbonate"
#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
-
-
-
-
-
+#define REAGENT_KELOTANE "Kelotane"
+#define REAGENT_ID_KELOTANE "kelotane"
+#define REAGENT_DERMALINE "Dermaline"
+#define REAGENT_ID_DERMALINE "dermaline"
+#define REAGENT_DERMALAZE "Dermalaze"
+#define REAGENT_ID_DERMALAZE "dermalaze"
+#define REAGENT_ANTITOXIN "Dylovene"
+#define REAGENT_ID_ANTITOXIN "anti_toxin"
+#define REAGENT_CARTHATOLINE "Carthatoline"
+#define REAGENT_ID_CARTHATOLINE "carthatoline"
+#define REAGENT_DEXALIN "Dexalin"
+#define REAGENT_ID_DEXALIN "dexalin"
+#define REAGENT_DEXALINP "Dexalin Plus"
+#define REAGENT_ID_DEXALINP "dexalinp"
+#define REAGENT_TRICORDRAZINE "Tricordrazine"
+#define REAGENT_ID_TRICORDRAZINE "tricordrazine"
+#define REAGENT_TRICORLIDAZE "Tricorlidaze"
+#define REAGENT_ID_TRICORLIDAZE "tricorlidaze"
+#define REAGENT_CRYOXADONE "Cryoxadone"
+#define REAGENT_ID_CRYOXADONE "cryoxadone"
+#define REAGENT_CLONEXADONE "Clonexadone"
+#define REAGENT_ID_CLONEXADONE "clonexadone"
+#define REAGENT_MORTIFERIN "Mortiferin"
+#define REAGENT_ID_MORTIFERIN "mortiferin"
+#define REAGENT_NECROXADONE "Necroxadone"
+#define REAGENT_ID_NECROXADONE "necroxadone"
+#define REAGENT_PARACETAMOL "Paracetamol"
+#define REAGENT_ID_PARACETAMOL "paracetamol"
+#define REAGENT_TRAMADOL "Tramadol"
+#define REAGENT_ID_TRAMADOL "tramadol"
+#define REAGENT_OXYCODONE "Oxycodone"
+#define REAGENT_ID_OXYCODONE "oxycodone"
+#define REAGENT_SYNAPTIZINE "Synaptizine"
+#define REAGENT_ID_SYNAPTIZINE "synaptizine"
+#define REAGENT_HYPERZINE "Hyperzine"
+#define REAGENT_ID_HYPERZINE "hyperzine"
+#define REAGENT_ALKYSINE "Alkysine"
+#define REAGENT_ID_ALKYSINE "alkysine"
+#define REAGENT_IMIDAZOLINE "Imidazoline"
+#define REAGENT_ID_IMIDAZOLINE "imidazoline"
+#define REAGENT_PERIDAXON "Peridaxon"
+#define REAGENT_ID_PERIDAXON "peridaxon"
+#define REAGENT_OSTEODAXON "Osteodaxon"
+#define REAGENT_ID_OSTEODAXON "osteodaxon"
+#define REAGENT_MYELAMINE "Myelamine"
+#define REAGENT_ID_MYELAMINE "myelamine"
+#define REAGENT_RESPIRODAXON "Respirodaxon"
+#define REAGENT_ID_RESPIRODAXON "respirodaxon
+#define REAGENT_GASTIRODAXON "Gastirodaxon"
+#define REAGENT_ID_GASTIRODAXON "gastirodaxon"
+#define REAGENT_HEPANEPHRODAXON "Hepanephrodaxon"
+#define REAGENT_ID_HEPANEPHRODAXON "hepanephrodaxon"
+#define REAGENT_CORDRADAXON "Cordradaxon"
+#define REAGENT_ID_CORDRADAXON "cordradaxon"
+#define REAGENT_IMMUNOSUPRIZINE "Immunosuprizine"
+#define REAGENT_ID_IMMUNOSUPRIZINE "immunosuprizine"
+#define REAGENT_MALISHQUALEM "Malish-Qualem"
+#define REAGENT_ID_MALISHQUALEM "malish-qualem"
+#define REAGENT_RYETALYN "Ryetalyn"
+#define REAGENT_ID_RYETALYN "ryetalyn"
+#define REAGENT_ETHYLREDOXRAZINE "Ethylredoxrazine"
+#define REAGENT_ID_ETHYLREDOXRAZINE "ethylredoxrazine"
+#define REAGENT_HYRONALIN "Hyronalin"
+#define REAGENT_ID_HYRONALIN "hyronalin"
+#define REAGENT_ARITHRAZINE "Arithrazine"
+#define REAGENT_ID_ARITHRAZINE "arithrazine"
+#define REAGENT_SPACEACILLIN "Spaceacillin"
+#define REAGENT_ID_SPACEACILLIN "spaceacillin"
+#define REAGENT_COROPHIZINE "Corophizine"
+#define REAGENT_ID_COROPHIZINE "corophizine"
+#define REAGENT_SPACOMYCAZE "Spacomycaze"
+#define REAGENT_ID_SPACOMYCAZE "spacomycaze"
+#define REAGENT_STERILIZINE "Sterilizine"
+#define REAGENT_ID_STERILIZINE "sterilizine"
+#define REAGENT_LEPORAZINE "Leporazine"
+#define REAGENT_ID_LEPORAZINE "leporazine"
+#define REAGENT_REZADONE "Rezadone"
+#define REAGENT_ID_REZADONE "rezadone"
+#define REAGENT_HEALINGNANITES "Restorative Nanites"
+#define REAGENT_ID_HEALINGNANITES "healing_nanites"
+#define REAGENT_MENTHOL "Menthol"
+#define REAGENT_ID_MENTHOL "menthol"
+#define REAGENT_EARTHSBLOOD "Earthsblood"
+#define REAGENT_ID_EARTHSBLOOD "earthsblood"
// Virology
@@ -510,6 +570,37 @@
+
+
+#define REAGENT_PROTEIN "Protein"
+#define REAGENT_ID_PROTEIN "protein"
+#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_
+#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_
+
+
+
+
+
+
+
// Toxins
#define REAGENT_TOXIN "Toxin"
#define REAGENT_ID_TOXIN "toxin"
@@ -593,11 +684,11 @@
#define REAGENT_ID_MUTATIONTOXIN "mutationtoxin"
#define REAGENT_DOCILITYTOXIN "Docility Toxin"
#define REAGENT_ID_DOCILITYTOXIN "docilitytoxin"
-#define REAGENT_SHREDDINGNANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_SHREDDINGNANITES REAGENT_HEALINGNANITES
#define REAGENT_ID_SHREDDINGNANITES "shredding_nanites"
-#define REAGENT_IRRADIATEDNANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_IRRADIATEDNANITES REAGENT_HEALINGNANITES
#define REAGENT_ID_IRRADIATEDNANITES "irradiated_nanites"
-#define REAGENT_NEUROPHAGENANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_NEUROPHAGENANITES REAGENT_HEALINGNANITES
#define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites"
#define REAGENT_SALMONELLA "Salmonella"
#define REAGENT_ID_SALMONELLA "salmonella"
@@ -608,7 +699,7 @@
-Files left: food_drinks.dm, medicine.dm
+Files left: food_drinks.dm,
includes: .dm
excludes: reagents.dm,ores.dm,materials.dm,mre.dm
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index 22cdabb1dd..f5d21ce3ba 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread)
return
- if(affected_mob.bloodstr.has_reagent("spaceacillin") || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
+ if(affected_mob.bloodstr.has_reagent(REAGENT_ID_SPACEACILLIN) || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
return
var/spread_range = 1
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 117a86892e..4ef18ca30e 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -2,8 +2,8 @@ GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
- "spaceacillin", "glucose", REAGENT_ID_ETHANOL,
- "leporazine", REAGENT_ID_IMPEDREZENE, "hepanephrodaxon",
+ REAGENT_ID_SPACEACILLIN, "glucose", REAGENT_ID_ETHANOL,
+ REAGENT_ID_LEPORAZINE, REAGENT_ID_IMPEDREZENE, REAGENT_ID_HEPANEPHRODAXON,
REAGENT_ID_SILVER, REAGENT_ID_GOLD
))
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index 3f9fbd8eee..1e69116c94 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -29,8 +29,8 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(4, 5)
- if(M.reagents.get_reagent_amount("dexalin") < 10)
- M.reagents.add_reagent("dexalin", 10)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_DEXALIN) < 10)
+ M.reagents.add_reagent(REAGENT_ID_DEXALIN, 10)
else
if(prob(SYMPTOM_ACTIVATION_PROB * 5))
to_chat(M, span_notice(pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")))
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 84328d194c..8de8690841 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -39,8 +39,8 @@ Bonus
M.reagents.del_reagent(REAGENT_ID_BLISS)
M.hallucination = max(0, M.hallucination-4)
if(A.stage >= 5)
- if(M.reagents.get_reagent_amount("alkysine") < 10)
- M.reagents.add_reagent("alkysine", 5)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_ALKYSINE) < 10)
+ M.reagents.add_reagent(REAGENT_ID_ALKYSINE, 5)
/datum/symptom/sensory_restoration
name = "Sensory Restoration"
@@ -56,8 +56,8 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(4, 5)
- if(M.reagents.get_reagent_amount("imidazoline") < 10)
- M.reagents.add_reagent("imidazoline", 5)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_IMIDAZOLINE) < 10)
+ M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
else
if(prob(SYMPTOM_ACTIVATION_PROB))
to_chat(M, span_notice(pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.")))
diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm
index 4a427d4036..f1f4460266 100644
--- a/code/datums/diseases/advance/symptoms/stimulant.dm
+++ b/code/datums/diseases/advance/symptoms/stimulant.dm
@@ -36,8 +36,8 @@ Bonus
if(3, 4)
L.jitteriness += 10
else
- if(L.reagents.get_reagent_amount("hyperzine" < 10))
- L.reagents.add_reagent("hyperzine", 5)
+ if(L.reagents.get_reagent_amount(REAGENT_ID_HYPERZINE < 10))
+ L.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
if(prob(30))
L.jitteriness += 15
return
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 57899ef201..b7fa0ea033 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -3,8 +3,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
- cure_text = "Alkysine"
- cures = list("alkysine")
+ cure_text = REAGENT_ALKYSINE
+ cures = list(REAGENT_ID_ALKYSINE)
agent = "Cryptococcus Cosmosis"
viable_mobtypes = list(/mob/living/carbon/human)
cure_chance = 15
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index ae9c307297..da735da65e 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -4,7 +4,7 @@
spread_text = "Airborne"
spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
- cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
+ cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
agent = "XY-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm
index a0fa691976..ff82a5cfb5 100644
--- a/code/datums/diseases/cold9.dm
+++ b/code/datums/diseases/cold9.dm
@@ -4,8 +4,8 @@
max_stages = 3
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
- cure_text = "Spaceacillin"
- cures = list("spaceacillin")
+ cure_text = REAGENT_SPACEACILLIN
+ cures = list(REAGENT_ID_SPACEACILLIN)
agent = "ICE9-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated the subject will slow, as if partly frozen."
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 8c3062809b..4152623124 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -2,8 +2,8 @@
name = "The Flu"
max_stages = 3
spread_text = "Airborne"
- cure_text = "Spaceacillin"
- cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
+ cure_text = REAGENT_SPACEACILLIN
+ cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
cure_chance = 10
agent = "H13N1 flu virion"
diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index d223274576..6c3050b441 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -42,8 +42,8 @@
stage_prob = 5
spread_text = "Non-contagious"
spread_flags = NON_CONTAGIOUS
- cure_text = "Cryoxadone"
- cures = list("cryoxadone")
+ cure_text = REAGENT_CRYOXADONE
+ cures = list(REAGENT_ID_CRYOXADONE)
cure_chance = 10
agent = "gibbis"
disease_flags = CURABLE
diff --git a/code/datums/diseases/roanoake.dm b/code/datums/diseases/roanoake.dm
index 412ff16ae7..3d6176728e 100644
--- a/code/datums/diseases/roanoake.dm
+++ b/code/datums/diseases/roanoake.dm
@@ -4,9 +4,9 @@
stage_prob = 2
spread_text = "Blood and close contact"
spread_flags = BLOOD
- cure_text = "Spaceacillin"
+ cure_text = REAGENT_SPACEACILLIN
agent = "Chimera cells"
- cures = list("spaceacillin")
+ cures = list(REAGENT_ID_SPACEACILLIN)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated, subject will become a xenochimera upon perishing."
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 897846fccf..f12840fdf3 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -1143,12 +1143,12 @@ datum
var/target_name
New(var/text,var/joba)
..()
- var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\
- "Leporazine", REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\
- "Kelotane", "Dexalin", "Tricordrazine")
+ var/list/items = list(REAGENT_SACID, REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\
+ REAGENT_LEPORAZINE, REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\
+ REAGENT_KELOTANE, REAGENT_DEXALIN, REAGENT_TRICORDRAZINE)
target_name = pick(items)
switch(target_name)
- if("Sulphuric acid")
+ if(REAGENT_SACID)
steal_target = /datum/reagent/acid
if(REAGENT_PACID)
steal_target = /datum/reagent/pacid
@@ -1156,17 +1156,17 @@ datum
steal_target = /datum/reagent/lube
if(REAGENT_MUTAGEN)
steal_target = /datum/reagent/mutagen
- if("Leporazine")
+ if(REAGENT_LEPORAZINE)
steal_target = /datum/reagent/leporazine
if(REAGENT_CRYPTOBIOLIN)
steal_target =/datum/reagent/cryptobiolin
if(REAGENT_LEXORIN)
steal_target = /datum/reagent/lexorin
- if("Kelotane")
+ if(REAGENT_KELOTANE)
steal_target = /datum/reagent/kelotane
- if("Dexalin")
+ if(REAGENT_DEXALIN)
steal_target = /datum/reagent/dexalin
- if("Tricordrazine")
+ if(REAGENT_TRICORDRAZINE)
steal_target = /datum/reagent/tricordrazine
explanation_text = "Steal a container filled with [target_name]."
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index e0a146a820..7962de2640 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -94,7 +94,7 @@
circuit = /obj/item/circuitboard/sleeper
var/mob/living/carbon/human/occupant = null
var/list/available_chemicals = list()
- var/list/base_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
+ var/list/base_chemicals = list(REAGENT_ID_INAPROVALINE = REAGENT_INAPROVALINE, REAGENT_ID_PARACETAMOL = REAGENT_PARACETAMOL, REAGENT_ID_ANTITOXIN = REAGENT_ANTITOXIN, REAGENT_ID_DEXALIN = REAGENT_DEXALIN)
var/amounts = list(5, 10)
var/obj/item/reagent_containers/glass/beaker = null
var/filtering = 0
@@ -149,18 +149,18 @@
if(man_rating >= 4) // Alien tech.
var/reag_ID = pickweight(list(
- "healing_nanites" = 10,
+ REAGENT_ID_HEALINGNANITES = 10,
REAGENT_ID_SHREDDINGNANITES = 5,
REAGENT_ID_IRRADIATEDNANITES = 5,
REAGENT_ID_NEUROPHAGENANITES = 2)
)
new_chemicals[reag_ID] = "Nanite"
if(man_rating >= 3) // Anomalous tech.
- new_chemicals["immunosuprizine"] = "Immunosuprizine"
+ new_chemicals[REAGENT_ID_IMMUNOSUPRIZINE] = REAGENT_IMMUNOSUPRIZINE
if(man_rating >= 2) // Tier 3.
- new_chemicals["spaceacillin"] = "Spaceacillin"
+ new_chemicals[REAGENT_ID_SPACEACILLIN] = REAGENT_SPACEACILLIN
if(man_rating >= 1) // Tier 2.
- new_chemicals["leporazine"] = "Leporazine"
+ new_chemicals[REAGENT_ID_LEPORAZINE] = REAGENT_LEPORAZINE
if(new_chemicals.len)
available_chemicals += new_chemicals
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 30a0d81465..ac0d7bc590 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -195,8 +195,8 @@
occupant.adjustBrainLoss(-(CEILING(0.5*heal_rate, 1)))
//So clones don't die of oxyloss in a running pod.
- if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
- occupant.reagents.add_reagent("inaprovaline", 60)
+ if(occupant.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 30)
+ occupant.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 60)
occupant.Sleeping(30)
//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
occupant.adjustOxyLoss(-4)
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 14449730b2..3f196e998d 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -232,8 +232,8 @@
var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
occupant.heal_organ_damage(heal_brute,heal_fire)
- var/has_cryo = occupant.reagents.get_reagent_amount("cryoxadone") >= 1
- var/has_clonexa = occupant.reagents.get_reagent_amount("clonexadone") >= 1
+ var/has_cryo = occupant.reagents.get_reagent_amount(REAGENT_ID_CRYOXADONE) >= 1
+ var/has_clonexa = occupant.reagents.get_reagent_amount(REAGENT_ID_CLONEXADONE) >= 1
var/has_cryo_medicine = has_cryo || has_clonexa
if(beaker && !has_cryo_medicine)
beaker.reagents.trans_to_mob(occupant, 1, CHEM_BLOOD, 10)
diff --git a/code/game/mecha/equipment/tools/sleeper.dm b/code/game/mecha/equipment/tools/sleeper.dm
index 7dd617557d..3183a2593e 100644
--- a/code/game/mecha/equipment/tools/sleeper.dm
+++ b/code/game/mecha/equipment/tools/sleeper.dm
@@ -236,8 +236,8 @@
M.Paralyse(2)
M.Weaken(2)
M.Stun(2)
- if(M.reagents.get_reagent_amount("inaprovaline") < 5)
- M.reagents.add_reagent("inaprovaline", 5)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 5)
+ M.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 5)
chassis.use_power(energy_drain)
update_equip_info()
return
diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm
index e47db0d36b..580e36acf4 100644
--- a/code/game/mecha/equipment/tools/syringe_gun.dm
+++ b/code/game/mecha/equipment/tools/syringe_gun.dm
@@ -22,7 +22,7 @@
. = ..()
flags |= NOREACT
syringes = new
- known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Dylovene")
+ known_reagents = list(REAGENT_ID_INAPROVALINE=REAGENT_INAPROVALINE,REAGENT_ID_ANTITOXIN=REAGENT_ANTITOXIN)
processed_reagents = new
create_reagents(max_volume)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 3a0bd663d9..206f91ff33 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -149,7 +149,7 @@
if(M.getBrainLoss() > 15)
to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
- var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
+ var/list/pinpoint = list(REAGENT_ID_OXYCODONE=1,REAGENT_ID_TRAMADOL=5)
var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,REAGENT_ID_MINDBREAKER=1)
if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm
index 4eca83946c..1dc29984d0 100644
--- a/code/game/objects/items/devices/scanners/health.dm
+++ b/code/game/objects/items/devices/scanners/health.dm
@@ -260,8 +260,8 @@
if (M.getCloneLoss())
dat += span_warning("Subject appears to have been imperfectly cloned.")
dat += "
"
-// if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."))
+// if (M.reagents && M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE))
+// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount(REAGENT_ID_INAPROVALINE)] units of rejuvenation chemicals."))
if (M.has_brain_worms())
dat += span_warning("Subject suffering from aberrant brain activity. Recommend further scanning.")
dat += "
"
diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
index 93cfd6bd68..973239a777 100644
--- a/code/game/objects/items/weapons/ecigs.dm
+++ b/code/game/objects/items/weapons/ecigs.dm
@@ -205,7 +205,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("menthol", 5)
+ reagents.add_reagent(REAGENT_ID_MENTHOL, 5)
/obj/item/reagent_containers/ecig_cartridge/watermelon
name = "watermelon flavour cartridge"
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index f0f3a37867..9fc8936d0b 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -220,7 +220,7 @@
pack.desc += " 'MB' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
- pack.reagents.add_reagent("tricordrazine", 15 * pack.storage_slots)
+ pack.reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 15 * pack.storage_slots)
pack.desc += " 'T' has been scribbled on it."
new /obj/item/flame/lighter/zippo(src)
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 242a99f8a5..555d34b83e 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -142,7 +142,7 @@
name = "Allied Blob Revival"
id = "blob_friend"
result = null
- required_reagents = list(REAGENT_ID_HYDROPHORON = 40, "peridaxon" = 20, REAGENT_ID_MUTAGEN = 20)
+ required_reagents = list(REAGENT_ID_HYDROPHORON = 40, REAGENT_ID_PERIDAXON = 20, REAGENT_ID_MUTAGEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)
diff --git a/code/modules/blob2/overmind/types/classic.dm b/code/modules/blob2/overmind/types/classic.dm
index b7d5fe28bc..63bcdaadc2 100644
--- a/code/modules/blob2/overmind/types/classic.dm
+++ b/code/modules/blob2/overmind/types/classic.dm
@@ -31,7 +31,7 @@
if(!istype(blood))
blood = new(T)
blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
- blood.reagents.add_reagent("tricorlidaze", 5)
+ blood.reagents.add_reagent(REAGENT_ID_TRICORLIDAZE, 5)
blood.update_icon()
return
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
index 77cd68161c..6c29ebe4be 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
@@ -13,13 +13,13 @@
interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream."
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
@@ -30,16 +30,16 @@
//Want more? Go refill. Gives the ninja another reason to have to show their face.
charges = list(
- list("tricordrazine", "tricordrazine", 0, 30),
- list("tramadol", "tramadol", 0, 30),
- list("dexalin plus", "dexalinp", 0, 30),
- list("antibiotics", "spaceacillin", 0, 30),
- list("antitoxins", "anti_toxin", 0, 60),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 30),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 30),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60),
list("nutrients", "glucose", 0, 80),
- list("bicaridine", "bicaridine", 0, 30),
- list("clotting agent", "myelamine", 0, 30),
- list("peridaxon", "peridaxon", 0, 30),
- list("hyronalin", "hyronalin", 0, 30),
+ list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30),
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30),
+ list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 30),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
@@ -124,11 +124,11 @@
desc = "A complex web of tubing and needles suitable for hardsuit use."
charges = list(
- list("synaptizine", "synaptizine", 0, 30),
- list("hyperzine", "hyperzine", 0, 30),
- list("oxycodone", "oxycodone", 0, 30),
+ list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30),
+ list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30),
+ list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30),
list("nutrients", "glucose", 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
interface_name = "combat chem dispenser"
@@ -149,26 +149,26 @@
/obj/item/rig_module/chem_dispenser/injector/advanced
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
/obj/item/rig_module/chem_dispenser/injector/advanced/empty
charges = list(
- list("tricordrazine", "tricordrazine", 0, 0),
- list("tramadol", "tramadol", 0, 0),
- list("dexalin plus", "dexalinp", 0, 0),
- list("antibiotics", "spaceacillin", 0, 0),
- list("antitoxins", "anti_toxin", 0, 0),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 0),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 0),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 0),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 0),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 0),
list("nutrients", "glucose", 0, 0),
- list("hyronalin", "hyronalin", 0, 0),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 0),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0),
- list("clotting agent", "myelamine", 0, 0)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 0)
)
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm
index 0b54dd879b..1e74c2dae2 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm
@@ -19,10 +19,10 @@
var/chems_to_use = 5 //Per injection
charges = list(
- list("inaprovaline", "inaprovaline", 0, 20),
- list("anti_toxin", "anti_toxin", 0, 20),
- list("paracetamol", "paracetamol", 0, 20),
- list("dexalin", "dexalin", 0, 20)
+ list(REAGENT_ID_INAPROVALINE, REAGENT_ID_INAPROVALINE, 0, 20),
+ list(REAGENT_ID_ANTITOXIN, REAGENT_ID_ANTITOXIN, 0, 20),
+ list(REAGENT_ID_PARACETAMOL, REAGENT_ID_PARACETAMOL, 0, 20),
+ list(REAGENT_ID_DEXALIN, REAGENT_ID_DEXALIN, 0, 20)
)
/obj/item/rig_module/rescue_pharm/process()
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index e53816b98e..17825ed637 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -143,13 +143,13 @@
interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream."
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
@@ -160,16 +160,16 @@
//Want more? Go refill. Gives the ninja another reason to have to show their face.
charges = list(
- list("tricordrazine", "tricordrazine", 0, 30),
- list("tramadol", "tramadol", 0, 30),
- list("dexalin plus", "dexalinp", 0, 30),
- list("antibiotics", "spaceacillin", 0, 30),
- list("antitoxins", "anti_toxin", 0, 60),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 30),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 30),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60),
list("nutrients", "glucose", 0, 80),
- list("bicaridine", "bicaridine", 0, 30),
- list("clotting agent", "myelamine", 0, 30),
- list("peridaxon", "peridaxon", 0, 30),
- list("hyronalin", "hyronalin", 0, 30),
+ list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30),
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30),
+ list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 30),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
@@ -254,11 +254,11 @@
desc = "A complex web of tubing and needles suitable for hardsuit use."
charges = list(
- list("synaptizine", "synaptizine", 0, 30),
- list("hyperzine", "hyperzine", 0, 30),
- list("oxycodone", "oxycodone", 0, 30),
+ list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30),
+ list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30),
+ list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30),
list("nutrients", "glucose", 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
interface_name = "combat chem dispenser"
@@ -279,15 +279,15 @@
/obj/item/rig_module/chem_dispenser/injector/advanced
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
/obj/item/rig_module/voice
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 6502e04ec4..d0fae7402d 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -448,7 +448,7 @@
/obj/item/reagent_containers/food/snacks/aesirsalad/Initialize()
. = ..()
reagents.add_reagent("doctorsdelight", 8)
- reagents.add_reagent("tricordrazine", 8)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 8)
/obj/item/reagent_containers/food/snacks/candy/donor
name = "Donor Candy"
@@ -807,7 +807,7 @@
if(9)
reagents.add_reagent("berryjuice", 3)
if(10)
- reagents.add_reagent("tricordrazine", 3)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 3)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry
filling_color = "#ED1169"
@@ -1077,7 +1077,7 @@
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
. = ..()
reagents.add_reagent("protein", 12)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
/obj/item/reagent_containers/food/snacks/xenomeat
name = "xenomeat"
@@ -1139,7 +1139,7 @@
nutriment_amt = 2
nutriment_desc = list("heartiness" = 1, "dough" = 2)
var/warm = FALSE
- var/list/heated_reagents = list("tricordrazine" = 5)
+ var/list/heated_reagents = list(REAGENT_ID_TRICORDRAZINE = 5)
/obj/item/reagent_containers/food/snacks/donkpocket/Initialize()
. = ..()
@@ -1218,7 +1218,7 @@
name = "\improper Sin-pocket"
desc = "The food of choice for the veteran. Do NOT overconsume."
filling_color = "#6D6D00"
- heated_reagents = list("doctorsdelight" = 5, "hyperzine" = 0.75, "synaptizine" = 0.25)
+ heated_reagents = list("doctorsdelight" = 5, REAGENT_ID_HYPERZINE = 0.75, REAGENT_ID_SYNAPTIZINE = 0.25)
var/has_been_heated = 0
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user)
@@ -1244,7 +1244,7 @@
/obj/item/reagent_containers/food/snacks/brainburger/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
- reagents.add_reagent("alkysine", 6)
+ reagents.add_reagent(REAGENT_ID_ALKYSINE, 6)
/obj/item/reagent_containers/food/snacks/ghostburger
name = "Ghost Burger"
@@ -1536,7 +1536,7 @@
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, nutriment_desc)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
/obj/item/reagent_containers/food/snacks/xemeatpie
name = "Xeno-pie"
@@ -1706,7 +1706,7 @@
/obj/item/reagent_containers/food/snacks/carrotfries/Initialize()
. = ..()
- reagents.add_reagent("imidazoline", 3)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 3)
/obj/item/reagent_containers/food/snacks/cheesyfries
@@ -2507,7 +2507,7 @@
/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_WATER, 5)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
/obj/item/reagent_containers/food/snacks/mysterysoup
name = "Mystery soup"
@@ -2536,7 +2536,7 @@
if(3)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 5)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
if(4)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 10)
@@ -2558,7 +2558,7 @@
if(10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
/obj/item/reagent_containers/food/snacks/wishsoup
name = "Wish Soup"
@@ -2663,7 +2663,7 @@
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/bearstew
@@ -2681,9 +2681,9 @@
/obj/item/reagent_containers/food/snacks/bearstew/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -2742,7 +2742,7 @@
reagents.add_reagent("protein", 3)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
///////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////Sliceable/////////////////////////////////////////////////
@@ -2950,7 +2950,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/carrotcake/Initialize()
. = ..()
- reagents.add_reagent("imidazoline", 10)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 10)
/obj/item/reagent_containers/food/snacks/slice/carrotcake
name = "Carrot Cake slice"
@@ -2980,7 +2980,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize()
. = ..()
reagents.add_reagent("protein", 25)
- reagents.add_reagent("alkysine", 10)
+ reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
/obj/item/reagent_containers/food/snacks/slice/braincake
name = "Brain Cake slice"
@@ -3436,8 +3436,8 @@
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
- reagents.add_reagent("bicaridine", 1)
- reagents.add_reagent("kelotane", 1)
+ reagents.add_reagent(REAGENT_ID_BICARIDINE, 1)
+ reagents.add_reagent(REAGENT_ID_KELOTANE, 1)
reagents.add_reagent(REAGENT_ID_TOXIN, 1)
/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice
@@ -3776,7 +3776,7 @@
. = ..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("imidazoline", 12)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 12)
/obj/item/reagent_containers/food/snacks/slice/vegetablepizza
name = "Vegetable pizza slice"
@@ -4279,7 +4279,7 @@
. = ..()
set_light(1, 1, "#5dadcf")
- reagents.add_reagent("oxycodone", 1)
+ reagents.add_reagent(REAGENT_ID_OXYCODONE, 1)
reagents.add_reagent(REAGENT_ID_SIFSAP, 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
@@ -4365,8 +4365,8 @@
/obj/item/reagent_containers/food/snacks/liquidvitamin/Initialize()
. = ..()
reagents.add_reagent("flour", 20)
- reagents.add_reagent("tricordrazine", 5)
- reagents.add_reagent("paracetamol", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
+ reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
reagents.add_reagent("enzyme", 1)
reagents.add_reagent(REAGENT_ID_IRON, 3)
@@ -7043,7 +7043,7 @@
/obj/item/reagent_containers/food/snacks/canned/spinach/Initialize()
.=..()
reagents.add_reagent(REAGENT_ID_ADRENALINE, 4)
- reagents.add_reagent("hyperzine", 4)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 4)
reagents.add_reagent(REAGENT_ID_IRON, 4)
//////////////////////////////Advanced Canned Food//////////////////////////////
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index 0c7792e279..b236c3fd34 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -103,7 +103,7 @@
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
. = ..()
reagents.add_reagent("protein", 12)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
/obj/item/reagent_containers/food/snacks/xenomeat
name = "xenomeat"
@@ -170,7 +170,7 @@
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent(REAGENT_ID_PHORON, 3)
- reagents.add_reagent("myelamine", 3)
+ reagents.add_reagent(REAGENT_ID_MYELAMINE, 3)
src.bitesize = 3
/obj/item/reagent_containers/food/snacks/meat/worm/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 47f5c8b145..204d150124 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -262,7 +262,7 @@
. = ..()
bitesize = 5
reagents.add_reagent("protein", 20)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
reagents.add_reagent(REAGENT_ID_IRON, 5)
/obj/item/reagent_containers/food/snacks/cuttlefish
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 7e7e86bb19..99e2fa3ba7 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -215,29 +215,29 @@
reagents.add_reagent(REAGENT_ID_STOMACID, 10)
reagents.add_reagent(REAGENT_ID_MUTAGEN, 4)
reagents.add_reagent("thirteenloko", 20)
- reagents.add_reagent("hyperzine", 10)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 10)
bitesize = 30
if(4)
name = "Slice Of Good" //anti-tox
desc = "A colourful slice, smelling of pear and coated in delicious cream."
nutriment_desc = list("Hapiness" = 10)
- reagents.add_reagent("anti_toxin", 2)
- reagents.add_reagent("tricordrazine", 2)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 2)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 2)
bitesize = 3
if(5)
name = "Slice Of Good" //anti-oxy
desc = "A light slice, it's pretty to look at and smells of vanilla."
nutriment_desc = list("Freedom" = 10)
- reagents.add_reagent("dexalinp", 2)
- reagents.add_reagent("tricordrazine", 2)
+ reagents.add_reagent(REAGENT_ID_DEXALINP, 2)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 2)
bitesize = 3
if(6)
name = "Slice Of Good" //anti-burn/brute
desc = "A hearty slice, it smells of chocolate and strawberries."
nutriment_desc = list("Love" = 10)
- reagents.add_reagent("bicaridine", 2)
- reagents.add_reagent("tricordrazine", 2)
- reagents.add_reagent("kelotane", 2)
+ reagents.add_reagent(REAGENT_ID_BICARIDINE, 2)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 2)
+ reagents.add_reagent(REAGENT_ID_KELOTANE, 2)
bitesize = 4
/obj/structure/chaoscake/attackby(var/obj/item/W, var/mob/living/user)
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index 640edfbefc..38b31aa67c 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -63,7 +63,7 @@
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("inaprovaline" = 60)
+ prefill = list(REAGENT_ID_INAPROVALINE = 60)
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
@@ -98,7 +98,7 @@
desc = "A small bottle of dylovene. Counters poisons, and repairs damage. A wonder drug."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("anti_toxin" = 60)
+ prefill = list(REAGENT_ID_ANTITOXIN = 60)
/obj/item/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
diff --git a/code/modules/food/glass/bottle/robot.dm b/code/modules/food/glass/bottle/robot.dm
index a3da0e3b9f..d047976c9b 100644
--- a/code/modules/food/glass/bottle/robot.dm
+++ b/code/modules/food/glass/bottle/robot.dm
@@ -12,8 +12,8 @@
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- reagent = "inaprovaline"
- prefill = list("inaprovaline" = 60)
+ reagent = REAGENT_ID_INAPROVALINE
+ prefill = list(REAGENT_ID_INAPROVALINE = 60)
/obj/item/reagent_containers/glass/bottle/robot/antitoxin
@@ -21,5 +21,5 @@
desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- reagent = "anti_toxin"
- prefill = list("anti_toxin" = 60)
+ reagent = REAGENT_ID_ANTITOXIN
+ prefill = list(REAGENT_ID_ANTITOXIN = 60)
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index e6e0cc236a..c6328c6e38 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -3,7 +3,7 @@
desc = "A small green bottle containing some red liquid that claims to heal injuries."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-5"
- prefill = list("bicaridine" = 30)
+ prefill = list(REAGENT_ID_BICARIDINE = 30)
/obj/item/reagent_containers/glass/bottle/potion/healing
@@ -15,32 +15,32 @@
/obj/item/reagent_containers/glass/bottle/potion/fire_resist
name = "fire resistance potion"
desc = "A small green bottle containing some orange liquid that claims to protect the drinker from fire."
- prefill = list("dermaline" = 15, "kelotane" = 15)
+ prefill = list(REAGENT_ID_DERMALINE = 15, REAGENT_ID_KELOTANE = 15)
/obj/item/reagent_containers/glass/bottle/potion/antidote
name = "antidote potion"
desc = "A small green bottle containing some green liquid that claims to cure poisoning."
- prefill = list("anti_toxin" = 30)
+ prefill = list(REAGENT_ID_ANTITOXIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/water
name = "water breathing potion"
desc = "A small green bottle containing some blue liquid that claims to allow the drinker to breathe under water."
- prefill = list("dexalinp" = 30)
+ prefill = list(REAGENT_ID_DEXALINP = 30)
/obj/item/reagent_containers/glass/bottle/potion/regeneration
name = "regeneration potion"
desc = "A small green bottle containing some purple liquid that claims to regenerate severe wounds."
- prefill = list("peridaxon" = 30)
+ prefill = list(REAGENT_ID_PERIDAXON = 30)
/obj/item/reagent_containers/glass/bottle/potion/panacea
name = "panacea potion"
desc = "A small green bottle containing some white liquid that claims to cure all ailments."
- prefill = list("spaceacillin" = 30)
+ prefill = list(REAGENT_ID_SPACEACILLIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/magic
name = "magic resistence potion"
desc = "A small green bottle containing some dark green liquid that claims to cure magical effects."
- prefill = list("hyronalin" = 30)
+ prefill = list(REAGENT_ID_HYRONALIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/lightness
name = "feather weight potion"
@@ -50,7 +50,7 @@
/obj/item/reagent_containers/glass/bottle/potion/SOP
name = "standard operating potion"
desc = "A small green bottle containing some yellow liquid that claims to be important."
- prefill = list("myelamine" = 30)
+ prefill = list(REAGENT_ID_MYELAMINE = 30)
/obj/item/reagent_containers/glass/bottle/potion/shrink
name = "diminution potion"
@@ -65,7 +65,7 @@
/obj/item/reagent_containers/glass/bottle/potion/pain
name = "grit potion"
desc = "A small green bottle containing some thin purple liquid that claims to power through even the most perilous injuries."
- prefill = list("tramadol" = 30)
+ prefill = list(REAGENT_ID_TRAMADOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/faerie
name = "faerie dance potion"
@@ -80,12 +80,12 @@
/obj/item/reagent_containers/glass/bottle/potion/speed
name = "blinding speed potion"
desc = "A small green bottle containing some bubbling orange liquid that claims to make you move at incredible speeds."
- prefill = list("hyperzine" = 30)
+ prefill = list(REAGENT_ID_HYPERZINE = 30)
/obj/item/reagent_containers/glass/bottle/potion/attractiveness
name = "love potion"
desc = "A small green bottle containing some light mint coloured liquid that claims to make you more attractive to potential partners."
- prefill = list("menthol" = 30)
+ prefill = list(REAGENT_ID_MENTHOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/girljuice
name = "girl transformation potion"
@@ -105,7 +105,7 @@
/obj/item/reagent_containers/glass/bottle/potion/bonerepair
name = "mending potion"
desc = "A small green bottle containing some pale blue liquid that claims to fix that which is broken."
- prefill = list("osteodaxon" = 1)
+ prefill = list(REAGENT_ID_OSTEODAXON = 1)
/obj/item/reagent_containers/glass/bottle/potion/truepolymorph
name = "polymorph potion"
diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm
index 8179250b7a..157bbc0b7a 100644
--- a/code/modules/food/glass/bottle_vr.dm
+++ b/code/modules/food/glass/bottle_vr.dm
@@ -3,7 +3,7 @@
desc = "A small bottle. Bicaridine is an analgesic medication and can be used to treat blunt trauma."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("bicaridine" = 60)
+ prefill = list(REAGENT_ID_BICARIDINE = 60)
/obj/item/reagent_containers/glass/bottle/vermicetol
name = "vermicetol bottle"
@@ -17,119 +17,119 @@
desc = "A small bottle. A fifty-fifty mix of the popular burn medications kelotane and deramline."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("dermaline" = 30, "kelotane" = 30)
+ prefill = list(REAGENT_ID_DERMALINE = 30, REAGENT_ID_KELOTANE = 30)
/obj/item/reagent_containers/glass/bottle/dermaline
name = "dermaline bottle"
desc = "A small bottle. Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("dermaline" = 60)
+ prefill = list(REAGENT_ID_DERMALINE = 60)
/obj/item/reagent_containers/glass/bottle/carthatoline
name = "carthatoline bottle"
desc = "A small bottle. Carthatoline is strong evacuant used to treat severe poisoning."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("carthatoline" = 60)
+ prefill = list(REAGENT_ID_CARTHATOLINE = 60)
/obj/item/reagent_containers/glass/bottle/dexalinp
name = "dexalinp bottle"
desc = "A small bottle. Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("dexalinp" = 60)
+ prefill = list(REAGENT_ID_DEXALINP = 60)
/obj/item/reagent_containers/glass/bottle/tramadol
name = "tramadol bottle"
desc = "A small bottle. A simple, yet effective painkiller."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("tramadol" = 60)
+ prefill = list(REAGENT_ID_TRAMADOL = 60)
/obj/item/reagent_containers/glass/bottle/oxycodone
name = "oxycodone bottle"
desc = "A small bottle. An effective and very addictive painkiller."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("oxycodone" = 60)
+ prefill = list(REAGENT_ID_OXYCODONE = 60)
/obj/item/reagent_containers/glass/bottle/alkysine
name = "alkysine bottle"
desc = "A small bottle. Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("alkysine" = 60)
+ prefill = list(REAGENT_ID_ALKYSINE = 60)
/obj/item/reagent_containers/glass/bottle/imidazoline
name = "imidazoline bottle"
desc = "A small bottle. Heals eye damage."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("imidazoline" = 60)
+ prefill = list(REAGENT_ID_IMIDAZOLINE = 60)
/obj/item/reagent_containers/glass/bottle/peridaxon
name = "peridaxon bottle"
desc = "A small bottle. Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("peridaxon" = 60)
+ prefill = list(REAGENT_ID_PERIDAXON = 60)
/obj/item/reagent_containers/glass/bottle/osteodaxon
name = "osteodaxon bottle"
desc = "A small bottle. An experimental drug used to heal bone fractures."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("osteodaxon" = 60)
+ prefill = list(REAGENT_ID_OSTEODAXON = 60)
/obj/item/reagent_containers/glass/bottle/myelamine
name = "myelamine bottle"
desc = "A small bottle. Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("myelamine" = 60)
+ prefill = list(REAGENT_ID_MYELAMINE = 60)
/obj/item/reagent_containers/glass/bottle/hyronalin
name = "hyronalin bottle"
desc = "A small bottle. Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("hyronalin" = 60)
+ prefill = list(REAGENT_ID_HYRONALIN = 60)
/obj/item/reagent_containers/glass/bottle/arithrazine
name = "arithrazine bottle"
desc = "A small bottle. Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("arithrazine" = 60)
+ prefill = list(REAGENT_ID_ARITHRAZINE = 60)
/obj/item/reagent_containers/glass/bottle/spaceacillin
name = "spaceacillin bottle"
desc = "A small bottle. An all-purpose antiviral agent."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("spaceacillin" = 60)
+ prefill = list(REAGENT_ID_SPACEACILLIN = 60)
/obj/item/reagent_containers/glass/bottle/corophizine
name = "corophizine bottle"
desc = "A small bottle. A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("corophizine" = 60)
+ prefill = list(REAGENT_ID_COROPHIZINE = 60)
/obj/item/reagent_containers/glass/bottle/rezadone
name = "rezadone bottle"
desc = "A small bottle. A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("rezadone" = 60)
+ prefill = list(REAGENT_ID_REZADONE = 60)
/obj/item/reagent_containers/glass/bottle/healing_nanites
name = "healing nanites bottle"
desc = "A small bottle. Miniature medical robots that swiftly restore bodily damage."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("healing_nanites" = 60)
+ prefill = list(REAGENT_ID_HEALINGNANITES = 60)
/obj/item/reagent_containers/glass/bottle/ickypak
name = "ickypak bottle"
diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm
index 3ff4ee9416..6ee490cd56 100644
--- a/code/modules/genetics/side_effects.dm
+++ b/code/modules/genetics/side_effects.dm
@@ -24,7 +24,7 @@
H.custom_emote(VISIBLE_MESSAGE, "starts turning very red..")
/datum/genetics/side_effect/genetic_burn/finish(mob/living/carbon/human/H)
- if(H.reagents.has_reagent("dexalin"))
+ if(H.reagents.has_reagent(REAGENT_ID_DEXALIN))
return
for(var/organ_name in BP_ALL)
var/obj/item/organ/external/E = H.get_organ(organ_name)
@@ -41,7 +41,7 @@
H.custom_emote(VISIBLE_MESSAGE, "'s limbs start shivering uncontrollably.")
/datum/genetics/side_effect/bone_snap/finish(mob/living/carbon/human/H)
- if(H.reagents.has_reagent("bicaridine"))
+ if(H.reagents.has_reagent(REAGENT_ID_BICARIDINE))
return
var/organ_name = pick(BP_ALL)
var/obj/item/organ/external/E = H.get_organ(organ_name)
@@ -60,7 +60,7 @@
H.custom_emote(VISIBLE_MESSAGE, "has drool running down from [T.his] mouth.")
/datum/genetics/side_effect/confuse/finish(mob/living/carbon/human/H)
- if(H.reagents.has_reagent("anti_toxin"))
+ if(H.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
return
H.Confuse(100)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 431075c0c6..c1fef23695 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -72,7 +72,7 @@
var/list/descriptors = list()
if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
- if(reagents.has_reagent("anti_toxin"))
+ if(reagents.has_reagent(REAGENT_ID_ANTITOXIN))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
@@ -88,11 +88,11 @@
descriptors |= "radioactive"
if(reagents.has_reagent(REAGENT_ID_AMATOXIN) || reagents.has_reagent(REAGENT_ID_TOXIN))
descriptors |= "poisonous"
- if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent(REAGENT_ID_EARTHSBLOOD))
descriptors |= "hallucinogenic"
- if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_BICARIDINE) || reagents.has_reagent(REAGENT_ID_EARTHSBLOOD))
descriptors |= "medicinal"
- if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent(REAGENT_ID_EARTHSBLOOD))
descriptors |= "shiny"
if(reagents.has_reagent(REAGENT_ID_LUBE))
descriptors |= "slippery"
diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm
index b55b63af2b..b7b83ff848 100644
--- a/code/modules/hydroponics/seedtypes/ambrosia.dm
+++ b/code/modules/hydroponics/seedtypes/ambrosia.dm
@@ -5,7 +5,7 @@
display_name = "ambrosia vulgaris"
kitchen_tag = "ambrosia"
mutants = list("ambrosiadeus")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), REAGENT_ID_KELOTANE = list(1,8,1), REAGENT_ID_BICARIDINE = list(1,10,1))
/datum/seed/ambrosia/New()
..()
@@ -25,7 +25,7 @@
display_name = "ambrosia deus"
kitchen_tag = "ambrosiadeus"
mutants = list("ambrosiainfernus", "ambrosiagaia")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_BICARIDINE = list(1,8), REAGENT_ID_SYNAPTIZINE = list(1,8,1), REAGENT_ID_HYPERZINE = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
..()
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), REAGENT_ID_OXYCODONE = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
@@ -51,7 +51,7 @@
display_name = "ambrosia gaia"
kitchen_tag = "ambrosiagaia"
mutants = null
- chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
+ chems = list (REAGENT_ID_EARTHSBLOOD = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
/datum/seed/ambrosia/gaia/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm
index f1e40e6320..be905b8d6a 100644
--- a/code/modules/hydroponics/seedtypes/carrots.dm
+++ b/code/modules/hydroponics/seedtypes/carrots.dm
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), "carrotjuice" = list(10,20))
/datum/seed/carrots/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm
index 39faaf4a3f..e50b396c3b 100644
--- a/code/modules/hydroponics/seedtypes/flowers.dm
+++ b/code/modules/hydroponics/seedtypes/flowers.dm
@@ -22,7 +22,7 @@
seed_name = "poppy"
display_name = "poppies"
kitchen_tag = "poppy"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10))
/datum/seed/flower/poppy/New()
..()
@@ -58,7 +58,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10))
/datum/seed/flower/lavender/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm
index fd63ef95bd..0da587e729 100644
--- a/code/modules/hydroponics/seedtypes/grapes.dm
+++ b/code/modules/hydroponics/seedtypes/grapes.dm
@@ -26,7 +26,7 @@
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_KELOTANE = list(3,5), "grapejuice" = list(10,10))
/datum/seed/grapes/green/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/kudzu.dm b/code/modules/hydroponics/seedtypes/kudzu.dm
index 667ff7e845..182466a297 100644
--- a/code/modules/hydroponics/seedtypes/kudzu.dm
+++ b/code/modules/hydroponics/seedtypes/kudzu.dm
@@ -3,7 +3,7 @@
seed_name = "kudzu"
display_name = "kudzu vines"
kitchen_tag = "kudzu"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "anti_toxin" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_ANTITOXIN = list(1,25))
/datum/seed/kudzu/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/lettuce.dm b/code/modules/hydroponics/seedtypes/lettuce.dm
index 77281dc5e0..a8bb68b40f 100644
--- a/code/modules/hydroponics/seedtypes/lettuce.dm
+++ b/code/modules/hydroponics/seedtypes/lettuce.dm
@@ -26,7 +26,7 @@
seed_name = "glacial lettuce"
display_name = "glacial lettuce"
kitchen_tag = "icelettuce"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "paracetamol" = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_PARACETAMOL = list(0,2))
/datum/seed/lettuce/ice/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/malanitear.dm b/code/modules/hydroponics/seedtypes/malanitear.dm
index 15b62d23d4..67106e41f7 100644
--- a/code/modules/hydroponics/seedtypes/malanitear.dm
+++ b/code/modules/hydroponics/seedtypes/malanitear.dm
@@ -3,7 +3,7 @@
seed_name = "Malani's tear"
display_name = "Malani's tear leaves"
kitchen_tag = "mtear"
- chems = list("honey" = list(1,10), "kelotane" = list(3,5))
+ chems = list("honey" = list(1,10), REAGENT_ID_KELOTANE = list(3,5))
/datum/seed/mtear/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#4CC789")
set_trait(TRAIT_PLANT_ICON,"bush7")
set_trait(TRAIT_IDEAL_HEAT, 283)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/selemhand.dm b/code/modules/hydroponics/seedtypes/selemhand.dm
index 5b49728c61..f9e451a627 100644
--- a/code/modules/hydroponics/seedtypes/selemhand.dm
+++ b/code/modules/hydroponics/seedtypes/selemhand.dm
@@ -3,7 +3,7 @@
seed_name = "Selem's hand"
display_name = "Selem's hand leaves"
kitchen_tag = "shand"
- chems = list("bicaridine" = list(0,10))
+ chems = list(REAGENT_ID_BICARIDINE = list(0,10))
/datum/seed/shand/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#378C61")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_IDEAL_HEAT, 283)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm
index c9a3b9e86c..a571a0f35f 100644
--- a/code/modules/hydroponics/seedtypes/surik.dm
+++ b/code/modules/hydroponics/seedtypes/surik.dm
@@ -3,7 +3,7 @@
seed_name = "surik"
display_name = "surik vine"
kitchen_tag = "surik"
- chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),REAGENT_ID_SYNAPTIZINE = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/tobacco.dm b/code/modules/hydroponics/seedtypes/tobacco.dm
index 52136e0b15..0e11bacfa0 100644
--- a/code/modules/hydroponics/seedtypes/tobacco.dm
+++ b/code/modules/hydroponics/seedtypes/tobacco.dm
@@ -23,7 +23,7 @@
name = "stimbush"
seed_name = "stim-bush"
display_name = "stim-bush"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_HYPERZINE = list(1,10), REAGENT_ID_SYNAPTIZINE = list(1,5))
/datum/seed/tobacco/stimbush/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/vale.dm b/code/modules/hydroponics/seedtypes/vale.dm
index 37cf0d7a58..fcfac20d87 100644
--- a/code/modules/hydroponics/seedtypes/vale.dm
+++ b/code/modules/hydroponics/seedtypes/vale.dm
@@ -3,7 +3,7 @@
seed_name = "vale"
display_name = "vale bush"
kitchen_tag = "vale"
- chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
+ chems = list(REAGENT_ID_PARACETAMOL = list(1,5),REAGENT_ID_DEXALIN = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
/datum/seed/vale/New()
..()
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 1c307da029..c11ac18bb6 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -55,14 +55,14 @@
// Reagent information for process(), consider moving this to a controller along
// with cycle information under 'mechanical concerns' at some point.
var/static/list/toxic_reagents = list(
- "anti_toxin" = -2,
+ REAGENT_ID_ANTITOXIN = -2,
REAGENT_ID_TOXIN = 2,
REAGENT_ID_FLUORINE = 2.5,
REAGENT_ID_CHLORINE = 1.5,
REAGENT_ID_SACID = 1.5,
REAGENT_ID_PACID = 3,
REAGENT_ID_PLANTBGONE = 3,
- "cryoxadone" = -3,
+ REAGENT_ID_CRYOXADONE = -3,
REAGENT_ID_RADIUM = 2
)
var/static/list/nutrient_reagents = list(
@@ -116,7 +116,7 @@
REAGENT_ID_SACID = list( -1, 0, 0 ),
REAGENT_ID_PACID = list( -2, 0, 0 ),
REAGENT_ID_PLANTBGONE = list( -2, 0, 0.2),
- "cryoxadone" = list( 3, 0, 0 ),
+ REAGENT_ID_CRYOXADONE = list( 3, 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 ),
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index c7834148d4..2ca495e5c9 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -31,11 +31,11 @@
var/injection_amount = 15 //How much reagent do we inject at a time?
var/heal_threshold = 10 //Start healing when they have this much damage in a category
var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
- var/treatment_brute = "tricordrazine"
- var/treatment_oxy = "tricordrazine"
- var/treatment_fire = "tricordrazine"
- var/treatment_tox = "tricordrazine"
- var/treatment_virus = "spaceacillin"
+ var/treatment_brute = REAGENT_ID_TRICORDRAZINE
+ var/treatment_oxy = REAGENT_ID_TRICORDRAZINE
+ var/treatment_fire = REAGENT_ID_TRICORDRAZINE
+ var/treatment_tox = REAGENT_ID_TRICORDRAZINE
+ var/treatment_virus = REAGENT_ID_SPACEACILLIN
var/treatment_emag = REAGENT_ID_TOXIN
var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
@@ -52,10 +52,10 @@
name = "\improper Mysterious Medibot"
desc = "International Medibot of mystery."
skin = "bezerk"
- treatment_brute = "bicaridine"
- treatment_fire = "dermaline"
- treatment_oxy = "dexalin"
- treatment_tox = "anti_toxin"
+ treatment_brute = REAGENT_ID_BICARIDINE
+ treatment_fire = REAGENT_ID_DERMALINE
+ treatment_oxy = REAGENT_ID_DEXALIN
+ treatment_tox = REAGENT_ID_ANTITOXIN
/mob/living/bot/medbot/handleIdle()
if(is_tipped) // Don't handle idle things if we're incapacitated!
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index 4a6e50cfcc..b3537fc728 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -82,8 +82,8 @@
// ========
/datum/medical_effect/headache
name = "Headache"
- triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
- cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
+ triggers = list(REAGENT_ID_CRYOXADONE = 10, REAGENT_ID_BICARIDINE = 15, REAGENT_ID_TRICORDRAZINE = 15)
+ cures = list(REAGENT_ID_ALKYSINE, REAGENT_ID_TRAMADOL, REAGENT_ID_PARACETAMOL, REAGENT_ID_OXYCODONE)
cure_message = "Your head stops throbbing..."
/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
@@ -99,8 +99,8 @@
// ===========
/datum/medical_effect/bad_stomach
name = "Bad Stomach"
- triggers = list("kelotane" = 30, "dermaline" = 15)
- cures = list("anti_toxin")
+ triggers = list(REAGENT_ID_KELOTANE = 30, REAGENT_ID_DERMALINE = 15)
+ cures = list(REAGENT_ID_ANTITOXIN)
cure_message = "Your stomach feels a little better now..."
/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
@@ -116,8 +116,8 @@
// ======
/datum/medical_effect/cramps
name = "Cramps"
- triggers = list("anti_toxin" = 30, "tramadol" = 15)
- cures = list("inaprovaline")
+ triggers = list(REAGENT_ID_ANTITOXIN = 30, REAGENT_ID_TRAMADOL = 15)
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -135,7 +135,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list(REAGENT_ID_BLISS = 10)
- cures = list("inaprovaline")
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index 4a6e50cfcc..b3537fc728 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -82,8 +82,8 @@
// ========
/datum/medical_effect/headache
name = "Headache"
- triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
- cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
+ triggers = list(REAGENT_ID_CRYOXADONE = 10, REAGENT_ID_BICARIDINE = 15, REAGENT_ID_TRICORDRAZINE = 15)
+ cures = list(REAGENT_ID_ALKYSINE, REAGENT_ID_TRAMADOL, REAGENT_ID_PARACETAMOL, REAGENT_ID_OXYCODONE)
cure_message = "Your head stops throbbing..."
/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
@@ -99,8 +99,8 @@
// ===========
/datum/medical_effect/bad_stomach
name = "Bad Stomach"
- triggers = list("kelotane" = 30, "dermaline" = 15)
- cures = list("anti_toxin")
+ triggers = list(REAGENT_ID_KELOTANE = 30, REAGENT_ID_DERMALINE = 15)
+ cures = list(REAGENT_ID_ANTITOXIN)
cure_message = "Your stomach feels a little better now..."
/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
@@ -116,8 +116,8 @@
// ======
/datum/medical_effect/cramps
name = "Cramps"
- triggers = list("anti_toxin" = 30, "tramadol" = 15)
- cures = list("inaprovaline")
+ triggers = list(REAGENT_ID_ANTITOXIN = 30, REAGENT_ID_TRAMADOL = 15)
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -135,7 +135,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list(REAGENT_ID_BLISS = 10)
- cures = list("inaprovaline")
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
index 034aa0ac13..122d2a824b 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
@@ -203,7 +203,7 @@
name = "MediHound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves, designed for heavy-duty medical equipment."
charge_cost = 10
- reagent_ids = list("inaprovaline", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "paracetamol")
+ reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PARACETAMOL)
var/datum/matter_synth/water = null
/obj/item/reagent_containers/borghypo/hound/process() //Recharges in smaller steps and uses the water reserves as well.
@@ -220,12 +220,12 @@
/obj/item/reagent_containers/borghypo/hound/lost
name = "Hound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves."
- reagent_ids = list("tricordrazine", "inaprovaline", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
+ reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
/obj/item/reagent_containers/borghypo/hound/trauma
name = "Hound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves."
- reagent_ids = list("tricordrazine", "inaprovaline", "oxycodone", "dexalin" ,"spaceacillin")
+ reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_OXYCODONE, REAGENT_ID_DEXALIN ,REAGENT_ID_SPACEACILLIN)
//Tongue stuff
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index 10b7738149..e0da78daf7 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -13,7 +13,7 @@
var/min_health = -100
var/cleaning = 0
var/patient_laststat = null
- var/list/injection_chems = list("inaprovaline", "bicaridine", "kelotane", "anti_toxin", "dexalin", "tricordrazine", "spaceacillin", "tramadol") //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
+ var/list/injection_chems = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_TRAMADOL) //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
var/eject_port = "ingestion"
var/list/items_preserved = list()
var/UI_open = FALSE
@@ -449,7 +449,7 @@
return
if(patient && !(patient.stat & DEAD)) //What is bitwise NOT? ... Thought it was tilde.
- if(href_list["inject"] == "inaprovaline" || patient.health > min_health)
+ if(href_list["inject"] == REAGENT_ID_INAPROVALINE || patient.health > min_health)
inject_chem(usr, href_list["inject"])
else
to_chat(usr, span_notice("ERROR: Subject is not in stable condition for injections."))
@@ -462,7 +462,7 @@
/obj/item/dogborg/sleeper/proc/inject_chem(mob/user, chem)
if(patient && patient.reagents)
- if(chem in injection_chems + "inaprovaline")
+ if(chem in injection_chems + REAGENT_ID_INAPROVALINE)
if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it.
to_chat(hound, span_notice("You don't have enough power to synthesize fluids."))
return
@@ -748,7 +748,7 @@
name = "Supply Storage"
desc = "A mounted survival unit with fuel processor, helpful with both deliveries and assisting injured miners."
icon_state = "sleeperc"
- injection_chems = list("glucose","inaprovaline","tricordrazine")
+ injection_chems = list("glucose",REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE)
max_item_count = 10
recycles = FALSE
stabilizer = TRUE
@@ -775,19 +775,19 @@
name = "Emergency Storage"
desc = "A mounted 'emergency containment cell'."
icon_state = "sleeperert"
- injection_chems = list("inaprovaline", "tramadol") // short list
+ injection_chems = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_TRAMADOL) // short list
/obj/item/dogborg/sleeper/trauma //Trauma borg belly
name = "Recovery Belly"
desc = "A downgraded model of the sleeper belly, intended primarily for post-surgery recovery."
icon_state = "sleeper"
- injection_chems = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone")
+ injection_chems = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_OXYCODONE)
/obj/item/dogborg/sleeper/lost
name = "Multipurpose Belly"
desc = "A multipurpose belly, capable of functioning as both sleeper and processor."
icon_state = "sleeperlost"
- injection_chems = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
+ injection_chems = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
compactor = TRUE
max_item_count = 25
stabilizer = TRUE
@@ -797,7 +797,7 @@
name = "Combat Triage Belly"
desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves. This one is for more extreme combat scenarios."
icon_state = "sleepersyndiemed"
- injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
+ injection_chems = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
digest_multiplier = 2
/obj/item/dogborg/sleeper/K9/syndie
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
index 6bf397a381..49f5b5cb05 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
@@ -1437,7 +1437,7 @@
water_state = "enzyme_shallow"
under_state = "flesh_floor"
- reagent_type = "Sulphuric acid" //why not
+ reagent_type = REAGENT_ID_SACID //why not
outdoors = FALSE
var/mob/living/simple_mob/vore/overmap/stardog/linked_mob
var/mobstuff = TRUE //if false, we don't care about dogs, and that's terrible
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
index 85087a9b15..345b20aa47 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
@@ -218,7 +218,7 @@
if(chemicals < 50)
to_chat(src, span_warning("You don't have enough chemicals!"))
- var/chem = tgui_input_list(usr, "Select a chemical to secrete.", "Chemicals", list("alkysine","bicaridine","hyperzine","tramadol"))
+ var/chem = tgui_input_list(usr, "Select a chemical to secrete.", "Chemicals", list(REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_HYPERZINE,REAGENT_ID_TRAMADOL))
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index ed4cea05b0..261d37a7c5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -49,9 +49,9 @@
var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
var/infest_target = BP_TORSO // The currently chosen bodypart to infest.
var/mob/living/carbon/host // Our humble host.
- var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
+ var/list/produceable_chemicals = list(REAGENT_ID_INAPROVALINE,REAGENT_ID_ANTITOXIN,REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_TRAMADOL,REAGENT_ID_KELOTANE,REAGENT_ID_LEPORAZINE,REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
- var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
+ var/passive_reagent = REAGENT_ID_PARACETAMOL // Reagent passively produced by the leech. Should usually be a painkiller.
var/feeding_delay = 30 SECONDS // How long do we have to wait to bite our host's organs?
var/last_feeding = 0
@@ -159,7 +159,7 @@
ai_holder.hostile = FALSE
ai_holder.lose_target()
alpha = 5
- if(host.reagents.has_reagent("cordradaxon") && !docile) // Overwhelms the leech with food.
+ if(host.reagents.has_reagent(REAGENT_ID_CORDRADAXON) && !docile) // Overwhelms the leech with food.
var/message = "We feel the rush of cardiac pluripotent cells in your host's blood, lulling us into docility."
to_chat(src, span_warning(message))
docile = TRUE
@@ -178,23 +178,23 @@
if(!docile && ishuman(host) && chemicals < max_chemicals)
var/mob/living/carbon/human/H = host
H.remove_blood(1)
- if(!H.reagents.has_reagent("inaprovaline"))
- H.reagents.add_reagent("inaprovaline", 1)
+ if(!H.reagents.has_reagent(REAGENT_ID_INAPROVALINE))
+ H.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 1)
chemicals += 2
if(!client && !docile) // Automatic 'AI' to manage damage levels.
if(host.getBruteLoss() >= 30 && chemicals > 50)
- host.reagents.add_reagent("bicaridine", 5)
+ host.reagents.add_reagent(REAGENT_ID_BICARIDINE, 5)
chemicals -= 30
if(host.getToxLoss() >= 30 && chemicals > 50)
- var/randomchem = pickweight(list("tramadol" = 7, "anti_toxin" = 15, "frostoil" = 3))
+ var/randomchem = pickweight(list(REAGENT_ID_TRAMADOL = 7, REAGENT_ID_ANTITOXIN = 15, "frostoil" = 3))
host.reagents.add_reagent(randomchem, 5)
chemicals -= 50
if(host.getFireLoss() >= 30 && chemicals > 50)
- host.reagents.add_reagent("kelotane", 5)
- host.reagents.add_reagent("leporazine", 2)
+ host.reagents.add_reagent(REAGENT_ID_KELOTANE, 5)
+ host.reagents.add_reagent(REAGENT_ID_LEPORAZINE, 2)
chemicals -= 50
if(host.getOxyLoss() >= 30 && chemicals > 50)
@@ -202,8 +202,8 @@
chemicals -= 40
if(host.getBrainLoss() >= 10 && chemicals > 100)
- host.reagents.add_reagent("alkysine", 5)
- host.reagents.add_reagent("tramadol", 3)
+ host.reagents.add_reagent(REAGENT_ID_ALKYSINE, 5)
+ host.reagents.add_reagent(REAGENT_ID_TRAMADOL, 3)
chemicals -= 100
if(prob(30) && chemicals > 50)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
index 93c2958519..91b62843e7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
@@ -1007,7 +1007,7 @@ I think I covered everything.
//Alternatively bully a coder (me) to make a unique digest_mode for mob healbellies that prevents death, or something.
if(istype(A, /mob/living/carbon/human))
var/mob/living/carbon/human/P = L
- var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", REAGENT_ID_IRON, "hyronalin")
+ var/list/to_inject = list(REAGENT_ID_MYELAMINE,REAGENT_ID_OSTEODAXON,REAGENT_ID_SPACEACILLIN,REAGENT_ID_PERIDAXON, REAGENT_ID_IRON, REAGENT_ID_HYRONALIN)
//Lets not OD them...
for(var/RG in to_inject)
if(!P.reagents.has_reagent(RG))
diff --git a/code/modules/organs/internal/liver.dm b/code/modules/organs/internal/liver.dm
index b26c864609..75e3f8dec6 100644
--- a/code/modules/organs/internal/liver.dm
+++ b/code/modules/organs/internal/liver.dm
@@ -11,7 +11,7 @@
if(owner.life_tick % PROCESS_ACCURACY == 0)
//High toxins levels are dangerous
- if(owner.getToxLoss() >= 50 && !owner.reagents.has_reagent("anti_toxin"))
+ if(owner.getToxLoss() >= 50 && !owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
//Healthy liver suffers on its own
if (src.damage < min_broken_damage)
src.damage += 0.2 * PROCESS_ACCURACY
@@ -22,7 +22,7 @@
O.damage += 0.2 * PROCESS_ACCURACY
//Detox can heal small amounts of damage
- if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))
+ if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
src.damage -= 0.2 * PROCESS_ACCURACY
if(src.damage < 0)
diff --git a/code/modules/organs/internal/spleen.dm b/code/modules/organs/internal/spleen.dm
index db2942926b..86299edfc8 100644
--- a/code/modules/organs/internal/spleen.dm
+++ b/code/modules/organs/internal/spleen.dm
@@ -15,7 +15,7 @@
if(owner.life_tick % spleen_tick == 0)
//High toxins levels are dangerous
- if(owner.getToxLoss() >= 30 && !owner.reagents.has_reagent("anti_toxin"))
+ if(owner.getToxLoss() >= 30 && !owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
//Healthy liver suffers on its own
if (src.damage < min_broken_damage)
src.damage += 0.2 * spleen_tick
@@ -34,7 +34,7 @@
B.adjust_germ_level(round(rand(-3 * spleen_efficiency, -10 * spleen_efficiency)))
//Detox can heal small amounts of damage
- if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))
+ if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
src.damage -= 0.2 * spleen_tick * spleen_efficiency
if(src.damage < 0)
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index 30515e746b..c6d9f32682 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -11,7 +11,7 @@
/obj/item/organ/internal/borer/process()
// Borer husks regenerate health, feel no pain, and are resistant to stuns and brainloss.
- for(var/chem in list("tricordrazine","tramadol","hyperzine","alkysine"))
+ for(var/chem in list(REAGENT_ID_TRICORDRAZINE,REAGENT_ID_TRAMADOL,REAGENT_ID_HYPERZINE,REAGENT_ID_ALKYSINE))
if(owner.reagents.get_reagent_amount(chem) < 3)
owner.reagents.add_reagent(chem, 5)
@@ -59,4 +59,4 @@
/obj/item/organ/internal/stack/vox/stack
name = "vox cortical stack"
- icon_state = "cortical_stack"
\ No newline at end of file
+ icon_state = "cortical_stack"
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index dd8279f67f..195abc32d0 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -757,9 +757,9 @@ Note that amputating the affected organ does in fact remove the infection from t
// Internal wounds get worse over time. Low temperatures (cryo) stop them.
if(W.internal && owner.bodytemperature >= 170)
- var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
- var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
- var/myeldose = owner.reagents.get_reagent_amount("myelamine")
+ var/bicardose = owner.reagents.get_reagent_amount(REAGENT_ID_BICARIDINE)
+ var/inaprovaline = owner.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE)
+ var/myeldose = owner.reagents.get_reagent_amount(REAGENT_ID_MYELAMINE)
if(!(W.can_autoheal() || (bicardose && inaprovaline) || myeldose)) //bicaridine and inaprovaline stop internal wounds from growing bigger with time, unless it is so small that it is already healing
W.open_wound(0.1 * wound_update_accuracy)
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index 725eb699b5..a6912dfea7 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -194,60 +194,60 @@
// ERT
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
- spawn_reagent = "inaprovaline"
+ spawn_reagent = REAGENT_ID_INAPROVALINE
/obj/item/reagent_containers/chem_disp_cartridge/ryetalyn
- spawn_reagent = "ryetalyn"
+ spawn_reagent = REAGENT_ID_RYETALYN
/obj/item/reagent_containers/chem_disp_cartridge/paracetamol
- spawn_reagent = "paracetamol"
+ spawn_reagent = REAGENT_ID_PARACETAMOL
/obj/item/reagent_containers/chem_disp_cartridge/tramadol
- spawn_reagent = "tramadol"
+ spawn_reagent = REAGENT_ID_TRAMADOL
/obj/item/reagent_containers/chem_disp_cartridge/oxycodone
- spawn_reagent = "oxycodone"
+ spawn_reagent = REAGENT_ID_OXYCODONE
/obj/item/reagent_containers/chem_disp_cartridge/sterilizine
- spawn_reagent = "sterilizine"
+ spawn_reagent = REAGENT_ID_STERILIZINE
/obj/item/reagent_containers/chem_disp_cartridge/leporazine
- spawn_reagent = "leporazine"
+ spawn_reagent = REAGENT_ID_LEPORAZINE
/obj/item/reagent_containers/chem_disp_cartridge/kelotane
- spawn_reagent = "kelotane"
+ spawn_reagent = REAGENT_ID_KELOTANE
/obj/item/reagent_containers/chem_disp_cartridge/dermaline
- spawn_reagent = "dermaline"
+ spawn_reagent = REAGENT_ID_DERMALINE
/obj/item/reagent_containers/chem_disp_cartridge/dexalin
- spawn_reagent = "dexalin"
+ spawn_reagent = REAGENT_ID_DEXALIN
/obj/item/reagent_containers/chem_disp_cartridge/dexalin/small
volume = CARTRIDGE_VOLUME_SMALL // For the medicine cartridge crate, so it's not too easy to get large amounts of dexalin
/obj/item/reagent_containers/chem_disp_cartridge/dexalin_p
- spawn_reagent = "dexalinp"
+ spawn_reagent = REAGENT_ID_DEXALINP
/obj/item/reagent_containers/chem_disp_cartridge/tricord
- spawn_reagent = "tricordrazine"
+ spawn_reagent = REAGENT_ID_TRICORDRAZINE
/obj/item/reagent_containers/chem_disp_cartridge/dylovene
- spawn_reagent = "anti_toxin"
+ spawn_reagent = REAGENT_ID_ANTITOXIN
/obj/item/reagent_containers/chem_disp_cartridge/synaptizine
- spawn_reagent = "synaptizine"
+ spawn_reagent = REAGENT_ID_SYNAPTIZINE
/obj/item/reagent_containers/chem_disp_cartridge/hyronalin
- spawn_reagent = "hyronalin"
+ spawn_reagent = REAGENT_ID_HYRONALIN
/obj/item/reagent_containers/chem_disp_cartridge/arithrazine
- spawn_reagent = "arithrazine"
+ spawn_reagent = REAGENT_ID_ARITHRAZINE
/obj/item/reagent_containers/chem_disp_cartridge/alkysine
- spawn_reagent = "alkysine"
+ spawn_reagent = REAGENT_ID_ALKYSINE
/obj/item/reagent_containers/chem_disp_cartridge/imidazoline
- spawn_reagent = "imidazoline"
+ spawn_reagent = REAGENT_ID_IMIDAZOLINE
/obj/item/reagent_containers/chem_disp_cartridge/peridaxon
- spawn_reagent = "peridaxon"
+ spawn_reagent = REAGENT_ID_PERIDAXON
/obj/item/reagent_containers/chem_disp_cartridge/bicaridine
- spawn_reagent = "bicaridine"
+ spawn_reagent = REAGENT_ID_BICARIDINE
/obj/item/reagent_containers/chem_disp_cartridge/hyperzine
- spawn_reagent = "hyperzine"
+ spawn_reagent = REAGENT_ID_HYPERZINE
/obj/item/reagent_containers/chem_disp_cartridge/rezadone
- spawn_reagent = "rezadone"
+ spawn_reagent = REAGENT_ID_REZADONE
/obj/item/reagent_containers/chem_disp_cartridge/spaceacillin
- spawn_reagent = "spaceacillin"
+ spawn_reagent = REAGENT_ID_SPACEACILLIN
/obj/item/reagent_containers/chem_disp_cartridge/ethylredox
- spawn_reagent = "ethylredoxrazine"
+ spawn_reagent = REAGENT_ID_ETHYLREDOXRAZINE
/obj/item/reagent_containers/chem_disp_cartridge/sleeptox
spawn_reagent = REAGENT_ID_STOXIN
/obj/item/reagent_containers/chem_disp_cartridge/chloral
spawn_reagent = REAGENT_ID_CHLORALHYDRATE
/obj/item/reagent_containers/chem_disp_cartridge/cryoxadone
- spawn_reagent = "cryoxadone"
+ spawn_reagent = REAGENT_ID_CRYOXADONE
/obj/item/reagent_containers/chem_disp_cartridge/clonexadone
- spawn_reagent = "clonexadone"
+ spawn_reagent = REAGENT_ID_CLONEXADONE
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
index 2115dca67d..e6de541cef 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
@@ -11,7 +11,7 @@
//Special Ops
biomass spawn_reagent = REAGENT_ID_BIOMASS
- carthatoline spawn_reagent = "carthatoline"
- corophizine spawn_reagent = "corophizine"
- myelamine spawn_reagent = "myelamine"
- osteodaxon spawn_reagent = "osteodaxon"
+ carthatoline spawn_reagent = REAGENT_ID_CARTHATOLINE
+ corophizine spawn_reagent = REAGENT_ID_COROPHIZINE
+ myelamine spawn_reagent = REAGENT_ID_MYELAMINE
+ osteodaxon spawn_reagent = REAGENT_ID_OSTEODAXON
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index db299f8ebc..30dad26e77 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -37,11 +37,11 @@
/obj/machinery/chemical_dispenser/ert
dispense_reagents = list(
- "inaprovaline", "ryetalyn", "paracetamol", "tramadol", "oxycodone", "sterilizine", "leporazine",
- "kelotane", "dermaline", "dexalin", "dexalinp", "tricordrazine", "anti_toxin", "synaptizine",
- "hyronalin", "arithrazine", "alkysine", "imidazoline", "peridaxon", "bicaridine", "hyperzine",
- "rezadone", "spaceacillin", "ethylredoxrazine", REAGENT_ID_STOXIN, REAGENT_ID_CHLORALHYDRATE, "cryoxadone",
- "clonexadone"
+ REAGENT_ID_INAPROVALINE, REAGENT_ID_RYETALYN, REAGENT_ID_PARACETAMOL, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_STERILIZINE, REAGENT_ID_LEPORAZINE,
+ REAGENT_ID_KELOTANE, REAGENT_ID_DERMALINE, REAGENT_ID_DEXALIN, REAGENT_ID_DEXALINP, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_ANTITOXIN, REAGENT_ID_SYNAPTIZINE,
+ REAGENT_ID_HYRONALIN, REAGENT_ID_ARITHRAZINE, REAGENT_ID_ALKYSINE, REAGENT_ID_IMIDAZOLINE, REAGENT_ID_PERIDAXON, REAGENT_ID_BICARIDINE, REAGENT_ID_HYPERZINE,
+ REAGENT_ID_REZADONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_ETHYLREDOXRAZINE, REAGENT_ID_STOXIN, REAGENT_ID_CHLORALHYDRATE, REAGENT_ID_CRYOXADONE,
+ REAGENT_ID_CLONEXADONE
)
/obj/machinery/chemical_dispenser/bar_soft
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index bcd14cfd74..65b32a1440 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -63,8 +63,8 @@
/decl/chemical_reaction/distilling/inaprovalaze
name = "Distilling Inaprovalaze"
id = "distill_inaprovalaze"
- result = "inaprovalaze"
- required_reagents = list("inaprovaline" = 2, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_INAPROVALAZE
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 2, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -74,8 +74,8 @@
/decl/chemical_reaction/distilling/bicaridaze
name = "Distilling Bicaridaze"
id = "distill_bicaridaze"
- result = "bicaridaze"
- required_reagents = list("bicaridine" = 2, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_BICARIDAZE
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -85,8 +85,8 @@
/decl/chemical_reaction/distilling/dermalaze
name = "Distilling Dermalaze"
id = "distill_dermalaze"
- result = "dermalaze"
- required_reagents = list("dermaline" = 2, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_DERMALAZE
+ required_reagents = list(REAGENT_ID_DERMALINE = 2, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -96,8 +96,8 @@
/decl/chemical_reaction/distilling/spacomycaze
name = "Distilling Spacomycaze"
id = "distill_spacomycaze"
- result = "spacomycaze"
- required_reagents = list("paracetamol" = 1, "spaceacillin" = 1, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_SPACOMYCAZE
+ required_reagents = list(REAGENT_ID_PARACETAMOL = 1, REAGENT_ID_SPACEACILLIN = 1, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -107,8 +107,8 @@
/decl/chemical_reaction/distilling/tricorlidaze
name = "Distilling Tricorlidaze"
id = "distill_tricorlidaze"
- result = "tricorlidaze"
- required_reagents = list("tricordrazine" = 1, "sterilizine" = 1, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_TRICORLIDAZE
+ required_reagents = list(REAGENT_ID_TRICORDRAZINE = 1, REAGENT_ID_STERILIZINE = 1, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -119,7 +119,7 @@
name = "Distilling Synthplas"
id = "distill_synthplas"
result = REAGENT_ID_SYNTHBLOOD_DILUTE
- required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, "bicaridine" = 1)
+ required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, REAGENT_ID_BICARIDINE = 1)
result_amount = 3
reaction_rate = HALF_LIFE(15)
@@ -156,7 +156,7 @@
name = "Distilling Brute Juice"
id = "distill_brutejuice"
result = REAGENT_ID_BERSERKMED
- required_reagents = list(REAGENT_ID_BIOMASS = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1)
+ required_reagents = list(REAGENT_ID_BIOMASS = 1, REAGENT_ID_HYPERZINE = 3, REAGENT_ID_SYNAPTIZINE = 2, REAGENT_ID_PHORON = 1)
result_amount = 3
temp_range = list(T0C + 600, T0C + 700)
@@ -195,7 +195,7 @@
name = "Distilling Lichpowder"
id = "distill_lichpowder"
result = REAGENT_ID_LICHPOWDER
- required_reagents = list(REAGENT_ID_ZOMBIEPOWDER = 2, "leporazine" = 1)
+ required_reagents = list(REAGENT_ID_ZOMBIEPOWDER = 2, REAGENT_ID_LEPORAZINE = 1)
result_amount = 2
reaction_rate = HALF_LIFE(8)
@@ -205,8 +205,8 @@
/decl/chemical_reaction/distilling/necroxadone
name = "Distilling Necroxadone"
id = "distill_necroxadone"
- result = "necroxadone"
- required_reagents = list(REAGENT_ID_LICHPOWDER = 1, "cryoxadone" = 1, "carthatoline" = 1)
+ result = REAGENT_ID_NECROXADONE
+ required_reagents = list(REAGENT_ID_LICHPOWDER = 1, REAGENT_ID_CRYOXADONE = 1, REAGENT_ID_CARTHATOLINE = 1)
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 1647d8d551..4e69751c47 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -365,7 +365,7 @@
name = "The Doctor's Delight"
id = "doctordelight"
result = "doctorsdelight"
- required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, "tricordrazine" = 1)
+ required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/irish_cream
@@ -1246,7 +1246,7 @@
name = "Godka"
id = "godka"
result = "godka"
- required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, "carthatoline" = 1)
+ required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1)
catalysts = list("enzyme" = 5, REAGENT_ID_HOLYWATER = 5)
result_amount = 1
@@ -1339,7 +1339,7 @@
name = "Soda Oil"
id = "sodaoil"
result = "sodaoil"
- required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, "tricordrazine" = 1)
+ required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fusionnaire
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index 5ac6b07569..fd5d87f89b 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -153,7 +153,7 @@
name = "Syntiflesh"
id = "syntiflesh"
result = null
- required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
diff --git a/code/modules/reagents/reactions/instant/food_vr.dm b/code/modules/reagents/reactions/instant/food_vr.dm
index 7c39b10a75..cf34c86468 100644
--- a/code/modules/reagents/reactions/instant/food_vr.dm
+++ b/code/modules/reagents/reactions/instant/food_vr.dm
@@ -1,2 +1,2 @@
/decl/chemical_reaction/instant/food/syntiflesh
- required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 1)
+ required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 1)
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 365a9fa276..0fc3d46542 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -4,54 +4,54 @@
/* Common reactions */
/decl/chemical_reaction/instant/inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- result = "inaprovaline"
+ name = REAGENT_INAPROVALINE
+ id = REAGENT_ID_INAPROVALINE
+ result = REAGENT_ID_INAPROVALINE
required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/dylovene
- name = "Dylovene"
- id = "anti_toxin"
- result = "anti_toxin"
+ name = REAGENT_ANTITOXIN
+ id = REAGENT_ID_ANTITOXIN
+ result = REAGENT_ID_ANTITOXIN
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/carthatoline
- name = "Carthatoline"
- id = "carthatoline"
- result = "carthatoline"
- required_reagents = list("anti_toxin" = 1, REAGENT_ID_CARBON = 2, REAGENT_ID_PHORON = 0.1)
+ name = REAGENT_CARTHATOLINE
+ id = REAGENT_ID_CARTHATOLINE
+ result = REAGENT_ID_CARTHATOLINE
+ required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CARBON = 2, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 1)
result_amount = 2
/decl/chemical_reaction/instant/paracetamol
- name = "Paracetamol"
- id = "paracetamol"
- result = "paracetamol"
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1)
+ name = REAGENT_PARACETAMOL
+ id = REAGENT_ID_PARACETAMOL
+ result = REAGENT_ID_PARACETAMOL
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/tramadol
- name = "Tramadol"
- id = "tramadol"
- result = "tramadol"
- required_reagents = list("paracetamol" = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1)
+ name = REAGENT_TRAMADOL
+ id = REAGENT_ID_TRAMADOL
+ result = REAGENT_ID_TRAMADOL
+ required_reagents = list(REAGENT_ID_PARACETAMOL = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/oxycodone
- name = "Oxycodone"
- id = "oxycodone"
- result = "oxycodone"
- required_reagents = list(REAGENT_ID_ETHANOL = 1, "tramadol" = 1)
+ name = REAGENT_OXYCODONE
+ id = REAGENT_ID_OXYCODONE
+ result = REAGENT_ID_OXYCODONE
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_TRAMADOL = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
/decl/chemical_reaction/instant/sterilizine
- name = "Sterilizine"
- id = "sterilizine"
- result = "sterilizine"
- required_reagents = list(REAGENT_ID_ETHANOL = 1, "anti_toxin" = 1, REAGENT_ID_CHLORINE = 1)
+ name = REAGENT_STERILIZINE
+ id = REAGENT_ID_STERILIZINE
+ result = REAGENT_ID_STERILIZINE
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
/decl/chemical_reaction/instant/silicate
@@ -104,24 +104,24 @@
result_amount = 3
/decl/chemical_reaction/instant/synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- result = "synaptizine"
+ name = REAGENT_SYNAPTIZINE
+ id = REAGENT_ID_SYNAPTIZINE
+ result = REAGENT_ID_SYNAPTIZINE
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1, REAGENT_ID_WATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- result = "hyronalin"
- required_reagents = list(REAGENT_ID_RADIUM = 1, "anti_toxin" = 1)
+ name = REAGENT_HYRONALIN
+ id = REAGENT_ID_HYRONALIN
+ result = REAGENT_ID_HYRONALIN
+ required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- result = "arithrazine"
- required_reagents = list("hyronalin" = 1, REAGENT_ID_HYDROGEN = 1)
+ name = REAGENT_ARITHRAZINE
+ id = REAGENT_ID_ARITHRAZINE
+ result = REAGENT_ID_ARITHRAZINE
+ required_reagents = list(REAGENT_ID_HYRONALIN = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 2
/decl/chemical_reaction/instant/impedrezene
@@ -132,64 +132,64 @@
result_amount = 2
/decl/chemical_reaction/instant/kelotane
- name = "Kelotane"
- id = "kelotane"
- result = "kelotane"
+ name = REAGENT_KELOTANE
+ id = REAGENT_ID_KELOTANE
+ result = REAGENT_ID_KELOTANE
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
log_is_important = 1
/decl/chemical_reaction/instant/peridaxon
- name = "Peridaxon"
- id = "peridaxon"
- result = "peridaxon"
- required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
+ name = REAGENT_PERIDAXON
+ id = REAGENT_ID_PERIDAXON
+ result = REAGENT_ID_PERIDAXON
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_CLONEXADONE = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/osteodaxon
- name = "Osteodaxon"
- id = "osteodaxon"
- result = "osteodaxon"
- required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, REAGENT_ID_CARPOTOXIN = 1)
+ name = REAGENT_OSTEODAXON
+ id = REAGENT_ID_OSTEODAXON
+ result = REAGENT_ID_OSTEODAXON
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_PHORON = 0.1, REAGENT_ID_CARPOTOXIN = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("clonexadone" = 1) // Messes with cryox
+ inhibitors = list(REAGENT_ID_CLONEXADONE = 1) // Messes with cryox
result_amount = 2
/decl/chemical_reaction/instant/respirodaxon
- name = "Respirodaxon"
- id = "respirodaxon"
- result = "respirodaxon"
- required_reagents = list("dexalinp" = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_PHORON = 1)
+ name = REAGENT_RESPIRODAXON
+ id = REAGENT_ID_HYRONALIN
+ result = REAGENT_ID_HYRONALIN
+ required_reagents = list(REAGENT_ID_DEXALINP = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_PHORON = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("dexalin" = 1)
+ inhibitors = list(REAGENT_ID_DEXALIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/gastirodaxon
- name = "Gastirodaxon"
- id = "gastirodaxon"
- result = "gastirodaxon"
- required_reagents = list("carthatoline" = 1, REAGENT_ID_BIOMASS = 2, REAGENT_ID_TUNGSTEN = 2)
+ name = REAGENT_GASTIRODAXON
+ id = REAGENT_ID_GASTIRODAXON
+ result = REAGENT_ID_GASTIRODAXON
+ required_reagents = list(REAGENT_ID_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
/decl/chemical_reaction/instant/hepanephrodaxon
- name = "Hepanephrodaxon"
- id = "hepanephrodaxon"
- result = "hepanephrodaxon"
- required_reagents = list("carthatoline" = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_LITHIUM = 1)
+ name = REAGENT_HEPANEPHRODAXON
+ id = REAGENT_ID_HEPANEPHRODAXON
+ result = REAGENT_ID_HEPANEPHRODAXON
+ required_reagents = list(REAGENT_ID_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
/decl/chemical_reaction/instant/cordradaxon
- name = "Cordradaxon"
- id = "cordradaxon"
- result = "cordradaxon"
- required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2)
+ name = REAGENT_CORDRADAXON
+ id = REAGENT_ID_CORDRADAXON
+ result = REAGENT_ID_CORDRADAXON
+ required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 1, REAGENT_ID_BIOMASS = 2, REAGENT_ID_BICARIDINE = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("clonexadone" = 1)
+ inhibitors = list(REAGENT_ID_CLONEXADONE = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food
@@ -200,9 +200,9 @@
result_amount = 5
/decl/chemical_reaction/instant/leporazine
- name = "Leporazine"
- id = "leporazine"
- result = "leporazine"
+ name = REAGENT_LEPORAZINE
+ id = REAGENT_ID_LEPORAZINE
+ result = REAGENT_ID_LEPORAZINE
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_COPPER = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -215,61 +215,61 @@
result_amount = 3
/decl/chemical_reaction/instant/tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- result = "tricordrazine"
- required_reagents = list("inaprovaline" = 1, "anti_toxin" = 1)
+ name = REAGENT_TRICORDRAZINE
+ id = REAGENT_ID_TRICORDRAZINE
+ result = REAGENT_ID_TRICORDRAZINE
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/alkysine
- name = "Alkysine"
- id = "alkysine"
- result = "alkysine"
- required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1)
+ name = REAGENT_ALKYSINE
+ id = REAGENT_ID_ALKYSINE
+ result = REAGENT_ID_ALKYSINE
+ required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/dexalin
- name = "Dexalin"
- id = "dexalin"
- result = "dexalin"
+ name = REAGENT_DEXALIN
+ id = REAGENT_ID_DEXALIN
+ result = REAGENT_ID_DEXALIN
required_reagents = list(REAGENT_ID_OXYGEN = 2, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 1)
inhibitors = list(REAGENT_ID_WATER = 1) // Messes with cryox
result_amount = 1
/decl/chemical_reaction/instant/dermaline
- name = "Dermaline"
- id = "dermaline"
- result = "dermaline"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, "kelotane" = 1)
+ name = REAGENT_DERMALINE
+ id = REAGENT_ID_DERMALINE
+ result = REAGENT_ID_DERMALINE
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_KELOTANE = 1)
result_amount = 3
/decl/chemical_reaction/instant/dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- result = "dexalinp"
- required_reagents = list("dexalin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1)
+ name = REAGENT_DEXALINP
+ id = REAGENT_ID_DEXALINP
+ result = REAGENT_ID_DEXALINP
+ required_reagents = list(REAGENT_ID_DEXALIN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1)
result_amount = 3
/decl/chemical_reaction/instant/bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- result = "bicaridine"
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_CARBON = 1)
+ name = REAGENT_BICARIDINE
+ id = REAGENT_ID_BICARIDINE
+ result = REAGENT_ID_BICARIDINE
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_CARBON = 1)
inhibitors = list(REAGENT_ID_SUGAR = 1) // Messes up with inaprovaline
result_amount = 2
/decl/chemical_reaction/instant/myelamine
- name = "Myelamine"
- id = "myelamine"
- result = "myelamine"
- required_reagents = list("bicaridine" = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1)
+ name = REAGENT_MYELAMINE
+ id = REAGENT_ID_MYELAMINE
+ result = REAGENT_ID_MYELAMINE
+ required_reagents = list(REAGENT_ID_BICARIDINE = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- result = "hyperzine"
+ name = REAGENT_HYPERZINE
+ id = REAGENT_ID_HYPERZINE
+ result = REAGENT_ID_HYPERZINE
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_SULFUR = 1)
result_amount = 3
@@ -282,76 +282,76 @@
result_amount = 2
/decl/chemical_reaction/instant/ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- result = "ryetalyn"
- required_reagents = list("arithrazine" = 1, REAGENT_ID_CARBON = 1)
+ name = REAGENT_RYETALYN
+ id = REAGENT_ID_RYETALYN
+ result = REAGENT_ID_RYETALYN
+ required_reagents = list(REAGENT_ID_ARITHRAZINE = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
/decl/chemical_reaction/instant/cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
- result = "cryoxadone"
- required_reagents = list("dexalin" = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1)
+ name = REAGENT_CRYOXADONE
+ id = REAGENT_ID_CRYOXADONE
+ result = REAGENT_ID_CRYOXADONE
+ required_reagents = list(REAGENT_ID_DEXALIN = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/clonexadone
- name = "Clonexadone"
- id = "clonexadone"
- result = "clonexadone"
- required_reagents = list("cryoxadone" = 1, REAGENT_ID_SODIUM = 1, REAGENT_ID_PHORON = 0.1)
+ name = REAGENT_CLONEXADONE
+ id = REAGENT_ID_CLONEXADONE
+ result = REAGENT_ID_CLONEXADONE
+ required_reagents = list(REAGENT_ID_CRYOXADONE = 1, REAGENT_ID_SODIUM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/mortiferin
- name = "Mortiferin"
- id = "mortiferin"
- result = "mortiferin"
- required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "clonexadone" = 1, "corophizine" = 1)
+ name = REAGENT_MORTIFERIN
+ id = REAGENT_ID_MORTIFERIN
+ result = REAGENT_ID_MORTIFERIN
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_CLONEXADONE = 1, REAGENT_ID_COROPHIZINE = 1)
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
/decl/chemical_reaction/instant/spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
- result = "spaceacillin"
- required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "inaprovaline" = 1)
+ name = REAGENT_SPACEACILLIN
+ id = REAGENT_ID_SPACEACILLIN
+ result = REAGENT_ID_SPACEACILLIN
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 2
/decl/chemical_reaction/instant/corophizine
- name = "Corophizine"
- id = "corophizine"
- result = "corophizine"
- required_reagents = list("spaceacillin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_PHORON = 0.1)
+ name = REAGENT_COROPHIZINE
+ id = REAGENT_ID_COROPHIZINE
+ result = REAGENT_ID_COROPHIZINE
+ required_reagents = list(REAGENT_ID_SPACEACILLIN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/immunosuprizine
- name = "Immunosuprizine"
- id = "immunosuprizine"
- result = "immunosuprizine"
- required_reagents = list("corophizine" = 1, REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_SACID = 1)
+ name = REAGENT_IMMUNOSUPRIZINE
+ id = REAGENT_ID_IMMUNOSUPRIZINE
+ result = REAGENT_ID_IMMUNOSUPRIZINE
+ required_reagents = list(REAGENT_ID_COROPHIZINE = 1, REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_SACID = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/imidazoline
- name = "imidazoline"
- id = "imidazoline"
- result = "imidazoline"
- required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
+ name = REAGENT_ID_IMIDAZOLINE
+ id = REAGENT_ID_IMIDAZOLINE
+ result = REAGENT_ID_IMIDAZOLINE
+ required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/ethylredoxrazine
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
- result = "ethylredoxrazine"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, REAGENT_ID_CARBON = 1)
+ name = REAGENT_ETHYLREDOXRAZINE
+ id = REAGENT_ID_ETHYLREDOXRAZINE
+ result = REAGENT_ID_ETHYLREDOXRAZINE
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
/decl/chemical_reaction/instant/calciumcarbonate
name = "Calcium Carbonate"
- id = "calciumcarbonate"
- result = "calciumcarbonate"
+ id = REAGENT_ID_CALCIUMCARBONATE
+ result = REAGENT_ID_CALCIUMCARBONATE
required_reagents = list(REAGENT_ID_OXYGEN = 3, REAGENT_ID_CALCIUM = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
@@ -404,7 +404,7 @@
name = REAGENT_MINDBREAKER
id = REAGENT_ID_MINDBREAKER
result = REAGENT_ID_MINDBREAKER
- required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
+ required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 3
/decl/chemical_reaction/instant/lipozine
@@ -502,9 +502,9 @@
log_is_important = 1
/decl/chemical_reaction/instant/rezadone
- name = "Rezadone"
- id = "rezadone"
- result = "rezadone"
+ name = REAGENT_REZADONE
+ id = REAGENT_ID_REZADONE
+ result = REAGENT_ID_REZADONE
required_reagents = list(REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_COPPER = 1)
result_amount = 3
@@ -533,7 +533,7 @@
name = REAGENT_PAROXETINE
id = REAGENT_ID_PAROXETINE
result = REAGENT_ID_PAROXETINE
- required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
+ required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 3
/decl/chemical_reaction/instant/neurotoxin
@@ -1205,10 +1205,10 @@
result_amount = 4
/decl/chemical_reaction/instant/malish_qualem
- name = "Malish-Qualem"
- id = "malish-qualem"
- result = "malish-qualem"
- required_reagents = list("immunosuprizine" = 1, REAGENT_ID_QERRQUEM = 1, "inaprovaline" = 1)
+ name = REAGENT_MALISHQUALEM
+ id = REAGENT_ID_MALISHQUALEM
+ result = REAGENT_ID_MALISHQUALEM
+ required_reagents = list(REAGENT_ID_IMMUNOSUPRIZINE = 1, REAGENT_ID_QERRQUEM = 1, REAGENT_ID_INAPROVALINE = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -1226,7 +1226,7 @@
name = "Neutralize Toxic Proteins"
id = "neurotoxic_protein_neutral"
result = "protein"
- required_reagents = list("anti_toxin" = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
+ required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
result_amount = 2
/decl/chemical_reaction/instant/neutralize_carpotoxin
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 02f612893d..8cad988a79 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -5,7 +5,7 @@
name = REAGENT_SIZEOXADONE
id = REAGENT_ID_SIZEOXADONE
result = REAGENT_ID_SIZEOXADONE
- required_reagents = list("clonexadone" = 1, "tramadol" = 3, REAGENT_ID_PHORON = 1)
+ required_reagents = list(REAGENT_ID_CLONEXADONE = 1, REAGENT_ID_TRAMADOL = 3, REAGENT_ID_PHORON = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 5
@@ -30,7 +30,7 @@
id = REAGENT_ID_NORMALCILLIN
result = REAGENT_ID_NORMALCILLIN
// POLARISTODO requires_heating = 1
- required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "leporazine" = 20)
+ required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_LEPORAZINE = 20)
result_amount = 1
/decl/chemical_reaction/instant/dontcrossthebeams
@@ -53,7 +53,7 @@
name = REAGENT_AMORPHOROVIR
id = REAGENT_ID_AMORPHOROVIR
result = REAGENT_ID_AMORPHOROVIR
- required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20)
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 30, REAGENT_ID_BIOMASS = 30, REAGENT_ID_HYPERZINE = 20)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
@@ -61,21 +61,21 @@
name = REAGENT_ANDROROVIR
id = REAGENT_ID_ANDROROVIR
result = REAGENT_ID_ANDROROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "bicaridine" = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_BICARIDINE = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir
name = REAGENT_GYNOROVIR
id = REAGENT_ID_GYNOROVIR
result = REAGENT_ID_GYNOROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "inaprovaline" = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_INAPROVALINE = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir
name = REAGENT_ANDROGYNOROVIR
id = REAGENT_ID_ANDROGYNOROVIR
result = REAGENT_ID_ANDROGYNOROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "anti_toxin" = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_ANTITOXIN = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/androrovir_bootleg
@@ -129,7 +129,7 @@
name = REAGENT_ICKYPAK
id = REAGENT_ID_ICKYPAK
result = REAGENT_ID_ICKYPAK
- required_reagents = list("hyperzine" = 4, REAGENT_ID_FLUOROSURFACTANT = 1)
+ required_reagents = list(REAGENT_ID_HYPERZINE = 4, REAGENT_ID_FLUOROSURFACTANT = 1)
result_amount = 5
/decl/chemical_reaction/instant/unsorbitol
@@ -152,7 +152,7 @@
name = REAGENT_VERMICETOL
id = REAGENT_ID_VERMICETOL
result = REAGENT_ID_VERMICETOL
- required_reagents = list("bicaridine" = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1)
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 3
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index adda682adb..c2ea1ec0c3 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -37,7 +37,7 @@
name = REAGENT_SUGARVIRUSFOOD
id = "inaprovalinevirusfood"
result = REAGENT_ID_SUGARVIRUSFOOD
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_size
@@ -157,5 +157,5 @@
id = "antibodiesmix"
result = REAGENT_ID_ANTIBODIES
required_reagents = list(REAGENT_ID_VACCINE)
- catalysts = list("inaprovaline" = 0.1)
+ catalysts = list(REAGENT_ID_INAPROVALINE = 0.1)
result_amount = 0.5
diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm
index 08a01ba3c1..9beec35380 100644
--- a/code/modules/reagents/reagent_containers/borghypo.dm
+++ b/code/modules/reagents/reagent_containers/borghypo.dm
@@ -14,25 +14,25 @@
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/bypass_protection = FALSE // If true, can inject through things like spacesuits and armor.
- var/list/reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
+ var/list/reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_DEXALIN ,REAGENT_ID_SPACEACILLIN)
var/list/reagent_volumes = list()
var/list/reagent_names = list()
/obj/item/reagent_containers/borghypo/surgeon
- reagent_ids = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone")
+ reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_OXYCODONE)
/obj/item/reagent_containers/borghypo/crisis
- reagent_ids = list("inaprovaline", "bicaridine", "kelotane", "anti_toxin", "dexalin", "tricordrazine", "spaceacillin", "tramadol")
+ reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_TRAMADOL)
/obj/item/reagent_containers/borghypo/lost
- reagent_ids = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
+ reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
/obj/item/reagent_containers/borghypo/merc
name = "advanced cyborg hypospray"
desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \
thick materials that other hyposprays would struggle with."
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
- reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
+ reagent_ids = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 1e8447dc6d..e48f2fe6fd 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -282,7 +282,7 @@
/obj/item/reagent_containers/glass/beaker/cryoxadone
name = "beaker (cryoxadone)"
- prefill = list("cryoxadone" = 30)
+ prefill = list(REAGENT_ID_CRYOXADONE = 30)
/obj/item/reagent_containers/glass/beaker/sulphuric
prefill = list(REAGENT_ID_SACID = 60)
diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm
index 3510c179ed..29f663faff 100644
--- a/code/modules/reagents/reagent_containers/glass_vr.dm
+++ b/code/modules/reagents/reagent_containers/glass_vr.dm
@@ -3,51 +3,51 @@
/obj/item/reagent_containers/glass/beaker/vial/bicaridine
name = "vial (bicaridine)"
- prefill = list("bicaridine" = 30)
+ prefill = list(REAGENT_ID_BICARIDINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dylovene
name = "vial (dylovene)"
- prefill = list("dylovene" = 30)
+ prefill = list(REAGENT_ID_ANTITOXIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dermaline
name = "vial (dermaline)"
- prefill = list("dermaline" = 30)
+ prefill = list(REAGENT_ID_DERMALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/kelotane
name = "vial (kelotane)"
- prefill = list("kelotane" = 30)
+ prefill = list(REAGENT_ID_KELOTANE = 30)
/obj/item/reagent_containers/glass/beaker/vial/inaprovaline
name = "vial (inaprovaline)"
- prefill = list("inaprovaline" = 30)
+ prefill = list(REAGENT_ID_INAPROVALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalin
name = "vial (dexalin)"
- prefill = list("dexalin" = 30)
+ prefill = list(REAGENT_ID_DEXALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalinplus
name = "vial (dexalinp)"
- prefill = list("dexalinp" = 30)
+ prefill = list(REAGENT_ID_DEXALINP = 30)
/obj/item/reagent_containers/glass/beaker/vial/tricordrazine
name = "vial (tricordrazine)"
- prefill = list("tricordrazine" = 30)
+ prefill = list(REAGENT_ID_TRICORDRAZINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/alkysine
name = "vial (alkysine)"
- prefill = list("alkysine" = 30)
+ prefill = list(REAGENT_ID_ALKYSINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/imidazoline
name = "vial (imidazoline)"
- prefill = list("imidazoline" = 30)
+ prefill = list(REAGENT_ID_IMIDAZOLINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/peridaxon
name = "vial (peridaxon)"
- prefill = list("peridaxon" = 30)
+ prefill = list(REAGENT_ID_PERIDAXON = 30)
/obj/item/reagent_containers/glass/beaker/vial/hyronalin
name = "vial (hyronalin)"
- prefill = list("hyronalin" = 30)
+ prefill = list(REAGENT_ID_HYRONALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/amorphorovir
name = "vial (" + REAGENT_ID_AMORPHOROVIR + ")"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index d8152f9759..f69d56feb8 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -154,7 +154,7 @@
amount_per_transfer_from_this = 5
volume = 5
filled = 1
- filled_reagents = list("inaprovaline" = 5)
+ filled_reagents = list(REAGENT_ID_INAPROVALINE = 5)
preserve_item = 0
hyposound = 'sound/effects/hypospray.ogg'
@@ -194,18 +194,18 @@
/obj/item/reagent_containers/hypospray/autoinjector/detox
name = "autoinjector (antitox)"
icon_state = "green"
- filled_reagents = list("anti_toxin" = 5)
+ filled_reagents = list(REAGENT_ID_ANTITOXIN = 5)
//Special autoinjectors, while having potent chems like the 15u ones, the chems are usually potent enough that 5u is enough
/obj/item/reagent_containers/hypospray/autoinjector/bonemed
name = "bone repair injector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating damage to bones."
- filled_reagents = list("osteodaxon" = 5)
+ filled_reagents = list(REAGENT_ID_OSTEODAXON = 5)
/obj/item/reagent_containers/hypospray/autoinjector/clonemed
name = "clone injector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating genetic damage."
- filled_reagents = list("rezadone" = 5)
+ filled_reagents = list(REAGENT_ID_REZADONE = 5)
// These have a 15u capacity, somewhat higher tech level, and generally more useful chems, but are otherwise the same as the regular autoinjectors.
/obj/item/reagent_containers/hypospray/autoinjector/biginjector
@@ -215,7 +215,7 @@
amount_per_transfer_from_this = 15
volume = 15
origin_tech = list(TECH_BIO = 4)
- filled_reagents = list("inaprovaline" = 15)
+ filled_reagents = list(REAGENT_ID_INAPROVALINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty //for the autolathe
name = "large autoinjector"
@@ -226,52 +226,52 @@
name = "trauma hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on victims of \
moderate blunt trauma."
- filled_reagents = list("bicaridine" = 15)
+ filled_reagents = list(REAGENT_ID_BICARIDINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn
name = "burn hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on burn victims, \
featuring an optimized chemical mixture to allow for rapid healing."
- filled_reagents = list("kelotane" = 7.5, "dermaline" = 7.5)
+ filled_reagents = list(REAGENT_ID_KELOTANE = 7.5, REAGENT_ID_DERMALINE = 7.5)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin
name = "toxin hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract toxins."
- filled_reagents = list("anti_toxin" = 15)
+ filled_reagents = list(REAGENT_ID_ANTITOXIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy
name = "oxy hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract oxygen \
deprivation."
- filled_reagents = list("dexalinp" = 10, "tricordrazine" = 5)
+ filled_reagents = list(REAGENT_ID_DEXALINP = 10, REAGENT_ID_TRICORDRAZINE = 5)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity
name = "purity hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \
resolving viruses, infections, radiation, and genetic maladies."
- filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, REAGENT_ID_PRUSSIANBLUE = 5, "ryetalyn" = 1)
+ filled_reagents = list(REAGENT_ID_SPACEACILLIN = 4, REAGENT_ID_ARITHRAZINE = 5, REAGENT_ID_PRUSSIANBLUE = 5, REAGENT_ID_RYETALYN = 1)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain
name = "pain hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one contains potent painkillers."
- filled_reagents = list("tramadol" = 15)
+ filled_reagents = list(REAGENT_ID_TRAMADOL = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ
name = "organ hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. Organ damage is resolved by this variant."
- filled_reagents = list("alkysine" = 3, "imidazoline" = 2, "peridaxon" = 10)
+ filled_reagents = list(REAGENT_ID_ALKYSINE = 3, REAGENT_ID_IMIDAZOLINE = 2, REAGENT_ID_PERIDAXON = 10)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat
name = "combat hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This is a more dangerous and potentially \
addictive hypo compared to others, as it contains a potent cocktail of various chemicals to optimize the recipient's combat \
ability."
- filled_reagents = list("bicaridine" = 3, "kelotane" = 1.5, "dermaline" = 1.5, "oxycodone" = 3, "hyperzine" = 3, "tricordrazine" = 3)
+ filled_reagents = list(REAGENT_ID_BICARIDINE = 3, REAGENT_ID_KELOTANE = 1.5, REAGENT_ID_DERMALINE = 1.5, REAGENT_ID_OXYCODONE = 3, REAGENT_ID_HYPERZINE = 3, REAGENT_ID_TRICORDRAZINE = 3)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting
name = "clotting agent"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at treating bleeding wounds and internal bleeding."
- filled_reagents = list("inaprovaline" = 5, "myelamine" = 10)
+ filled_reagents = list(REAGENT_ID_INAPROVALINE = 5, REAGENT_ID_MYELAMINE = 10)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose
name = "glucose hypo"
@@ -361,7 +361,7 @@
The injector stores a slurry of highly advanced and specialized nanomachines designed \
to restore bodily health from within. The nanomachines are short-lived but degrade \
harmlessly, and cannot self-replicate in order to remain Five Points compliant."
- filled_reagents = list("healing_nanites" = 15)
+ filled_reagents = list(REAGENT_ID_HEALINGNANITES = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites
name = "defective nanite injector"
diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm
index 37d273a5cf..c620419558 100644
--- a/code/modules/reagents/reagent_containers/hypospray_vr.dm
+++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm
@@ -1,22 +1,22 @@
/obj/item/reagent_containers/hypospray/autoinjector/burn
name = "autoinjector (burn)"
icon_state = "purple"
- filled_reagents = list("dermaline" = 3.5, "leporazine" = 1.5)
+ filled_reagents = list(REAGENT_ID_DERMALINE = 3.5, REAGENT_ID_LEPORAZINE = 1.5)
/obj/item/reagent_containers/hypospray/autoinjector/trauma
name = "autoinjector (trauma)"
icon_state = "black"
- filled_reagents = list("bicaridine" = 4, "tramadol" = 1)
+ filled_reagents = list(REAGENT_ID_BICARIDINE = 4, REAGENT_ID_TRAMADOL = 1)
/obj/item/reagent_containers/hypospray/autoinjector/oxy
name = "autoinjector (oxy)"
icon_state = "blue"
- filled_reagents = list("dexalinp" = 5)
+ filled_reagents = list(REAGENT_ID_DEXALINP = 5)
/obj/item/reagent_containers/hypospray/autoinjector/rad
name = "autoinjector (rad)"
icon_state = "black"
- filled_reagents = list("hyronalin" = 5)
+ filled_reagents = list(REAGENT_ID_HYRONALIN = 5)
/obj/item/storage/box/traumainjectors
name = "box of emergency injectors"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 202f454fc6..a52c847a65 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -120,13 +120,13 @@
//Pills
/obj/item/reagent_containers/pill/antitox
- name = "Dylovene (30u)" //VOREStation Edit
+ name = REAGENT_ANTITOXIN + " (30u)" //VOREStation Edit
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/reagent_containers/pill/antitox/Initialize()
. = ..()
- reagents.add_reagent("anti_toxin", 30) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/tox
@@ -150,7 +150,7 @@
/obj/item/reagent_containers/pill/adminordrazine
- name = "Adminordrazine pill"
+ name = REAGENT_ADMINORDRAZINE + " pill"
desc = "It's magic. We don't have to explain it."
icon_state = "pillA"
@@ -160,7 +160,7 @@
/obj/item/reagent_containers/pill/stox
- name = "Soporific (15u)"
+ name = REAGENT_STOXIN + " (15u)"
desc = "Commonly used to treat insomnia."
icon_state = "pill2"
@@ -170,37 +170,37 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/kelotane
- name = "Kelotane (20u)" //VOREStation Edit
+ name = REAGENT_KELOTANE + " (20u)" //VOREStation Edit
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/reagent_containers/pill/kelotane/Initialize()
. = ..()
- reagents.add_reagent("kelotane", 20) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_KELOTANE, 20) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/paracetamol
- name = "Paracetamol (15u)"
- desc = "Paracetamol! A painkiller for the ages. Chewables!"
+ name = REAGENT_PARACETAMOL + " (15u)"
+ desc = REAGENT_PARACETAMOL + "! A painkiller for the ages. Chewables!"
icon_state = "pill3"
/obj/item/reagent_containers/pill/paracetamol/Initialize()
. = ..()
- reagents.add_reagent("paracetamol", 15)
+ reagents.add_reagent(REAGENT_ID_PARACETAMOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/tramadol
- name = "Tramadol (15u)"
+ name = REAGENT_TRAMADOL + " (15u)"
desc = "A simple painkiller."
icon_state = "pill3"
/obj/item/reagent_containers/pill/tramadol/Initialize()
. = ..()
- reagents.add_reagent("tramadol", 15)
+ reagents.add_reagent(REAGENT_ID_TRAMADOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/methylphenidate
- name = "Methylphenidate (15u)"
+ name = REAGENT_METHYLPHENIDATE + " (15u)"
desc = "Improves the ability to concentrate."
icon_state = "pill2"
@@ -210,7 +210,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/citalopram
- name = "Citalopram (15u)"
+ name = REAGENT_CITALOPRAM + " (15u)"
desc = "Mild anti-depressant."
icon_state = "pill4"
@@ -220,77 +220,77 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin
- name = "Dexalin (7.5u)" //VOREstation Edit
+ name = REAGENT_DEXALIN + " (7.5u)" //VOREstation Edit
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dexalin/Initialize()
. = ..()
- reagents.add_reagent("dexalin", 7.5) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin_plus
- name = "Dexalin Plus (15u)"
+ name = REAGENT_DEXALINP + " (15u)"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dexalin_plus/Initialize()
. = ..()
- reagents.add_reagent("dexalinp", 15)
+ reagents.add_reagent(REAGENT_ID_DEXALINP, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dermaline
- name = "Dermaline (15u)"
+ name = REAGENT_DERMALINE + " (15u)"
desc = "Used to treat burn wounds."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dermaline/Initialize()
. = ..()
- reagents.add_reagent("dermaline", 15)
+ reagents.add_reagent(REAGENT_ID_DERMALINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dylovene
- name = "Dylovene (15u)"
+ name = REAGENT_ANTITOXIN + " (15u)"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dylovene/Initialize()
. = ..()
- reagents.add_reagent("anti_toxin", 15)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/inaprovaline
- name = "Inaprovaline (30u)"
+ name = REAGENT_INAPROVALINE + " (30u)"
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/reagent_containers/pill/inaprovaline/Initialize()
. = ..()
- reagents.add_reagent("inaprovaline", 30)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/bicaridine
- name = "Bicaridine (20u)"
+ name = REAGENT_BICARIDINE + " (20u)"
desc = "Used to treat physical injuries."
icon_state = "pill2"
/obj/item/reagent_containers/pill/bicaridine/Initialize()
. = ..()
- reagents.add_reagent("bicaridine", 20)
+ reagents.add_reagent(REAGENT_ID_BICARIDINE, 20)
color = reagents.get_color()
/obj/item/reagent_containers/pill/spaceacillin
- name = "Spaceacillin (15u)" //VOREStation Edit
+ name = REAGENT_SPACEACILLIN + " (15u)" //VOREStation Edit
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
icon_state = "pill3"
/obj/item/reagent_containers/pill/spaceacillin/Initialize()
. = ..()
- reagents.add_reagent("spaceacillin", 15)
+ reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/carbon
- name = "Carbon (30u)" //VOREStation Edit
+ name = REAGENT_CARBON + " (30u)" //VOREStation Edit
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
@@ -300,7 +300,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/iron
- name = "Iron (30u)" //VOREStation Edit
+ name = REAGENT_IRON + " (30u)" //VOREStation Edit
desc = "Used to aid in blood regeneration after bleeding for red-blooded crew."
icon_state = "pill1"
@@ -310,7 +310,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/copper
- name = "Copper (30u)"
+ name = REAGENT_COPPER + " (30u)"
desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew."
icon_state = "pill1"
diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm
index 3a4fadc2f7..659792bf79 100644
--- a/code/modules/reagents/reagent_containers/pill_vr.dm
+++ b/code/modules/reagents/reagent_containers/pill_vr.dm
@@ -1,6 +1,6 @@
/obj/item/reagent_containers/pill/nutriment
- name = "Nutriment (30u)"
- desc = "Used to feed people on the field. Contains 30 units of Nutriment."
+ name = REAGENT_NUTRIMENT + " (30u)"
+ desc = "Used to feed people on the field. Contains 30 units of " + REAGENT_NUTRIMENT + "."
icon_state = "pill10"
/obj/item/reagent_containers/pill/nutriment/Initialize()
@@ -8,8 +8,8 @@
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
/obj/item/reagent_containers/pill/protein
- name = "Protein (30u)"
- desc = "Used to feed carnivores on the field. Contains 30 units of Protein."
+ name = REAGENT_PROTEIN + " (30u)"
+ desc = "Used to feed carnivores on the field. Contains 30 units of " + REAGENT_PROTEIN + "."
icon_state = "pill24"
/obj/item/reagent_containers/pill/protein/Initialize()
@@ -17,108 +17,108 @@
reagents.add_reagent("protein", 30)
/obj/item/reagent_containers/pill/rezadone
- name = "Rezadone (5u)"
+ name = REAGENT_REZADONE + " (5u)"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon_state = "pill2"
/obj/item/reagent_containers/pill/rezadone/Initialize()
. = ..()
- reagents.add_reagent("rezadone", 5)
+ reagents.add_reagent(REAGENT_ID_REZADONE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/peridaxon
- name = "Peridaxon (10u)"
+ name = REAGENT_PERIDAXON + " (10u)"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon_state = "pill10"
/obj/item/reagent_containers/pill/peridaxon/Initialize()
. = ..()
- reagents.add_reagent("peridaxon", 10)
+ reagents.add_reagent(REAGENT_ID_PERIDAXON, 10)
/obj/item/reagent_containers/pill/carthatoline
- name = "Carthatoline (15u)"
- desc = "Carthatoline is strong evacuant used to treat severe poisoning."
+ name = REAGENT_CARTHATOLINE + " (15u)"
+ desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/carthatoline/Initialize()
. = ..()
- reagents.add_reagent("carthatoline", 15)
+ reagents.add_reagent(REAGENT_ID_CARTHATOLINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/alkysine
- name = "Alkysine (10u)"
- desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ name = REAGENT_ALKYSINE + " (10u)"
+ desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon_state = "pill3"
/obj/item/reagent_containers/pill/alkysine/Initialize()
. = ..()
- reagents.add_reagent("alkysine", 10)
+ reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/imidazoline
- name = "Imidazoline (15u)"
+ name = REAGENT_IMIDAZOLINE + " (15u)"
desc = "Heals eye damage."
icon_state = "pill3"
/obj/item/reagent_containers/pill/imidazoline/Initialize()
. = ..()
- reagents.add_reagent("imidazoline", 15)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/osteodaxon
- name = "Osteodaxon (25u)"
+ name = REAGENT_OSTEODAXON + " (25u)"
desc = "An experimental drug used to heal bone fractures."
icon_state = "pill2"
/obj/item/reagent_containers/pill/osteodaxon/Initialize()
. = ..()
- reagents.add_reagent("osteodaxon", 15)
- reagents.add_reagent("inaprovaline", 10)
+ reagents.add_reagent(REAGENT_ID_OSTEODAXON, 15)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/myelamine
- name = "Myelamine (25u)"
+ name = REAGENT_MYELAMINE + " (25u)"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon_state = "pill1"
/obj/item/reagent_containers/pill/myelamine/Initialize()
. = ..()
- reagents.add_reagent("myelamine", 15)
- reagents.add_reagent("inaprovaline", 10)
+ reagents.add_reagent(REAGENT_ID_MYELAMINE, 15)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/hyronalin
- name = "Hyronalin (15u)"
- desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+ name = REAGENT_HYRONALIN + " (15u)"
+ desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/hyronalin/Initialize()
. = ..()
- reagents.add_reagent("hyronalin", 15)
+ reagents.add_reagent(REAGENT_ID_HYRONALIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/arithrazine
- name = "Arithrazine (5u)"
- desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ name = REAGENT_ARITHRAZINE + " (5u)"
+ desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
icon_state = "pill2"
/obj/item/reagent_containers/pill/arithrazine/Initialize()
. = ..()
- reagents.add_reagent("arithrazine", 5)
+ reagents.add_reagent(REAGENT_ID_ARITHRAZINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/corophizine
- name = "Corophizine (5u)"
+ name = REAGENT_COROPHIZINE + " (5u)"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon_state = "pill2"
/obj/item/reagent_containers/pill/corophizine/Initialize()
. = ..()
- reagents.add_reagent("corophizine", 5)
+ reagents.add_reagent(REAGENT_ID_COROPHIZINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/vermicetol
- name = "Vermicetol (15u)"
+ name = REAGENT_VERMICETOL + " (15u)"
desc = "An extremely potent drug to treat physical injuries."
icon_state = "pill1"
@@ -128,17 +128,17 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/healing_nanites
- name = "Healing nanites (30u)"
+ name = REAGENT_HEALINGNANITES + " (30u)"
desc = "Miniature medical robots that swiftly restore bodily damage."
icon_state = "pill1"
/obj/item/reagent_containers/pill/healing_nanites/Initialize()
. = ..()
- reagents.add_reagent("healing_nanites", 30)
+ reagents.add_reagent(REAGENT_ID_HEALINGNANITES, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/sleevingcure
- name = "Kitsuhanan Cure (1u)"
+ name = REAGENT_SLEEVINGCURE + " (1u)"
desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
icon_state = "pill3"
@@ -154,5 +154,5 @@
/obj/item/reagent_containers/pill/airlock/New()
..()
- reagents.add_reagent("anti_toxin", 15)
- reagents.add_reagent("paracetamol", 5)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
+ reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index c89015e3e2..078ee4d390 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -109,12 +109,12 @@
reagents.add_reagent(REAGENT_ID_CLEANER, volume)
/obj/item/reagent_containers/spray/sterilizine
- name = "sterilizine"
+ name = REAGENT_ID_STERILIZINE
desc = "Great for hiding incriminating bloodstains and sterilizing scalpels."
/obj/item/reagent_containers/spray/sterilizine/Initialize()
. = ..()
- reagents.add_reagent("sterilizine", volume)
+ reagents.add_reagent(REAGENT_ID_STERILIZINE, volume)
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 20d6485b8c..37a14f8615 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -338,7 +338,7 @@
/obj/item/reagent_containers/syringe/inaprovaline/Initialize()
. = ..()
- reagents.add_reagent("inaprovaline", 15)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -348,7 +348,7 @@
/obj/item/reagent_containers/syringe/antitoxin/Initialize()
. = ..()
- reagents.add_reagent("anti_toxin", 15)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/syringe/antiviral/Initialize()
. = ..()
- reagents.add_reagent("spaceacillin", 15)
+ reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -387,7 +387,7 @@
/obj/item/reagent_containers/syringe/steroid/Initialize()
..()
//reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks.
- reagents.add_reagent("hyperzine",10)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE,10)
/obj/item/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
if(!ishuman(loc))
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index b4e5e23429..2b2275e31a 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -1051,7 +1051,7 @@
/datum/reagent/drink/juice/carrot/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
- M.reagents.add_reagent("imidazoline", removed * 0.2)
+ M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, removed * 0.2)
/datum/reagent/drink/juice/lettuce
name = "Lettuce Juice"
diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm
index 7df322752b..5876a319f2 100644
--- a/code/modules/reagents/reagents/medicine.dm
+++ b/code/modules/reagents/reagents/medicine.dm
@@ -1,9 +1,9 @@
/* General medicine */
/datum/reagent/inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients. Also counteracts allergic reactions."
+ name = REAGENT_INAPROVALINE
+ id = REAGENT_ID_INAPROVALINE
+ description = REAGENT_INAPROVALINE + " is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients. Also counteracts allergic reactions."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#00BFFF"
@@ -18,9 +18,9 @@
M.remove_chemical_effect(CE_ALLERGEN)
/datum/reagent/inaprovaline/topical
- name = "Inaprovalaze"
- id = "inaprovalaze"
- description = "Inaprovalaze is a topical variant of Inaprovaline."
+ name = REAGENT_INAPROVALAZE
+ id = REAGENT_ID_INAPROVALAZE
+ description = REAGENT_INAPROVALAZE + " is a topical variant of Inaprovaline."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#00BFFF"
@@ -41,9 +41,9 @@
M.add_chemical_effect(CE_PAINKILLER, 12 * M.species.chem_strength_pain)
/datum/reagent/bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
+ name = REAGENT_BICARIDINE
+ id = REAGENT_ID_BICARIDINE
+ description = REAGENT_BICARIDINE + " is an analgesic medication and can be used to treat blunt trauma."
taste_description = "bitterness"
taste_mult = 3
reagent_state = LIQUID
@@ -77,9 +77,9 @@
O.wounds -= W
/datum/reagent/bicaridine/topical
- name = "Bicaridaze"
- id = "bicaridaze"
- description = "Bicaridaze is a topical variant of the chemical Bicaridine."
+ name = REAGENT_BICARIDAZE
+ id = REAGENT_ID_BICARIDAZE
+ description = REAGENT_BICARIDAZE + " is a topical variant of the chemical Bicaridine."
taste_description = "bitterness"
taste_mult = 3
reagent_state = LIQUID
@@ -105,8 +105,8 @@
M.heal_organ_damage(6 * removed * chem_effective, 0)
/datum/reagent/calciumcarbonate
- name = "calcium carbonate"
- id = "calciumcarbonate"
+ name = REAGENT_CALCIUMCARBONATE
+ id = REAGENT_ID_CALCIUMCARBONATE
description = "Calcium carbonate is a calcium salt commonly used as an antacid."
taste_description = "chalk"
reagent_state = SOLID
@@ -124,9 +124,9 @@
M.add_chemical_effect(CE_ANTACID, 3)
/datum/reagent/kelotane
- name = "Kelotane"
- id = "kelotane"
- description = "Kelotane is a drug used to treat burns."
+ name = REAGENT_KELOTANE
+ id = REAGENT_ID_KELOTANE
+ description = REAGENT_KELOTANE + " is a drug used to treat burns."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FFA800"
@@ -142,9 +142,10 @@
M.heal_organ_damage(0, 4 * removed * chem_effective) //VOREStation edit
/datum/reagent/dermaline
- name = "Dermaline"
- id = "dermaline"
- description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
+ name = REAGENT_DERMALINE
+ id = REAGENT_ID_DERMALINE
+ name = REAGENT_DERMALINE
+ description = REAGENT_DERMALINE + " is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
taste_description = "bitterness"
taste_mult = 1.5
reagent_state = LIQUID
@@ -160,9 +161,9 @@
M.heal_organ_damage(0, 8 * removed * chem_effective) //VOREStation edit
/datum/reagent/dermaline/topical
- name = "Dermalaze"
- id = "dermalaze"
- description = "Dermalaze is a topical variant of the chemical Dermaline."
+ name = REAGENT_DERMALAZE
+ id = REAGENT_ID_DERMALAZE
+ description = REAGENT_DERMALAZE + " is a topical variant of the chemical Dermaline."
taste_description = "bitterness"
taste_mult = 1.5
reagent_state = LIQUID
@@ -188,9 +189,9 @@
M.heal_organ_damage(0, 12 * removed * chem_effective)
/datum/reagent/dylovene
- name = "Dylovene"
- id = "anti_toxin"
- description = "Dylovene is a broad-spectrum antitoxin."
+ name = REAGENT_ANTITOXIN
+ id = REAGENT_ID_ANTITOXIN
+ description = REAGENT_ANTITOXIN + " is a broad-spectrum antitoxin."
taste_description = "a roll of gauze"
reagent_state = LIQUID
color = "#00A000"
@@ -210,9 +211,9 @@
M.remove_a_modifier_of_type(/datum/modifier/poisoned)
/datum/reagent/carthatoline
- name = "Carthatoline"
- id = "carthatoline"
- description = "Carthatoline is strong evacuant used to treat severe poisoning."
+ name = REAGENT_CARTHATOLINE
+ id = REAGENT_ID_CARTHATOLINE
+ description = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
reagent_state = LIQUID
color = "#225722"
scannable = 1
@@ -245,9 +246,9 @@
st?.take_damage(removed * 2) // Causes stomach contractions, makes sense for an overdose to make it much worse.
/datum/reagent/dexalin
- name = "Dexalin"
- id = "dexalin"
- description = "Dexalin is used in the treatment of oxygen deprivation."
+ name = REAGENT_DEXALIN
+ id = REAGENT_ID_DEXALIN
+ description = REAGENT_DEXALIN + " is used in the treatment of oxygen deprivation."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#0080FF"
@@ -270,9 +271,9 @@
holder.remove_reagent(REAGENT_ID_LEXORIN, 8 * removed) //VOREStation Edit
/datum/reagent/dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
+ name = REAGENT_DEXALINP
+ id = REAGENT_ID_DEXALINP
+ description = REAGENT_DEXALINP + " is used in the treatment of oxygen deprivation. It is highly effective."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#0040FF"
@@ -295,9 +296,9 @@
holder.remove_reagent(REAGENT_ID_LEXORIN, 3 * removed)
/datum/reagent/tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
+ name = REAGENT_TRICORDRAZINE
+ id = REAGENT_ID_TRICORDRAZINE
+ description = REAGENT_TRICORDRAZINE + " is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#8040FF"
@@ -317,9 +318,9 @@
affect_blood(M, alien, removed * 0.4)
/datum/reagent/tricorlidaze
- name = "Tricorlidaze"
- id = "tricorlidaze"
- description = "Tricorlidaze is a topical gel produced with tricordrazine and sterilizine."
+ name = REAGENT_TRICORLIDAZE
+ id = REAGENT_ID_TRICORLIDAZE
+ description = REAGENT_TRICORLIDAZE + " is a topical gel produced with tricordrazine and sterilizine."
taste_description = "bitterness"
reagent_state = SOLID
color = "#B060FF"
@@ -353,8 +354,8 @@
remove_self(to_produce * 5)
/datum/reagent/cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
+ name = REAGENT_CRYOXADONE
+ id = REAGENT_ID_CRYOXADONE
description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
taste_description = "overripe bananas"
reagent_state = LIQUID
@@ -378,8 +379,8 @@
M.adjustToxLoss(-10 * removed * chem_effective)
/datum/reagent/clonexadone
- name = "Clonexadone"
- id = "clonexadone"
+ name = REAGENT_CLONEXADONE
+ id = REAGENT_ID_CLONEXADONE
description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube."
taste_description = "rotten bananas"
reagent_state = LIQUID
@@ -404,8 +405,8 @@
M.adjustToxLoss(-30 * removed * chem_effective)
/datum/reagent/mortiferin
- name = "Mortiferin"
- id = "mortiferin"
+ name = REAGENT_MORTIFERIN
+ id = REAGENT_ID_MORTIFERIN
description = "A liquid compound based upon those used in cloning. Utilized in cases of toxic shock. May cause liver damage."
taste_description = "meat"
reagent_state = LIQUID
@@ -447,8 +448,8 @@
L.take_damage(rand(1,3) * removed)
/datum/reagent/necroxadone
- name = "Necroxadone"
- id = "necroxadone"
+ name = REAGENT_NECROXADONE
+ id = REAGENT_ID_NECROXADONE
description = "A liquid compound based upon that which is used in the cloning process. Utilized primarily in severe cases of toxic shock."
taste_description = "meat"
reagent_state = LIQUID
@@ -482,8 +483,8 @@
/* Painkillers */
/datum/reagent/paracetamol
- name = "Paracetamol"
- id = "paracetamol"
+ name = REAGENT_PARACETAMOL
+ id = REAGENT_ID_PARACETAMOL
description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -507,8 +508,8 @@
M.hallucination = max(M.hallucination, 2)
/datum/reagent/tramadol
- name = "Tramadol"
- id = "tramadol"
+ name = REAGENT_TRAMADOL
+ id = REAGENT_ID_TRAMADOL
description = "A simple, yet effective painkiller."
taste_description = "sourness"
reagent_state = LIQUID
@@ -531,8 +532,8 @@
M.hallucination = max(M.hallucination, 2)
/datum/reagent/oxycodone
- name = "Oxycodone"
- id = "oxycodone"
+ name = REAGENT_OXYCODONE
+ id = REAGENT_ID_OXYCODONE
description = "An effective and very addictive painkiller."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -560,9 +561,9 @@
/* Other medicine */
/datum/reagent/synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- description = "Synaptizine is used to treat various diseases."
+ name = REAGENT_SYNAPTIZINE
+ id = REAGENT_ID_SYNAPTIZINE
+ description = REAGENT_SYNAPTIZINE + " is used to treat various diseases."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#99CCFF"
@@ -590,9 +591,9 @@
M.add_chemical_effect(CE_PAINKILLER, 20 * chem_effective * M.species.chem_strength_pain)
/datum/reagent/hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
+ name = REAGENT_HYPERZINE
+ id = REAGENT_ID_HYPERZINE
+ description = REAGENT_HYPERZINE + " is a highly effective, long lasting, muscle stimulant."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FF3300"
@@ -620,9 +621,9 @@
to_chat(M, span_warning("Huh... Is this what a heart attack feels like?"))
/datum/reagent/alkysine
- name = "Alkysine"
- id = "alkysine"
- description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ name = REAGENT_ALKYSINE
+ id = REAGENT_ID_ALKYSINE
+ description = REAGENT_ALKYSINE " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FFFF66"
@@ -644,8 +645,8 @@
M.add_chemical_effect(CE_PAINKILLER, 10 * chem_effective * M.species.chem_strength_pain)
/datum/reagent/imidazoline
- name = "Imidazoline"
- id = "imidazoline"
+ name = REAGENT_IMIDAZOLINE
+ id = REAGENT_ID_IMIDAZOLINE
description = "Heals eye damage"
taste_description = "dull toxin"
reagent_state = LIQUID
@@ -668,8 +669,8 @@
H.sdisabilities &= ~BLIND
/datum/reagent/peridaxon
- name = "Peridaxon"
- id = "peridaxon"
+ name = REAGENT_PERIDAXON
+ id = REAGENT_ID_PERIDAXON
description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -701,8 +702,8 @@
M.hallucination = max(M.hallucination, 10)
/datum/reagent/osteodaxon
- name = "Osteodaxon"
- id = "osteodaxon"
+ name = REAGENT_OSTEODAXON
+ id = REAGENT_ID_OSTEODAXON
description = "An experimental drug used to heal bone fractures."
reagent_state = LIQUID
color = "#C9BCE3"
@@ -724,8 +725,8 @@
H.AdjustWeakened(1) //Bones being regrown will knock you over
/datum/reagent/myelamine
- name = "Myelamine"
- id = "myelamine"
+ name = REAGENT_MYELAMINE
+ id = REAGENT_ID_MYELAMINE
description = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
reagent_state = LIQUID
color = "#4246C7"
@@ -771,8 +772,8 @@
O.wounds -= W
/datum/reagent/respirodaxon
- name = "Respirodaxon"
- id = "respirodaxon"
+ name = REAGENT_RESPIRODAXON
+ id = REAGENT_ID_RESPIRODAXON
description = "Used to repair the tissue of the lungs and similar organs."
taste_description = "metallic"
reagent_state = LIQUID
@@ -794,7 +795,7 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("gastirodaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_GASTIRODAXON) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
if(H.losebreath >= 15 && prob(H.losebreath))
H.Stun(2)
else
@@ -803,8 +804,8 @@
H.losebreath = max(H.losebreath - 4, 0)
/datum/reagent/gastirodaxon
- name = "Gastirodaxon"
- id = "gastirodaxon"
+ name = REAGENT_GASTIRODAXON
+ id = REAGENT_ID_GASTIRODAXON
description = "Used to repair the tissues of the digestive system."
taste_description = "chalk"
reagent_state = LIQUID
@@ -826,7 +827,7 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("hepanephrodaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_HEPANEPHRODAXON) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
if(prob(10))
H.vomit(1)
else if(H.nutrition > 30)
@@ -835,8 +836,8 @@
H.adjustToxLoss(-10 * removed) // Carthatoline based, considering cost.
/datum/reagent/hepanephrodaxon
- name = "Hepanephrodaxon"
- id = "hepanephrodaxon"
+ name = REAGENT_HEPANEPHRODAXON
+ id = REAGENT_ID_HEPANEPHRODAXON
description = "Used to repair the common tissues involved in filtration."
taste_description = "glue"
reagent_state = LIQUID
@@ -858,7 +859,7 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("cordradaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_CORDRADAXON) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
if(prob(5))
H.vomit(1)
else if(prob(5))
@@ -869,8 +870,8 @@
H.adjustToxLoss(-12 * removed) // Carthatoline based, considering cost.
/datum/reagent/cordradaxon
- name = "Cordradaxon"
- id = "cordradaxon"
+ name = REAGENT_CORDRADAXON
+ id = REAGENT_ID_CORDRADAXON
description = "Used to repair the specialized tissues involved in the circulatory system."
taste_description = "rust"
reagent_state = LIQUID
@@ -892,14 +893,14 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("respirodaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_HYRONALIN) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
H.losebreath = CLAMP(H.losebreath + 1, 0, 10)
else
H.adjustOxyLoss(-30 * removed) // Deals with blood oxygenation.
/datum/reagent/immunosuprizine
- name = "Immunosuprizine"
- id = "immunosuprizine"
+ name = REAGENT_IMMUNOSUPRIZINE
+ id = REAGENT_ID_IMMUNOSUPRIZINE
description = "An experimental powder believed to have the ability to prevent any organ rejection."
taste_description = "flesh"
reagent_state = SOLID
@@ -945,7 +946,7 @@
I.rejecting = 0
I.can_reject = FALSE
- if(H.reagents.has_reagent("spaceacillin") || H.reagents.has_reagent("corophizine")) // Chemicals that increase your immune system's aggressiveness make this chemical's job harder.
+ if(H.reagents.has_reagent(REAGENT_ID_SPACEACILLIN) || H.reagents.has_reagent(REAGENT_ID_COROPHIZINE)) // Chemicals that increase your immune system's aggressiveness make this chemical's job harder.
for(var/obj/item/organ/I in organtotal)
if(I.transplant_data)
var/rejectmem = I.can_reject
@@ -955,8 +956,8 @@
I.take_damage(1)
/datum/reagent/skrellimmuno
- name = "Malish-Qualem"
- id = "malish-qualem"
+ name = REAGENT_MALISHQUALEM
+ id = REAGENT_ID_MALISHQUALEM
description = "A strange, oily powder used by Malish-Katish to prevent organ rejection."
taste_description = "mordant"
reagent_state = SOLID
@@ -991,7 +992,7 @@
I.rejecting = 0
I.can_reject = FALSE
- if(H.reagents.has_reagent("spaceacillin") || H.reagents.has_reagent("corophizine"))
+ if(H.reagents.has_reagent(REAGENT_ID_SPACEACILLIN) || H.reagents.has_reagent(REAGENT_ID_COROPHIZINE))
for(var/obj/item/organ/I in organtotal)
if(I.transplant_data)
var/rejectmem = I.can_reject
@@ -1001,9 +1002,9 @@
I.take_damage(1)
/datum/reagent/ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- description = "Ryetalyn can cure all genetic abnomalities via a catalytic process."
+ name = REAGENT_RYETALYN
+ id = REAGENT_ID_RYETALYN
+ description = REAGENT_RYETALYN + " can cure all genetic abnomalities via a catalytic process."
taste_description = "acid"
reagent_state = SOLID
color = "#004000"
@@ -1048,8 +1049,8 @@
H.update_mutations()
/datum/reagent/ethylredoxrazine
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
+ name = REAGENT_ETHYLREDOXRAZINE
+ id = REAGENT_ID_ETHYLREDOXRAZINE
description = "A powerful oxidizer that reacts with ethanol."
taste_description = "bitterness"
reagent_state = SOLID
@@ -1081,9 +1082,9 @@
R.remove_self(removed * 20)
/datum/reagent/hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+ name = REAGENT_HYRONALIN
+ id = REAGENT_ID_HYRONALIN
+ description = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#408000"
@@ -1098,9 +1099,9 @@
M.accumulated_rads = max(M.accumulated_rads - 30 * removed * M.species.chem_strength_heal, 0)
/datum/reagent/arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ name = REAGENT_ARITHRAZINE
+ id = REAGENT_ID_ARITHRAZINE
+ description = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#008000"
@@ -1119,8 +1120,8 @@
M.take_organ_damage(4 * removed, 0)
/datum/reagent/spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
+ name = REAGENT_SPACEACILLIN
+ id = REAGENT_ID_SPACEACILLIN
description = "An all-purpose antiviral agent."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -1148,8 +1149,8 @@
affect_blood(M, alien, removed * 0.8) // Not 100% as effective as injections, though still useful.
/datum/reagent/corophizine
- name = "Corophizine"
- id = "corophizine"
+ name = REAGENT_COROPHIZINE
+ id = REAGENT_ID_COROPHIZINE
description = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
taste_description = "burnt toast"
reagent_state = LIQUID
@@ -1216,8 +1217,8 @@
eo.fracture()
/datum/reagent/spacomycaze
- name = "Spacomycaze"
- id = "spacomycaze"
+ name = REAGENT_SPACOMYCAZE
+ id = REAGENT_ID_SPACOMYCAZE
description = "An all-purpose painkilling antibiotic gel."
taste_description = "oil"
reagent_state = SOLID
@@ -1265,8 +1266,8 @@
remove_self(to_produce)
/datum/reagent/sterilizine
- name = "Sterilizine"
- id = "sterilizine"
+ name = REAGENT_STERILIZINE
+ id = REAGENT_ID_STERILIZINE
description = "Sterilizes wounds in preparation for surgery and thoroughly removes blood."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -1317,8 +1318,8 @@
remove_self(amount)
/datum/reagent/leporazine
- name = "Leporazine"
- id = "leporazine"
+ name = REAGENT_LEPORAZINE
+ id = REAGENT_ID_LEPORAZINE
description = "Leporazine can be use to stabilize an individuals body temperature."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -1339,8 +1340,8 @@
M.bodytemperature = min(temp, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
/datum/reagent/rezadone
- name = "Rezadone"
- id = "rezadone"
+ name = REAGENT_REZADONE
+ id = REAGENT_ID_REZADONE
description = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
taste_description = "bitterness"
reagent_state = SOLID
@@ -1387,8 +1388,8 @@
// This exists to cut the number of chemicals a merc borg has to juggle on their hypo.
/datum/reagent/healing_nanites
- name = "Restorative Nanites"
- id = "healing_nanites"
+ name = REAGENT_HEALINGNANITES
+ id = REAGENT_ID_HEALINGNANITES
description = "Miniature medical robots that swiftly restore bodily damage."
taste_description = "metal"
reagent_state = SOLID
@@ -1404,8 +1405,8 @@
M.adjustCloneLoss(-2 * removed)
/datum/reagent/menthol
- name = "Menthol"
- id = "menthol"
+ name = REAGENT_MENTHOL
+ id = REAGENT_ID_MENTHOL
description = "Tastes naturally minty, and imparts a very mild numbing sensation."
taste_description = "mint"
reagent_state = LIQUID
@@ -1415,8 +1416,8 @@
scannable = 1
/datum/reagent/earthsblood
- name = "Earthsblood"
- id = "earthsblood"
+ name = REAGENT_EARTHSBLOOD
+ id = REAGENT_ID_EARTHSBLOOD
description = "A rare plant extract with immense, almost magical healing capabilities. Induces a potent psychoactive state, damaging neurons with prolonged use."
taste_description = "honey and sunlight"
reagent_state = LIQUID
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index 4e46d84b97..491746274f 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -163,8 +163,8 @@
occupant.adjustBrainLoss(-(CEILING((0.5*heal_rate), 1)))
//So clones don't die of oxyloss in a running pod.
- if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
- occupant.reagents.add_reagent("inaprovaline", 60)
+ if(occupant.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 30)
+ occupant.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 60)
//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
occupant.adjustOxyLoss(-4)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 7b75f82277..b8b1f29a4a 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -133,7 +133,7 @@
return 0
var/obj/item/reagent_containers/container = tool
- if(!container.reagents.has_reagent("peridaxon"))
+ if(!container.reagents.has_reagent(REAGENT_ID_PERIDAXON))
return 0
if(!hasorgans(target))
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 6c0da1fe9c..2110834bbf 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1396,7 +1396,7 @@
desc = "A small bottle of finely ground poppyseed and mixed dried berries."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
- prefill = list("bicaridine" = 30, REAGENT_ID_NUTRIMENT = 30)
+ prefill = list(REAGENT_ID_BICARIDINE = 30, REAGENT_ID_NUTRIMENT = 30)
/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize()
. = ..()
diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
index 47a6678e48..e08717ec61 100644
--- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
@@ -50,12 +50,12 @@
coolant_reagents_purity["icecoffee"] = 0.6
coolant_reagents_purity["icetea"] = 0.6
coolant_reagents_purity["milkshake"] = 0.6
- coolant_reagents_purity["leporazine"] = 0.7
- coolant_reagents_purity["kelotane"] = 0.7
- coolant_reagents_purity["sterilizine"] = 0.7
- coolant_reagents_purity["dermaline"] = 0.7
- coolant_reagents_purity["hyperzine"] = 0.8
- coolant_reagents_purity["cryoxadone"] = 0.9
+ coolant_reagents_purity[REAGENT_ID_LEPORAZINE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_KELOTANE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_STERILIZINE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_DERMALINE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_HYPERZINE] = 0.8
+ coolant_reagents_purity[REAGENT_ID_CRYOXADONE] = 0.9
coolant_reagents_purity[REAGENT_ID_COOLANT] = 1
coolant_reagents_purity[REAGENT_ID_ADMINORDRAZINE] = 2
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index 73f9f04e7e..b7e89a3c95 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -99,7 +99,7 @@
name = REAGENT_SLIMEJELLY
id = "m_jelly"
result = REAGENT_ID_SLIMEJELLY
- required_reagents = list("peridaxon" = 5)
+ required_reagents = list(REAGENT_ID_PERIDAXON = 5)
result_amount = 15
required = /obj/item/slime_extract/grey
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index f70a98e702..82082d5d30 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -1504,7 +1504,7 @@
/decl/chemical_reaction/instant/slime/emerald_hyperzine
name = "Slime Hyperzine"
id = "m_emerald_hyperzine"
- result = "hyperzine"
+ result = REAGENT_ID_HYPERZINE
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/emerald
diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm
index f821f024cd..a5dc08c9a7 100644
--- a/code/modules/xenobio2/_xeno_setup.dm
+++ b/code/modules/xenobio2/_xeno_setup.dm
@@ -67,15 +67,15 @@ var/global/list/xenoChemList = list(REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_RADIUM,
REAGENT_ID_SACID,
REAGENT_ID_SUGAR,
- "kelotane",
- "dermaline",
- "anti_toxin",
- "dexalin",
- "synaptizine",
- "alkysine",
- "imidazoline",
- "peridaxon",
- "rezadone",
+ REAGENT_ID_KELOTANE,
+ REAGENT_ID_DERMALINE,
+ REAGENT_ID_ANTITOXIN,
+ REAGENT_ID_DEXALIN,
+ REAGENT_ID_SYNAPTIZINE,
+ REAGENT_ID_ALKYSINE,
+ REAGENT_ID_IMIDAZOLINE,
+ REAGENT_ID_PERIDAXON,
+ REAGENT_ID_REZADONE,
REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_MUTATIONTOXIN)
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index 4d199afdaf..89b4b9acc9 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -1,22 +1,22 @@
/hook/startup/proc/xenochems_vr() //A chemical whitelist. Adds on to the other chemical whitelist. This is required, as you don't want users getting certain chemicals (See: Adminordizine) and also don't want them to just get pure stock chemicals, as that'd be boring for the player.
- xenoChemList += "inaprovaline"
- xenoChemList += "bicaridine"
- xenoChemList += "dylovene"
- xenoChemList += "dexalinp"
- xenoChemList += "tricordrazine"
- xenoChemList += "cryoxadone"
- xenoChemList += "clonexadone"
- xenoChemList += "paracetamol"
- xenoChemList += "tramadol"
- xenoChemList += "oxycodone"
- xenoChemList += "ryetalyn"
- xenoChemList += "hyperzine"
- xenoChemList += "ethylredoxrazine"
- xenoChemList += "hyronalin"
- xenoChemList += "arithrazine"
- xenoChemList += "spaceacillin"
- xenoChemList += "sterilizine"
- xenoChemList += "leporazine"
+ xenoChemList += REAGENT_ID_INAPROVALINE
+ xenoChemList += REAGENT_ID_BICARIDINE
+ xenoChemList += REAGENT_ID_ANTITOXIN
+ xenoChemList += REAGENT_ID_DEXALINP
+ xenoChemList += REAGENT_ID_TRICORDRAZINE
+ xenoChemList += REAGENT_ID_CRYOXADONE
+ xenoChemList += REAGENT_ID_CLONEXADONE
+ xenoChemList += REAGENT_ID_PARACETAMOL
+ xenoChemList += REAGENT_ID_TRAMADOL
+ xenoChemList += REAGENT_ID_OXYCODONE
+ xenoChemList += REAGENT_ID_RYETALYN
+ xenoChemList += REAGENT_ID_HYPERZINE
+ xenoChemList += REAGENT_ID_ETHYLREDOXRAZINE
+ xenoChemList += REAGENT_ID_HYRONALIN
+ xenoChemList += REAGENT_ID_ARITHRAZINE
+ xenoChemList += REAGENT_ID_SPACEACILLIN
+ xenoChemList += REAGENT_ID_STERILIZINE
+ xenoChemList += REAGENT_ID_LEPORAZINE
xenoChemList += REAGENT_ID_METHYLPHENIDATE
xenoChemList += REAGENT_ID_CITALOPRAM
xenoChemList += REAGENT_ID_PAROXETINE
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index b501624fb7..dde4267802 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -60,7 +60,7 @@ Slime definitions, Life and New live here.
REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9),
REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),
- "cryoxadone" = list(XENO_CHEM_TOXIC = 0.4),
+ REAGENT_ID_CRYOXADONE = list(XENO_CHEM_TOXIC = 0.4),
"flourine" = list(XENO_CHEM_TOXIC = 0.1),
REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5),
"glucose" = list(XENO_CHEM_NUTRI = 0.5),
diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm
index 7d2aaa9bbc..6b54bcfb4c 100644
--- a/maps/expedition_vr/alienship/_alienship.dm
+++ b/maps/expedition_vr/alienship/_alienship.dm
@@ -101,7 +101,7 @@
icon = 'alienship.dmi'
icon_state = "alien_injector"
item_state = "autoinjector"
- filled_reagents = list("rezadone" = 4, "corophizine" = 1)
+ filled_reagents = list(REAGENT_ID_REZADONE = 4, REAGENT_ID_COROPHIZINE = 1)
// -- Areas -- //
From 5d14c2affab2c0ebdd75f1a29e6f2b519a0df28a Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sat, 7 Dec 2024 02:16:23 +0100
Subject: [PATCH 10/29] only food left...
---
.../reagents/reagent_containers/glass_vr.dm | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm
index 29f663faff..246cd5eec0 100644
--- a/code/modules/reagents/reagent_containers/glass_vr.dm
+++ b/code/modules/reagents/reagent_containers/glass_vr.dm
@@ -2,51 +2,51 @@
prefill = list("neurotoxin" = 50)
/obj/item/reagent_containers/glass/beaker/vial/bicaridine
- name = "vial (bicaridine)"
+ name = "vial (" + REAGENT_ID_BICARIDINE + ")"
prefill = list(REAGENT_ID_BICARIDINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dylovene
- name = "vial (dylovene)"
+ name = "vial (" + REAGENT_ID_ANTITOXIN + ")"
prefill = list(REAGENT_ID_ANTITOXIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dermaline
- name = "vial (dermaline)"
+ name = "vial (" + REAGENT_ID_DERMALINE + ")"
prefill = list(REAGENT_ID_DERMALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/kelotane
- name = "vial (kelotane)"
+ name = "vial (" + REAGENT_ID_KELOTANE + ")"
prefill = list(REAGENT_ID_KELOTANE = 30)
/obj/item/reagent_containers/glass/beaker/vial/inaprovaline
- name = "vial (inaprovaline)"
+ name = "vial (" + REAGENT_ID_INAPROVALINE + ")"
prefill = list(REAGENT_ID_INAPROVALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalin
- name = "vial (dexalin)"
+ name = "vial (" + REAGENT_ID_DEXALIN + ")"
prefill = list(REAGENT_ID_DEXALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalinplus
- name = "vial (dexalinp)"
+ name = "vial (" + REAGENT_ID_DEXALINP + ")"
prefill = list(REAGENT_ID_DEXALINP = 30)
/obj/item/reagent_containers/glass/beaker/vial/tricordrazine
- name = "vial (tricordrazine)"
+ name = "vial (" + REAGENT_ID_TRICORDRAZINE + ")"
prefill = list(REAGENT_ID_TRICORDRAZINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/alkysine
- name = "vial (alkysine)"
+ name = "vial (" + REAGENT_ID_ALKYSINE + ")"
prefill = list(REAGENT_ID_ALKYSINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/imidazoline
- name = "vial (imidazoline)"
+ name = "vial (" + REAGENT_ID_IMIDAZOLINE + ")"
prefill = list(REAGENT_ID_IMIDAZOLINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/peridaxon
- name = "vial (peridaxon)"
+ name = "vial (" + REAGENT_ID_PERIDAXON + ")"
prefill = list(REAGENT_ID_PERIDAXON = 30)
/obj/item/reagent_containers/glass/beaker/vial/hyronalin
- name = "vial (hyronalin)"
+ name = "vial (" + REAGENT_ID_HYRONALIN +")"
prefill = list(REAGENT_ID_HYRONALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/amorphorovir
@@ -78,7 +78,7 @@
prefill = list(REAGENT_ID_NORMALCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/supermatter
- name = "vial (supermatter)"
+ name = "vial (" + REAGENT_ID_SUPERMATTER + ")"
desc = "A glass vial containing the extremely dangerous results of grinding a shard of supermatter down to a fine powder."
prefill = list(REAGENT_ID_SUPERMATTER = 5)
From e9550345d29767ab203654bf7faa8b5a5a7df29f Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 01:14:10 +0100
Subject: [PATCH 11/29] half of the food and drinks
---
code/__defines/{reagents.dm => _reagents.dm} | 320 +++++++-
code/__defines/chemistry.dm | 2 +-
code/_onclick/hud/screen_objects.dm | 2 +-
code/datums/diseases/advance/advance.dm | 4 +-
.../gamemodes/changeling/powers/cryo_sting.dm | 2 +-
code/game/machinery/biogenerator.dm | 12 +-
code/game/objects/items/weapons/chewables.dm | 6 +-
code/game/objects/items/weapons/ecigs.dm | 10 +-
.../items/weapons/grenades/chem_grenade.dm | 4 +-
.../objects/items/weapons/storage/fancy.dm | 2 +-
.../items/weapons/storage/firstaid_vr.dm | 40 +-
.../rig/modules/specific/chem_dispenser.dm | 10 +-
.../spacesuits/rig/modules/utility.dm | 8 +-
code/modules/fishing/fishing_rod.dm | 2 +-
code/modules/food/drinkingglass/shaker.dm | 2 +-
code/modules/food/food/cans.dm | 72 +-
code/modules/food/food/condiment.dm | 120 +--
code/modules/food/food/drinks.dm | 24 +-
code/modules/food/food/drinks/bottle.dm | 50 +-
.../modules/food/food/drinks/drinkingglass.dm | 6 +-
code/modules/food/food/snacks.dm | 738 +++++++++---------
code/modules/food/food/snacks/meat.dm | 18 +-
code/modules/food/food/snacks_vr.dm | 104 +--
code/modules/food/food/superfoods.dm | 18 +-
code/modules/food/glass/bottle.dm | 4 +-
code/modules/food/glass/bottle_potion.dm | 4 +-
code/modules/food/glass/bottle_vr.dm | 2 +-
.../kitchen/cooking_machines/_appliance.dm | 2 +-
.../food/kitchen/cooking_machines/fryer.dm | 2 +-
code/modules/food/kitchen/icecream.dm | 16 +-
code/modules/food/kitchen/microwave.dm | 4 +-
code/modules/food/recipe.dm | 2 +-
code/modules/food/recipes_fryer.dm | 18 +-
code/modules/food/recipes_fryer_vr.dm | 4 +-
code/modules/food/recipes_grill.dm | 22 +-
code/modules/food/recipes_microwave.dm | 122 +--
code/modules/food/recipes_microwave_vr.dm | 18 +-
code/modules/food/recipes_oven.dm | 80 +-
code/modules/hydroponics/backtank.dm | 4 +-
.../modules/hydroponics/beekeeping/beehive.dm | 2 +-
code/modules/hydroponics/grown.dm | 16 +-
code/modules/hydroponics/seed.dm | 2 +-
code/modules/hydroponics/seedtypes/amauri.dm | 2 +-
code/modules/hydroponics/seedtypes/apples.dm | 2 +-
code/modules/hydroponics/seedtypes/banana.dm | 4 +-
code/modules/hydroponics/seedtypes/berries.dm | 6 +-
code/modules/hydroponics/seedtypes/carrots.dm | 2 +-
.../modules/hydroponics/seedtypes/cherries.dm | 2 +-
code/modules/hydroponics/seedtypes/chili.dm | 6 +-
code/modules/hydroponics/seedtypes/citrus.dm | 6 +-
code/modules/hydroponics/seedtypes/cocoa.dm | 2 +-
code/modules/hydroponics/seedtypes/corn.dm | 2 +-
code/modules/hydroponics/seedtypes/durian.dm | 2 +-
.../modules/hydroponics/seedtypes/eggplant.dm | 2 +-
code/modules/hydroponics/seedtypes/gelthi.dm | 2 +-
code/modules/hydroponics/seedtypes/grapes.dm | 4 +-
.../hydroponics/seedtypes/malanitear.dm | 2 +-
code/modules/hydroponics/seedtypes/peanuts.dm | 2 +-
.../hydroponics/seedtypes/pineapple.dm | 4 +-
code/modules/hydroponics/seedtypes/potato.dm | 2 +-
code/modules/hydroponics/seedtypes/rice.dm | 2 +-
code/modules/hydroponics/seedtypes/soybean.dm | 2 +-
code/modules/hydroponics/seedtypes/thaadra.dm | 2 +-
.../modules/hydroponics/seedtypes/tomatoes.dm | 2 +-
code/modules/hydroponics/seedtypes/vanilla.dm | 2 +-
code/modules/hydroponics/seedtypes/wabback.dm | 6 +-
.../hydroponics/seedtypes/watermelon.dm | 2 +-
code/modules/hydroponics/seedtypes/wheat.dm | 2 +-
.../modules/hydroponics/seedtypes/wurmwoad.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 12 +-
.../station/station_special_abilities_vr.dm | 4 +-
.../silicon/robot/dogborg/dog_sleeper_vr.dm | 2 +-
.../living/silicon/robot/sprites/civilian.dm | 4 +-
.../subtypes/animal/alien animals/catslug.dm | 4 +-
.../subtypes/animal/alien animals/teppi.dm | 4 +-
.../subtypes/animal/farm animals/cow.dm | 4 +-
.../subtypes/animal/farm animals/goat.dm | 4 +-
.../subtypes/animal/giant_spider/frost.dm | 2 +-
.../simple_mob/subtypes/animal/sif/leech.dm | 4 +-
.../subtypes/slime/xenobio/subtypes.dm | 2 +-
code/modules/projectiles/projectile/blob.dm | 2 +-
.../machinery/dispenser/cartridge_presets.dm | 60 +-
.../dispenser/cartridge_presets_vr.dm | 2 +-
.../machinery/dispenser/dispenser2_energy.dm | 12 +-
.../dispenser/dispenser_presets_vr.dm | 2 +-
.../machinery/dispenser/reagent_tank.dm | 6 +-
code/modules/reagents/machinery/grinder.dm | 8 +-
.../reactions/distilling/distilling.dm | 4 +-
.../reagents/reactions/instant/drinks.dm | 610 +++++++--------
.../reagents/reactions/instant/drinks_vr.dm | 32 +-
.../reagents/reactions/instant/food.dm | 116 +--
.../reagents/reactions/instant/instant.dm | 86 +-
.../reagents/reactions/instant/instant_vr.dm | 24 +-
.../reagents/reactions/instant/virology.dm | 8 +-
.../reagents/reagent_containers/borghypo.dm | 48 +-
.../reagents/reagent_containers/hypospray.dm | 4 +-
.../reagents/reagent_containers/pill.dm | 2 +-
.../reagents/reagent_containers/pill_vr.dm | 2 +-
.../reagents/reagent_containers/spray.dm | 2 +-
code/modules/reagents/reagents/food_drinks.dm | 736 ++++++++---------
code/modules/reagents/reagents/medicine.dm | 2 +-
.../vore/fluffstuff/custom_implants_vr.dm | 44 +-
.../vore/fluffstuff/custom_items_vr.dm | 4 +-
.../tools/geosample_scanner.dm | 6 +-
code/modules/xenobio/items/extracts.dm | 2 +-
code/modules/xenobio/items/extracts_vr.dm | 8 +-
code/modules/xenobio2/_xeno_setup_vr.dm | 10 +-
code/modules/xenobio2/mob/slime/slime.dm | 8 +-
vorestation.dme | 2 +-
109 files changed, 2084 insertions(+), 1790 deletions(-)
rename code/__defines/{reagents.dm => _reagents.dm} (69%)
diff --git a/code/__defines/reagents.dm b/code/__defines/_reagents.dm
similarity index 69%
rename from code/__defines/reagents.dm
rename to code/__defines/_reagents.dm
index 32e6df659b..62db7c2493 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/_reagents.dm
@@ -73,8 +73,6 @@
#define REAGENT_ID_SULFUR "sulfur"
#define REAGENT_TUNGSTEN "Tungsten"
#define REAGENT_ID_TUNGSTEN "tungsten"
-#define REAGENT_SODIUMCHLORIDE "Table Salt"
-#define REAGENT_ID_SODIUMCHLORIDE "sodiumchloride"
#define REAGENT_NUTRIMENT "Nutriment"
#define REAGENT_ID_NUTRIMENT "nutriment"
@@ -223,7 +221,7 @@
#define REAGENT_MYELAMINE "Myelamine"
#define REAGENT_ID_MYELAMINE "myelamine"
#define REAGENT_RESPIRODAXON "Respirodaxon"
-#define REAGENT_ID_RESPIRODAXON "respirodaxon
+#define REAGENT_ID_RESPIRODAXON "respirodaxon"
#define REAGENT_GASTIRODAXON "Gastirodaxon"
#define REAGENT_ID_GASTIRODAXON "gastirodaxon"
#define REAGENT_HEPANEPHRODAXON "Hepanephrodaxon"
@@ -415,7 +413,7 @@
#define REAGENT_ID_ADMINORDRAZINE "adminordrazine"
-// Food and Drinks
+// Foods & Drinks
#define REAGENT_MEATCOLONY "A colony of meat cells"
#define REAGENT_ID_MEATCOLONY "meatcolony"
#define REAGENT_PLANTCOLONY "A colony of plant cells"
@@ -478,8 +476,6 @@
#define REAGENT_ID_UNSWEETTEA "unsweettea"
#define REAGENT_HAIROFTHERAT "Hair of the Rat"
#define REAGENT_ID_HAIROFTHERAT "hairoftherat"
-#define REAGENT_BEPIS "Bepis"
-#define REAGENT_ID_BEPIS "bepis"
#define REAGENT_BEPIS "Bepis Cola"
#define REAGENT_ID_BEPIS "bepis"
#define REAGENT_BUZZFUZZ "Buzz Fuzz"
@@ -511,7 +507,7 @@
#define REAGENT_ID_STRAWBERRYPROTEINPOWDER "strawberry_protein_powder"
#define REAGENT_STRAWBERRYPROTEINSHAKE "Strawberry Protein Shake"
#define REAGENT_ID_STRAWBERRYPROTEINSHAKE "strawberry_protein_shake"
-#define REAGENT_SOUP "Soup
+#define REAGENT_SOUP "Soup"
#define REAGENT_ID_SOUP "generic_soup"
#define REAGENT_TOMATOSOUP "Tomato Soup"
#define REAGENT_ID_TOMATOSOUP "tomato_soup"
@@ -567,13 +563,311 @@
#define REAGENT_ID_NUKIEMEGASHRINK "nukie_mega_shrink"
#define REAGENT_NUKIEMEGAGROWTH "Nukie Mega Growth"
#define REAGENT_ID_NUKIEMEGAGROWTH "nukie_mega_growth"
-
-
-
-
-
-#define REAGENT_PROTEIN "Protein"
+#define REAGENT_COATING "coating"
+#define REAGENT_ID_COATING "coating"
+#define REAGENT_BATTER "batter mix"
+#define REAGENT_ID_BATTER "batter"
+#define REAGENT_BEERBATTER "beer batter mix"
+#define REAGENT_ID_BEERBATTER "beerbatter"
+#define REAGENT_TRIGLYCERIDE "triglyceride"
+#define REAGENT_ID_TRIGLYCERIDE "triglyceride"
+#define REAGENT_OIL "Oil"
+#define REAGENT_ID_OIL "oil"
+#define REAGENT_COOKINGOIL "Cooking Oil"
+#define REAGENT_ID_COOKINGOIL "cookingoil"
+#define REAGENT_CORNOIL "Corn Oil"
+#define REAGENT_ID_CORNOIL "cornoil"
+#define REAGENT_PEANUTOIL "Peanut Oil"
+#define REAGENT_ID_PEANUTOIL "peanutoil"
+#define REAGENT_GLUCOSE "Glucose"
+#define REAGENT_ID_GLUCOSE "glucose"
+#define REAGENT_PROTEIN "animal protein"
#define REAGENT_ID_PROTEIN "protein"
+#define REAGENT_TOFU "tofu protein"
+#define REAGENT_ID_TOFU "tofu"
+#define REAGENT_SEAFOOD "seafood protein"
+#define REAGENT_ID_SEAFOOD "seafood"
+#define REAGENT_CHEESE "cheese"
+#define REAGENT_ID_CHEESE "cheese"
+#define REAGENT_EGG "egg yolk"
+#define REAGENT_ID_EGG "egg"
+#define REAGENT_MURK_PROTEIN "murkfin protein"
+#define REAGENT_ID_MURK_PROTEIN "murk_protein"
+#define REAGENT_BEANPROTEIN "beans"
+#define REAGENT_ID_BEANPROTEIN "bean_protein"
+#define REAGENT_HONEY "Honey"
+#define REAGENT_ID_HONEY "honey"
+#define REAGENT_MAYO "Mayonnaise"
+#define REAGENT_ID_MAYO "mayo"
+#define REAGENT_YEAST "Yeast"
+#define REAGENT_ID_YEAST "yeast"
+#define REAGENT_FLOUR "Flour"
+#define REAGENT_ID_FLOUR "flour"
+#define REAGENT_COFFEEPOWDER "Coffee Powder"
+#define REAGENT_ID_COFFEEPOWDER "coffeepowder"
+#define REAGENT_TEAPOWDER "Tea Powder"
+#define REAGENT_ID_TEAPOWDER "teapowder"
+#define REAGENT_DECAFTEAPOWDER "Decaf Tea Powder"
+#define REAGENT_ID_DECAFTEAPOWDER "decafteapowder"
+#define REAGENT_COCO "Coco Powder"
+#define REAGENT_ID_COCO "coco"
+#define REAGENT_CHOCOLATE "Chocolate"
+#define REAGENT_ID_CHOCOLATE "chocolate"
+#define REAGENT_INSTANTJUICE "Juice Powder"
+#define REAGENT_ID_INSTANTJUICE "instantjuice"
+#define REAGENT_INSTANTGRAPE "Grape Juice Powder"
+#define REAGENT_ID_INSTANTGRAPE "instantgrape"
+#define REAGENT_INSTANTORANGE "Orange Juice Powder"
+#define REAGENT_ID_INSTANTORANGE "instantorange"
+#define REAGENT_INSTANTWATERMELON "Watermelon Juice Powder"
+#define REAGENT_ID_INSTANTWATERMELON "instantwatermelon"
+#define REAGENT_INSTANTAPPLE "Apple Juice Powder"
+#define REAGENT_ID_INSTANTAPPLE "instantapple"
+#define REAGENT_SOYSAUCE "Soy Sauce"
+#define REAGENT_ID_SOYSAUCE "soysauce"
+#define REAGENT_VINEGAR "Vinegar"
+#define REAGENT_ID_VINEGAR "vinegar"
+#define REAGENT_KETCHUP "Ketchup"
+#define REAGENT_ID_KETCHUP "ketchup"
+#define REAGENT_MUSTARD "Mustard"
+#define REAGENT_ID_MUSTARD "mustard"
+#define REAGENT_BARBECUE "Barbeque Sauce"
+#define REAGENT_ID_BARBECUE "barbecue"
+#define REAGENT_RICE "Rice"
+#define REAGENT_ID_RICE "rice"
+#define REAGENT_CHERRYJELLY "Cherry Jelly"
+#define REAGENT_ID_CHERRYJELLY "cherryjelly"
+#define REAGENT_PEANUTBUTTER "Peanut Butter"
+#define REAGENT_ID_PEANUTBUTTER "peanutbutter"
+#define REAGENT_VANILLA "Vanilla Extract"
+#define REAGENT_ID_VANILLA "vanilla"
+#define REAGENT_DURIANPASTE "Durian Paste"
+#define REAGENT_ID_DURIANPASTE "durianpaste"
+#define REAGENT_VIRUSFOOD "Virus Food"
+#define REAGENT_ID_VIRUSFOOD "virusfood"
+#define REAGENT_SPRINKLES "Sprinkles"
+#define REAGENT_ID_SPRINKLES "sprinkles"
+#define REAGENT_MINT "Mint"
+#define REAGENT_ID_MINT "mint"
+#define REAGENT_LIPOZINE "Lipozine"
+#define REAGENT_ID_LIPOZINE "lipozine"
+#define REAGENT_SODIUMCHLORIDE "Table Salt"
+#define REAGENT_ID_SODIUMCHLORIDE "sodiumchloride"
+#define REAGENT_BLACKPEPPER "Black Pepper"
+#define REAGENT_ID_BLACKPEPPER "blackpepper"
+#define REAGENT_ENZYME "Universal Enzyme"
+#define REAGENT_ID_ENZYME "enzyme"
+#define REAGENT_SPACESPICE "Wurmwoad"
+#define REAGENT_ID_SPACESPICE "spacespice"
+#define REAGENT_BROWNIEMIX "Brownie Mix"
+#define REAGENT_ID_BROWNIEMIX "browniemix"
+#define REAGENT_CAKEBATTER "Cake Batter"
+#define REAGENT_ID_CAKEBATTER "cakebatter"
+#define REAGENT_FROSTOIL "Frost Oil"
+#define REAGENT_ID_FROSTOIL "frostoil"
+#define REAGENT_CRYOTOXIN "Cryotoxin"
+#define REAGENT_ID_CRYOTOXIN "cryotoxin"
+#define REAGENT_CAPSAICIN "Capsaicin Oil"
+#define REAGENT_ID_CAPSAICIN "capsaicin"
+#define REAGENT_CONDENSEDCAPSAICIN "Condensed Capsaicin"
+#define REAGENT_ID_CONDENSEDCAPSAICIN "condensedcapsaicin"
+
+#define REAGENT_DRINK "Drink"
+#define REAGENT_ID_DRINK "drink"
+
+// Juices
+#define REAGENT_BANANA "Banana Juice"
+#define REAGENT_ID_BANANA "banana"
+#define REAGENT_BERRYJUICE "Berry Juice"
+#define REAGENT_ID_BERRYJUICE "berryjuice"
+#define REAGENT_PINEAPPLEJUICE "Pineapple Juice"
+#define REAGENT_ID_PINEAPPLEJUICE "pineapplejuice"
+#define REAGENT_CARROTJUICE "Carrot juice"
+#define REAGENT_ID_CARROTJUICE "carrotjuice"
+#define REAGENT_LETTUCEJUICE "Lettuce Juice"
+#define REAGENT_ID_LETTUCEJUICE "lettucejuice"
+#define REAGENT_GRAPEJUICE "Grape Juice"
+#define REAGENT_ID_GRAPEJUICE "grapejuice"
+#define REAGENT_LEMONJUICE "Lemon Juice"
+#define REAGENT_ID_LEMONJUICE "lemonjuice"
+#define REAGENT_APPLEJUICE "Apple Juice"
+#define REAGENT_ID_APPLEJUICE "applejuice"
+#define REAGENT_LIMEJUICE "Lime Juice"
+#define REAGENT_ID_LIMEJUICE "limejuice"
+#define REAGENT_ORANGEJUICE "Orange juice"
+#define REAGENT_ID_ORANGEJUICE "orangejuice"
+#define REAGENT_POISONBERRYJUICE "Poison Berry Juice"
+#define REAGENT_ID_POISONBERRYJUICE "poisonberryjuice"
+#define REAGENT_POTATOJUICE "Potato Juice"
+#define REAGENT_ID_POTATOJUICE "potatojuice"
+#define REAGENT_TURNIPJUICE "Turnip Juice"
+#define REAGENT_ID_TURNIPJUICE "turnipjuice"
+#define REAGENT_TOMATOJUICE "Tomato Juice"
+#define REAGENT_ID_TOMATOJUICE "tomatojuice"
+#define REAGENT_WATERMELONJUICE "Watermelon Juice"
+#define REAGENT_ID_WATERMELONJUICE "watermelonjuice"
+
+// Drinks
+#define REAGENT_MILK "Milk"
+#define REAGENT_ID_MILK "milk"
+#define REAGENT_CHOCOLATEMILK "Chocolate Milk"
+#define REAGENT_ID_CHOCOLATEMILK "chocolate_milk"
+#define REAGENT_CREAM "Cream"
+#define REAGENT_ID_CREAM "cream"
+#define REAGENT_SOYMILK "Soy Milk"
+#define REAGENT_ID_SOYMILK "soymilk"
+#define REAGENT_MILKFOAM "Milk Foam"
+#define REAGENT_ID_MILKFOAM "milk_foam"
+#define REAGENT_TEA "Tea"
+#define REAGENT_ID_TEA "tea"
+#define REAGENT_TEADECAF "Decaf Tea"
+#define REAGENT_ID_TEADECAF "teadecaf"
+#define REAGENT_ICETEA "Iced Tea"
+#define REAGENT_ID_ICETEA "icetea"
+#define REAGENT_ICETEADECAF "Decaf Iced Tea"
+#define REAGENT_ID_ICETEADECAF "iceteadecaf"
+#define REAGENT_MINTTEA "Mint Tea"
+#define REAGENT_ID_MINTTEA "minttea"
+#define REAGENT_MINTTEADECAF "Decaf Mint Tea"
+#define REAGENT_ID_MINTTEADECAF "mintteadecaf"
+#define REAGENT_LEMONTEA "Lemon Tea"
+#define REAGENT_ID_LEMONTEA "lemontea"
+#define REAGENT_LEMONTEADECAF "Decaf Lemon Tea"
+#define REAGENT_ID_LEMONTEADECAF "lemonteadecaf"
+#define REAGENT_LIMETEA "Lime Tea"
+#define REAGENT_ID_LIMETEA "limetea"
+#define REAGENT_LIMETEADECAF "Decaf Lime Tea"
+#define REAGENT_ID_LIMETEADECAF "limeteadecaf"
+#define REAGENT_ORANGETEA "Orange Tea"
+#define REAGENT_ID_ORANGETEA "orangetea"
+#define REAGENT_ORANGETEADECAF "Decaf orange Tea"
+#define REAGENT_ID_ORANGETEADECAF "orangeteadecaf"
+#define REAGENT_BERRYTEA "Berry Tea"
+#define REAGENT_ID_BERRYTEA "berrytea"
+#define REAGENT_BERRYTEADECAF "Decaf Berry Tea"
+#define REAGENT_ID_BERRYTEADECAF "berryteadecaf"
+#define REAGENT_GREENTEA "Green Tea"
+#define REAGENT_ID_GREENTEA "greentea"
+#define REAGENT_CHAITEA "Chai Tea"
+#define REAGENT_ID_CHAITEA "chaitea"
+#define REAGENT_CHAITEADECAF "Decaf Chai Tea"
+#define REAGENT_ID_CHAITEADECAF "chaiteadecaf"
+#define REAGENT_COFFEE "Coffee"
+#define REAGENT_ID_COFFEE "coffee"
+#define REAGENT_ICECOFFEE "Iced Coffee"
+#define REAGENT_ID_ICECOFFEE "icecoffee"
+#define REAGENT_SOYLATTE "Soy Latte"
+#define REAGENT_ID_SOYLATTE "soy_latte"
+#define REAGENT_CAFELATTE "Cafe Latte"
+#define REAGENT_ID_CAFELATTE "cafe_latte"
+#define REAGENT_DECAF "Decaf Coffee"
+#define REAGENT_ID_DECAF "decaf"
+#define REAGENT_HOTCOCO "Hot Chocolate"
+#define REAGENT_ID_HOTCOCO "hot_coco"
+#define REAGENT_BLACKEYE "Black Eye Coffee"
+#define REAGENT_ID_BLACKEYE "black_eye"
+#define REAGENT_DRIPCOFFEE "Drip Coffee"
+#define REAGENT_ID_DRIPCOFFEE "drip_coffee"
+#define REAGENT_AMERICANO "Americano"
+#define REAGENT_ID_AMERICANO "americano"
+#define REAGENT_LONGBLACK "Long Black Coffee"
+#define REAGENT_ID_LONGBLACK "long_black"
+#define REAGENT_MACCHIATO "Macchiato"
+#define REAGENT_ID_MACCHIATO "macchiato"
+#define REAGENT_CORTADO "Cortado"
+#define REAGENT_ID_CORTADO "cortado"
+#define REAGENT_BREVE "Breve"
+#define REAGENT_ID_BREVE "breve"
+#define REAGENT_CAPPUCCINO "Cappuccino"
+#define REAGENT_ID_CAPPUCCINO "cappuccino"
+#define REAGENT_FLATWHITE "Flat White Coffee"
+#define REAGENT_ID_FLATWHITE "flat_white"
+#define REAGENT_MOCHA "Mocha"
+#define REAGENT_ID_MOCHA "mocha"
+#define REAGENT_VIENNA "Vienna"
+#define REAGENT_ID_VIENNA "vienna"
+#define REAGENT_SODAWATER "Soda Water"
+#define REAGENT_ID_SODAWATER "sodawater"
+#define REAGENT_TONIC "Tonic Water"
+#define REAGENT_ID_TONIC "tonic"
+#define REAGENT_LEMONADE "Lemonade"
+#define REAGENT_ID_LEMONADE "lemonade"
+#define REAGENT_MELONADE "Melonade"
+#define REAGENT_ID_MELONADE "melonade"
+#define REAGENT_APPLEADE "Appleade"
+#define REAGENT_ID_APPLEADE "appleade"
+#define REAGENT_PINEAPPLEADE "Pineappleade"
+#define REAGENT_ID_PINEAPPLEADE "pineappleade"
+#define REAGENT_KIRASPECIAL "Kira Special"
+#define REAGENT_ID_KIRASPECIAL "kiraspecial"
+#define REAGENT_BROWNSTAR "Brown Star"
+#define REAGENT_ID_BROWNSTAR "brownstar"
+#define REAGENT_BROWNSTARDECAF "Decaf Brown Star"
+#define REAGENT_ID_BROWNSTARDECAF "brownstar_decaf"
+#define REAGENT_MILKSHAKE "Milkshake"
+#define REAGENT_ID_MILKSHAKE "milkshake"
+#define REAGENT_CHOCOSHAKE "Chocolate Milkshake"
+#define REAGENT_ID_CHOCOSHAKE "chocoshake"
+#define REAGENT_BERRYSHAKE "Berry Milkshake"
+#define REAGENT_ID_BERRYSHAKE "berryshake"
+#define REAGENT_COFFEESHAKE "Coffee Milkshake"
+#define REAGENT_ID_COFFEESHAKE "coffeeshake"
+#define REAGENT_PEANUTMILKSHAKE "Peanut Milkshake"
+#define REAGENT_ID_PEANUTMILKSHAKE "peanutmilkshake"
+#define REAGENT_REWRITER "Rewriter"
+#define REAGENT_ID_REWRITER "rewriter"
+#define REAGENT_NUKACOLA "Nuka Cola"
+#define REAGENT_ID_NUKACOLA "nuka_cola"
+#define REAGENT_GRENADINE "Grenadine Syrup"
+#define REAGENT_ID_GRENADINE "grenadine"
+#define REAGENT_COLA "Space Cola"
+#define REAGENT_ID_COLA "cola"
+#define REAGENT_DECAFCOLA "Space Cola Free"
+#define REAGENT_ID_DECAFCOLA "decafcola"
+#define REAGENT_LEMONSODA "Lemon Soda"
+#define REAGENT_ID_LEMONSODA "lemonsoda"
+#define REAGENT_APPLESODA "Apple Soda"
+#define REAGENT_ID_APPLESODA "applesoda"
+#define REAGENT_STRAWSODA "Strawberry Soda"
+#define REAGENT_ID_STRAWSODA "strawsoda"
+#define REAGENT_ORANGESODA "Orange Soda"
+#define REAGENT_ID_ORANGESODA "orangesoda"
+#define REAGENT_GRAPESODA "Grape Soda"
+#define REAGENT_ID_GRAPESODA "grapesoda"
+#define REAGENT_SARSAPARILLA "Sarsaparilla"
+#define REAGENT_ID_SARSAPARILLA "sarsaparilla"
+#define REAGENT_PORKSODA "Bacon Soda"
+#define REAGENT_ID_PORKSODA "porksoda"
+#define REAGENT_SPACEMOUNTAINWIND "Mountain Wind"
+#define REAGENT_ID_SPACEMOUNTAINWIND "spacemountainwind"
+#define REAGENT_DRGIBB "Dr. Gibb"
+#define REAGENT_ID_DRGIBB "dr_gibb"
+#define REAGENT_SPACEUP "Space-Up"
+#define REAGENT_ID_SPACEUP "space_up"
+#define REAGENT_LEMONLIME "Lemon-Lime"
+#define REAGENT_ID_LEMONLIME "lemon_lime"
+#define REAGENT_GINGERALE "Ginger Ale"
+#define REAGENT_ID_GINGERALE "gingerale"
+#define REAGENT_ROOTBEER "R&D Root Beer"
+#define REAGENT_ID_ROOTBEER "rootbeer"
+#define REAGENT_DIETDRGIBB "Diet Dr. Gibb"
+#define REAGENT_ID_DIETDRGIBB "diet_dr_gibb"
+#define REAGENT_SHIRLEYTEMPLE "Shirley Temple"
+#define REAGENT_ID_SHIRLEYTEMPLE "shirley_temple"
+#define REAGENT_ROYROGERS "Roy Rogers"
+#define REAGENT_ID_ROYROGERS "roy_rogers"
+#define REAGENT_COLLINSMIX "Collins Mix"
+#define REAGENT_ID_COLLINSMIX "collins_mix"
+#define REAGENT_ARNOLDPALMER "Arnold Palmer"
+#define REAGENT_ID_ARNOLDPALMER "arnold_palmer"
+#define REAGENT_DOCTORSDELIGHT "The Doctor's Delight"
+#define REAGENT_ID_DOCTORSDELIGHT "doctorsdelight"
+#define REAGENT_DRYRAMEN "Dry Ramen"
+#define REAGENT_ID_DRYRAMEN "dry_ramen"
+
+
+
+
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index a730c1a449..af2301e265 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", REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
+var/list/tachycardics = list(REAGENT_ID_COFFEE, REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
var/list/bradycardics = list("neurotoxin", REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
var/list/heartstopper = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart.
var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE) // This stops the heart when overdose is met. -- c = conditional
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index d9aac00b57..4d221c9c4f 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -431,7 +431,7 @@
if(C.internals)
C.internals.icon_state = "internal1"
else
- to_chat(C, span_notice("You don't have a[breathes==GAS_O2 ? "n " + GAS_O2 + " : addtext(" ",breathes)] tank."))
+ to_chat(C, span_notice("You don't have a[breathes==GAS_O2 ? "n " + GAS_O2 : addtext(" ",breathes)] tank."))
if("act_intent")
usr.a_intent_change("right")
if(I_HELP)
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 4ef18ca30e..ecf4ff22fc 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -1,8 +1,8 @@
GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
- REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
- REAGENT_ID_SPACEACILLIN, "glucose", REAGENT_ID_ETHANOL,
+ REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE,
+ REAGENT_ID_SPACEACILLIN, REAGENT_ID_GLUCOSE, REAGENT_ID_ETHANOL,
REAGENT_ID_LEPORAZINE, REAGENT_ID_IMPEDREZENE, REAGENT_ID_HEPANEPHRODAXON,
REAGENT_ID_SILVER, REAGENT_ID_GOLD
))
diff --git a/code/game/gamemodes/changeling/powers/cryo_sting.dm b/code/game/gamemodes/changeling/powers/cryo_sting.dm
index adf6cc0751..b61b5b00ed 100644
--- a/code/game/gamemodes/changeling/powers/cryo_sting.dm
+++ b/code/game/gamemodes/changeling/powers/cryo_sting.dm
@@ -22,7 +22,7 @@
inject_amount = inject_amount * 1.5
to_chat(src, span_notice("We inject extra chemicals."))
if(T.reagents)
- T.reagents.add_reagent("cryotoxin", inject_amount)
+ T.reagents.add_reagent(REAGENT_ID_CRYOTOXIN, inject_amount)
feedback_add_details("changeling_powers","CS")
remove_verb(src, /mob/proc/changeling_cryo_sting)
spawn(3 MINUTES)
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index a4df3f8814..cafdd36a14 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -64,16 +64,16 @@
item_list = list()
item_list["Food Items"] = list(
- BIOGEN_REAGENT("Milk x10", "milk", 10, 20),
- BIOGEN_REAGENT("Milk x50", "milk", 50, 95),
- BIOGEN_REAGENT("Cream x10", "cream", 10, 30),
- BIOGEN_REAGENT("Cream x50", "cream", 50, 120),
+ BIOGEN_REAGENT("Milk x10", REAGENT_ID_MILK, 10, 20),
+ BIOGEN_REAGENT("Milk x50", REAGENT_ID_MILK, 50, 95),
+ BIOGEN_REAGENT("Cream x10", REAGENT_ID_CREAM, 10, 30),
+ BIOGEN_REAGENT("Cream x50", REAGENT_ID_CREAM, 50, 120),
BIOGEN_ITEM("Slab of meat", /obj/item/reagent_containers/food/snacks/meat, 1, 50),
BIOGEN_ITEM("Slabs of meat x5", /obj/item/reagent_containers/food/snacks/meat, 5, 250),
)
item_list["Cooking Ingredients"] = list(
- BIOGEN_REAGENT("Universal Enzyme x10", "enzyme", 10, 30),
- BIOGEN_REAGENT("Universal Enzyme x50", "enzyme", 50, 120),
+ BIOGEN_REAGENT("Universal Enzyme x10", REAGENT_ID_ENZYME, 10, 30),
+ BIOGEN_REAGENT("Universal Enzyme x50", REAGENT_ID_ENZYME, 50, 120),
BIOGEN_ITEM("Nutri-spread", /obj/item/reagent_containers/food/snacks/spreads, 1, 30),
BIOGEN_ITEM("Nutri-spread x5", /obj/item/reagent_containers/food/snacks/spreads, 5, 120),
)
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 1f57b7a9c4..fa69ce9b4a 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -226,7 +226,7 @@
/obj/item/clothing/mask/chewable/candy/gum/Initialize()
. = ..()
- reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10)
+ reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),10)
color = reagents.get_color()
update_icon()
@@ -263,7 +263,7 @@
/obj/item/clothing/mask/chewable/candy/lolli/Initialize()
. = ..()
- reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20)
+ reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),20)
color = reagents.get_color()
update_icon()
@@ -287,7 +287,7 @@
desc = "A chocolate-coated biscuit stick."
icon_state = "pockystick"
item_state = "pocky"
- filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5)
+ filling = list(REAGENT_ID_SUGAR = 2, REAGENT_ID_CHOCOLATE = 5)
type_butt = null
/obj/item/clothing/mask/chewable/candy/pocky/process()
diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
index 973239a777..423e7df8cd 100644
--- a/code/game/objects/items/weapons/ecigs.dm
+++ b/code/game/objects/items/weapons/ecigs.dm
@@ -196,7 +196,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("orangejuice", 5)
+ reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/mint
name = "mint flavour cartridge"
@@ -214,7 +214,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("watermelonjuice", 5)
+ reagents.add_reagent(REAGENT_ID_WATERMELONJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/grape
name = "grape flavour cartridge"
@@ -223,7 +223,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("grapejuice", 5)
+ reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/lemonlime
name = "lemon-lime flavour cartridge"
@@ -232,7 +232,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("lemon_lime", 5)
+ reagents.add_reagent(REAGENT_ID_LEMONLIME, 5)
/obj/item/reagent_containers/ecig_cartridge/coffee
name = "coffee flavour cartridge"
@@ -241,7 +241,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("coffee", 5)
+ reagents.add_reagent(REAGENT_ID_COFFEE, 5)
/*
/obj/item/reagent_containers/ecig_cartridge/cannabis
name = "herb flavour cartridge"
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 03801310ac..4055039a99 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -306,9 +306,9 @@
B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40)
- B1.reagents.add_reagent("condensedcapsaicin", 40)
+ B1.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40)
- B2.reagents.add_reagent("condensedcapsaicin", 80)
+ B2.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 80)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index eeb20d7da9..bcc1ecb732 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -50,7 +50,7 @@
/obj/item/storage/fancy/egg_box
icon = 'icons/obj/food.dmi'
icon_state = "eggbox"
- icon_type = "egg"
+ icon_type = REAGENT_ID_EGG
name = "egg box"
center_of_mass = list("x" = 16,"y" = 7)
storage_slots = 12
diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm
index 35bd4f4dea..35e80cc1ce 100644
--- a/code/game/objects/items/weapons/storage/firstaid_vr.dm
+++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm
@@ -154,7 +154,7 @@
/obj/item/reagent_containers/pill/copper = 5)
/obj/item/storage/pill_bottle/adminordrazine
- name = "pill bottle (Adminordrazine)"
+ name = "pill bottle (" + REAGENT_ADMINORDRAZINE + ")"
desc = "It's magic. We don't have to explain it."
starts_with = list(/obj/item/reagent_containers/pill/adminordrazine = 21)
@@ -164,37 +164,37 @@
starts_with = list(/obj/item/reagent_containers/pill/nutriment = 7, /obj/item/reagent_containers/pill/protein = 7)
/obj/item/storage/pill_bottle/rezadone
- name = "pill bottle (Rezadone)"
+ name = "pill bottle (" + REAGENT_REZADONE + ")"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
starts_with = list(/obj/item/reagent_containers/pill/rezadone = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/storage/pill_bottle/peridaxon
- name = "pill bottle (Peridaxon)"
+ name = "pill bottle (" + REAGENT_PERIDAXON + ")"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
starts_with = list(/obj/item/reagent_containers/pill/peridaxon = 14)
wrapper_color = COLOR_PURPLE
/obj/item/storage/pill_bottle/carthatoline
- name = "pill bottle (Carthatoline)"
- desc = "Carthatoline is strong evacuant used to treat severe poisoning."
+ name = "pill bottle (" + REAGENT_CARTHATOLINE + ")"
+ desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
starts_with = list(/obj/item/reagent_containers/pill/carthatoline = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/storage/pill_bottle/alkysine
- name = "pill bottle (Alkysine)"
- desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ name = "pill bottle (" + REAGENT_ALKYSINE + ")"
+ desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
starts_with = list(/obj/item/reagent_containers/pill/alkysine = 14)
wrapper_color = COLOR_YELLOW
/obj/item/storage/pill_bottle/imidazoline
- name = "pill bottle (Imidazoline)"
+ name = "pill bottle (" + REAGENT_IMIDAZOLINE + ")"
desc = "Heals eye damage."
starts_with = list(/obj/item/reagent_containers/pill/imidazoline = 14)
wrapper_color = COLOR_PURPLE_GRAY
/obj/item/storage/pill_bottle/osteodaxon
- name = "pill bottle (Osteodaxon)"
+ name = "pill bottle (" + REAGENT_OSTEODAXON + ")"
desc = "An experimental drug used to heal bone fractures."
starts_with = list(/obj/item/reagent_containers/pill/osteodaxon = 14)
wrapper_color = COLOR_WHITE
@@ -206,36 +206,36 @@
wrapper_color = COLOR_PALE_PURPLE_GRAY
/obj/item/storage/pill_bottle/hyronalin
- name = "pill bottle (Hyronalin)"
- desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+ name = "pill bottle (" + REAGENT_HYRONALIN + ")"
+ desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
starts_with = list(/obj/item/reagent_containers/pill/hyronalin = 14)
wrapper_color = COLOR_TEAL
/obj/item/storage/pill_bottle/arithrazine
- name = "pill bottle (Arithrazine)"
- desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ name = "pill bottle (" + REAGENT_ARITHRAZINE + ")"
+ desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
starts_with = list(/obj/item/reagent_containers/pill/arithrazine = 14)
wrapper_color = COLOR_TEAL
/obj/item/storage/pill_bottle/corophizine
- name = "pill bottle (Corophizine)"
+ name = "pill bottle (" + REAGENT_COROPHIZINE + ")"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
starts_with = list(/obj/item/reagent_containers/pill/corophizine = 14)
wrapper_color = COLOR_PALE_GREEN_GRAY
/obj/item/storage/pill_bottle/vermicetol
- name = "pill bottle (Vermicetol)"
+ name = "pill bottle (" + REAGENT_VERMICETOL + ")"
desc = "Contains pills used to stabilize the extremely injured."
starts_with = list(/obj/item/reagent_containers/pill/vermicetol = 14)
wrapper_color = COLOR_MAROON
/obj/item/storage/pill_bottle/healing_nanites
- name = "pill bottle (Healing nanites)"
+ name = "pill bottle (" + REAGENT_HEALINGNANITES + ")"
desc = "Miniature medical robots that swiftly restore bodily damage."
starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14)
/obj/item/storage/pill_bottle/sleevingcure
- name = "pill bottle (Kitsuhanan Cure)"
+ name = "pill bottle (" + REAGENT_SLEEVINGCURE + ")"
desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 7)
@@ -250,18 +250,18 @@
can_hold = list(/obj/item/reagent_containers/pill)
/obj/item/storage/mrebag/pill/sleevingcure
- name = "vacuum-sealed pill (Kitsuhanan Cure)"
+ name = "vacuum-sealed pill (" + REAGENT_SLEEVINGCURE + ")"
desc = "A small vacuum-sealed package containing a singular pill. For emergencies only."
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure)
/obj/item/storage/pill_bottle/paracetamol
- name = "pill bottle (Paracetamol)"
+ name = "pill bottle (" + REAGENT_PARACETAMOL + ")"
desc = "Contains over the counter medicine to treat pain."
starts_with = list(/obj/item/reagent_containers/pill/paracetamol = 14)
wrapper_color = COLOR_GRAY
/obj/item/storage/pill_bottle/dexalin
- name = "pill bottle (Dexalin)"
+ name = "pill bottle (" + REAGENT_DEXALIN + ")"
desc = "Contains pills used to treat oxygen deprivation."
starts_with = list(/obj/item/reagent_containers/pill/dexalin = 14)
wrapper_color = "#3366cc"
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
index 6c29ebe4be..3a2d29c9e3 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
@@ -18,7 +18,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
@@ -35,7 +35,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30),
list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30),
@@ -127,7 +127,7 @@
list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30),
list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30),
list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
@@ -154,7 +154,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
@@ -167,7 +167,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 0),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 0),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 0),
- list("nutrients", "glucose", 0, 0),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 0),
list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 0),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 0)
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 17825ed637..2bf7344c97 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -148,7 +148,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
@@ -165,7 +165,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30),
list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30),
@@ -257,7 +257,7 @@
list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30),
list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30),
list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
@@ -284,7 +284,7 @@
list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
- list("nutrients", "glucose", 0, 80),
+ list("nutrients", REAGENT_ID_GLUCOSE, 0, 80),
list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 9910f4e5f9..817da5baf8 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 == REAGENT_ID_FISHBAIT)
+ if(re.id == REAGENT_ID_NUTRIMENT || re.id == REAGENT_ID_PROTEIN || re.id == REAGENT_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/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm
index 1369441664..4ed66b69f5 100644
--- a/code/modules/food/drinkingglass/shaker.dm
+++ b/code/modules/food/drinkingglass/shaker.dm
@@ -34,7 +34,7 @@
cut_overlays()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
reagents.add_reagent(REAGENT_ID_IRON, 10)
- reagents.add_reagent("protein", 35)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 35)
reagents.add_reagent(REAGENT_ID_WATER, 25)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon()
diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
index ec7c739dee..f88e09cf79 100644
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -17,7 +17,7 @@
/obj/item/reagent_containers/food/drinks/cans/cola/Initialize()
. = ..()
- reagents.add_reagent("cola", 30)
+ reagents.add_reagent(REAGENT_ID_COLA, 30)
/obj/item/reagent_containers/food/drinks/cans/decaf_cola
name = "\improper Space Cola Free"
@@ -28,7 +28,7 @@
/obj/item/reagent_containers/food/drinks/cans/decaf_cola/Initialize()
. = ..()
- reagents.add_reagent("decafcola", 30)
+ reagents.add_reagent(REAGENT_ID_DECAFCOLA, 30)
/obj/item/reagent_containers/food/drinks/cans/waterbottle
name = "bottled water"
@@ -52,7 +52,7 @@
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize()
. = ..()
- reagents.add_reagent("spacemountainwind", 30)
+ reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 30)
/obj/item/reagent_containers/food/drinks/cans/thirteenloko
name = "\improper Thirteen Loko"
@@ -73,7 +73,7 @@
/obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize()
..()
- reagents.add_reagent("dr_gibb", 30)
+ reagents.add_reagent(REAGENT_ID_DRGIBB, 30)
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet
name = "\improper Diet Dr. Gibb"
@@ -84,7 +84,7 @@
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize()
..()
- reagents.add_reagent("diet_dr_gibb", 30)
+ reagents.add_reagent(REAGENT_ID_DIETDRGIBB, 30)
/obj/item/reagent_containers/food/drinks/cans/starkist
name = "\improper Star-kist"
@@ -95,7 +95,7 @@
/obj/item/reagent_containers/food/drinks/cans/starkist/Initialize()
. = ..()
- reagents.add_reagent("brownstar", 30)
+ reagents.add_reagent(REAGENT_ID_BROWNSTAR, 30)
/obj/item/reagent_containers/food/drinks/cans/starkistdecaf
name = "\improper Star-kist Classic"
@@ -106,7 +106,7 @@
/obj/item/reagent_containers/food/drinks/cans/starkistdecaf/Initialize()
. = ..()
- reagents.add_reagent("brownstar_decaf", 30)
+ reagents.add_reagent(REAGENT_ID_BROWNSTARDECAF, 30)
/obj/item/reagent_containers/food/drinks/cans/space_up
name = "\improper Space-Up"
@@ -117,7 +117,7 @@
/obj/item/reagent_containers/food/drinks/cans/space_up/Initialize()
. = ..()
- reagents.add_reagent("space_up", 30)
+ reagents.add_reagent(REAGENT_ID_SPACEUP, 30)
/obj/item/reagent_containers/food/drinks/cans/lemon_lime
name = "\improper Lemon-Lime"
@@ -128,7 +128,7 @@
/obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize()
. = ..()
- reagents.add_reagent("lemon_lime", 30)
+ reagents.add_reagent(REAGENT_ID_LEMONLIME, 30)
/obj/item/reagent_containers/food/drinks/cans/iced_tea
name = "\improper Vrisk Serket Iced Tea"
@@ -139,7 +139,7 @@
/obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize()
. = ..()
- reagents.add_reagent("icetea", 30)
+ reagents.add_reagent(REAGENT_ID_ICETEA, 30)
/obj/item/reagent_containers/food/drinks/cans/grape_juice
name = "\improper Grapel Juice"
@@ -150,7 +150,7 @@
/obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize()
. = ..()
- reagents.add_reagent("grapejuice", 30)
+ reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 30)
/obj/item/reagent_containers/food/drinks/cans/tonic
name = "\improper T-Borg's Tonic Water"
@@ -161,7 +161,7 @@
/obj/item/reagent_containers/food/drinks/cans/tonic/Initialize()
. = ..()
- reagents.add_reagent("tonic", 30)
+ reagents.add_reagent(REAGENT_ID_TONIC, 30)
/obj/item/reagent_containers/food/drinks/cans/sodawater
name = "soda water"
@@ -171,7 +171,7 @@
/obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize()
. = ..()
- reagents.add_reagent("sodawater", 30)
+ reagents.add_reagent(REAGENT_ID_SODAWATER, 30)
/obj/item/reagent_containers/food/drinks/cans/gingerale
name = "\improper Classic Ginger Ale"
@@ -182,7 +182,7 @@
/obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize()
. = ..()
- reagents.add_reagent("gingerale", 30)
+ reagents.add_reagent(REAGENT_ID_GINGERALE, 30)
/obj/item/reagent_containers/food/drinks/cans/root_beer
name = "\improper R&D Root Beer"
@@ -193,7 +193,7 @@
/obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize()
. = ..()
- reagents.add_reagent("rootbeer", 30)
+ reagents.add_reagent(REAGENT_ID_ROOTBEER, 30)
/////////////////////////BODA VENDOR DRINKS/////////////////////////
@@ -227,7 +227,7 @@
/obj/item/reagent_containers/food/drinks/cans/boda/Initialize()
. = ..()
- reagents.add_reagent("sodawater", 30)
+ reagents.add_reagent(REAGENT_ID_SODAWATER, 30)
/obj/item/reagent_containers/food/drinks/cans/bodaplus
name = "\improper Boda-Plyus"
@@ -237,16 +237,16 @@
/obj/item/reagent_containers/food/drinks/cans/bodaplus/Initialize()
. = ..()
- reagents.add_reagent("sodawater", 15)
+ reagents.add_reagent(REAGENT_ID_SODAWATER, 15)
reagents.add_reagent(pick(list(
- "applejuice",
- "grapejuice",
- "lemonjuice",
- "limejuice",
- "watermelonjuice",
- "banana",
- "berryjuice",
- "pineapplejuice")), 15)
+ REAGENT_ID_APPLEJUICE,
+ REAGENT_ID_GRAPEJUICE,
+ REAGENT_ID_LEMONJUICE,
+ REAGENT_ID_LIMEJUICE,
+ REAGENT_ID_WATERMELONJUICE,
+ REAGENT_ID_BANANA,
+ REAGENT_ID_BERRYJUICE,
+ REAGENT_ID_PINEAPPLEJUICE)), 15)
/obj/item/reagent_containers/food/drinks/cans/redarmy
name = "\improper Red Army Twist"
@@ -256,8 +256,8 @@
/obj/item/reagent_containers/food/drinks/cans/redarmy/Initialize()
. = ..()
- reagents.add_reagent("potatojuice", 15)
- reagents.add_reagent("sodawater", 15)
+ reagents.add_reagent(REAGENT_ID_POTATOJUICE, 15)
+ reagents.add_reagent(REAGENT_ID_SODAWATER, 15)
/obj/item/reagent_containers/food/drinks/cans/arstbru
name = "\improper Arstotzka Brü"
@@ -267,7 +267,7 @@
/obj/item/reagent_containers/food/drinks/cans/arstbru/Initialize()
. = ..()
- reagents.add_reagent("turnipjuice", 30)
+ reagents.add_reagent(REAGENT_ID_TURNIPJUICE, 30)
/obj/item/reagent_containers/food/drinks/cans/terra_cola
name = "\improper Terra-Cola"
@@ -291,7 +291,7 @@
/obj/item/reagent_containers/food/drinks/cans/straw_cola/Initialize()
. = ..()
- reagents.add_reagent("strawsoda", 30)
+ reagents.add_reagent(REAGENT_ID_STRAWSODA, 30)
/obj/item/reagent_containers/food/drinks/cans/apple_cola
name = "\improper Andromeda Apple"
@@ -301,7 +301,7 @@
/obj/item/reagent_containers/food/drinks/cans/apple_cola/Initialize()
. = ..()
- reagents.add_reagent("applesoda", 30)
+ reagents.add_reagent(REAGENT_ID_APPLESODA, 30)
/obj/item/reagent_containers/food/drinks/cans/lemon_cola
name = "\improper Lunar Lemon"
@@ -311,7 +311,7 @@
/obj/item/reagent_containers/food/drinks/cans/lemon_cola/Initialize()
. = ..()
- reagents.add_reagent("lemonsoda", 30)
+ reagents.add_reagent(REAGENT_ID_LEMONSODA, 30)
/obj/item/reagent_containers/food/drinks/cans/sarsaparilla
name = "\improper Starship Sarsaparilla"
@@ -321,7 +321,7 @@
/obj/item/reagent_containers/food/drinks/cans/sarsaparilla/Initialize()
. = ..()
- reagents.add_reagent("sarsaparilla", 30)
+ reagents.add_reagent(REAGENT_ID_SARSAPARILLA, 30)
/obj/item/reagent_containers/food/drinks/cans/grape_cola
name = "\improper Gravity Grape"
@@ -331,7 +331,7 @@
/obj/item/reagent_containers/food/drinks/cans/grape_cola/Initialize()
. = ..()
- reagents.add_reagent("grapesoda", 30)
+ reagents.add_reagent(REAGENT_ID_GRAPESODA, 30)
/obj/item/reagent_containers/food/drinks/cans/orange_cola
name = "\improper Orion Orange"
@@ -341,7 +341,7 @@
/obj/item/reagent_containers/food/drinks/cans/orange_cola/Initialize()
. = ..()
- reagents.add_reagent("orangesoda", 30)
+ reagents.add_reagent(REAGENT_ID_ORANGESODA, 30)
/obj/item/reagent_containers/food/drinks/cans/baconsoda
name = "\improper Bacon Soda"
@@ -351,7 +351,7 @@
/obj/item/reagent_containers/food/drinks/cans/baconsoda/Initialize()
. = ..()
- reagents.add_reagent("porksoda", 30)
+ reagents.add_reagent(REAGENT_ID_PORKSODA, 30)
/obj/item/reagent_containers/food/drinks/cans/bepis
name = "\improper Bepis"
@@ -392,7 +392,7 @@
/obj/item/reagent_containers/food/drinks/cans/icecoffee/Initialize()
. = ..()
- reagents.add_reagent("icecoffee", 30)
+ reagents.add_reagent(REAGENT_ID_ICECOFFEE, 30)
/obj/item/reagent_containers/food/drinks/cans/buzz
name = "\improper Buzz Fuzz"
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index fd10a97bd7..05f7d2cb24 100644
--- a/code/modules/food/food/condiment.dm
+++ b/code/modules/food/food/condiment.dm
@@ -56,37 +56,37 @@
/obj/item/reagent_containers/food/condiment/on_reagent_change()
if(reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
- if("ketchup")
- name = "Ketchup"
+ if(REAGENT_ID_KETCHUP)
+ name = REAGENT_KETCHUP
desc = "You feel more American already."
icon_state = "ketchup"
center_of_mass = list("x"=16, "y"=6)
- if("mustard")
- name = "Mustard"
+ if(REAGENT_ID_MUSTARD)
+ name = REAGENT_MUSTARD
desc = "A somewhat bitter topping."
icon_state = "mustard"
center_of_mass = list("x"=16, "y"=6)
- if("capsaicin")
+ if(REAGENT_ID_CAPSAICIN)
name = "Hotsauce"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
center_of_mass = list("x"=16, "y"=6)
- if("enzyme")
- name = "Universal Enzyme"
+ if(REAGENT_ID_ENZYME)
+ name = REAGENT_ENZYME
desc = "Used in cooking various dishes."
icon_state = "enzyme"
center_of_mass = list("x"=16, "y"=6)
- if("soysauce")
- name = "Soy Sauce"
+ if(REAGENT_ID_SOYSAUCE)
+ name = REAGENT_SOYSAUCE
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
center_of_mass = list("x"=16, "y"=6)
- if("vinegar")
- name = "Vinegar"
+ if(REAGENT_ID_VINEGAR)
+ name = REAGENT_VINEGAR
desc = "An acetic acid used in various dishes."
icon_state = "vinegar"
center_of_mass = list("x"=16, "y"=6)
- if("frostoil")
+ if(REAGENT_ID_FROSTOIL)
name = "Coldsauce"
desc = "Leaves the tongue numb in its passage."
icon_state = "coldsauce"
@@ -96,13 +96,13 @@
desc = "Salt. From space oceans, presumably."
icon_state = "saltshaker"
center_of_mass = list("x"=17, "y"=11)
- if("blackpepper")
+ if(REAGENT_ID_BLACKPEPPER)
name = "Pepper Mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
center_of_mass = list("x"=17, "y"=11)
- if("cookingoil")
- name = "Cooking Oil"
+ if(REAGENT_ID_COOKINGOIL)
+ name = REAGENT_COOKINGOIL
desc = "A delicious oil used in cooking. General purpose."
icon_state = "oliveoil"
center_of_mass = list("x"=16, "y"=6)
@@ -110,33 +110,33 @@
name = "Sugar"
desc = "Tastey space sugar!"
center_of_mass = list("x"=16, "y"=6)
- if("peanutbutter")
- name = "Peanut Butter"
+ if(REAGENT_ID_PEANUTBUTTER)
+ name = REAGENT_PEANUTBUTTER
desc = "A jar of smooth peanut butter."
icon_state = "peanutbutter"
center_of_mass = list("x"=16, "y"=6)
- if("mayo")
- name = "Mayonnaise"
+ if(REAGENT_ID_MAYO)
+ name = REAGENT_MAYO
desc = "A jar of mayonnaise!"
icon_state = "mayo"
center_of_mass = list("x"=16, "y"=6)
- if("yeast")
- name = "Yeast"
+ if(REAGENT_ID_YEAST)
+ name = REAGENT_YEAST
desc = "This is what you use to make bread fluffy."
icon_state = "yeast"
center_of_mass = list("x"=16, "y"=6)
- if("spacespice")
+ if(REAGENT_ID_SPACESPICE)
name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms."
icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6)
- if("barbecue")
+ if(REAGENT_ID_BARBECUE)
name = "barbecue sauce"
desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
icon_state = "barbecue"
center_of_mass = list("x"=16, "y"=6)
- if("sprinkles")
- name = "sprinkles"
+ if(REAGENT_ID_SPRINKLES)
+ name = REAGENT_ID_SPRINKLES
desc = "Bottle of sprinkles, colourful!"
icon_state= "sprinkles"
center_of_mass = list("x"=16, "y"=6)
@@ -156,13 +156,13 @@
return
/obj/item/reagent_containers/food/condiment/enzyme
- name = "Universal Enzyme"
+ name = REAGENT_ENZYME
desc = "Used in cooking various dishes."
icon_state = "enzyme"
/obj/item/reagent_containers/food/condiment/enzyme/Initialize()
. = ..()
- reagents.add_reagent("enzyme", 50)
+ reagents.add_reagent(REAGENT_ID_ENZYME, 50)
/obj/item/reagent_containers/food/condiment/sugar/Initialize()
. = ..()
@@ -170,55 +170,55 @@
/obj/item/reagent_containers/food/condiment/ketchup/Initialize()
. = ..()
- reagents.add_reagent("ketchup", 50)
+ reagents.add_reagent(REAGENT_ID_KETCHUP, 50)
/obj/item/reagent_containers/food/condiment/mustard/Initialize()
. = ..()
- reagents.add_reagent("mustard", 50)
+ reagents.add_reagent(REAGENT_ID_MUSTARD, 50)
/obj/item/reagent_containers/food/condiment/hotsauce/Initialize()
. = ..()
- reagents.add_reagent("capsaicin", 50)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 50)
/obj/item/reagent_containers/food/condiment/cookingoil
- name = "Cooking Oil"
+ name = REAGENT_COOKINGOIL
/obj/item/reagent_containers/food/condiment/cookingoil/Initialize()
. = ..()
- reagents.add_reagent("cookingoil", 50)
+ reagents.add_reagent(REAGENT_ID_COOKINGOIL, 50)
/obj/item/reagent_containers/food/condiment/cornoil
- name = "Corn Oil"
+ name = REAGENT_CORNOIL
/obj/item/reagent_containers/food/condiment/cornoil/Initialize()
. = ..()
- reagents.add_reagent("cornoil", 50)
+ reagents.add_reagent(REAGENT_ID_CORNOIL, 50)
/obj/item/reagent_containers/food/condiment/coldsauce/Initialize()
. = ..()
- reagents.add_reagent("frostoil", 50)
+ reagents.add_reagent(REAGENT_ID_FROSTOIL, 50)
/obj/item/reagent_containers/food/condiment/soysauce/Initialize()
. = ..()
- reagents.add_reagent("soysauce", 50)
+ reagents.add_reagent(REAGENT_ID_SOYSAUCE, 50)
/obj/item/reagent_containers/food/condiment/vinegar/Initialize()
. = ..()
- reagents.add_reagent("vinegar", 50)
+ reagents.add_reagent(REAGENT_ID_VINEGAR, 50)
/obj/item/reagent_containers/food/condiment/yeast
- name = "Yeast"
+ name = REAGENT_YEAST
/obj/item/reagent_containers/food/condiment/yeast/Initialize()
. = ..()
- reagents.add_reagent("yeast", 50)
+ reagents.add_reagent(REAGENT_ID_YEAST, 50)
/obj/item/reagent_containers/food/condiment/sprinkles
- name = "Sprinkles"
+ name = REAGENT_SPRINKLES
/obj/item/reagent_containers/food/condiment/sprinkles/Initialize()
. = ..()
- reagents.add_reagent("sprinkles", 50)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 50)
/obj/item/reagent_containers/food/condiment/small
possible_transfer_amounts = list(1,20)
@@ -247,7 +247,7 @@
/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..()
- reagents.add_reagent("blackpepper", 20)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 20)
/obj/item/reagent_containers/food/condiment/small/peppergrinder
name = "pepper mill"
@@ -257,7 +257,7 @@
/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..()
- reagents.add_reagent("blackpepper", 30)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 30)
/obj/item/reagent_containers/food/condiment/small/sugar
name = REAGENT_ID_SUGAR
@@ -293,7 +293,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/pepper/Initialize()
. = ..()
- reagents.add_reagent("blackpepper", 5)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/sugar
name = "sugar packet"
@@ -312,7 +312,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/jelly/Initialize()
. = ..()
- reagents.add_reagent("cherryjelly", 10)
+ reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 10)
/obj/item/reagent_containers/food/condiment/small/packet/honey
name = "honey packet"
@@ -322,7 +322,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/honey/Initialize()
. = ..()
- reagents.add_reagent("honey", 10)
+ reagents.add_reagent(REAGENT_ID_HONEY, 10)
/obj/item/reagent_containers/food/condiment/small/packet/capsaicin
name = "hot sauce packet"
@@ -331,7 +331,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/capsaicin/Initialize()
. = ..()
- reagents.add_reagent("capsaicin", 5)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 5)
/obj/item/reagent_containers/food/condiment/small/packet/ketchup
name = "ketchup packet"
@@ -340,7 +340,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/ketchup/Initialize()
. = ..()
- reagents.add_reagent("ketchup", 5)
+ reagents.add_reagent(REAGENT_ID_KETCHUP, 5)
/obj/item/reagent_containers/food/condiment/small/packet/mayo
name = "mayonnaise packet"
@@ -349,7 +349,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/mayo/Initialize()
. = ..()
- reagents.add_reagent("mayo", 5)
+ reagents.add_reagent(REAGENT_ID_MAYO, 5)
/obj/item/reagent_containers/food/condiment/small/packet/soy
name = "soy sauce packet"
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/soy/Initialize()
. = ..()
- reagents.add_reagent("soysauce", 5)
+ reagents.add_reagent(REAGENT_ID_SOYSAUCE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/coffee
name = "coffee powder packet"
@@ -366,7 +366,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/coffee/Initialize()
. = ..()
- reagents.add_reagent("coffeepowder", 5)
+ reagents.add_reagent(REAGENT_ID_COFFEEPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/tea
name = "tea powder packet"
@@ -374,7 +374,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/tea/Initialize()
. = ..()
- reagents.add_reagent("tea", 5)
+ reagents.add_reagent(REAGENT_ID_TEA, 5)
/obj/item/reagent_containers/food/condiment/small/packet/cocoa
name = "cocoa powder packet"
@@ -382,7 +382,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/cocoa/Initialize()
. = ..()
- reagents.add_reagent("coco", 5)
+ reagents.add_reagent(REAGENT_ID_COCO, 5)
/obj/item/reagent_containers/food/condiment/small/packet/grape
name = "grape juice powder packet"
@@ -390,7 +390,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/grape/Initialize()
. = ..()
- reagents.add_reagent("instantgrape", 5)
+ reagents.add_reagent(REAGENT_ID_INSTANTGRAPE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/orange
name = "orange juice powder packet"
@@ -398,7 +398,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/orange/Initialize()
. = ..()
- reagents.add_reagent("instantorange", 5)
+ reagents.add_reagent(REAGENT_ID_INSTANTORANGE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/watermelon
name = "watermelon juice powder packet"
@@ -406,7 +406,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/watermelon/Initialize()
. = ..()
- reagents.add_reagent("instantwatermelon", 5)
+ reagents.add_reagent(REAGENT_ID_INSTANTWATERMELON, 5)
/obj/item/reagent_containers/food/condiment/small/packet/apple
name = "apple juice powder packet"
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/apple/Initialize()
. = ..()
- reagents.add_reagent("instantapple", 5)
+ reagents.add_reagent(REAGENT_ID_INSTANTAPPLE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein
name = "protein powder packet"
@@ -424,7 +424,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon
name = "crayon powder packet"
@@ -474,7 +474,7 @@
/obj/item/reagent_containers/food/condiment/carton/flour/Initialize()
. = ..()
- reagents.add_reagent("flour", 200)
+ reagents.add_reagent(REAGENT_ID_FLOUR, 200)
randpixel_xy()
/obj/item/reagent_containers/food/condiment/carton/update_icon()
@@ -525,7 +525,7 @@
/obj/item/reagent_containers/food/condiment/spacespice/Initialize()
. = ..()
- reagents.add_reagent("spacespice", 40)
+ reagents.add_reagent(REAGENT_ID_SPACESPICE, 40)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder
name = "protein powder packet"
diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
index 50216ed927..49cdf76562 100644
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -252,7 +252,7 @@
/obj/item/reagent_containers/food/drinks/milk/Initialize()
. = ..()
- reagents.add_reagent("milk", 50)
+ reagents.add_reagent(REAGENT_ID_MILK, 50)
/obj/item/reagent_containers/food/drinks/soymilk
name = "soymilk carton"
@@ -266,7 +266,7 @@
/obj/item/reagent_containers/food/drinks/soymilk/Initialize()
. = ..()
- reagents.add_reagent("soymilk", 50)
+ reagents.add_reagent(REAGENT_ID_SOYMILK, 50)
/obj/item/reagent_containers/food/drinks/smallmilk
name = "small milk carton"
@@ -281,7 +281,7 @@
/obj/item/reagent_containers/food/drinks/smallmilk/Initialize()
. = ..()
- reagents.add_reagent("milk", 30)
+ reagents.add_reagent(REAGENT_ID_MILK, 30)
/obj/item/reagent_containers/food/drinks/smallchocmilk
name = "small chocolate milk carton"
@@ -296,7 +296,7 @@
/obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize()
. = ..()
- reagents.add_reagent("chocolate_milk", 30)
+ reagents.add_reagent(REAGENT_ID_CHOCOLATEMILK, 30)
/obj/item/reagent_containers/food/drinks/coffee
name = "\improper Robust Coffee"
@@ -310,7 +310,7 @@
/obj/item/reagent_containers/food/drinks/coffee/Initialize()
. = ..()
- reagents.add_reagent("coffee", 30)
+ reagents.add_reagent(REAGENT_ID_COFFEE, 30)
/obj/item/reagent_containers/food/drinks/tea
name = "cup of Duke Purple tea"
@@ -325,7 +325,7 @@
/obj/item/reagent_containers/food/drinks/tea/Initialize()
. = ..()
- reagents.add_reagent("tea", 30)
+ reagents.add_reagent(REAGENT_ID_TEA, 30)
/obj/item/reagent_containers/food/drinks/decaf_tea
name = "cup of Count Mauve decaffeinated tea"
@@ -340,7 +340,7 @@
/obj/item/reagent_containers/food/drinks/decaf_tea/Initialize()
. = ..()
- reagents.add_reagent("teadecaf", 30)
+ reagents.add_reagent(REAGENT_ID_TEADECAF, 30)
/obj/item/reagent_containers/food/drinks/ice
name = "cup of ice"
@@ -364,7 +364,7 @@
/obj/item/reagent_containers/food/drinks/h_chocolate/Initialize()
. = ..()
- reagents.add_reagent("hot_coco", 30)
+ reagents.add_reagent(REAGENT_ID_HOTCOCO, 30)
/obj/item/reagent_containers/food/drinks/greentea
name = "cup of green tea"
@@ -379,7 +379,7 @@
/obj/item/reagent_containers/food/drinks/greentea/Initialize()
. = ..()
- reagents.add_reagent("greentea", 30)
+ reagents.add_reagent(REAGENT_ID_GREENTEA, 30)
/obj/item/reagent_containers/food/drinks/chaitea
name = "cup of chai tea"
@@ -394,7 +394,7 @@
/obj/item/reagent_containers/food/drinks/chaitea/Initialize()
. = ..()
- reagents.add_reagent("chaitea", 30)
+ reagents.add_reagent(REAGENT_ID_CHAITEA, 30)
/obj/item/reagent_containers/food/drinks/decaf
name = "cup of decaf coffee"
@@ -409,7 +409,7 @@
/obj/item/reagent_containers/food/drinks/decaf/Initialize()
. = ..()
- reagents.add_reagent("decaf", 30)
+ reagents.add_reagent(REAGENT_ID_DECAF, 30)
/obj/item/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
@@ -423,7 +423,7 @@
/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize()
. = ..()
- reagents.add_reagent("dry_ramen", 30)
+ reagents.add_reagent(REAGENT_ID_DRYRAMEN, 30)
/obj/item/reagent_containers/food/drinks/sillycup
name = "paper cup"
diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm
index e270451a78..ae3c7ebae3 100644
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -502,7 +502,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize()
. = ..()
- reagents.add_reagent("cola", 100)
+ reagents.add_reagent(REAGENT_ID_COLA, 100)
/obj/item/reagent_containers/food/drinks/bottle/decaf_cola
name = "\improper two-liter Space Cola Free"
@@ -512,7 +512,7 @@
/obj/item/reagent_containers/food/drinks/bottle/decaf_cola/Initialize()
. = ..()
- reagents.add_reagent("decafcola", 100)
+ reagents.add_reagent(REAGENT_ID_DECAFCOLA, 100)
/obj/item/reagent_containers/food/drinks/bottle/space_up
name = "\improper two-liter Space-Up"
@@ -522,7 +522,7 @@
/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize()
. = ..()
- reagents.add_reagent("space_up", 100)
+ reagents.add_reagent(REAGENT_ID_SPACEUP, 100)
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind
name = "\improper two-liter Space Mountain Wind"
@@ -532,7 +532,7 @@
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize()
. = ..()
- reagents.add_reagent("spacemountainwind", 100)
+ reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 100)
/obj/item/reagent_containers/food/drinks/bottle/dr_gibb
name = "\improper two-liter Dr. Gibb"
@@ -542,7 +542,7 @@
/obj/item/reagent_containers/food/drinks/bottle/dr_gibb/Initialize()
. = ..()
- reagents.add_reagent("dr_gibb", 100)
+ reagents.add_reagent(REAGENT_ID_DRGIBB, 100)
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
name = "Orange Juice"
@@ -554,10 +554,10 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize()
. = ..()
- reagents.add_reagent("orangejuice", 100)
+ reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 100)
/obj/item/reagent_containers/food/drinks/bottle/applejuice
- name = "Apple Juice"
+ name = REAGENT_APPLEJUICE
desc = "Squeezed, pressed and ground to perfection!"
icon_state = "applejuice"
item_state = "carton"
@@ -566,7 +566,7 @@
/obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize()
. = ..()
- reagents.add_reagent("applejuice", 100)
+ reagents.add_reagent(REAGENT_ID_APPLEJUICE, 100)
/obj/item/reagent_containers/food/drinks/bottle/milk
name = "Large Milk Carton"
@@ -578,7 +578,7 @@
/obj/item/reagent_containers/food/drinks/bottle/milk/Initialize()
. = ..()
- reagents.add_reagent("milk", 100)
+ reagents.add_reagent(REAGENT_ID_MILK, 100)
/obj/item/reagent_containers/food/drinks/bottle/cream
name = "Milk Cream"
@@ -590,10 +590,10 @@
/obj/item/reagent_containers/food/drinks/bottle/cream/Initialize()
. = ..()
- reagents.add_reagent("cream", 100)
+ reagents.add_reagent(REAGENT_ID_CREAM, 100)
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
- name = "Tomato Juice"
+ name = REAGENT_TOMATOJUICE
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
item_state = "carton"
@@ -602,10 +602,10 @@
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize()
. = ..()
- reagents.add_reagent("tomatojuice", 100)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 100)
/obj/item/reagent_containers/food/drinks/bottle/limejuice
- name = "Lime Juice"
+ name = REAGENT_LIMEJUICE
desc = "Sweet-sour goodness."
icon_state = "limejuice"
item_state = "carton"
@@ -614,10 +614,10 @@
/obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize()
. = ..()
- reagents.add_reagent("limejuice", 100)
+ reagents.add_reagent(REAGENT_ID_LIMEJUICE, 100)
/obj/item/reagent_containers/food/drinks/bottle/lemonjuice
- name = "Lemon Juice"
+ name = REAGENT_LEMONJUICE
desc = "Sweet-sour goodness. Minus the sweet."
icon_state = "lemonjuice"
item_state = "carton"
@@ -626,7 +626,7 @@
/obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize()
. = ..()
- reagents.add_reagent("lemonjuice", 100)
+ reagents.add_reagent(REAGENT_ID_LEMONJUICE, 100)
/obj/item/reagent_containers/food/drinks/bottle/grenadine
name = "Briar Rose Grenadine Syrup"
@@ -636,7 +636,7 @@
/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize()
. = ..()
- reagents.add_reagent("grenadine", 100)
+ reagents.add_reagent(REAGENT_ID_GRENADINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/grapejuice
name = "Special Blend Grapejuice"
@@ -646,7 +646,7 @@
/obj/item/reagent_containers/food/drinks/bottle/grapejuice/Initialize()
. = ..()
- reagents.add_reagent("grapejuice", 100)
+ reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 100)
//////////////////////////SMALL BOTTLES///////////////////////
@@ -723,24 +723,24 @@
//////////////////////////SMALL BOTTLED SODA///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/small/cola
- name = "Space Cola"
+ name = REAGENT_COLA
desc = "Cola. In space."
icon_state = "colabottle2"
center_of_mass = list("x"=16, "y"=6)
/obj/item/reagent_containers/food/drinks/bottle/small/cola/Initialize()
. = ..()
- reagents.add_reagent("cola", 50)
+ reagents.add_reagent(REAGENT_ID_COLA, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/space_up
- name = "Space-Up"
+ name = REAGENT_SPACEUP
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle2"
center_of_mass = list("x"=16, "y"=6)
/obj/item/reagent_containers/food/drinks/bottle/small/space_up/Initialize()
. = ..()
- reagents.add_reagent("space_up", 50)
+ reagents.add_reagent(REAGENT_ID_SPACEUP, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind
name = "Space Mountain Wind"
@@ -750,14 +750,14 @@
/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize()
. = ..()
- reagents.add_reagent("spacemountainwind", 50)
+ reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb
- name = "Dr. Gibb"
+ name = REAGENT_DRGIBB
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb_bottle2"
center_of_mass = list("x"=16, "y"=6)
/obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize()
. = ..()
- reagents.add_reagent("dr_gibb", 50)
+ reagents.add_reagent(REAGENT_ID_DRGIBB, 50)
diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm
index 78e7449862..f33e5ef78d 100644
--- a/code/modules/food/food/drinks/drinkingglass.dm
+++ b/code/modules/food/food/drinks/drinkingglass.dm
@@ -94,11 +94,11 @@
// for /obj/machinery/vending/sovietsoda
/obj/item/reagent_containers/food/drinks/drinkingglass/soda/New()
..()
- reagents.add_reagent("sodawater", 50)
+ reagents.add_reagent(REAGENT_ID_SODAWATER, 50)
/obj/item/reagent_containers/food/drinks/drinkingglass/cola/New()
..()
- reagents.add_reagent("cola", 50)
+ reagents.add_reagent(REAGENT_ID_COLA, 50)
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
name = "shot glass"
@@ -164,7 +164,7 @@
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
reagents.add_reagent(REAGENT_ID_IRON, 10)
- reagents.add_reagent("protein", 15)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 15)
reagents.add_reagent(REAGENT_ID_WATER, 45)
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index d0fae7402d..5b48d1d1e8 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -447,7 +447,7 @@
/obj/item/reagent_containers/food/snacks/aesirsalad/Initialize()
. = ..()
- reagents.add_reagent("doctorsdelight", 8)
+ reagents.add_reagent(REAGENT_ID_DOCTORSDELIGHT, 8)
reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 8)
/obj/item/reagent_containers/food/snacks/candy/donor
@@ -484,13 +484,13 @@
filling_color = "#7D5F46"
center_of_mass = list("x"=15, "y"=15)
nutriment_amt = 2
- nutriment_desc = list("chocolate" = 5)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5)
bitesize = 2
/obj/item/reagent_containers/food/snacks/chocolatebar/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
- reagents.add_reagent("coco", 2)
+ reagents.add_reagent(REAGENT_ID_COCO, 2)
/obj/item/reagent_containers/food/snacks/chocolatepiece
name = "chocolate piece"
@@ -499,7 +499,7 @@
filling_color = "#7D5F46"
center_of_mass = list("x"=15, "y"=15)
nutriment_amt = 1
- nutriment_desc = list("chocolate" = 3, "caramel" = 2, "lusciousness" = 1)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 3, "caramel" = 2, "lusciousness" = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/chocolatepiece/white
@@ -513,7 +513,7 @@
name = "chocolate truffle"
desc = "A bite-sized milk chocolate truffle that could buy anyone's love."
icon_state = "chocolatepiece_truffle"
- nutriment_desc = list("chocolate" = 3, "undying devotion" = 3)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 3, "undying devotion" = 3)
/obj/item/reagent_containers/food/snacks/chocolateegg
name = "Chocolate Egg"
@@ -522,13 +522,13 @@
filling_color = "#7D5F46"
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 3
- nutriment_desc = list("chocolate" = 5)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5)
bitesize = 2
/obj/item/reagent_containers/food/snacks/chocolateegg/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
- reagents.add_reagent("coco", 2)
+ reagents.add_reagent(REAGENT_ID_COCO, 2)
/obj/item/reagent_containers/food/snacks/donut
name = "donut"
@@ -557,7 +557,7 @@
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/pink
name = "pink frosted donut"
@@ -575,7 +575,7 @@
/obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/purple
name = "purple frosted donut"
@@ -593,7 +593,7 @@
/obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/green
name = "green frosted donut"
@@ -611,7 +611,7 @@
/obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/beige
name = "beige frosted donut"
@@ -629,7 +629,7 @@
/obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/choc
name = "chocolate frosted donut"
@@ -639,7 +639,7 @@
/obj/item/reagent_containers/food/snacks/donut/choc/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("chocolate", 5)
+ reagents.add_reagent(REAGENT_ID_CHOCOLATE, 5)
/obj/item/reagent_containers/food/snacks/donut/choc/jelly
name = "chocolate frosted jelly donut"
@@ -648,8 +648,8 @@
/obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
- reagents.add_reagent("chocolate", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
+ reagents.add_reagent(REAGENT_ID_CHOCOLATE, 5)
/obj/item/reagent_containers/food/snacks/donut/blue
name = "blue frosted donut"
@@ -667,7 +667,7 @@
/obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/yellow
name = "yellow frosted donut"
@@ -685,7 +685,7 @@
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/olive
name = "olive frosted donut"
@@ -703,7 +703,7 @@
/obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/homer
name = "frosted donut with sprinkles"
@@ -713,7 +713,7 @@
/obj/item/reagent_containers/food/snacks/donut/homer/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 1)
/obj/item/reagent_containers/food/snacks/donut/homer/jelly
name = "frosted jelly donut with sprinkles"
@@ -722,8 +722,8 @@
/obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 1)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles
name = "chocolate sprinkles donut"
@@ -733,8 +733,8 @@
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("chocolate", 1)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 1)
+ reagents.add_reagent(REAGENT_ID_CHOCOLATE, 1)
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly
name = "chocolate sprinkles jelly donut"
@@ -743,9 +743,9 @@
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("berryjuice", 5)
- reagents.add_reagent("chocolate", 1)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 1)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
+ reagents.add_reagent(REAGENT_ID_CHOCOLATE, 1)
/obj/item/reagent_containers/food/snacks/donut/meat
name = "meat donut"
@@ -754,7 +754,7 @@
overlay_state = "donut_meat_inbox"
/obj/item/reagent_containers/food/snacks/donut/meat/Initialize()
. = ..()
- reagents.add_reagent("protein", 3, nutriment_desc)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/laugh
name = "laugh donut"
@@ -772,7 +772,7 @@
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/chaos
@@ -786,26 +786,26 @@
/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize()
. = ..()
- reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 1)
switch(rand(1,10))
if(1)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
if(2)
- reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3)
if(3)
- reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent(REAGENT_ID_FROSTOIL, 3)
if(4)
- reagents.add_reagent("sprinkles", 3)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 3)
if(5)
reagents.add_reagent(REAGENT_ID_PHORON, 3)
if(6)
- reagents.add_reagent("coco", 3)
+ reagents.add_reagent(REAGENT_ID_COCO, 3)
if(7)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 3)
if(8)
- reagents.add_reagent("banana", 3)
+ reagents.add_reagent(REAGENT_ID_BANANA, 3)
if(9)
- reagents.add_reagent("berryjuice", 3)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3)
if(10)
reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 3)
@@ -814,7 +814,7 @@
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry/Initialize()
. = ..()
- reagents.add_reagent("poisonberryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly
filling_color = "#ED1169"
@@ -828,7 +828,7 @@
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly/Initialize()
. = ..()
- reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5)
/obj/item/reagent_containers/food/snacks/egg
@@ -841,7 +841,7 @@
/obj/item/reagent_containers/food/snacks/egg/Initialize()
. = ..()
- reagents.add_reagent("egg", 3)
+ reagents.add_reagent(REAGENT_ID_EGG, 3)
/obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity)
if(istype(O,/obj/machinery/microwave))
@@ -908,9 +908,9 @@
/obj/item/reagent_containers/food/snacks/friedegg/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
/obj/item/reagent_containers/food/snacks/boiledegg
name = "Boiled egg"
@@ -920,7 +920,7 @@
/obj/item/reagent_containers/food/snacks/boiledegg/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/organ
name = "organ"
@@ -933,17 +933,17 @@
/obj/item/reagent_containers/food/snacks/organ/Initialize()
. = ..()
- reagents.add_reagent("protein", rand(3,5))
+ reagents.add_reagent(REAGENT_ID_PROTEIN, rand(3,5))
reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,3))
/obj/item/reagent_containers/food/snacks/tofu
name = "Tofu"
- icon_state = "tofu"
+ icon_state = REAGENT_ID_TOFU
desc = "We all love tofu."
filling_color = "#FFFEE0"
center_of_mass = list("x"=17, "y"=10)
nutriment_amt = 3
- nutriment_desc = list("tofu" = 3, "goeyness" = 3)
+ nutriment_desc = list(REAGENT_ID_TOFU = 3, "goeyness" = 3)
bitesize = 3
/obj/item/reagent_containers/food/snacks/tofurkey
@@ -953,7 +953,7 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 12
- nutriment_desc = list("turkey" = 3, "tofu" = 5, "goeyness" = 4)
+ nutriment_desc = list("turkey" = 3, REAGENT_ID_TOFU = 5, "goeyness" = 4)
bitesize = 3
/obj/item/reagent_containers/food/snacks/stuffing
@@ -979,7 +979,7 @@
/obj/item/reagent_containers/food/snacks/carpmeat/Initialize()
. = ..()
- reagents.add_reagent("seafood", 3)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 3)
if(toxin_type && toxin_amount)
reagents.add_reagent(toxin_type, toxin_amount)
@@ -1015,7 +1015,7 @@
/obj/item/reagent_containers/food/snacks/crab_legs/Initialize()
. = ..()
- reagents.add_reagent("seafood", 6)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 6)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishfingers
@@ -1028,7 +1028,7 @@
/obj/item/reagent_containers/food/snacks/fishfingers/Initialize()
. = ..()
- reagents.add_reagent("seafood", 4)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 4)
/obj/item/reagent_containers/food/snacks/zestfish
name = "Zesty Fish"
@@ -1040,7 +1040,7 @@
/obj/item/reagent_containers/food/snacks/zestfish/Initialize()
. = ..()
- reagents.add_reagent("seafood", 4)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 4)
/obj/item/reagent_containers/food/snacks/mushroomslice
name = "mushroom slice"
@@ -1076,7 +1076,7 @@
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
. = ..()
- reagents.add_reagent("protein", 12)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 12)
reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
/obj/item/reagent_containers/food/snacks/xenomeat
@@ -1089,7 +1089,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
@@ -1115,7 +1115,7 @@
/obj/item/reagent_containers/food/snacks/meatball/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/sausage
name = "Sausage"
@@ -1127,7 +1127,7 @@
/obj/item/reagent_containers/food/snacks/sausage/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/donkpocket
name = "\improper Donk-pocket"
@@ -1143,7 +1143,7 @@
/obj/item/reagent_containers/food/snacks/donkpocket/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/donkpocket/proc/heat()
warm = 1
@@ -1183,14 +1183,14 @@
desc = "Delicious, cheesy and surprisingly filling."
icon_state = "donkpocketpizza"
nutriment_amt = 2
- nutriment_desc = list("meat" = 1, "dough" = 2, "cheese"= 2)
+ nutriment_desc = list("meat" = 1, "dough" = 2, REAGENT_ID_CHEESE= 2)
/obj/item/reagent_containers/food/snacks/donkpocket/honk
name = "\improper Honk-pocket"
desc = "The award-winning donk-pocket that won the hearts of clowns and humans alike."
icon_state = "donkpocketbanana"
nutriment_amt = 2
- nutriment_desc = list("banana" = 1, "dough" = 2, "children's antibiotics"= 1)
+ nutriment_desc = list(REAGENT_ID_BANANA = 1, "dough" = 2, "children's antibiotics"= 1)
/obj/item/reagent_containers/food/snacks/donkpocket/berry
name = "\improper Berry-pocket"
@@ -1218,7 +1218,7 @@
name = "\improper Sin-pocket"
desc = "The food of choice for the veteran. Do NOT overconsume."
filling_color = "#6D6D00"
- heated_reagents = list("doctorsdelight" = 5, REAGENT_ID_HYPERZINE = 0.75, REAGENT_ID_SYNAPTIZINE = 0.25)
+ heated_reagents = list(REAGENT_ID_DOCTORSDELIGHT = 5, REAGENT_ID_HYPERZINE = 0.75, REAGENT_ID_SYNAPTIZINE = 0.25)
var/has_been_heated = 0
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user)
@@ -1243,7 +1243,7 @@
/obj/item/reagent_containers/food/snacks/brainburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
reagents.add_reagent(REAGENT_ID_ALKYSINE, 6)
/obj/item/reagent_containers/food/snacks/ghostburger
@@ -1270,7 +1270,7 @@
/obj/item/reagent_containers/food/snacks/human/burger/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/cheeseburger
name = "cheeseburger"
@@ -1278,11 +1278,11 @@
icon_state = "cheeseburger"
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 2
- nutriment_desc = list("cheese" = 2, "bun" = 2)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 2, "bun" = 2)
/obj/item/reagent_containers/food/snacks/cheeseburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/monkeyburger
name = "burger"
@@ -1296,7 +1296,7 @@
/obj/item/reagent_containers/food/snacks/monkeyburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/fishburger
name = "Fillet -o- Carp Sandwich"
@@ -1308,7 +1308,7 @@
/obj/item/reagent_containers/food/snacks/fishburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/tofuburger
name = "Tofu Burger"
@@ -1349,7 +1349,7 @@
/obj/item/reagent_containers/food/snacks/xenoburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/clownburger
name = JOB_CLOWN + " Burger"
@@ -1383,7 +1383,7 @@
/obj/item/reagent_containers/food/snacks/omelette/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/muffin
name = "Muffin"
@@ -1404,12 +1404,12 @@
filling_color = "#FBFFB8"
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 4
- nutriment_desc = list("pie" = 3, "cream" = 2)
+ nutriment_desc = list("pie" = 3, REAGENT_ID_CREAM = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/pie/Initialize()
. = ..()
- reagents.add_reagent("banana",5)
+ reagents.add_reagent(REAGENT_ID_BANANA,5)
/obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
. = ..()
@@ -1429,11 +1429,11 @@
/obj/item/reagent_containers/food/snacks/berryclafoutis/berry/Initialize()
. = ..()
- reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/berryclafoutis/poison/Initialize()
. = ..()
- reagents.add_reagent("poisonberryjuice", 5)
+ reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 5)
/obj/item/reagent_containers/food/snacks/waffles
name = "waffles"
@@ -1454,7 +1454,7 @@
filling_color = "#4D2F5E"
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 6
- nutriment_desc = list("cheese" = 3, "eggplant" = 3)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 3, "eggplant" = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/soylentgreen
@@ -1468,7 +1468,7 @@
/obj/item/reagent_containers/food/snacks/soylentgreen/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/soylenviridians
name = "Soylen Virdians"
@@ -1492,7 +1492,7 @@
/obj/item/reagent_containers/food/snacks/meatpie/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/tofupie
name = "Tofu-pie"
@@ -1502,7 +1502,7 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 10
- nutriment_desc = list("tofu" = 2, "pie" = 8)
+ nutriment_desc = list(REAGENT_ID_TOFU = 2, "pie" = 8)
bitesize = 2
/obj/item/reagent_containers/food/snacks/amanita_pie
@@ -1549,7 +1549,7 @@
/obj/item/reagent_containers/food/snacks/xemeatpie/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/wingfangchu
name = "Wing Fang Chu"
@@ -1562,7 +1562,7 @@
/obj/item/reagent_containers/food/snacks/wingfangchu/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/human/kabob
name = "-kabob"
@@ -1575,7 +1575,7 @@
/obj/item/reagent_containers/food/snacks/human/kabob/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/monkeykabob
name = "Meat-kabob"
@@ -1588,7 +1588,7 @@
/obj/item/reagent_containers/food/snacks/monkeykabob/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/tofukabob
name = "Tofu-kabob"
@@ -1599,7 +1599,7 @@
bitesize = 2
center_of_mass = list("x"=17, "y"=15)
nutriment_amt = 8
- nutriment_desc = list("tofu" = 3, "metal" = 1)
+ nutriment_desc = list(REAGENT_ID_TOFU = 3, "metal" = 1)
/obj/item/reagent_containers/food/snacks/cubancarp
name = "Cuban Carp"
@@ -1614,8 +1614,8 @@
/obj/item/reagent_containers/food/snacks/cubancarp/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3)
/obj/item/reagent_containers/food/snacks/popcorn
name = "Popcorn"
@@ -1659,7 +1659,7 @@
/obj/item/reagent_containers/food/snacks/fries/Initialize()
. = ..()
- reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning
+ reagents.add_reagent(REAGENT_ID_OIL, 1.2)//This is mainly for the benefit of adminspawning
/obj/item/reagent_containers/food/snacks/onionrings
name = "onion rings"
@@ -1717,12 +1717,12 @@
filling_color = "#EDDD00"
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 4
- nutriment_desc = list("fresh fries" = 3, "cheese" = 3)
+ nutriment_desc = list("fresh fries" = 3, REAGENT_ID_CHEESE = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/chilicheesefries
name = "chili cheese fries"
@@ -1738,8 +1738,8 @@
/obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("capsaicin", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2)
/obj/item/reagent_containers/food/snacks/blackpudding
name = "Black Pudding"
@@ -1751,7 +1751,7 @@
/obj/item/reagent_containers/food/snacks/blackpudding/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
reagents.add_reagent(REAGENT_ID_BLOOD, 5)
/obj/item/reagent_containers/food/snacks/soydope
@@ -1799,9 +1799,9 @@
/obj/item/reagent_containers/food/snacks/meatsteak/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
/obj/item/reagent_containers/food/snacks/spacylibertyduff
name = "Spacy Liberty Duff"
@@ -1859,7 +1859,7 @@
/obj/item/reagent_containers/food/snacks/monkeycube/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/monkeycube/attack_self(mob/user as mob)
if(wrapped)
@@ -1949,7 +1949,7 @@
/obj/item/reagent_containers/food/snacks/bigbiteburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/enchiladas
name = "Enchiladas"
@@ -1964,8 +1964,8 @@
/obj/item/reagent_containers/food/snacks/enchiladas/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("capsaicin", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 6)
/obj/item/reagent_containers/food/snacks/monkeysdelight
name = "monkey's Delight"
@@ -1978,9 +1978,9 @@
/obj/item/reagent_containers/food/snacks/monkeysdelight/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
+ reagents.add_reagent(REAGENT_ID_BANANA, 5)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/baguette
@@ -1995,7 +1995,7 @@
/obj/item/reagent_containers/food/snacks/baguette/Initialize()
. = ..()
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishandchips
@@ -2010,7 +2010,7 @@
/obj/item/reagent_containers/food/snacks/fishandchips/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/rofflewaffles
name = "Roffle Waffles"
@@ -2039,7 +2039,7 @@
/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry/Initialize()
. = ..()
- reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5)
/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize()
. = ..()
@@ -2081,7 +2081,7 @@
/obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize()
. = ..()
- reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5)
/obj/item/reagent_containers/food/snacks/stewedsoymeat
name = "Stewed Soy Meat"
@@ -2112,7 +2112,7 @@
filling_color = "#FFFBDB"
center_of_mass = list("x"=17, "y"=11)
nutriment_amt = 2
- nutriment_desc = list("rice" = 2)
+ nutriment_desc = list(REAGENT_ID_RICE = 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/ricepudding
@@ -2123,7 +2123,7 @@
filling_color = "#FFFBDB"
center_of_mass = list("x"=17, "y"=11)
nutriment_amt = 4
- nutriment_desc = list("rice" = 2)
+ nutriment_desc = list(REAGENT_ID_RICE = 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/kudzudonburi
@@ -2134,12 +2134,12 @@
filling_color = "#FFFBDB"
center_of_mass = list("x"=17, "y"=11)
nutriment_amt = 16
- nutriment_desc = list("rice" = 2, "gauze" = 4, "fish" = 10)
+ nutriment_desc = list(REAGENT_ID_RICE = 2, "gauze" = 4, "fish" = 10)
bitesize = 2
/obj/item/reagent_containers/food/snacks/kudzudonburi/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/pastatomato
name = "Spaghetti"
@@ -2154,7 +2154,7 @@
/obj/item/reagent_containers/food/snacks/pastatomato/Initialize()
. = ..()
- reagents.add_reagent("tomatojuice", 10)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 10)
/obj/item/reagent_containers/food/snacks/meatballspagetti
name = "Spaghetti & Meatballs"
@@ -2169,7 +2169,7 @@
/obj/item/reagent_containers/food/snacks/meatballspagetti/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/spesslaw
name = "Spesslaw"
@@ -2183,7 +2183,7 @@
/obj/item/reagent_containers/food/snacks/spesslaw/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/superbiteburger
name = "Super Bite Burger"
@@ -2197,7 +2197,7 @@
/obj/item/reagent_containers/food/snacks/superbiteburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 25)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 25)
/obj/item/reagent_containers/food/snacks/caramelapple
name = "Caramel Apple"
@@ -2261,12 +2261,12 @@
filling_color = "#D9BE29"
center_of_mass = list("x"=16, "y"=4)
nutriment_amt = 3
- nutriment_desc = list("bread" = 3, "cheese" = 3)
+ nutriment_desc = list("bread" = 3, REAGENT_ID_CHEESE = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/sandwich/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/clubsandwich
name = "Club Sandwich"
@@ -2284,12 +2284,12 @@
filling_color = "#D9BE29"
center_of_mass = list("x"=16, "y"=4)
nutriment_amt = 3
- nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
+ nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
reagents.add_reagent(REAGENT_ID_CARBON, 2)
/obj/item/reagent_containers/food/snacks/grilledcheese
@@ -2298,12 +2298,12 @@
icon_state = "toastedsandwich"
filling_color = "#D9BE29"
nutriment_amt = 3
- nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
+ nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/grilledcheese/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/jellysandwich
name = "Jelly Sandwich"
@@ -2321,7 +2321,7 @@
/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize()
. = ..()
- reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5)
/obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter
desc = "You wish you had some peanut butter to go with this... Oh wait!"
@@ -2329,7 +2329,7 @@
/obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter/Initialize()
. = ..()
- reagents.add_reagent("peanutbutter", 5)
+ reagents.add_reagent(REAGENT_ID_PEANUTBUTTER, 5)
// End Sandwiches //////////////////////////////////////////////
@@ -2371,7 +2371,7 @@
/obj/item/reagent_containers/food/snacks/chawanmushi/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
/obj/item/reagent_containers/food/snacks/tossedsalad
name = "tossed salad"
@@ -2397,7 +2397,7 @@
/obj/item/reagent_containers/food/snacks/validsalad/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
@@ -2430,7 +2430,7 @@
/obj/item/reagent_containers/food/snacks/meatballsoup/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/slimesoup
@@ -2457,7 +2457,7 @@
/obj/item/reagent_containers/food/snacks/bloodsoup/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -2474,7 +2474,7 @@
/obj/item/reagent_containers/food/snacks/clownstears/Initialize()
. = ..()
- reagents.add_reagent("banana", 5)
+ reagents.add_reagent(REAGENT_ID_BANANA, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/vegetablesoup
@@ -2500,7 +2500,7 @@
filling_color = "#AFC4B5"
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 8
- nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2)
+ nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, "potato" = 2)
bitesize = 5
eating_sound = 'sound/items/drink.ogg'
@@ -2527,12 +2527,12 @@
switch(mysteryselect)
if(1)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2)
if(2)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent(REAGENT_ID_FROSTOIL, 3)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2)
if(3)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -2542,7 +2542,7 @@
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2, nutriment_desc)
- reagents.add_reagent("banana", 10)
+ reagents.add_reagent(REAGENT_ID_BANANA, 10)
if(6)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
@@ -2554,10 +2554,10 @@
reagents.add_reagent(REAGENT_ID_TOXIN, 10)
if(9)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
- reagents.add_reagent("tomatojuice", 10)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 10)
if(10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
- reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5)
reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
/obj/item/reagent_containers/food/snacks/wishsoup
@@ -2661,8 +2661,8 @@
/obj/item/reagent_containers/food/snacks/stew/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5)
reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -2680,9 +2680,9 @@
/obj/item/reagent_containers/food/snacks/bearstew/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
- reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5)
reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -2701,9 +2701,9 @@
/obj/item/reagent_containers/food/snacks/hotchili/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2)
/obj/item/reagent_containers/food/snacks/coldchili
name = "Cold Chili"
@@ -2719,9 +2719,9 @@
/obj/item/reagent_containers/food/snacks/coldchili/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_FROSTOIL, 3)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2)
/obj/item/reagent_containers/food/snacks/bearchili
@@ -2739,9 +2739,9 @@
/obj/item/reagent_containers/food/snacks/bearchili/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2)
reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
///////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2798,7 +2798,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/meatbread/Initialize()
. = ..()
- reagents.add_reagent("protein", 20)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 20)
/obj/item/reagent_containers/food/snacks/slice/meatbread
name = "meatbread slice"
@@ -2827,7 +2827,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread/Initialize()
. = ..()
- reagents.add_reagent("protein", 20)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 20)
/obj/item/reagent_containers/food/snacks/slice/xenomeatbread
name = "xenomeatbread slice"
@@ -2856,7 +2856,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/bananabread/Initialize()
. = ..()
- reagents.add_reagent("banana", 20)
+ reagents.add_reagent(REAGENT_ID_BANANA, 20)
/obj/item/reagent_containers/food/snacks/slice/bananabread
name = "Banana-nut bread slice"
@@ -2878,7 +2878,7 @@
slices_num = 5
filling_color = "#F7FFE0"
center_of_mass = list("x"=16, "y"=9)
- nutriment_desc = list("tofu" = 10)
+ nutriment_desc = list(REAGENT_ID_TOFU = 10)
nutriment_amt = 10
bitesize = 2
@@ -2916,13 +2916,13 @@
slices_num = 5
filling_color = "#FFF896"
center_of_mass = list("x"=16, "y"=9)
- nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3)
+ nutriment_desc = list("bread" = 6, REAGENT_ID_CREAM = 3, REAGENT_ID_CHEESE = 3)
nutriment_amt = 5
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize()
. = ..()
- reagents.add_reagent("protein", 15)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 15)
/obj/item/reagent_containers/food/snacks/slice/creamcheesebread
name = "Cream Cheese Bread slice"
@@ -2979,7 +2979,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize()
. = ..()
- reagents.add_reagent("protein", 25)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 25)
reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
/obj/item/reagent_containers/food/snacks/slice/braincake
@@ -3003,13 +3003,13 @@
slices_num = 5
filling_color = "#FAF7AF"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "cream" = 10, "cheese" = 15)
+ nutriment_desc = list("cake" = 10, REAGENT_ID_CREAM = 10, REAGENT_ID_CHEESE = 15)
nutriment_amt = 10
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake/Initialize()
. = ..()
- reagents.add_reagent("protein", 15)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 15)
/obj/item/reagent_containers/food/snacks/slice/cheesecake
name = "Cheese Cake slice"
@@ -3038,7 +3038,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/peanutcake/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
/obj/item/reagent_containers/food/snacks/slice/peanutcake
name = "Peanut Cake slice"
@@ -3061,7 +3061,7 @@
slices_num = 5
filling_color = "#F7EDD5"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "vanilla" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, REAGENT_ID_VANILLA = 15)
nutriment_amt = 20
/obj/item/reagent_containers/food/snacks/slice/plaincake
@@ -3158,7 +3158,7 @@
slices_num = 5
filling_color = "#805930"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "chocolate" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, REAGENT_ID_CHOCOLATE = 15)
nutriment_amt = 20
/obj/item/reagent_containers/food/snacks/slice/chocolatecake
@@ -3182,13 +3182,13 @@
slices_num = 5
filling_color = "#FFF700"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cheese" = 10)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 10)
nutriment_amt = 10
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/cheesewedge
name = "Cheese wedge"
@@ -3212,7 +3212,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake/Initialize()
. = ..()
- reagents.add_reagent("sprinkles", 10)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 10)
/obj/item/reagent_containers/food/snacks/slice/birthdaycake
name = "Birthday Cake slice"
@@ -3279,7 +3279,7 @@
slices_num = 5
filling_color = "#F5B951"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("pie" = 5, "cream" = 5, "pumpkin" = 5)
+ nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, "pumpkin" = 5)
nutriment_amt = 15
/obj/item/reagent_containers/food/snacks/slice/pumpkinpie
@@ -3315,7 +3315,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize()
. = ..()
- reagents.add_reagent("seafood", 12)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 12)
/obj/item/reagent_containers/food/snacks/grilled_carp_slice
name = "korlaaskak slice"
@@ -3336,7 +3336,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/keylimepieslice
name = "slice of key lime pie"
@@ -3359,12 +3359,12 @@
slices_num = 5
filling_color = "#F5B951"
nutriment_amt = 10
- nutriment_desc = list("cheese" = 5, "egg" = 5)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 5, REAGENT_ID_EGG = 5)
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/quicheslice
name = "slice of quiche"
@@ -3381,7 +3381,7 @@
/obj/item/reagent_containers/food/snacks/quicheslice/filled/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/sliceable/brownies
name = "brownies"
@@ -3399,7 +3399,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/browniesslice
name = "brownie"
@@ -3416,7 +3416,7 @@
/obj/item/reagent_containers/food/snacks/browniesslice/filled/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies
name = "cosmic brownies"
@@ -3434,7 +3434,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
reagents.add_reagent(REAGENT_ID_BICARIDINE, 1)
reagents.add_reagent(REAGENT_ID_KELOTANE, 1)
@@ -3455,7 +3455,7 @@
/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/lasagna
name = "lasagna"
@@ -3467,7 +3467,7 @@
/obj/item/reagent_containers/food/snacks/lasagna/Initialize()
. = ..()
- reagents.add_reagent("protein", 2) //For meaty things.
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2) //For meaty things.
/obj/item/reagent_containers/food/snacks/gigapuddi
name = "Astro-Pudding"
@@ -3504,7 +3504,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 9)
- reagents.add_reagent("coco", 5)
+ reagents.add_reagent(REAGENT_ID_COCO, 5)
/obj/item/reagent_containers/food/snacks/bucheslice
name = "\improper Buche de Noel slice"
@@ -3530,9 +3530,9 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
- reagents.add_reagent("cookingoil", 1)
+ reagents.add_reagent(REAGENT_ID_COOKINGOIL, 1)
/obj/item/reagent_containers/food/snacks/turkeyslice
name = "turkey drumstick"
@@ -3560,9 +3560,9 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
- reagents.add_reagent("cookingoil", 1)
+ reagents.add_reagent(REAGENT_ID_COOKINGOIL, 1)
/obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra()
for(var/i in extra_product)
@@ -3656,14 +3656,14 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/margherita
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15)
+ nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15)
nutriment_amt = 35
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
- reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6)
/obj/item/reagent_containers/food/snacks/slice/margherita
name = "Margherita slice"
@@ -3690,9 +3690,9 @@
/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("cheese", 5)
- reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
+ reagents.add_reagent(REAGENT_ID_CHEESE, 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6)
/obj/item/reagent_containers/food/snacks/pineappleslice
name = "ham & pineapple pizza slice"
@@ -3713,14 +3713,14 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/meatpizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15, "meat" = 10)
+ nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15, "meat" = 10)
nutriment_amt = 10
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza/Initialize()
. = ..()
- reagents.add_reagent("protein", 34)
- reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 34)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6)
/obj/item/reagent_containers/food/snacks/slice/meatpizza
name = "Meatpizza slice"
@@ -3741,13 +3741,13 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "mushroom" = 10)
+ nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10)
nutriment_amt = 35
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
/obj/item/reagent_containers/food/snacks/slice/mushroompizza
name = "Mushroompizza slice"
@@ -3768,14 +3768,14 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/vegetablepizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)
+ nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)
nutriment_amt = 25
bitesize = 2
/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
- reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6)
reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 12)
/obj/item/reagent_containers/food/snacks/slice/vegetablepizza
@@ -3822,8 +3822,8 @@
/obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
- reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6)
reagents.add_reagent(REAGENT_ID_MOLD, 8)
/obj/item/reagent_containers/food/snacks/slice/oldpizza
@@ -4053,7 +4053,7 @@
/obj/item/reagent_containers/food/snacks/dough/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
// Dough + rolling pin = flat dough
/obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/W as obj, mob/user as mob)
@@ -4076,7 +4076,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/doughslice
name = "dough slice"
@@ -4160,11 +4160,11 @@
bitesize = 3
center_of_mass = list("x"=21, "y"=12)
nutriment_amt = 4
- nutriment_desc = list("cheese" = 2,"taco shell" = 2)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 2,"taco shell" = 2)
/obj/item/reagent_containers/food/snacks/taco/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/rawcutlet
name = "raw cutlet"
@@ -4176,7 +4176,7 @@
/obj/item/reagent_containers/food/snacks/rawcutlet/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -4188,7 +4188,7 @@
/obj/item/reagent_containers/food/snacks/cutlet/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/rawmeatball
name = "raw meatball"
@@ -4200,7 +4200,7 @@
/obj/item/reagent_containers/food/snacks/rawmeatball/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -4211,7 +4211,7 @@
/obj/item/reagent_containers/food/snacks/hotdog/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
///obj/item/reagent_containers/food/snacks/hotdog/old (Commented out on 4/23/2021 to make room for ancient hotdog)
// name = "old hotdog"
@@ -4294,7 +4294,7 @@
/obj/item/reagent_containers/food/snacks/bellefritter/Initialize()
. = ..()
- reagents.add_reagent("batter", 10)
+ reagents.add_reagent(REAGENT_ID_BATTER, 10)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/roastedsunflower
@@ -4348,7 +4348,7 @@
/obj/item/reagent_containers/food/snacks/liquidprotein/Initialize()
. = ..()
- reagents.add_reagent("protein", 30)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 30)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidvitamin
@@ -4364,10 +4364,10 @@
/obj/item/reagent_containers/food/snacks/liquidvitamin/Initialize()
. = ..()
- reagents.add_reagent("flour", 20)
+ reagents.add_reagent(REAGENT_ID_FLOUR, 20)
reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
- reagents.add_reagent("enzyme", 1)
+ reagents.add_reagent(REAGENT_ID_ENZYME, 1)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/meatcube
@@ -4380,7 +4380,7 @@
/obj/item/reagent_containers/food/snacks/meatcube/Initialize()
. = ..()
- reagents.add_reagent("protein", 15)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 15)
/obj/item/reagent_containers/food/snacks/tastybread
name = "bread tube"
@@ -4423,8 +4423,8 @@
/obj/item/reagent_containers/food/snacks/unajerky/Initialize()
. =..()
- reagents.add_reagent("protein", 8)
- reagents.add_reagent("capsaicin", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2)
/obj/item/reagent_containers/food/snacks/sashimi
name = "sashimi"
@@ -4436,7 +4436,7 @@
/obj/item/reagent_containers/food/snacks/sashimi/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/benedict
name = "eggs benedict"
@@ -4444,12 +4444,12 @@
filling_color = "#FFDF78"
icon_state = "benedict"
nutriment_amt = 4
- nutriment_desc = list("bread" = 2, "bacon" = 2, "egg" = 2)
+ nutriment_desc = list("bread" = 2, "bacon" = 2, REAGENT_ID_EGG = 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/benedict/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/beans
name = "baked beans"
@@ -4460,7 +4460,7 @@
/obj/item/reagent_containers/food/snacks/beans/Initialize()
. = ..()
- reagents.add_reagent("bean_protein", 6)
+ reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 6)
/obj/item/reagent_containers/food/snacks/cookie
name = "chocolate chip cookie"
@@ -4468,7 +4468,7 @@
filling_color = "#DBC94F"
icon_state = "cookie"
nutriment_amt = 5
- nutriment_desc = list("sweetness" = 2, "cookie" = 1, "chocolate" = 2)
+ nutriment_desc = list("sweetness" = 2, "cookie" = 1, REAGENT_ID_CHOCOLATE = 2)
bitesize = 1
/obj/item/reagent_containers/food/snacks/sugarcookie
@@ -4502,11 +4502,11 @@
/obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize()
. = ..()
- reagents.add_reagent("berryjuice", 3)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3)
/obj/item/reagent_containers/food/snacks/berrymuffin/poison/Initialize()
. = ..()
- reagents.add_reagent("poisonberryjuice", 3)
+ reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 3)
/obj/item/reagent_containers/food/snacks/ghostmuffin
name = "booberry muffin"
@@ -4520,11 +4520,11 @@
/obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize()
. = ..()
- reagents.add_reagent("berryjuice", 3)
+ reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3)
/obj/item/reagent_containers/food/snacks/ghostmuffin/poison/Initialize()
. = ..()
- reagents.add_reagent("poisonberryjuice", 3)
+ reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 3)
/obj/item/reagent_containers/food/snacks/devilledegg
name = "devilled eggs"
@@ -4533,12 +4533,12 @@
filling_color = "#799ACE"
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 8
- nutriment_desc = list("egg" = 4, "chili" = 4)
+ nutriment_desc = list(REAGENT_ID_EGG = 4, "chili" = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/devilledegg/Initialize()
. = ..()
- reagents.add_reagent("capsaicin", 2)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2)
/obj/item/reagent_containers/food/snacks/fruitsalad
name = "fruit salad"
@@ -4578,12 +4578,12 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
nutriment_amt = 6
- nutriment_desc = list("rice" = 2, "egg" = 4)
+ nutriment_desc = list(REAGENT_ID_RICE = 2, REAGENT_ID_EGG = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/eggbowl/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/tortilla
name = "tortilla"
@@ -4598,24 +4598,24 @@
desc = "That's some dangerously spicy nachos."
icon_state = "cubannachos"
nutriment_amt = 6
- nutriment_desc = list("salt" = 1, "cheese" = 2, "chili peppers" = 3)
+ nutriment_desc = list("salt" = 1, REAGENT_ID_CHEESE = 2, "chili peppers" = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/cubannachos/Initialize()
. = ..()
- reagents.add_reagent("capsaicin", 4)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4)
/obj/item/reagent_containers/food/snacks/curryrice
name = "curry rice"
desc = "That's some dangerously spicy rice."
icon_state = "curryrice"
nutriment_amt = 6
- nutriment_desc = list("salt" = 1, "rice" = 2, "chili peppers" = 3)
+ nutriment_desc = list("salt" = 1, REAGENT_ID_RICE = 2, "chili peppers" = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/curryrice/Initialize()
. = ..()
- reagents.add_reagent("capsaicin", 4)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4)
/obj/item/reagent_containers/food/snacks/piginblanket
name = "pig in a blanket"
@@ -4627,7 +4627,7 @@
/obj/item/reagent_containers/food/snacks/piginblanket/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/wormsickly
name = "sickly worm"
@@ -4641,7 +4641,7 @@
/obj/item/reagent_containers/food/snacks/wormsickly/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_FISHBAIT, 9)
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/worm
name = "strange worm"
@@ -4655,7 +4655,7 @@
/obj/item/reagent_containers/food/snacks/worm/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_FISHBAIT, 15)
- reagents.add_reagent("protein", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
/obj/item/reagent_containers/food/snacks/wormdeluxe
name = "deluxe worm"
@@ -4669,7 +4669,7 @@
/obj/item/reagent_containers/food/snacks/wormdeluxe/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_FISHBAIT, 30)
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/siffruit
name = "pulsing fruit"
@@ -4715,12 +4715,12 @@
desc = "This bread's got cheese n' chutzpah!"
icon_state = "bagelcheese"
nutriment_amt = 8
- nutriment_desc = list("bread" = 4, "cheese" = 4)
+ nutriment_desc = list("bread" = 4, REAGENT_ID_CHEESE = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/bagelcheese/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/bagelraisin
name = "cinnamon raisin bagel"
@@ -4943,9 +4943,9 @@
/obj/item/reagent_containers/food/snacks/sausage/battered/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("batter", 1.7)
- reagents.add_reagent("oil", 1.5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_BATTER, 1.7)
+ reagents.add_reagent(REAGENT_ID_OIL, 1.5)
/obj/item/reagent_containers/food/snacks/jalapeno_poppers
name = "jalapeno popper"
@@ -4960,8 +4960,8 @@
/obj/item/reagent_containers/food/snacks/jalapeno_poppers/Initialize()
. = ..()
- reagents.add_reagent("batter", 2)
- reagents.add_reagent("oil", 2)
+ reagents.add_reagent(REAGENT_ID_BATTER, 2)
+ reagents.add_reagent(REAGENT_ID_OIL, 2)
/obj/item/reagent_containers/food/snacks/mouseburger
name = "mouse burger"
@@ -4972,7 +4972,7 @@
/obj/item/reagent_containers/food/snacks/mouseburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/chickenkatsu
name = "chicken katsu"
@@ -4986,16 +4986,16 @@
/obj/item/reagent_containers/food/snacks/chickenkatsu/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("beerbatter", 2)
- reagents.add_reagent("oil", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_BEERBATTER, 2)
+ reagents.add_reagent(REAGENT_ID_OIL, 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize()
. = ..()
- reagents.add_reagent("batter", 6.5)
- coating = reagents.get_reagent("batter")
- reagents.add_reagent("oil", 4)
+ reagents.add_reagent(REAGENT_ID_BATTER, 6.5)
+ coating = reagents.get_reagent(REAGENT_ID_BATTER)
+ reagents.add_reagent(REAGENT_ID_OIL, 4)
/obj/item/reagent_containers/food/snacks/funnelcake
name = "funnel cake"
@@ -5008,7 +5008,7 @@
/obj/item/reagent_containers/food/snacks/funnelcake/Initialize()
. = ..()
- reagents.add_reagent("batter", 10)
+ reagents.add_reagent(REAGENT_ID_BATTER, 10)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/spreads
@@ -5030,7 +5030,7 @@
/obj/item/reagent_containers/food/snacks/spreads/Initialize()
. = ..()
- reagents.add_reagent("triglyceride", 20)
+ reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 20)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1)
/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob)
@@ -5051,7 +5051,7 @@
/obj/item/reagent_containers/food/snacks/rawbacon/Initialize()
. = ..()
- reagents.add_reagent("protein", 0.33)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 0.33)
/obj/item/reagent_containers/food/snacks/bacon
name = "bacon"
@@ -5076,8 +5076,8 @@
/obj/item/reagent_containers/food/snacks/bacon/Initialize()
. = ..()
- reagents.add_reagent("protein", 0.33)
- reagents.add_reagent("triglyceride", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 0.33)
+ reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 1)
/obj/item/reagent_containers/food/snacks/bacon_stick
name = "eggpop"
@@ -5087,8 +5087,8 @@
/obj/item/reagent_containers/food/snacks/bacon_stick/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("egg", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_EGG, 1)
/obj/item/reagent_containers/food/snacks/chilied_eggs
name = "Redeemed eggs"
@@ -5098,8 +5098,8 @@
/obj/item/reagent_containers/food/snacks/chilied_eggs/Initialize()
. = ..()
- reagents.add_reagent("egg", 6)
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_EGG, 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/bacon_and_eggs
name = "bacon and eggs"
@@ -5109,8 +5109,8 @@
/obj/item/reagent_containers/food/snacks/bacon_and_eggs/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("egg", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_EGG, 1)
/obj/item/reagent_containers/food/snacks/sweet_and_sour
name = "sweet and sour pork"
@@ -5122,7 +5122,7 @@
/obj/item/reagent_containers/food/snacks/sweet_and_sour/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/corn_dog
name = "corn dog"
@@ -5134,7 +5134,7 @@
/obj/item/reagent_containers/food/snacks/corn_dog/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/truffle
name = "chocolate truffle"
@@ -5145,7 +5145,7 @@
/obj/item/reagent_containers/food/snacks/truffle/Initialize()
. = ..()
- reagents.add_reagent("coco", 6)
+ reagents.add_reagent(REAGENT_ID_COCO, 6)
/obj/item/reagent_containers/food/snacks/truffle/random
name = "mystery chocolate truffle"
@@ -5153,7 +5153,7 @@
/obj/item/reagent_containers/food/snacks/truffle/random/Initialize()
. = ..()
- var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake"))
+ var/reagent_string = pick(list(REAGENT_ID_CREAM,REAGENT_ID_CHERRYJELLY,REAGENT_ID_MINT,REAGENT_ID_FROSTOIL,REAGENT_ID_CAPSAICIN,REAGENT_ID_CREAM,REAGENT_ID_COFFEE,REAGENT_ID_MILKSHAKE))
reagents.add_reagent(reagent_string, 4)
/obj/item/reagent_containers/food/snacks/bacon_flatbread
@@ -5165,7 +5165,7 @@
/obj/item/reagent_containers/food/snacks/bacon_flatbread/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
/obj/item/reagent_containers/food/snacks/meat_pocket
name = "meat pocket"
@@ -5176,7 +5176,7 @@
/obj/item/reagent_containers/food/snacks/meat_pocket/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/fish_taco
name = "fish taco"
@@ -5187,7 +5187,7 @@
/obj/item/reagent_containers/food/snacks/fish_taco/Initialize()
. = ..()
- reagents.add_reagent("seafood",3)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD,3)
/obj/item/reagent_containers/food/snacks/nt_muffin
name = "breakfast muffin"
@@ -5198,7 +5198,7 @@
/obj/item/reagent_containers/food/snacks/nt_muffin/Initialize()
. = ..()
- reagents.add_reagent("protein",5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN,5)
/obj/item/reagent_containers/food/snacks/pineapple_ring
name = "pineapple rings"
@@ -5209,7 +5209,7 @@
/obj/item/reagent_containers/food/snacks/pineapple_ring/Initialize()
. = ..()
- reagents.add_reagent("pineapplejuice",3)
+ reagents.add_reagent(REAGENT_ID_PINEAPPLEJUICE,3)
/obj/item/reagent_containers/food/snacks/burger/bacon
@@ -5224,7 +5224,7 @@
/obj/item/reagent_containers/food/snacks/burger/bacon/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/blt
name = "BLT"
@@ -5238,7 +5238,7 @@
/obj/item/reagent_containers/food/snacks/blt/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/porkbowl
name = "pork bowl"
@@ -5250,8 +5250,8 @@
/obj/item/reagent_containers/food/snacks/porkbowl/Initialize()
. = ..()
- reagents.add_reagent("rice", 6)
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_RICE, 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/mashedpotato
name = "mashed potato"
@@ -5276,7 +5276,7 @@
/obj/item/reagent_containers/food/snacks/loadedbakedpotato/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/bangersandmash
name = "Bangers and Mash"
@@ -5291,7 +5291,7 @@
/obj/item/reagent_containers/food/snacks/bangersandmash/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/cheesymash
name = "Cheesy Mashed Potato"
@@ -5306,7 +5306,7 @@
/obj/item/reagent_containers/food/snacks/cheesymash/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/croissant
name = "croissant"
@@ -5347,7 +5347,7 @@
var/shape = pick("lump", "star", "lizard", "corgi")
desc = "A chicken nugget vaguely shaped like a [shape]."
icon_state = "nugget_[shape]"
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/icecreamsandwich
name = "ice cream sandwich"
@@ -5368,7 +5368,7 @@
/obj/item/reagent_containers/food/snacks/honeybun/Initialize()
. = ..()
- reagents.add_reagent("honey", 3)
+ reagents.add_reagent(REAGENT_ID_HONEY, 3)
// Moved /bun/attackby() from /code/modules/food/food/snacks.dm
/obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W as obj, mob/user as mob)
@@ -5627,7 +5627,7 @@
/obj/item/reagent_containers/food/snacks/fuegoburrito/Initialize()
. = ..()
- reagents.add_reagent("capsaicin", 4)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4)
/obj/item/reagent_containers/food/snacks/meatburrito
name = "carne asada burrito"
@@ -5639,19 +5639,19 @@
/obj/item/reagent_containers/food/snacks/meatburrito/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/cheeseburrito
name = "Cheese burrito"
desc = "It's a burrito filled with beans and cheese."
icon_state = "cheeseburrito"
nutriment_amt = 6
- nutriment_desc = list("tortilla" = 3, "cheese" = 3)
+ nutriment_desc = list("tortilla" = 3, REAGENT_ID_CHEESE = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/cheeseburrito/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/eggroll
name = "egg roll"
@@ -5660,12 +5660,12 @@
filling_color = "#799ACE"
center_of_mass = list("x"=17, "y"=4)
nutriment_amt = 4
- nutriment_desc = list("egg" = 4)
+ nutriment_desc = list(REAGENT_ID_EGG = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/eggroll/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/burrito
name = "chilli burrito"
@@ -5678,7 +5678,7 @@
/obj/item/reagent_containers/food/snacks/burrito/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/burrito_spicy
name = "spicy burrito"
@@ -5691,7 +5691,7 @@
/obj/item/reagent_containers/food/snacks/burrito_spicy/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/burrito_cheese
name = "carne queso burrito"
@@ -5704,7 +5704,7 @@
/obj/item/reagent_containers/food/snacks/burrito_cheese/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/burrito_cheese_spicy
name = "spicy cheese burrito"
@@ -5717,7 +5717,7 @@
/obj/item/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/burrito_vegan
name = "vegan burrito"
@@ -5730,7 +5730,7 @@
/obj/item/reagent_containers/food/snacks/burrito_vegan/Initialize()
. = ..()
- reagents.add_reagent("tofu", 6)
+ reagents.add_reagent(REAGENT_ID_TOFU, 6)
/obj/item/reagent_containers/food/snacks/breakfast_wrap
name = "breakfast wrap"
@@ -5761,8 +5761,8 @@
/obj/item/reagent_containers/food/snacks/burrito_hell/Initialize()
. = ..()
- reagents.add_reagent("protein", 9)
- reagents.add_reagent("condensedcapsaicin", 10) //what could possibly go wrong
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 9)
+ reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 10) //what could possibly go wrong
//End Burritos///////////////////////////////////
@@ -5774,8 +5774,8 @@
/obj/item/reagent_containers/food/snacks/hatchling_suprise/Initialize()
. = ..()
- reagents.add_reagent("egg", 2)
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_EGG, 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/red_sun_special
name = "red sun special"
@@ -5785,7 +5785,7 @@
/obj/item/reagent_containers/food/snacks/red_sun_special/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/riztizkzi_sea
name = "moghesian sea delight"
@@ -5795,7 +5795,7 @@
/obj/item/reagent_containers/food/snacks/riztizkzi_sea/Initialize()
. = ..()
- reagents.add_reagent("egg", 4)
+ reagents.add_reagent(REAGENT_ID_EGG, 4)
/obj/item/reagent_containers/food/snacks/father_breakfast
name = "breakfast of champions"
@@ -5805,8 +5805,8 @@
/obj/item/reagent_containers/food/snacks/father_breakfast/Initialize()
. = ..()
- reagents.add_reagent("egg", 4)
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_EGG, 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/stuffed_meatball
name = "stuffed meatball" //YES
@@ -5816,7 +5816,7 @@
/obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/egg_pancake
name = "meat pancake"
@@ -5826,8 +5826,8 @@
/obj/item/reagent_containers/food/snacks/egg_pancake/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("egg", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_EGG, 2)
/obj/item/reagent_containers/food/snacks/redcurry
name = "red curry"
@@ -5843,7 +5843,7 @@
/obj/item/reagent_containers/food/snacks/redcurry/Initialize()
. = ..()
- reagents.add_reagent("protein", 7)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 7)
/obj/item/reagent_containers/food/snacks/greencurry
name = "green curry"
@@ -5859,8 +5859,8 @@
/obj/item/reagent_containers/food/snacks/greencurry/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
- reagents.add_reagent("capsaicin", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2)
/obj/item/reagent_containers/food/snacks/yellowcurry
name = "yellow curry"
@@ -5876,7 +5876,7 @@
/obj/item/reagent_containers/food/snacks/yellowcurry/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/bearburger
name = "bearburger"
@@ -5888,7 +5888,7 @@
/obj/item/reagent_containers/food/snacks/bearburger/Initialize()
. = ..()
- reagents.add_reagent("protein", 4) //So spawned burgers will not be empty I guess?
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4) //So spawned burgers will not be empty I guess?
/obj/item/reagent_containers/food/snacks/bibimbap
name = "bibimbap bowl"
@@ -5897,13 +5897,13 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#4f2100"
nutriment_amt = 10
- nutriment_desc = list("egg" = 5, "vegetables" = 5)
+ nutriment_desc = list(REAGENT_ID_EGG = 5, "vegetables" = 5)
center_of_mass = list("x"=15, "y"=9)
bitesize = 4
/obj/item/reagent_containers/food/snacks/bibimbap/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/lomein
name = "lo mein"
@@ -5919,7 +5919,7 @@
/obj/item/reagent_containers/food/snacks/lomein/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/friedrice
name = "fried rice"
@@ -5929,7 +5929,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
nutriment_amt = 7
- nutriment_desc = list("rice" = 7)
+ nutriment_desc = list(REAGENT_ID_RICE = 7)
center_of_mass = list("x"=17, "y"=11)
bitesize = 2
@@ -5945,7 +5945,7 @@
/obj/item/reagent_containers/food/snacks/chickenfillet/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/friedmushroom
name = "fried mushroom"
@@ -5959,7 +5959,7 @@
/obj/item/reagent_containers/food/snacks/friedmushroom/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/pisanggoreng
name = "pisang goreng"
@@ -5975,7 +5975,7 @@
/obj/item/reagent_containers/food/snacks/pisanggoreng/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/meatbun
name = "meat and leaf bun"
@@ -5989,7 +5989,7 @@
/obj/item/reagent_containers/food/snacks/meatbun/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/spicedmeatbun
name = "char sui meat bun"
@@ -6003,7 +6003,7 @@
/obj/item/reagent_containers/food/snacks/spicedmeatbun/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/custardbun
name = "custard bun"
@@ -6029,7 +6029,7 @@
/obj/item/reagent_containers/food/snacks/chickenmomo/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
/obj/item/reagent_containers/food/snacks/veggiemomo
name = "veggie momo"
@@ -6045,7 +6045,7 @@
/obj/item/reagent_containers/food/snacks/veggiemomo/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/risotto
name = "risotto"
@@ -6055,13 +6055,13 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#edd7d7"
nutriment_amt = 9
- nutriment_desc = list("savory rice" = 6, "cream" = 3)
+ nutriment_desc = list("savory rice" = 6, REAGENT_ID_CREAM = 3)
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
/obj/item/reagent_containers/food/snacks/risotto/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/risottoballs
name = "risotto balls"
@@ -6071,7 +6071,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#edd7d7"
nutriment_amt = 1
- nutriment_desc = list("batter" = 1)
+ nutriment_desc = list(REAGENT_ID_BATTER = 1)
center_of_mass = list("x"=15, "y"=9)
bitesize = 3
@@ -6082,14 +6082,14 @@
trash = /obj/item/trash/plate
filling_color = "#FFDF78"
nutriment_amt = 1
- nutriment_desc = list("egg" = 1)
+ nutriment_desc = list(REAGENT_ID_EGG = 1)
center_of_mass = list("x"=16, "y"=14)
bitesize = 2
/obj/item/reagent_containers/food/snacks/poachedegg/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
/obj/item/reagent_containers/food/snacks/ribplate
name = "plate of ribs"
@@ -6098,16 +6098,16 @@
trash = /obj/item/trash/plate
filling_color = "#7A3D11"
nutriment_amt = 6
- nutriment_desc = list("barbecue" = 6)
+ nutriment_desc = list(REAGENT_ID_BARBECUE = 6)
center_of_mass = list("x"=16, "y"=13)
bitesize = 4
/obj/item/reagent_containers/food/snacks/ribplate/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("triglyceride", 2)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("honey", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 2)
+ reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1)
+ reagents.add_reagent(REAGENT_ID_HONEY, 5)
/obj/item/reagent_containers/food/snacks/omurice
name = "omelette rice"
@@ -6116,7 +6116,7 @@
icon_state = "omurice"
trash = /obj/item/trash/plate
nutriment_amt = 8
- nutriment_desc = list("rice" = 4, "egg" = 4)
+ nutriment_desc = list(REAGENT_ID_RICE = 4, REAGENT_ID_EGG = 4)
bitesize = 1
/obj/item/reagent_containers/food/snacks/omurice/heart
@@ -6142,7 +6142,7 @@
////////////////////////////////////////////////////////////////////////////
/obj/item/reagent_containers/food/snacks/mint
- name = "mint"
+ name = REAGENT_ID_MINT
desc = "it is only wafer thin."
icon_state = "mint"
filling_color = "#F2F2F2"
@@ -6151,7 +6151,7 @@
/obj/item/reagent_containers/food/snacks/mint/Initialize()
. = ..()
- reagents.add_reagent("mint", 1)
+ reagents.add_reagent(REAGENT_ID_MINT, 1)
/obj/item/reagent_containers/food/snacks/mint/admints
desc = "Spearmint, peppermint's non-festive cousin."
@@ -6216,12 +6216,12 @@
icon_state = "proteinbar"
trash = /obj/item/trash/candy/proteinbar
nutriment_amt = 9
- nutriment_desc = list("candy" = 1, "protein" = 8)
+ nutriment_desc = list("candy" = 1, REAGENT_ID_PROTEIN = 8)
bitesize = 6
/obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/candy/gummy
@@ -6296,7 +6296,7 @@
icon_state = "cb02"
trash = /obj/item/trash/candy/cb02
nutriment_amt = 4
- nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "caramel" = 1, "puffed rice" = 1)
w_class = 1
bitesize = 2
@@ -6313,7 +6313,7 @@
icon_state = "cb03"
trash = /obj/item/trash/candy/cb03
nutriment_amt = 4
- nutriment_desc = list("chocolate" = 4)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 4)
w_class = 1
bitesize = 2
@@ -6330,7 +6330,7 @@
icon_state = "cb04"
trash = /obj/item/trash/candy/cb04
nutriment_amt = 4
- nutriment_desc = list("chocolate" = 2, "salt = 1", "licorice" = 1)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "salt = 1", "licorice" = 1)
w_class = 1
bitesize = 2
@@ -6364,14 +6364,14 @@
icon_state = "cb06"
trash = /obj/item/trash/candy/cb06
nutriment_amt = 4
- nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, REAGENT_ID_COFFEE = 1, "vanilla wafer" = 1)
w_class = 1
bitesize = 3
/obj/item/reagent_containers/food/snacks/cb06/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
- reagents.add_reagent("coffee", 1)
+ reagents.add_reagent(REAGENT_ID_COFFEE, 1)
/obj/item/reagent_containers/food/snacks/cb07
name = "\improper TaroMilk Bar"
@@ -6382,7 +6382,7 @@
icon_state = "cb07"
trash = /obj/item/trash/candy/cb07
nutriment_amt = 4
- nutriment_desc = list("chocolate" = 2, "taro" = 2)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "taro" = 2)
w_class = 1
bitesize = 3
@@ -6399,7 +6399,7 @@
icon_state = "cb08"
trash = /obj/item/trash/candy/cb08
nutriment_amt = 3
- nutriment_desc = list("chocolate" = 2, "malt puffs" = 1)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "malt puffs" = 1)
w_class = 1
bitesize = 3
@@ -6423,8 +6423,8 @@
/obj/item/reagent_containers/food/snacks/cb09/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
- reagents.add_reagent("milk", 1)
- reagents.add_reagent("peanutoil", 1)
+ reagents.add_reagent(REAGENT_ID_MILK, 1)
+ reagents.add_reagent(REAGENT_ID_PEANUTOIL, 1)
/obj/item/reagent_containers/food/snacks/cb10
name = "\improper Shantak Bar"
@@ -6435,15 +6435,15 @@
icon_state = "cb10"
trash = /obj/item/trash/candy/cb10
nutriment_amt = 5
- nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1)
w_class = 1
bitesize = 3
/obj/item/reagent_containers/food/snacks/cb10/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
- reagents.add_reagent("protein", 1)
- reagents.add_reagent("peanutoil", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
+ reagents.add_reagent(REAGENT_ID_PEANUTOIL, 1)
////////////////////Misc Vend Items////////////////////////////////////////////////////////////////
@@ -6478,7 +6478,7 @@
icon_state = "chips_snv"
trash = /obj/item/trash/chips/snv
nutriment_amt = 3
- nutriment_desc = list("salt" = 1, "vinegar" = 2)
+ nutriment_desc = list("salt" = 1, REAGENT_ID_VINEGAR = 2)
/obj/item/reagent_containers/food/snacks/tastybread
name = "bread tube"
@@ -6519,7 +6519,7 @@
/obj/item/reagent_containers/food/snacks/sosjerky/Initialize()
. =..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/unajerky
name = "Moghes Imported Sissalik Jerky"
@@ -6536,8 +6536,8 @@
/obj/item/reagent_containers/food/snacks/unajerky/Initialize()
. =..()
- reagents.add_reagent("protein", 8)
- reagents.add_reagent("capsaicin", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2)
/obj/item/reagent_containers/food/snacks/tuna
name = "\improper Tuna Snax"
@@ -6554,7 +6554,7 @@
/obj/item/reagent_containers/food/snacks/tuna/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/pistachios
name = "pistachios"
@@ -6594,7 +6594,7 @@
/obj/item/reagent_containers/food/snacks/squid/true/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/croutons
name = "\improper Suhariki"
@@ -6622,7 +6622,7 @@
/obj/item/reagent_containers/food/snacks/salo/true/Initialize()
. = ..()
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/driedfish
name = "\improper Vobla"
@@ -6638,7 +6638,7 @@
/obj/item/reagent_containers/food/snacks/driedfish/Initialize()
.=..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no Raisins"
@@ -6676,7 +6676,7 @@
filling_color = "#FFA305"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 4
- nutriment_desc = list("cheese" = 5, "chips" = 2)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 5, "chips" = 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/syndicake
@@ -6694,7 +6694,7 @@
/obj/item/reagent_containers/food/snacks/syndicake/Initialize()
. = ..()
- reagents.add_reagent("doctorsdelight", 5)
+ reagents.add_reagent(REAGENT_ID_DOCTORSDELIGHT, 5)
////////////////////sol_vend (Mars Mart)////////////////////////////////////////////////////
@@ -6730,7 +6730,7 @@
trash = /obj/item/trash/jupiter
filling_color = "#dc1919"
center_of_mass = list("x"=15, "y"=9)
- nutriment_desc = list("sweetness" = 4, "vanilla" = 1)
+ nutriment_desc = list("sweetness" = 4, REAGENT_ID_VANILLA = 1)
nutriment_amt = 5
bitesize = 2
@@ -6754,7 +6754,7 @@
trash = /obj/item/trash/mars
filling_color = "#d2c63f"
center_of_mass = list("x"=15, "y"=9)
- nutriment_desc = list("eggs" = 4, "potato" = 4, "mustard" = 2)
+ nutriment_desc = list("eggs" = 4, "potato" = 4, REAGENT_ID_MUSTARD = 2)
nutriment_amt = 8
bitesize = 2
@@ -6772,7 +6772,7 @@
/obj/item/reagent_containers/food/snacks/venus/Initialize()
.=..()
- reagents.add_reagent("capsaicin", 5)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 5)
/obj/item/reagent_containers/food/snacks/sun_snax
name = "\improper Sun Snax!"
@@ -6788,7 +6788,7 @@
/obj/item/reagent_containers/food/snacks/sun_snax/Initialize()
.=..()
- reagents.add_reagent("capsaicin", 6)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 6)
/obj/item/reagent_containers/food/snacks/oort
name = "\improper Oort Cloud Rocks"
@@ -6804,7 +6804,7 @@
/obj/item/reagent_containers/food/snacks/oort/Initialize()
.=..()
- reagents.add_reagent("frostoil",5)
+ reagents.add_reagent(REAGENT_ID_FROSTOIL,5)
/obj/item/reagent_containers/food/snacks/pretzels
name = "\improper Value Pretzel Snack"
@@ -6838,7 +6838,7 @@
icon = 'icons/obj/food_snacks.dmi'
icon_state = "ricecake"
desc = "Ancient earth snack food made from balled up rice."
- nutriment_desc = list("rice" = 4, "sweetness" = 1)
+ nutriment_desc = list(REAGENT_ID_RICE = 4, "sweetness" = 1)
nutriment_amt = 5
bitesize = 2
@@ -6872,7 +6872,7 @@
/obj/item/reagent_containers/food/snacks/weebonuts/Initialize()
.=..()
- reagents.add_reagent("capsaicin",1)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN,1)
/obj/item/reagent_containers/food/snacks/wasabi_peas
name = "\improper Hadokikku Peas"
@@ -6886,7 +6886,7 @@
/obj/item/reagent_containers/food/snacks/wasabi_peas/Initialize()
.=..()
- reagents.add_reagent("capsaicin",1)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN,1)
/obj/item/reagent_containers/food/snacks/chocobanana
name = "\improper Choco Banana"
@@ -6894,13 +6894,13 @@
icon_state = "chocobanana"
trash = /obj/item/trash/stick
desc = "A chocolate and sprinkles coated banana. On a stick."
- nutriment_desc = list("chocolate banana" = 4, "sprinkles" = 1)
+ nutriment_desc = list("chocolate banana" = 4, REAGENT_ID_SPRINKLES = 1)
nutriment_amt = 5
bitesize = 2
/obj/item/reagent_containers/food/snacks/chocobanana/Initialize()
.=..()
- reagents.add_reagent("sprinkles", 10)
+ reagents.add_reagent(REAGENT_ID_SPRINKLES, 10)
/obj/item/reagent_containers/food/snacks/goma_dango
name = "\improper Goma dango"
@@ -6908,7 +6908,7 @@
icon_state = "goma_dango"
trash = /obj/item/trash/stick
desc = "Sticky rice balls served on a skewer with a crispy rice flour outer layer and a thick red bean paste inner layer."
- nutriment_desc = list("rice" = 4, "earthy flavor" = 1)
+ nutriment_desc = list(REAGENT_ID_RICE = 4, "earthy flavor" = 1)
nutriment_amt = 5
bitesize = 2
@@ -6919,7 +6919,7 @@
trash = /obj/item/trash/stick
desc = "Three rice balls, each with a unique flavoring, served on a skewer. A traditional Japanese treat."
description_fluff = "Hanami dango is a traditional Japanese treat that is normally served during Hanami, a tradition dated back as early as the 8th century. Hanami, or cherry blossom viewing, is a spring time celebration that celebrates the cherry blossoms turning of color. It is a time of renewal, of life, and of beauty."
- nutriment_desc = list("rice" = 4, "earthy flavor" = 1)
+ nutriment_desc = list(REAGENT_ID_RICE = 4, "earthy flavor" = 1)
nutriment_amt = 5
bitesize = 2
@@ -6996,7 +6996,7 @@
/obj/item/reagent_containers/food/snacks/canned/beef/Initialize()
.=..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/beans
@@ -7007,13 +7007,13 @@
canned_open_state = "beans-open"
filling_color = "#ff6633"
center_of_mass = list("x"=15, "y"=9)
- nutriment_desc = list("beans" = 1, "tomato sauce" = 1)
+ nutriment_desc = list(REAGENT_BEANPROTEIN = 1, "tomato sauce" = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/canned/beans/Initialize()
.=..()
- reagents.add_reagent("bean_protein", 5)
- reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 5)
+ reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5)
/obj/item/reagent_containers/food/snacks/canned/tomato
name = "tomato soup"
@@ -7061,7 +7061,7 @@
/obj/item/reagent_containers/food/snacks/canned/caviar/Initialize()
. = ..()
- reagents.add_reagent("seafood", 5)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 5)
/obj/item/reagent_containers/food/snacks/canned/caviar/true
name = "\improper Classic Terran Caviar"
@@ -7076,7 +7076,7 @@
/obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize()
. = ..()
- reagents.add_reagent("seafood", 4)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 4)
reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 1)
/obj/item/reagent_containers/food/snacks/canned/maps
@@ -7091,7 +7091,7 @@
/obj/item/reagent_containers/food/snacks/canned/maps/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/appleberry
@@ -7107,7 +7107,7 @@
/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize()
. = ..()
- reagents.add_reagent("milk", 8)
+ reagents.add_reagent(REAGENT_ID_MILK, 8)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/canned/ntbeans
@@ -7122,8 +7122,8 @@
/obj/item/reagent_containers/food/snacks/canned/ntbeans/Initialize()
. = ..()
- reagents.add_reagent("bean_protein", 6)
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/canned/brainzsnax
name = "\improper BrainzSnax"
@@ -7175,7 +7175,7 @@
filling_color = "#ffffff"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 6
- nutriment_desc = list("sweetness" = 4, "vanilla" = 1)
+ nutriment_desc = list("sweetness" = 4, REAGENT_ID_VANILLA = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/packaged/darklunacake
@@ -7187,7 +7187,7 @@
filling_color = "#ffffff"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 6
- nutriment_desc = list("sweetness" = 4, "chocolate" = 1)
+ nutriment_desc = list("sweetness" = 4, REAGENT_ID_CHOCOLATE = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/packaged/mochicake
@@ -7199,7 +7199,7 @@
filling_color = "#ffffff"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 6
- nutriment_desc = list("sweetness" = 4, "rice" = 1)
+ nutriment_desc = list("sweetness" = 4, REAGENT_ID_RICE = 1)
bitesize = 2
//////////////Advanced Package Foods//////////////
@@ -7249,7 +7249,7 @@
/obj/item/reagent_containers/food/snacks/packaged/meatration/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/packaged/vegration
name = "veggie ration"
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index b236c3fd34..485b4ab093 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -8,8 +8,8 @@
/obj/item/reagent_containers/food/snacks/meat/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("triglyceride", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
+ reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 2)
src.bitesize = 1.5
/obj/item/reagent_containers/food/snacks/meat/cook()
@@ -55,7 +55,7 @@
/obj/item/reagent_containers/food/snacks/meat/chicken/Initialize()
. = ..()
- reagents.remove_reagent("triglyceride", INFINITY)
+ reagents.remove_reagent(REAGENT_ID_TRIGLYCERIDE, INFINITY)
//Chicken is low fat. Less total calories than other meats
/obj/item/reagent_containers/food/snacks/crabmeat
@@ -66,7 +66,7 @@
/obj/item/reagent_containers/food/snacks/crabmeat/Initialize()
. = ..()
- reagents.add_reagent("seafood", 2)
+ reagents.add_reagent(REAGENT_ID_SEAFOOD, 2)
/obj/item/reagent_containers/food/snacks/hugemushroomslice
name = "fungus slice"
@@ -102,7 +102,7 @@
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
. = ..()
- reagents.add_reagent("protein", 12)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 12)
reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
/obj/item/reagent_containers/food/snacks/xenomeat
@@ -115,7 +115,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
@@ -139,7 +139,7 @@
/obj/item/reagent_containers/food/snacks/rawturkey/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/meat/fox
name = "foxmeat"
@@ -154,7 +154,7 @@
/obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6)
bitesize = 6
@@ -168,7 +168,7 @@
/obj/item/reagent_containers/food/snacks/meat/worm/Initialize()
. = ..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
reagents.add_reagent(REAGENT_ID_PHORON, 3)
reagents.add_reagent(REAGENT_ID_MYELAMINE, 3)
src.bitesize = 3
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 204d150124..17cc46f6a9 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -6,12 +6,12 @@
icon_state = "sushi"
slice_path = /obj/item/reagent_containers/food/snacks/slice/sushi/filled
slices_num = 5
- nutriment_desc = list("rice" = 5, "fish" = 5)
+ nutriment_desc = list(REAGENT_ID_RICE = 5, "fish" = 5)
nutriment_amt = 15
/obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize()
. = ..()
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
bitesize = 5
/obj/item/reagent_containers/food/snacks/slice/sushi/filled
@@ -37,7 +37,7 @@
/obj/item/reagent_containers/food/snacks/goulash/Initialize()
. = ..()
- reagents.add_reagent("protein", 3) //For meaty things.
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3) //For meaty things.
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -51,7 +51,7 @@
/obj/item/reagent_containers/food/snacks/donerkebab/Initialize()
. = ..()
- reagents.add_reagent("protein", 2) //For meaty things.
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2) //For meaty things.
/obj/item/reagent_containers/food/snacks/roastbeef
@@ -65,7 +65,7 @@
/obj/item/reagent_containers/food/snacks/roastbeef/Initialize()
. = ..()
- reagents.add_reagent("protein", 4) //For meaty things.
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4) //For meaty things.
bitesize = 2
@@ -75,7 +75,7 @@
icon = 'icons/obj/food_vr.dmi'
icon_state = "reishiscup"
nutriment_amt = 3
- nutriment_desc = list("chocolate" = 4, "colors" = 2)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 4, "colors" = 2)
/obj/item/reagent_containers/food/snacks/reishicup/Initialize()
. = ..()
@@ -117,7 +117,7 @@
/obj/item/reagent_containers/food/snacks/chickenwing/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
bitesize = 3
@@ -128,7 +128,7 @@
icon_state = "hotandsoursoup"
trash = /obj/item/trash/asian_bowl
nutriment_amt = 6
- nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1)
+ nutriment_desc = list("spicyness" = 4, "sourness" = 4, REAGENT_ID_TOFU = 1)
eating_sound = 'sound/items/drink.ogg'
/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize()
@@ -161,7 +161,7 @@
/obj/item/reagent_containers/food/snacks/generalschicken/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/bugball
@@ -177,7 +177,7 @@
/obj/item/reagent_containers/food/snacks/bugball/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 7
@@ -192,7 +192,7 @@
/obj/item/reagent_containers/food/snacks/pillbug/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6)
bitesize = 6
@@ -206,7 +206,7 @@
/obj/item/reagent_containers/food/snacks/pillbug/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 3
@@ -234,7 +234,7 @@
/obj/item/reagent_containers/food/snacks/makaroni/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6)
bitesize = 7
@@ -261,7 +261,7 @@
/obj/item/reagent_containers/food/snacks/lobstercooked/Initialize()
. = ..()
bitesize = 5
- reagents.add_reagent("protein", 20)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 20)
reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
reagents.add_reagent(REAGENT_ID_IRON, 5)
@@ -287,7 +287,7 @@
/obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize()
. = ..()
bitesize = 5
- reagents.add_reagent("protein", 10)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 10)
/obj/item/reagent_containers/food/snacks/sliceable/monkfish
name = "extra large monkfish"
@@ -314,7 +314,7 @@
/obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize()
. = ..()
bitesize = 3
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
/obj/item/reagent_containers/food/snacks/monkfishcooked
name = "seasoned monkfish"
@@ -322,13 +322,13 @@
icon = 'icons/obj/food_vr.dmi'
icon_state = "monkfish_cooked"
nutriment_amt = 10
- nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2)
+ nutriment_desc = list("fish" = 3, REAGENT_ID_OIL = 1, "sweet chili" = 3, "spring onion" = 2)
trash = /obj/item/trash/fancyplate
/obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize()
. = ..()
bitesize = 4
- reagents.add_reagent("protein", 5)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains
name = "monkfish remains"
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize()
. = ..()
bitesize = 3
- reagents.add_reagent("protein", 20)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 20)
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
name = "slice of sharkmeat"
@@ -371,7 +371,7 @@
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize()
. = ..()
bitesize = 3
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/sharkmeatcooked
name = "shark steak"
@@ -386,7 +386,7 @@
/obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize()
. = ..()
bitesize = 3
- reagents.add_reagent("protein", 8)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 8)
/obj/item/reagent_containers/food/snacks/sharkmeatdip
name = "hot shark shank"
@@ -400,8 +400,8 @@
/obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize()
. = ..()
bitesize = 3
- reagents.add_reagent("capsaicin", 4)
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/sharkmeatcubes
name = "shark cubes"
@@ -415,7 +415,7 @@
/obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize()
. = ..()
bitesize = 10
- reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST.
+ reagents.add_reagent(REAGENT_ID_POTATOJUICE, 30) // for people who want to get fat, FAST.
/obj/item/reagent_containers/food/snacks/monkeycube/sobakacube
name = "sobaka cube"
@@ -492,7 +492,7 @@
/obj/item/reagent_containers/food/snacks/proteinslab/Initialize()
. = ..()
- reagents.add_reagent("protein", 30)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 30)
/obj/item/reagent_containers/food/snacks/cube/nutriment
name = "Nutriment cube"
@@ -546,7 +546,7 @@
icon_state = "honeybun"
bitesize = 2
nutriment_amt = 4
- nutriment_desc = list("honey" = 2, "pastry" = 1)
+ nutriment_desc = list(REAGENT_ID_HONEY = 2, "pastry" = 1)
/obj/item/reagent_containers/food/snacks/bun/Initialize()
. = ..()
@@ -569,12 +569,12 @@
desc = "The delicious combination of nachos and melting cheese."
icon_state = "cheesenachos"
nutriment_amt = 5
- nutriment_desc = list("salt" = 2, "cheese" = 3)
+ nutriment_desc = list("salt" = 2, REAGENT_ID_CHEESE = 3)
/obj/item/reagent_containers/food/snacks/cheesenachos/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/milosoup
@@ -630,7 +630,7 @@
/obj/item/reagent_containers/food/snacks/grub/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/grub_pink
@@ -692,7 +692,7 @@
/obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2)
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
bitesize = 4
/obj/item/reagent_containers/food/snacks/ant
@@ -707,8 +707,8 @@
/obj/item/reagent_containers/food/snacks/ant/Initialize()
. = ..()
- reagents.add_reagent("honey", 2)
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_HONEY, 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
bitesize = 1
/obj/item/reagent_containers/food/snacks/antball
@@ -721,7 +721,7 @@
/obj/item/reagent_containers/food/snacks/antball/Initialize()
. = ..()
- reagents.add_reagent("honey", 2)
+ reagents.add_reagent(REAGENT_ID_HONEY, 2)
bitesize = 1
/obj/item/reagent_containers/food/snacks/honey_candy
@@ -730,7 +730,7 @@
icon = 'icons/obj/food_vr.dmi'
icon_state = "candy_honey"
nutriment_amt = 4
- nutriment_desc = list("goo" = 1, "honey" = 1)
+ nutriment_desc = list("goo" = 1, REAGENT_ID_HONEY = 1)
slice_path = /obj/item/reagent_containers/food/snacks/antball
slices_num = 1
@@ -749,7 +749,7 @@
/obj/item/reagent_containers/food/snacks/locust/Initialize()
. = ..()
- reagents.add_reagent("protein", 1)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/locust_cooked
@@ -762,7 +762,7 @@
/obj/item/reagent_containers/food/snacks/locust_cooked/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/donkpocket/ascended
@@ -801,7 +801,7 @@
package = TRUE
trash = /obj/item/trash/ratveg
nutriment_amt = 3
- nutriment_desc = list("fresh mixed veggies" = 3, "vinegar" = 1)
+ nutriment_desc = list("fresh mixed veggies" = 3, REAGENT_ID_VINEGAR = 1)
/obj/item/reagent_containers/food/snacks/ratliquid
name = "Admiral's Choice Space-Safe Meal"
@@ -817,7 +817,7 @@
/obj/item/reagent_containers/food/snacks/ratliquid/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
/obj/item/reagent_containers/food/snacks/ratsteak
name = "altevian traditional steak"
@@ -830,7 +830,7 @@
/obj/item/reagent_containers/food/snacks/ratsteak/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
/obj/item/reagent_containers/food/snacks/ratfruitcake
name = "Premade Fruit Block"
@@ -917,7 +917,7 @@
package = TRUE
trash = /obj/item/trash/ratpacktaco
nutriment_amt = 2
- nutriment_desc = list("salsa sauce" = 2, "meat chunks" = 4, "cheese" = 3)
+ nutriment_desc = list("salsa sauce" = 2, "meat chunks" = 4, REAGENT_ID_CHEESE = 3)
/obj/item/reagent_containers/food/snacks/ratpackcake
name = "Instant Sweet Celebration"
@@ -953,11 +953,11 @@
icon_state = "jaffacake"
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list("chocolate" = 2, "orange" = 4, "cake" = 3)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "orange" = 4, "cake" = 3)
/obj/item/reagent_containers/food/snacks/bourbon/Initialize()
. = ..()
- reagents.add_reagent("coco", 2)
+ reagents.add_reagent(REAGENT_ID_COCO, 2)
/obj/item/storage/box/jaffacake //This is kinda like the donut box.
name = "Desatti Jaffa Cakes"
@@ -1002,7 +1002,7 @@
/obj/item/reagent_containers/food/snacks/winegum/white
icon_state = "winegum_white"
- nutriment_desc = list(REAGENT_ID_SUGAR = 5, "pineapplejuice" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_PINEAPPLEJUICE = 2)
/obj/item/storage/box/winegum //This is kinda like the donut box.
name = "Desatti Wine Gums"
@@ -1034,7 +1034,7 @@
/obj/item/reagent_containers/food/snacks/packaged/pasty/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/saucer
name = "Sherbert Saucer"
@@ -1072,7 +1072,7 @@
icon_state = "custard_cream"
nutriment_amt = 1
bitesize = 1
- nutriment_desc = list("biscuit" = 5, "cream" = 3, "custard" = 3)
+ nutriment_desc = list("biscuit" = 5, REAGENT_ID_CREAM = 3, "custard" = 3)
/obj/item/storage/box/custardcream //This is kinda like the donut box.
name = "Desatti Custard Creams"
@@ -1095,7 +1095,7 @@
icon_state = "bourbon"
nutriment_amt = 1
bitesize = 1
- nutriment_desc = list("biscuit" = 5, "cream" = 3, "chocolate" = 5)
+ nutriment_desc = list("biscuit" = 5, REAGENT_ID_CREAM = 3, REAGENT_ID_CHOCOLATE = 5)
/obj/item/storage/box/bourbon //This is kinda like the donut box.
name = "Desatti Bourbons"
@@ -1113,7 +1113,7 @@
/obj/item/reagent_containers/food/snacks/bourbon/Initialize()
. = ..()
- reagents.add_reagent("coco", 2)
+ reagents.add_reagent(REAGENT_ID_COCO, 2)
/obj/item/reagent_containers/food/snacks/packaged/sausageroll
name = "Sausage Roll"
@@ -1126,7 +1126,7 @@
/obj/item/reagent_containers/food/snacks/packaged/sausageroll/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/packaged/scotchegg
name = "Scotch Egg"
@@ -1135,11 +1135,11 @@
package_trash = /obj/item/trash/scotchegg
package_open_state = "scotchegg_open"
nutriment_amt = 3
- nutriment_desc = list("egg" = 5, "meat" = 5, "bread" = 2)
+ nutriment_desc = list(REAGENT_ID_EGG = 5, "meat" = 5, "bread" = 2)
/obj/item/reagent_containers/food/snacks/packaged/scotchegg/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
/obj/item/reagent_containers/food/snacks/foam_banana
name = "Foam Banana"
@@ -1149,7 +1149,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list(REAGENT_ID_SUGAR = 5, "banana" = 3)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_BANANA = 3)
/obj/item/reagent_containers/food/snacks/foam_shrimp
name = "Foam Shrimp"
@@ -1216,4 +1216,4 @@
/obj/item/reagent_containers/food/snacks/packaged/porkpie/Initialize()
. = ..()
- reagents.add_reagent("protein", 2)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 99e2fa3ba7..42a789a30b 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -1,7 +1,7 @@
// Chaos cake
/datum/recipe/chaoscake_layerone
- reagents = list("flour" = 30,"milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9)
+ reagents = list(REAGENT_ID_FLOUR = 30,REAGENT_ID_MILK = 20, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 9)
fruit = list("poisonberries" = 2, "cherries" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meat/,
@@ -12,8 +12,8 @@
result = /obj/structure/chaoscake
/datum/recipe/chaoscake_layertwo
- reagents = list("flour" = 30, "milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9, )
- fruit = list("vanilla" = 2, "banana" = 2)
+ reagents = list(REAGENT_ID_FLOUR = 30, REAGENT_ID_MILK = 20, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 9, )
+ fruit = list(REAGENT_ID_VANILLA = 2, REAGENT_ID_BANANA = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -23,7 +23,7 @@
result = /obj/item/chaoscake_layer
/datum/recipe/chaoscake_layerthree
- reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "deathbell" = 10)
+ reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, "deathbell" = 10)
fruit = list("grapes" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -33,7 +33,7 @@
result = /obj/item/chaoscake_layer/three
/datum/recipe/chaoscake_layerfour
- reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "milkshake" = 30)
+ reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_MILKSHAKE = 30)
fruit = list("rice" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -43,13 +43,13 @@
result = /obj/item/chaoscake_layer/four
/datum/recipe/chaoscake_layerfive
- reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, REAGENT_ID_BLOOD = 30)
+ reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_BLOOD = 30)
fruit = list("tomato" = 2)
items = list() //supposed to be made with lobster, still has to be ported.
result = /obj/item/chaoscake_layer/five
/datum/recipe/chaoscake_layersix
- reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, "sprinkles" = 5)
+ reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_SPRINKLES = 5)
fruit = list("apple" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -62,7 +62,7 @@
result = /obj/item/chaoscake_layer/six
/datum/recipe/chaoscake_layerseven
- reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "devilskiss" = 20)
+ reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, "devilskiss" = 20)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -72,7 +72,7 @@
result = /obj/item/chaoscake_layer/seven
/datum/recipe/chaoscake_layereight
- reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "cream" = 20)
+ reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_CREAM = 20)
fruit = list("lemon" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index 38b31aa67c..341a79c09b 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -161,14 +161,14 @@
desc = "A small bottle. Contains hot sauce."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("capsaicin" = 60)
+ prefill = list(REAGENT_ID_CAPSAICIN = 60)
/obj/item/reagent_containers/glass/bottle/frostoil
name = "frost oil bottle"
desc = "A small bottle. Contains cold sauce."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("frostoil" = 60)
+ prefill = list(REAGENT_ID_FROSTOIL = 60)
/obj/item/reagent_containers/glass/bottle/biomass
name = "biomass bottle"
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index c6328c6e38..86eda9b053 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -60,7 +60,7 @@
/obj/item/reagent_containers/glass/bottle/potion/growth
name = "fire giant potion"
desc = "A small green bottle containing some bubbling yellow liquid that claims to turn the drinker into a fire giant."
- prefill = list(REAGENT_ID_MACROCILLIN = 1, "capsaicin" = 5)
+ prefill = list(REAGENT_ID_MACROCILLIN = 1, REAGENT_ID_CAPSAICIN = 5)
/obj/item/reagent_containers/glass/bottle/potion/pain
name = "grit potion"
@@ -137,7 +137,7 @@
/obj/item/reagent_containers/glass/bottle/potion/capsaicin
name = "warm potion"
desc = "A small green bottle containing some red liquid."
- prefill = list("capsaicin" = 30)
+ prefill = list(REAGENT_ID_CAPSAICIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/soporific
name = "still potion"
diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm
index 157bbc0b7a..edceb1a80a 100644
--- a/code/modules/food/glass/bottle_vr.dm
+++ b/code/modules/food/glass/bottle_vr.dm
@@ -151,5 +151,5 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose/Initialize()
. = ..()
- reagents.add_reagent("glucose", 100)
+ reagents.add_reagent(REAGENT_ID_GLUCOSE, 100)
on_reagent_change()
diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm
index 067006e956..49700ae28a 100644
--- a/code/modules/food/kitchen/cooking_machines/_appliance.dm
+++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm
@@ -721,7 +721,7 @@
if(istype(src, /mob/living/carbon/human/diona) || istype(src, /mob/living/carbon/alien/diona))
src.composition_reagent = REAGENT_ID_NUTRIMENT // diona are plants, not meat
else
- src.composition_reagent = "protein"
+ src.composition_reagent = REAGENT_ID_PROTEIN
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
if(istype(H.species, /datum/species/diona))
diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm
index 57ed1bb7d5..d46a841be9 100644
--- a/code/modules/food/kitchen/cooking_machines/fryer.dm
+++ b/code/modules/food/kitchen/cooking_machines/fryer.dm
@@ -45,7 +45,7 @@
if(prob(20))
// Sometimes the fryer will start with much less than full oil, significantly impacting efficiency until filled
variance = rand()*0.5
- oil.add_reagent("cookingoil", optimal_oil*(1 - variance))
+ oil.add_reagent(REAGENT_ID_COOKINGOIL, optimal_oil*(1 - variance))
/obj/machinery/appliance/cooker/fryer/Destroy()
QDEL_NULL(fry_loop)
diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm
index fa9ac03798..d38bbdc653 100644
--- a/code/modules/food/kitchen/icecream.dm
+++ b/code/modules/food/kitchen/icecream.dm
@@ -24,17 +24,17 @@
/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type)
switch(type)
if(ICECREAM_CHOCOLATE)
- return list("milk", "ice", "coco")
+ return list(REAGENT_ID_MILK, "ice", REAGENT_ID_COCO)
if(ICECREAM_STRAWBERRY)
- return list("milk", "ice", "berryjuice")
+ return list(REAGENT_ID_MILK, "ice", REAGENT_ID_BERRYJUICE)
if(ICECREAM_BLUE)
- return list("milk", "ice", "singulo")
+ return list(REAGENT_ID_MILK, "ice", "singulo")
if(CONE_WAFFLE)
- return list("flour", REAGENT_ID_SUGAR)
+ return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR)
if(CONE_CHOC)
- return list("flour", REAGENT_ID_SUGAR, "coco")
+ return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR, REAGENT_ID_COCO)
else
- return list("milk", "ice")
+ return list(REAGENT_ID_MILK, "ice")
/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type)
switch(flavour_type)
@@ -56,8 +56,8 @@
create_reagents(100)
while(product_types.len < 6)
product_types.Add(5)
- reagents.add_reagent("milk", 5)
- reagents.add_reagent("flour", 5)
+ reagents.add_reagent(REAGENT_ID_MILK, 5)
+ reagents.add_reagent(REAGENT_ID_FLOUR, 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
reagents.add_reagent("ice", 5)
diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index 8b712a044f..9cd7ccd1bc 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -276,9 +276,9 @@
var/list/reagents_data = list()
for(var/datum/reagent/R in reagents.reagent_list)
var/display_name = R.name
- if(R.id == "capsaicin")
+ if(R.id == REAGENT_ID_CAPSAICIN)
display_name = "Hotsauce"
- if(R.id == "frostoil")
+ if(R.id == REAGENT_ID_FROSTOIL)
display_name = "Coldsauce"
UNTYPED_LIST_ADD(reagents_data, list(
"name" = display_name,
diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm
index 9d71101365..f656b31b87 100644
--- a/code/modules/food/recipe.dm
+++ b/code/modules/food/recipe.dm
@@ -31,7 +31,7 @@
* */
/datum/recipe
- var/list/reagents // Example: = list("berryjuice" = 5) // do not list same reagent twice
+ var/list/reagents // Example: = list(REAGENT_ID_BERRYJUICE = 5) // do not list same reagent twice
var/list/items // Example: = list(/obj/item/tool/crowbar, /obj/item/welder) // place /foo/bar before /foo
var/list/fruit // Example: = list("fruit" = 3)
var/coating = null // Required coating on all items in the recipe. The default value of null explitly requires no coating
diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm
index a73fb2e1bc..f137dd6c78 100644
--- a/code/modules/food/recipes_fryer.dm
+++ b/code/modules/food/recipes_fryer.dm
@@ -22,7 +22,7 @@
/datum/recipe/risottoballs
appliance = FRYER
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(/obj/item/reagent_containers/food/snacks/risotto)
coating = /datum/reagent/nutriment/coating/batter
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
@@ -120,7 +120,7 @@
/obj/item/reagent_containers/food/snacks/bacon,
/obj/item/reagent_containers/food/snacks/cutlet
)
- reagents = list("soysauce" = 5, "batter" = 10)
+ reagents = list(REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_BATTER = 10)
result = /obj/item/reagent_containers/food/snacks/sweet_and_sour
//Sweet Recipes.
@@ -128,7 +128,7 @@
// All donuts were given reagents of 5 to equal old recipes and make for faster cook times.
/datum/recipe/jellydonut
appliance = FRYER
- reagents = list("berryjuice" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_BERRYJUICE = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -136,7 +136,7 @@
result_quantity = 2
/datum/recipe/jellydonut/poisonberry
- reagents = list("poisonberryjuice" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_POISONBERRYJUICE = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -147,7 +147,7 @@
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly
/datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies.
- reagents = list("cherryjelly" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_CHERRYJELLY = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly
/datum/recipe/donut
@@ -161,7 +161,7 @@
/datum/recipe/chaosdonut
appliance = FRYER
- reagents = list("frostoil" = 10, "capsaicin" = 10, REAGENT_ID_SUGAR = 10)
+ reagents = list(REAGENT_ID_FROSTOIL = 10, REAGENT_ID_CAPSAICIN = 10, REAGENT_ID_SUGAR = 10)
reagent_mix = RECIPE_REAGENT_REPLACE //This creates its own reagents
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
@@ -171,7 +171,7 @@
/datum/recipe/funnelcake
appliance = FRYER
- reagents = list(REAGENT_ID_SUGAR = 5, "batter" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_BATTER = 10)
result = /obj/item/reagent_containers/food/snacks/funnelcake
result_quantity = 2
@@ -185,7 +185,7 @@
//VOREStation Add Start
/datum/recipe/generalschicken
appliance = FRYER
- reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
+ reagents = list(REAGENT_ID_CAPSAICIN = 2, REAGENT_ID_SUGAR = 2, REAGENT_ID_BATTER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
@@ -194,7 +194,7 @@
/datum/recipe/chickenwings
appliance = FRYER
- reagents = list("capsaicin" = 5, "batter" = 10)
+ reagents = list(REAGENT_ID_CAPSAICIN = 5, REAGENT_ID_BATTER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
diff --git a/code/modules/food/recipes_fryer_vr.dm b/code/modules/food/recipes_fryer_vr.dm
index 9b2bc5d49d..a0f7689eeb 100644
--- a/code/modules/food/recipes_fryer_vr.dm
+++ b/code/modules/food/recipes_fryer_vr.dm
@@ -1,6 +1,6 @@
/datum/recipe/generalschicken
appliance = FRYER
- reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
+ reagents = list(REAGENT_ID_CAPSAICIN = 2, REAGENT_ID_SUGAR = 2, REAGENT_ID_BATTER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
@@ -9,7 +9,7 @@
/datum/recipe/chickenwings
appliance = FRYER
- reagents = list("capsaicin" = 5, "batter" = 10)
+ reagents = list(REAGENT_ID_CAPSAICIN = 5, REAGENT_ID_BATTER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm
index eda4541ba0..9598c6732f 100644
--- a/code/modules/food/recipes_grill.dm
+++ b/code/modules/food/recipes_grill.dm
@@ -179,14 +179,14 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
)
- reagents = list("egg" = 3)
+ reagents = list(REAGENT_ID_EGG = 3)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/bigbiteburger
/datum/recipe/superbiteburger
appliance = GRILL
fruit = list("tomato" = 1)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, "blackpepper" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, REAGENT_ID_BLACKPEPPER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bigbiteburger,
/obj/item/reagent_containers/food/snacks/dough,
@@ -206,7 +206,7 @@
/datum/recipe/jellyburger
appliance = GRILL
- reagents = list("cherryjelly" = 5)
+ reagents = list(REAGENT_ID_CHERRYJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
@@ -236,34 +236,34 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge,
)
- reagents = list("egg" = 6)
+ reagents = list(REAGENT_ID_EGG = 6)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/omelette
/datum/recipe/omurice
appliance = GRILL
- reagents = list("rice" = 5, "ketchup" = 5, "egg" = 3)
+ reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_KETCHUP = 5, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/omurice
/datum/recipe/omurice/heart
appliance = GRILL
- reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3)
+ reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_KETCHUP = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/heart
/datum/recipe/omurice/face
appliance = GRILL
- reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "egg" = 3)
+ reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_KETCHUP = 5, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/face
/datum/recipe/meatsteak
appliance = GRILL
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/meatsteak
/datum/recipe/honeytoast
appliance = GRILL
- reagents = list("honey" = 5)
+ reagents = list(REAGENT_ID_HONEY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread
)
@@ -280,7 +280,7 @@
/obj/item/reagent_containers/food/snacks/carpmeat,
/obj/item/reagent_containers/food/snacks/carpmeat
)
- reagents = list("spacespice" = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1)
fruit = list("lettuce" = 1, "lime" = 1)
result = /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp
@@ -307,7 +307,7 @@
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
- reagents = list("spacespice" = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1)
result = /obj/item/reagent_containers/food/snacks/cheesetoast
result_quantity = 4
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 0ce5cde979..afcae6ebe3 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -20,7 +20,7 @@ I said no!
*/
/datum/recipe/friedegg
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
@@ -36,7 +36,7 @@ I said no!
/datum/recipe/devilledegg
fruit = list("chili" = 1)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "mayo" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_MAYO = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -67,7 +67,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
/datum/recipe/muffin
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -85,12 +85,12 @@ I said no!
/datum/recipe/soylenviridians
fruit = list("soybeans" = 1)
- reagents = list("flour" = 10)
+ reagents = list(REAGENT_ID_FLOUR = 10)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/soylenviridians
/datum/recipe/soylentgreen
- reagents = list("flour" = 10)
+ reagents = list(REAGENT_ID_FLOUR = 10)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/meat/human,
@@ -113,7 +113,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/berryclafoutis/poison
/datum/recipe/wingfangchu
- reagents = list("soysauce" = 5)
+ reagents = list(REAGENT_ID_SOYSAUCE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/xenomeat
)
@@ -165,7 +165,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fortunecookie
/datum/recipe/syntisteak
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat/syntiflesh)
result = /obj/item/reagent_containers/food/snacks/meatsteak
@@ -195,7 +195,7 @@ I said no!
/datum/recipe/nettlesoup
fruit = list("nettle" = 1, "potato" = 1)
- reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/nettlesoup
/datum/recipe/wishsoup
@@ -229,7 +229,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/sandwich
/datum/recipe/peanutbutterjellysandwich
- reagents = list("cherryjelly" = 5, "peanutbutter" = 5)
+ reagents = list(REAGENT_ID_CHERRYJELLY = 5, REAGENT_ID_PEANUTBUTTER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread
@@ -237,7 +237,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter
/datum/recipe/clubsandwich
- reagents = list("mayo" = 5)
+ reagents = list(REAGENT_ID_MAYO = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
@@ -276,7 +276,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
/datum/recipe/jelliedtoast
- reagents = list("cherryjelly" = 5)
+ reagents = list(REAGENT_ID_CHERRYJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
)
@@ -308,11 +308,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/boiledspagetti
/datum/recipe/boiledrice
- reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10)
result = /obj/item/reagent_containers/food/snacks/boiledrice
/datum/recipe/ricepudding
- reagents = list("milk" = 5, "rice" = 10)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_RICE = 10)
result = /obj/item/reagent_containers/food/snacks/ricepudding
/datum/recipe/pastatomato
@@ -348,7 +348,7 @@ I said no!
/datum/recipe/caramelapple
fruit = list("apple" = 1)
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate
result = /obj/item/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
@@ -368,7 +368,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime
/datum/recipe/cherrysandwich
- reagents = list("cherryjelly" = 5)
+ reagents = list(REAGENT_ID_CHERRYJELLY = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
@@ -408,14 +408,14 @@ I said no!
/datum/recipe/kudzudonburi
fruit = list("kudzu" = 1)
- reagents = list("rice" = 10)
+ reagents = list(REAGENT_ID_RICE = 10)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/reagent_containers/food/snacks/kudzudonburi
/datum/recipe/mysterysoup
- reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_EGG = 3)
items = list(
/obj/item/reagent_containers/food/snacks/badrecipe,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -426,19 +426,19 @@ I said no!
/datum/recipe/plumphelmetbiscuit
fruit = list("plumphelmet" = 1)
- reagents = list(REAGENT_ID_WATER = 5, "flour" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_FLOUR = 5)
result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
result_quantity = 2
/datum/recipe/mushroomsoup
fruit = list("mushroom" = 1)
- reagents = list(REAGENT_ID_WATER = 5, "milk" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_MILK = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/mushroomsoup
/datum/recipe/chawanmushi
fruit = list("mushroom" = 1)
- reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5, "egg" = 6)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_EGG = 6)
result = /obj/item/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
@@ -487,7 +487,7 @@ I said no!
being_cooked.reagents.del_reagent(REAGENT_ID_TOXIN)
/datum/recipe/stuffing
- reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/bread,
)
@@ -502,7 +502,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/mashedpotato
/datum/recipe/icecreamsandwich
- reagents = list("milk" = 5, "ice" = 5)
+ reagents = list(REAGENT_ID_MILK = 5, "ice" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/icecream
)
@@ -539,7 +539,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cutlet
/datum/recipe/roastedcornsunflowerseeds
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cornoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_CORNOIL = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -547,7 +547,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedsunflowerseeds
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cookingoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_COOKINGOIL = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -555,7 +555,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedpeanutsunflowerseeds
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "peanutoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_PEANUTOIL = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -564,28 +564,28 @@ I said no!
/datum/recipe/roastedpeanuts
fruit = list("peanut" = 2)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cookingoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_COOKINGOIL = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutscorn
fruit = list("peanut" = 2)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cornoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_CORNOIL = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutspeanut
fruit = list("peanut" = 2)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "peanutoil" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_PEANUTOIL = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/mint
- reagents = list(REAGENT_ID_SUGAR = 5, "frostoil" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_FROSTOIL = 5)
result = /obj/item/reagent_containers/food/snacks/mint
/datum/recipe/sashimi
- reagents = list("soysauce" = 5)
+ reagents = list(REAGENT_ID_SOYSAUCE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -601,19 +601,19 @@ I said no!
/datum/recipe/bakedbeans
fruit = list("soybeans" = 2)
- reagents = list("ketchup" = 5)
+ reagents = list(REAGENT_ID_KETCHUP = 5)
result = /obj/item/reagent_containers/food/snacks/beans
/datum/recipe/sugarcookie
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
- reagents = list(REAGENT_ID_SUGAR = 5, "egg" = 3)
+ reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
result_quantity = 4
/datum/recipe/berrymuffin
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -622,7 +622,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonberrymuffin
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -631,7 +631,7 @@ I said no!
result_quantity = 2
/datum/recipe/ghostmuffin
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -641,7 +641,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonghostmuffin
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -651,7 +651,7 @@ I said no!
result_quantity = 2
/datum/recipe/eggroll
- reagents = list("soysauce" = 10)
+ reagents = list(REAGENT_ID_SOYSAUCE = 10)
items = list(
/obj/item/reagent_containers/food/snacks/friedegg
)
@@ -663,11 +663,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fruitsalad
/datum/recipe/eggbowl
- reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/eggbowl
/datum/recipe/porkbowl
- reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet
)
@@ -675,7 +675,7 @@ I said no!
/datum/recipe/cubannachos
fruit = list("chili" = 1)
- reagents = list("ketchup" = 5)
+ reagents = list(REAGENT_ID_KETCHUP = 5)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
)
@@ -683,7 +683,7 @@ I said no!
/datum/recipe/curryrice
fruit = list("chili" = 1)
- reagents = list("rice" = 10)
+ reagents = list(REAGENT_ID_RICE = 10)
result = /obj/item/reagent_containers/food/snacks/curryrice
/datum/recipe/piginblanket
@@ -754,7 +754,7 @@ I said no!
//to reduce the risk of future recipe conflicts.
/datum/recipe/redcurry
- reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5)
+ reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet,
/obj/item/reagent_containers/food/snacks/cutlet
@@ -763,7 +763,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/redcurry
/datum/recipe/greencurry
- reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5)
+ reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5)
fruit = list("chili" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu,
@@ -773,7 +773,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/greencurry
/datum/recipe/yellowcurry
- reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5)
+ reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5)
fruit = list("peanut" = 2, "potato" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/yellowcurry
@@ -793,7 +793,7 @@ I said no!
/datum/recipe/bibimbap
fruit = list("carrot" = 1, "cabbage" = 1, "mushroom" = 1)
- reagents = list("rice" = 5, "spacespice" = 2)
+ reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_SPACESPICE = 2)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/cutlet
@@ -802,13 +802,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bibimbap
/datum/recipe/friedrice
- reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "soysauce" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SOYSAUCE = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/friedrice
/datum/recipe/lomein
- reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti
@@ -833,13 +833,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/chilicheesefries
/datum/recipe/risotto
- reagents = list("redwine" = 5, "rice" = 10, "spacespice" = 1)
+ reagents = list("redwine" = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1)
fruit = list("mushroom" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here
result = /obj/item/reagent_containers/food/snacks/risotto
/datum/recipe/poachedegg
- reagents = list("spacespice" = 1, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, REAGENT_ID_WATER = 5)
+ reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
@@ -847,7 +847,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/poachedegg
/datum/recipe/nugget
- reagents = list("flour" = 5)
+ reagents = list(REAGENT_ID_FLOUR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meat/chicken
)
@@ -857,7 +857,7 @@ I said no!
// Chip update
/datum/recipe/microwavetortilla
- reagents = list("flour" = 5, REAGENT_ID_WATER = 5)
+ reagents = list(REAGENT_ID_FLOUR = 5, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -889,13 +889,13 @@ I said no!
/datum/recipe/salsa
fruit = list("chili" = 1, "tomato" = 1, "lime" = 1)
- reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/dip/salsa
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/guac
fruit = list("chili" = 1, "lime" = 1)
- reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -904,7 +904,7 @@ I said no!
/datum/recipe/cheesesauce
fruit = list("chili" = 1, "tomato" = 1)
- reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge
)
@@ -917,7 +917,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball
)
- reagents = list("spacespice" = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1)
result = /obj/item/reagent_containers/food/snacks/burrito
/datum/recipe/burrito_vegan
@@ -947,7 +947,7 @@ I said no!
/datum/recipe/burrito_hell
fruit = list("soybeans" = 1, "chili" = 10)
- reagents = list("spacespice" = 1)
+ reagents = list(REAGENT_ID_SPACESPICE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -1045,7 +1045,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/sausage,
/obj/item/reagent_containers/food/snacks/meatsteak
)
- reagents = list("egg" = 6)
+ reagents = list(REAGENT_ID_EGG = 6)
result = /obj/item/reagent_containers/food/snacks/father_breakfast
/datum/recipe/stuffed_meatball
@@ -1063,7 +1063,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball
)
- reagents = list("egg" = 6)
+ reagents = list(REAGENT_ID_EGG = 6)
result = /obj/item/reagent_containers/food/snacks/egg_pancake
/datum/recipe/bacon_stick
@@ -1108,7 +1108,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/blt
/datum/recipe/gigapuddi
- reagents = list("milk" = 15)
+ reagents = list(REAGENT_ID_MILK = 15)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -1116,7 +1116,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi
/datum/recipe/gigapuddi/happy
- reagents = list("milk" = 15, REAGENT_ID_SUGAR = 5)
+ reagents = list(REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -1124,7 +1124,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi/happy
/datum/recipe/gigapuddi/anger
- reagents = list("milk" = 15, REAGENT_ID_SODIUMCHLORIDE = 5)
+ reagents = list(REAGENT_ID_MILK = 15, REAGENT_ID_SODIUMCHLORIDE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm
index 9e68234e4a..a8bd085784 100644
--- a/code/modules/food/recipes_microwave_vr.dm
+++ b/code/modules/food/recipes_microwave_vr.dm
@@ -12,7 +12,7 @@
/datum/recipe/sushi
fruit = list("cabbage" = 1)
- reagents = list("rice" = 20)
+ reagents = list(REAGENT_ID_RICE = 20)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
@@ -54,14 +54,14 @@
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "blackpepper" = 2, REAGENT_ID_WATER = 10)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_BLACKPEPPER = 2, REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
result = /obj/item/reagent_containers/food/snacks/hotandsoursoup
/datum/recipe/kitsuneudon
- reagents = list("egg" = 3)
+ reagents = list(REAGENT_ID_EGG = 3)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/tofu
@@ -77,11 +77,11 @@
/datum/recipe/mammi
fruit = list("orange" = 1)
- reagents = list(REAGENT_ID_WATER = 10, "flour" = 10, "milk" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
+ reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_FLOUR = 10, REAGENT_ID_MILK = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/mammi
/datum/recipe/makaroni
- reagents = list("flour" = 15, "milk" = 5)
+ reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meat/grubmeat,
/obj/item/reagent_containers/food/snacks/egg,
@@ -92,7 +92,7 @@
/datum/recipe/carpsushi
fruit = list("cabbage" = 1)
- reagents = list("rice" = 20)
+ reagents = list(REAGENT_ID_RICE = 20)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat,
/obj/item/reagent_containers/food/snacks/carpmeat,
@@ -121,7 +121,7 @@
result = /obj/item/reagent_containers/food/snacks/monkfishcooked
/datum/recipe/sharksteak
- reagents = list("blackpepper"= 1, REAGENT_ID_SODIUMCHLORIDE = 1)
+ reagents = list(REAGENT_ID_BLACKPEPPER= 1, REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
@@ -136,7 +136,7 @@
result = /obj/item/reagent_containers/food/snacks/sharkmeatdip
/datum/recipe/sharkcubes
- reagents = list("soysauce" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
+ reagents = list(REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -146,7 +146,7 @@
//// food cubes
/datum/recipe/foodcubes
- reagents = list("enzyme" = 20, "virusfood" = 5, REAGENT_ID_NUTRIMENT = 15, "protein" = 15) // labor intensive
+ reagents = list(REAGENT_ID_ENZYME = 20, REAGENT_ID_VIRUSFOOD = 5, REAGENT_ID_NUTRIMENT = 15, REAGENT_ID_PROTEIN = 15) // labor intensive
items = list()
result = /obj/item/storage/box/wings/tray
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index d08f88b8e4..e5c84673c0 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -19,7 +19,7 @@
/datum/recipe/monkeysdelight
appliance = OVEN
fruit = list("banana" = 1)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "flour" = 10)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_FLOUR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/monkeycube
)
@@ -28,7 +28,7 @@
/datum/recipe/ribplate
appliance = OVEN
- reagents = list("honey" = 5, "spacespice" = 2, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_HONEY = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_BLACKPEPPER = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/ribplate
@@ -36,7 +36,7 @@
/* OLD RECIPE
/datum/recipe/turkey
appliance = OVEN
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -47,7 +47,7 @@
/datum/recipe/turkey
appliance = OVEN
fruit = list("potato" = 1)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawturkey,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -56,7 +56,7 @@
/datum/recipe/tofurkey
appliance = OVEN
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -91,12 +91,12 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "yeast" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_YEAST = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/baguette
appliance = OVEN
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "yeast" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_YEAST = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -136,7 +136,7 @@
/datum/recipe/tortilla
appliance = OVEN
- reagents = list("flour" = 5)
+ reagents = list(REAGENT_ID_FLOUR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -182,7 +182,7 @@
/datum/recipe/bananabread
appliance = OVEN
fruit = list("banana" = 1)
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -278,13 +278,13 @@
/datum/recipe/keylimepie
appliance = OVEN
fruit = list("lime" = 2)
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3, "flour" = 10)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10)
result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie
reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise
/datum/recipe/quiche
appliance = OVEN
- reagents = list("milk" = 5, "egg" = 9, "flour" = 10)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_EGG = 9, REAGENT_ID_FLOUR = 10)
items = list(/obj/item/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/reagent_containers/food/snacks/sliceable/quiche
reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise
@@ -294,7 +294,7 @@
/datum/recipe/cookie
appliance = OVEN
- reagents = list("milk" = 10, REAGENT_ID_SUGAR = 10)
+ reagents = list(REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/chocolatebar
@@ -329,13 +329,13 @@
/datum/recipe/brownies
appliance = OVEN
- reagents = list("browniemix" = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_BROWNIEMIX = 10, REAGENT_ID_EGG = 3)
reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe
result = /obj/item/reagent_containers/food/snacks/sliceable/brownies
/datum/recipe/cosmicbrownies
appliance = OVEN
- reagents = list("browniemix" = 10, "egg" = 3)
+ reagents = list(REAGENT_ID_BROWNIEMIX = 10, REAGENT_ID_EGG = 3)
fruit = list("ambrosia" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe
result = /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies
@@ -343,12 +343,12 @@
/datum/recipe/buchedenoel
appliance = OVEN
fruit = list("berries" = 2)
- reagents = list("cakebatter" = 20, "cream" = 10, "coco" = 5)
+ reagents = list(REAGENT_ID_CAKEBATTER = 20, REAGENT_ID_CREAM = 10, REAGENT_ID_COCO = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel
/datum/recipe/cinnamonbun
appliance = OVEN
- reagents = list(REAGENT_ID_SUGAR = 15, "cream" = 10)
+ reagents = list(REAGENT_ID_SUGAR = 15, REAGENT_ID_CREAM = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -358,7 +358,7 @@
/datum/recipe/jaffacake
appliance = OVEN
fruit = list("orange" = 1)
- reagents = list("cakebatter" = 15, "coco" = 10)
+ reagents = list(REAGENT_ID_CAKEBATTER = 15, REAGENT_ID_COCO = 10)
result = /obj/item/reagent_containers/food/snacks/jaffacake
result_quantity = 6
@@ -448,19 +448,19 @@
//============
/datum/recipe/cake
appliance = OVEN
- reagents = list("cakebatter" = 30, "vanilla" = 2)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_VANILLA = 2)
result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/cake/carrot
appliance = OVEN
fruit = list("carrot" = 3)
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake
/datum/recipe/cake/cheese
appliance = OVEN
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -469,53 +469,53 @@
/datum/recipe/cake/peanut
fruit = list("peanut" = 1)
- reagents = list("cakebatter" = 30, "peanutbutter" = 5)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_PEANUTBUTTER = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/peanutcake
/datum/recipe/cake/orange
appliance = OVEN
fruit = list("orange" = 2)
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/orangecake
/datum/recipe/cake/lime
appliance = OVEN
fruit = list("lime" = 2)
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/limecake
/datum/recipe/cake/lemon
appliance = OVEN
fruit = list("lemon" = 2)
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake
/datum/recipe/cake/chocolate
appliance = OVEN
- reagents = list("cakebatter" = 30, "coco" = 5)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_COCO = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
/datum/recipe/cake/birthday
appliance = OVEN
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
items = list(/obj/item/clothing/head/cakehat)
result = /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
/datum/recipe/cake/apple
appliance = OVEN
fruit = list("apple" = 2)
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/applecake
/datum/recipe/cake/brain
appliance = OVEN
- reagents = list("cakebatter" = 30)
+ reagents = list(REAGENT_ID_CAKEBATTER = 30)
items = list(/obj/item/organ/internal/brain)
result = /obj/item/reagent_containers/food/snacks/sliceable/braincake
/datum/recipe/pancakes
appliance = OVEN
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -526,7 +526,7 @@
/datum/recipe/pancakes/berry
appliance = OVEN
fruit = list("berries" = 2)
- reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -551,7 +551,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
- reagents = list("milk" = 5, "egg" = 3,"honey" = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_EGG = 3,REAGENT_ID_HONEY = 5)
result = /obj/item/reagent_containers/food/snacks/honeybun
result_quantity = 4
@@ -595,7 +595,7 @@
/datum/recipe/truffle
appliance = OVEN
- reagents = list(REAGENT_ID_SUGAR = 5, "cream" = 5)
+ reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_CREAM = 5)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -605,7 +605,7 @@
/datum/recipe/croissant
appliance = OVEN
- reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, "milk" = 5, "yeast" = 5)
+ reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, REAGENT_ID_MILK = 5, REAGENT_ID_YEAST = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(/obj/item/reagent_containers/food/snacks/dough)
result = /obj/item/reagent_containers/food/snacks/croissant
@@ -613,7 +613,7 @@
/datum/recipe/macncheese
appliance = OVEN
- reagents = list("milk" = 5)
+ reagents = list(REAGENT_ID_MILK = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
@@ -623,7 +623,7 @@
/datum/recipe/suppermatter
appliance = OVEN
- reagents = list(REAGENT_ID_RADIUM = 5, "milk" = 5)
+ reagents = list(REAGENT_ID_RADIUM = 5, REAGENT_ID_MILK = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -632,7 +632,7 @@
/datum/recipe/excitingsuppermatter
appliance = OVEN
- reagents = list(REAGENT_ID_RADIUM = 5, "spacespice" = 5)
+ reagents = list(REAGENT_ID_RADIUM = 5, REAGENT_ID_SPACESPICE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -669,7 +669,7 @@
/datum/recipe/spicedmeatbun
appliance = OVEN
- reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
+ reagents = list(REAGENT_ID_SPACESPICE = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/rawcutlet
@@ -680,7 +680,7 @@
/datum/recipe/custardbun
appliance = OVEN
- reagents = list("spacespice" = 1, REAGENT_ID_WATER = 5, "egg" = 3)
+ reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_WATER = 5, REAGENT_ID_EGG = 3)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -689,7 +689,7 @@
/datum/recipe/chickenmomo
appliance = OVEN
- reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
+ reagents = list(REAGENT_ID_SPACESPICE = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -702,7 +702,7 @@
/datum/recipe/veggiemomo
appliance = OVEN
- reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
+ reagents = list(REAGENT_ID_SPACESPICE = 2, REAGENT_ID_WATER = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm
index d3cbc4d390..b2962061dc 100644
--- a/code/modules/hydroponics/backtank.dm
+++ b/code/modules/hydroponics/backtank.dm
@@ -202,7 +202,7 @@
/obj/item/watertank/pepperspray/Initialize()
. = ..()
- reagents.add_reagent("condensedcapsaicin", 1000)
+ reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 1000)
/obj/item/watertank/pepperspray/make_noz()
return new /obj/item/reagent_containers/spray/mister/pepperspray(src)
@@ -236,7 +236,7 @@
reagents.add_reagent(REAGENT_ID_FUEL, 500)
reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 500)
reagents.add_reagent(REAGENT_ID_PHORON, 500)
- reagents.add_reagent("condensedcapsaicin", 500)
+ reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 500)
/obj/item/watertank/op/make_noz()
return new /obj/item/reagent_containers/spray/mister/op(src)
diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm
index af43ffd97b..bc4f8ef2c9 100644
--- a/code/modules/hydroponics/beekeeping/beehive.dm
+++ b/code/modules/hydroponics/beekeeping/beehive.dm
@@ -196,7 +196,7 @@
return
var/obj/item/reagent_containers/glass/G = I
var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, honey)
- G.reagents.add_reagent("honey", transferred)
+ G.reagents.add_reagent(REAGENT_ID_HONEY, transferred)
honey -= transferred
user.visible_message(span_notice("[user] collects honey from \the [src] into \the [G]."), span_notice("You collect [transferred] units of honey from \the [src] into \the [G]."))
return 1
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index c1fef23695..01d1c0c9b8 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -70,19 +70,19 @@
desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
- if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
+ if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent(REAGENT_ID_CHERRYJELLY) || reagents.has_reagent(REAGENT_ID_HONEY) || reagents.has_reagent(REAGENT_ID_BERRYJUICE))
descriptors |= "sweet"
if(reagents.has_reagent(REAGENT_ID_ANTITOXIN))
descriptors |= "astringent"
- if(reagents.has_reagent("frostoil"))
+ if(reagents.has_reagent(REAGENT_ID_FROSTOIL))
descriptors |= "numbing"
if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
descriptors |= "nutritious"
- if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
+ if(reagents.has_reagent(REAGENT_ID_CONDENSEDCAPSAICIN) || reagents.has_reagent(REAGENT_ID_CAPSAICIN))
descriptors |= "spicy"
- if(reagents.has_reagent("coco"))
+ if(reagents.has_reagent(REAGENT_ID_COCO))
descriptors |= "bitter"
- if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
+ if(reagents.has_reagent(REAGENT_ID_ORANGEJUICE) || reagents.has_reagent(REAGENT_ID_LEMONJUICE) || reagents.has_reagent(REAGENT_ID_LIMEJUICE))
descriptors |= "sweet-sour"
if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent(REAGENT_ID_URANIUM))
descriptors |= "radioactive"
@@ -226,19 +226,19 @@
qdel(src)
return
- if(!isnull(seed.chems["carrotjuice"]))
+ if(!isnull(seed.chems[REAGENT_ID_CARROTJUICE]))
to_chat(user, span_filter_notice("You slice \the [src] into sticks."))
new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src))
qdel(src)
return
- if(!isnull(seed.chems["pineapplejuice"]))
+ if(!isnull(seed.chems[REAGENT_ID_PINEAPPLEJUICE]))
to_chat(user, span_filter_notice("You slice \the [src] into rings."))
new /obj/item/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
qdel(src)
return
- if(!isnull(seed.chems["soymilk"]))
+ if(!isnull(seed.chems[REAGENT_ID_SOYMILK]))
to_chat(user, span_filter_notice("You roughly chop up \the [src]."))
new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src))
qdel(src)
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 6a49d3c725..321a32386a 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -390,7 +390,7 @@
"calvatia", "gigantea", "clitopilis", "prumulus", "entoloma", "abortivum",
"suillus", "tuber", "aestivum", "volvacea", "delica", "russula", "rozites")
- possible_prefixes |= list("butter", "shad", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
+ possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
"black", "white", "paper", "slippery", "honey", "bitter")
prefix = pick(possible_prefixes)
diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm
index 4e9126df1a..c3d5e89311 100644
--- a/code/modules/hydroponics/seedtypes/amauri.dm
+++ b/code/modules/hydroponics/seedtypes/amauri.dm
@@ -3,7 +3,7 @@
seed_name = "amauri"
display_name = "amauri plant"
kitchen_tag = "amauri"
- chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),REAGENT_ID_CONDENSEDCAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm
index 15d223ae36..09f3075249 100644
--- a/code/modules/hydroponics/seedtypes/apples.dm
+++ b/code/modules/hydroponics/seedtypes/apples.dm
@@ -5,7 +5,7 @@
display_name = "apple tree"
kitchen_tag = "apple"
mutants = list("poisonapple","goldapple")
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10),REAGENT_ID_APPLEJUICE = list(10,20))
/datum/seed/apple/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/banana.dm b/code/modules/hydroponics/seedtypes/banana.dm
index c5cc980698..ab6f8ef771 100644
--- a/code/modules/hydroponics/seedtypes/banana.dm
+++ b/code/modules/hydroponics/seedtypes/banana.dm
@@ -3,7 +3,7 @@
seed_name = "banana"
display_name = "banana tree"
kitchen_tag = "banana"
- chems = list("banana" = list(10,10))
+ chems = list(REAGENT_ID_BANANA = list(10,10))
trash_type = /obj/item/bananapeel
/datum/seed/banana/New()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"tree4")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 7)
- set_trait(TRAIT_WATER_CONSUMPTION, 6)
\ No newline at end of file
+ set_trait(TRAIT_WATER_CONSUMPTION, 6)
diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm
index 75c98883ad..dcef36a1ff 100644
--- a/code/modules/hydroponics/seedtypes/berries.dm
+++ b/code/modules/hydroponics/seedtypes/berries.dm
@@ -5,7 +5,7 @@
display_name = "berry bush"
kitchen_tag = "berries"
mutants = list("glowberries","poisonberries")
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BERRYJUICE = list(10,10))
/datum/seed/berry/New()
..()
@@ -47,7 +47,7 @@
kitchen_tag = "poisonberries"
display_name = "poison berry bush"
mutants = list("deathberries")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), "poisonberryjuice" = list(10,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), REAGENT_ID_POISONBERRYJUICE = list(10,5))
/datum/seed/berry/poison/New()
..()
@@ -74,7 +74,7 @@
seed_name = "peppercorn berry"
kitchen_tag = "peppercorns"
display_name = "peppercorn bush"
- chems = list("blackpepper" = list(5,10))
+ chems = list(REAGENT_ID_BLACKPEPPER = list(5,10))
/datum/seed/berry/peppercorn/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm
index be905b8d6a..5012ac1aa5 100644
--- a/code/modules/hydroponics/seedtypes/carrots.dm
+++ b/code/modules/hydroponics/seedtypes/carrots.dm
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), "carrotjuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), REAGENT_ID_CARROTJUICE = list(10,20))
/datum/seed/carrots/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/cherries.dm b/code/modules/hydroponics/seedtypes/cherries.dm
index 7767263023..2f5896f59c 100644
--- a/code/modules/hydroponics/seedtypes/cherries.dm
+++ b/code/modules/hydroponics/seedtypes/cherries.dm
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "cherry tree"
kitchen_tag = "cherries"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), REAGENT_ID_CHERRYJELLY = list(10,15))
/datum/seed/cherries/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm
index 59adafd8fd..b667cfa156 100644
--- a/code/modules/hydroponics/seedtypes/chili.dm
+++ b/code/modules/hydroponics/seedtypes/chili.dm
@@ -4,7 +4,7 @@
seed_name = "chili"
display_name = "chili plants"
kitchen_tag = "chili"
- chems = list("capsaicin" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
+ chems = list(REAGENT_ID_CAPSAICIN = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
mutants = list("icechili", "ghostchili")
/datum/seed/chili/New()
@@ -26,7 +26,7 @@
display_name = "ice-pepper plants"
kitchen_tag = "icechili"
mutants = null
- chems = list("frostoil" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
+ chems = list(REAGENT_ID_FROSTOIL = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
/datum/seed/chili/ice/New()
..()
@@ -40,7 +40,7 @@
display_name = "ghost chili plants"
kitchen_tag = "ghostchili"
mutants = null
- chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
+ chems = list(REAGENT_ID_CONDENSEDCAPSAICIN = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
/datum/seed/chili/ghost/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/citrus.dm b/code/modules/hydroponics/seedtypes/citrus.dm
index 063026342b..ad701a74de 100644
--- a/code/modules/hydroponics/seedtypes/citrus.dm
+++ b/code/modules/hydroponics/seedtypes/citrus.dm
@@ -3,7 +3,7 @@
seed_name = "lime"
display_name = "lime trees"
kitchen_tag = "lime"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LIMEJUICE = list(10,20))
/datum/seed/citrus/New()
..()
@@ -23,7 +23,7 @@
seed_name = "lemon"
display_name = "lemon trees"
kitchen_tag = "lemon"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LEMONJUICE = list(10,20))
/datum/seed/citrus/lemon/New()
..()
@@ -38,7 +38,7 @@
seed_name = "orange"
display_name = "orange trees"
kitchen_tag = "orange"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_ORANGEJUICE = list(10,20))
/datum/seed/citrus/orange/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/cocoa.dm b/code/modules/hydroponics/seedtypes/cocoa.dm
index c89bfcf0e6..7233db5d69 100644
--- a/code/modules/hydroponics/seedtypes/cocoa.dm
+++ b/code/modules/hydroponics/seedtypes/cocoa.dm
@@ -3,7 +3,7 @@
seed_name = "cacao"
display_name = "cacao tree"
kitchen_tag = "cocoa"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_COCO = list(4,5))
/datum/seed/cocoa/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/corn.dm b/code/modules/hydroponics/seedtypes/corn.dm
index e46cf0f2d9..67fca53d8f 100644
--- a/code/modules/hydroponics/seedtypes/corn.dm
+++ b/code/modules/hydroponics/seedtypes/corn.dm
@@ -3,7 +3,7 @@
seed_name = "corn"
display_name = "ears of corn"
kitchen_tag = "corn"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_CORNOIL = list(3,15))
trash_type = /obj/item/corncob
/datum/seed/corn/New()
diff --git a/code/modules/hydroponics/seedtypes/durian.dm b/code/modules/hydroponics/seedtypes/durian.dm
index b0ad06f648..f282855464 100644
--- a/code/modules/hydroponics/seedtypes/durian.dm
+++ b/code/modules/hydroponics/seedtypes/durian.dm
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "durian"
kitchen_tag = "durian"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_DURIANPASTE = list(1, 20))
/datum/seed/durian/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm
index 1661aabe40..4bcee3db25 100644
--- a/code/modules/hydroponics/seedtypes/eggplant.dm
+++ b/code/modules/hydroponics/seedtypes/eggplant.dm
@@ -27,5 +27,5 @@
display_name = "egg-plants"
kitchen_tag = "egg-plant"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_EGG = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm
index 3ced3c0e67..3121c2a478 100644
--- a/code/modules/hydroponics/seedtypes/gelthi.dm
+++ b/code/modules/hydroponics/seedtypes/gelthi.dm
@@ -3,7 +3,7 @@
seed_name = "gelthi"
display_name = "gelthi plant"
kitchen_tag = "gelthi"
- chems = list(REAGENT_ID_STOXIN = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_STOXIN = list(1,5),REAGENT_ID_CAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/gelthi/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm
index 0da587e729..73a7853221 100644
--- a/code/modules/hydroponics/seedtypes/grapes.dm
+++ b/code/modules/hydroponics/seedtypes/grapes.dm
@@ -5,7 +5,7 @@
display_name = "grapevines"
kitchen_tag = "grapes"
mutants = list("greengrapes")
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), "grapejuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), REAGENT_ID_GRAPEJUICE = list(10,10))
/datum/seed/grapes/New()
..()
@@ -26,7 +26,7 @@
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_KELOTANE = list(3,5), "grapejuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_KELOTANE = list(3,5), REAGENT_ID_GRAPEJUICE = list(10,10))
/datum/seed/grapes/green/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/malanitear.dm b/code/modules/hydroponics/seedtypes/malanitear.dm
index 67106e41f7..f4878ca003 100644
--- a/code/modules/hydroponics/seedtypes/malanitear.dm
+++ b/code/modules/hydroponics/seedtypes/malanitear.dm
@@ -3,7 +3,7 @@
seed_name = "Malani's tear"
display_name = "Malani's tear leaves"
kitchen_tag = "mtear"
- chems = list("honey" = list(1,10), REAGENT_ID_KELOTANE = list(3,5))
+ chems = list(REAGENT_ID_HONEY = list(1,10), REAGENT_ID_KELOTANE = list(3,5))
/datum/seed/mtear/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/peanuts.dm b/code/modules/hydroponics/seedtypes/peanuts.dm
index 8dfa76addb..db0a3c0f36 100644
--- a/code/modules/hydroponics/seedtypes/peanuts.dm
+++ b/code/modules/hydroponics/seedtypes/peanuts.dm
@@ -4,7 +4,7 @@
seed_name = "peanut"
display_name = "peanut vines"
kitchen_tag = "peanut"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "peanutoil" = list(3,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PEANUTOIL = list(3,10))
/datum/seed/peanuts/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm
index 27e14c6c92..3ac1d79e8d 100644
--- a/code/modules/hydroponics/seedtypes/pineapple.dm
+++ b/code/modules/hydroponics/seedtypes/pineapple.dm
@@ -6,7 +6,7 @@
display_name = "pineapple"
kitchen_tag = "pineapple"
mutants = list("spineapple")
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "pineapplejuice" = list(1, 20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20))
/datum/seed/pineapple/New()
..()
@@ -30,7 +30,7 @@
seed_name = "spineapple"
display_name = "spineapple"
kitchen_tag = "spineapple"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_ENZYME = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20))
/datum/seed/spineapple/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/potato.dm b/code/modules/hydroponics/seedtypes/potato.dm
index f3a76300a6..59aebee0c6 100644
--- a/code/modules/hydroponics/seedtypes/potato.dm
+++ b/code/modules/hydroponics/seedtypes/potato.dm
@@ -3,7 +3,7 @@
seed_name = "potato"
display_name = "potatoes"
kitchen_tag = "potato"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "potatojuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_POTATOJUICE = list(10,10))
/datum/seed/potato/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/rice.dm b/code/modules/hydroponics/seedtypes/rice.dm
index e90c6b1e96..f52154c98b 100644
--- a/code/modules/hydroponics/seedtypes/rice.dm
+++ b/code/modules/hydroponics/seedtypes/rice.dm
@@ -3,7 +3,7 @@
seed_name = "rice"
display_name = "rice stalks"
kitchen_tag = "rice"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "rice" = list(10,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_RICE = list(10,15))
/datum/seed/rice/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/soybean.dm b/code/modules/hydroponics/seedtypes/soybean.dm
index c12d36803a..081949bde7 100644
--- a/code/modules/hydroponics/seedtypes/soybean.dm
+++ b/code/modules/hydroponics/seedtypes/soybean.dm
@@ -3,7 +3,7 @@
seed_name = "soybean"
display_name = "soybeans"
kitchen_tag = "soybeans"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "soymilk" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SOYMILK = list(10,20))
/datum/seed/soybean/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/thaadra.dm b/code/modules/hydroponics/seedtypes/thaadra.dm
index 7d2aaa1d93..c7ccb40f7d 100644
--- a/code/modules/hydroponics/seedtypes/thaadra.dm
+++ b/code/modules/hydroponics/seedtypes/thaadra.dm
@@ -3,7 +3,7 @@
seed_name = "thaa'dra"
display_name = "thaa'dra lichen"
kitchen_tag = "thaadra"
- chems = list("frostoil" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_FROSTOIL = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/thaadra/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm
index 3161361315..ce45ff774c 100644
--- a/code/modules/hydroponics/seedtypes/tomatoes.dm
+++ b/code/modules/hydroponics/seedtypes/tomatoes.dm
@@ -4,7 +4,7 @@
seed_name = "tomato"
display_name = "tomato plant"
mutants = list("bluetomato","bloodtomato")
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "tomatojuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_TOMATOJUICE = list(10,10))
kitchen_tag = "tomato"
/datum/seed/tomato/New()
diff --git a/code/modules/hydroponics/seedtypes/vanilla.dm b/code/modules/hydroponics/seedtypes/vanilla.dm
index 2d42a80c65..a9b57d14e0 100644
--- a/code/modules/hydroponics/seedtypes/vanilla.dm
+++ b/code/modules/hydroponics/seedtypes/vanilla.dm
@@ -3,7 +3,7 @@
seed_name = "vanilla"
display_name = "vanilla"
kitchen_tag = "vanilla"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "vanilla" = list(2,8), REAGENT_ID_SUGAR = list(1, 4))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_VANILLA = list(2,8), REAGENT_ID_SUGAR = list(1, 4))
/datum/seed/vanilla/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm
index db3dde13f9..253dccae16 100644
--- a/code/modules/hydroponics/seedtypes/wabback.dm
+++ b/code/modules/hydroponics/seedtypes/wabback.dm
@@ -4,7 +4,7 @@
seed_name = "white wabback"
seed_noun = "nodes"
display_name = "white wabback"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PROTEIN = list(1,5), REAGENT_ID_ENZYME = list(0,3))
kitchen_tag = "wabback"
mutants = list("blackwabback","wildwabback")
has_item_product = /obj/item/stack/material/cloth
@@ -31,7 +31,7 @@
seed_name = "black wabback"
display_name = "black wabback"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), REAGENT_ID_SEROTROTIUMV = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), REAGENT_ID_PROTEIN = list(1,10), REAGENT_ID_SEROTROTIUMV = list(0,1))
/datum/seed/wabback/vine/New()
..()
@@ -44,7 +44,7 @@
display_name = "wild wabback"
mutants = list("whitewabback")
has_item_product = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_PROTEIN = list(0,2), REAGENT_ID_ENZYME = list(0,1))
/datum/seed/wabback/wild/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/watermelon.dm b/code/modules/hydroponics/seedtypes/watermelon.dm
index 0999d88cba..32d98d3f82 100644
--- a/code/modules/hydroponics/seedtypes/watermelon.dm
+++ b/code/modules/hydroponics/seedtypes/watermelon.dm
@@ -3,7 +3,7 @@
seed_name = "watermelon"
display_name = "watermelon vine"
kitchen_tag = "watermelon"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,6), "watermelonjuice" = list(10,6))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,6), REAGENT_ID_WATERMELONJUICE = list(10,6))
/datum/seed/watermelon/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/wheat.dm b/code/modules/hydroponics/seedtypes/wheat.dm
index 5febc076fb..293d5cc047 100644
--- a/code/modules/hydroponics/seedtypes/wheat.dm
+++ b/code/modules/hydroponics/seedtypes/wheat.dm
@@ -3,7 +3,7 @@
seed_name = "wheat"
display_name = "wheat stalks"
kitchen_tag = "wheat"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "flour" = list(10,30))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_FLOUR = list(10,30))
/datum/seed/wheat/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/wurmwoad.dm b/code/modules/hydroponics/seedtypes/wurmwoad.dm
index 3ca70c9af6..f677ec8993 100644
--- a/code/modules/hydroponics/seedtypes/wurmwoad.dm
+++ b/code/modules/hydroponics/seedtypes/wurmwoad.dm
@@ -4,7 +4,7 @@
name = "wurmwoad"
seed_name = "wurmwoad"
display_name = "wurmwoad growth"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "spacespice" = list(5,15))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SPACESPICE = list(5,15))
kitchen_tag = "wurmwoad"
/datum/seed/wurmwoad/New()
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index c11ac18bb6..f0defd9f45 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -66,11 +66,11 @@
REAGENT_ID_RADIUM = 2
)
var/static/list/nutrient_reagents = list(
- "milk" = 0.1,
+ REAGENT_ID_MILK = 0.1,
"beer" = 0.25,
REAGENT_ID_PHOSPHORUS = 0.1,
REAGENT_ID_SUGAR = 0.1,
- "sodawater" = 0.1,
+ REAGENT_ID_SODAWATER = 0.1,
REAGENT_ID_AMMONIA = 1,
REAGENT_ID_DIETHYLAMINE = 2,
REAGENT_ID_NUTRIMENT = 1,
@@ -97,13 +97,13 @@
var/static/list/water_reagents = list(
REAGENT_ID_WATER = 1,
REAGENT_ID_ADMINORDRAZINE = 1,
- "milk" = 0.9,
+ REAGENT_ID_MILK = 0.9,
"beer" = 0.7,
REAGENT_ID_FLUORINE = -0.5,
REAGENT_ID_CHLORINE = -0.5,
REAGENT_ID_PHOSPHORUS = -0.5,
REAGENT_ID_WATER = 1,
- "sodawater" = 1,
+ REAGENT_ID_SODAWATER = 1,
)
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
@@ -112,7 +112,7 @@
REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
REAGENT_ID_CHLORINE = list( -1, 0, 0 ),
REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ),
- "sodawater" = list( 0.1, 0, 0 ),
+ REAGENT_ID_SODAWATER = list( 0.1, 0, 0 ),
REAGENT_ID_SACID = list( -1, 0, 0 ),
REAGENT_ID_PACID = list( -2, 0, 0 ),
REAGENT_ID_PLANTBGONE = list( -2, 0, 0.2),
@@ -164,7 +164,7 @@
return
if(weedlevel > 0)
- nymph.reagents.add_reagent("glucose", weedlevel)
+ nymph.reagents.add_reagent(REAGENT_ID_GLUCOSE, weedlevel)
weedlevel = 0
nymph.visible_message(span_notice(span_bold("[nymph]") + " begins rooting through [src], ripping out weeds and eating them noisily."),span_notice("You begin rooting through [src], ripping out weeds and eating them noisily."))
else if(nymph.nutrition > 100 && nutrilevel < 10)
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index 7be8f1fee3..f24185eff6 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -87,9 +87,9 @@
/mob/living/carbon/human/proc/hasnutriment()
- if (bloodstr.has_reagent(REAGENT_ID_NUTRIMENT, 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
+ if (bloodstr.has_reagent(REAGENT_ID_NUTRIMENT, 30) || src.bloodstr.has_reagent(REAGENT_ID_PROTEIN, 15)) //protein needs half as much. For reference, a steak contains 9u protein.
return TRUE
- else if (ingested.has_reagent(REAGENT_ID_NUTRIMENT, 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
+ else if (ingested.has_reagent(REAGENT_ID_NUTRIMENT, 60) || src.ingested.has_reagent(REAGENT_ID_PROTEIN, 30)) //try forcefeeding them, why not. Less effective.
return TRUE
else return FALSE
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index e0da78daf7..f5d67bf50b 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -748,7 +748,7 @@
name = "Supply Storage"
desc = "A mounted survival unit with fuel processor, helpful with both deliveries and assisting injured miners."
icon_state = "sleeperc"
- injection_chems = list("glucose",REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE)
+ injection_chems = list(REAGENT_ID_GLUCOSE,REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE)
max_item_count = 10
recycles = FALSE
stabilizer = TRUE
diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm
index ad912f5180..0f3f6ed639 100644
--- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm
@@ -209,10 +209,10 @@
var/list/booze_options = list("Beer" = "booze",
"Space Mountain Wind" = "boozegreen",
"Curacao" = "boozeblue",
- "Grape Soda" = "boozepurple",
+ REAGENT_GRAPESODA = "boozepurple",
"Demon's Blood" = "boozered",
"Whiskey Soda" = "boozeorange",
- "Coffee" = "boozebrown")
+ REAGENT_COFFEE = "boozebrown")
/datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
if(!("boozehound" in ourborg.sprite_extra_customization) || !ourborg.sprite_extra_customization["boozehound"])
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
index 6c20b92636..4dd3823f02 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
@@ -162,8 +162,8 @@
to_chat(user, span_notice("\The [src] seems too full to eat."))
return
var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much?
- var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much?
- var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much?
+ var/protein_amount = O.reagents?.get_reagent_amount(REAGENT_ID_PROTEIN) //does it have protein, if so how much?
+ var/glucose_amount = O.reagents?.get_reagent_amount(REAGENT_ID_GLUCOSE) //does it have glucose, if so how much?
var/yum = nutriment_amount + protein_amount + glucose_amount
if(yum)
yum = (yum * 20) / 3
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
index a8f73c964b..a119d03c73 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
@@ -513,8 +513,8 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
user.visible_message(span_notice("\The [user] tries to feed \the [O] to \the [src]. It snoofs but does not eat."),span_notice("You try to feed \the [O] to \the [src], but it only snoofts at it."))
return
var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much?
- var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much?
- var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much?
+ var/protein_amount = O.reagents?.get_reagent_amount(REAGENT_ID_PROTEIN) //does it have protein, if so how much?
+ var/glucose_amount = O.reagents?.get_reagent_amount(REAGENT_ID_GLUCOSE) //does it have glucose, if so how much?
var/yum = nutriment_amount + protein_amount + glucose_amount
if(yum)
if(!teppi_adult)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
index 4ef95170e8..556d10d678 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
@@ -33,7 +33,7 @@
var/obj/item/reagent_containers/glass/G = O
if(stat == CONSCIOUS && istype(G) && G.is_open_container())
user.visible_message(span_notice("[user] milks [src] using \the [O]."))
- var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
+ var/transfered = udder.trans_id_to(G, REAGENT_ID_MILK, rand(5,10))
if(G.reagents.total_volume >= G.volume)
to_chat(user, span_red("The [O] is full."))
if(!transfered)
@@ -45,7 +45,7 @@
. = ..()
if(stat == CONSCIOUS)
if(udder && prob(5))
- udder.add_reagent("milk", rand(5, 10))
+ udder.add_reagent(REAGENT_ID_MILK, rand(5, 10))
/mob/living/simple_mob/animal/passive/cow/attack_hand(mob/living/carbon/M as mob)
if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
index a1fccf962c..4b949d687f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
@@ -37,7 +37,7 @@
if(.)
if(stat == CONSCIOUS)
if(udder && prob(5))
- udder.add_reagent("milk", rand(5, 10))
+ udder.add_reagent(REAGENT_ID_MILK, rand(5, 10))
if(locate(/obj/effect/plant) in loc)
var/obj/effect/plant/SV = locate() in loc
@@ -64,7 +64,7 @@
var/obj/item/reagent_containers/glass/G = O
if(stat == CONSCIOUS && istype(G) && G.is_open_container())
user.visible_message(span_notice("[user] milks [src] using \the [O]."))
- var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
+ var/transfered = udder.trans_id_to(G, REAGENT_ID_MILK, rand(5,10))
if(G.reagents.total_volume >= G.volume)
to_chat(user, span_red("The [O] is full."))
if(!transfered)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm
index 2128b98ef4..4b44839d9b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm
@@ -27,7 +27,7 @@
health = 175
poison_per_bite = 5
- poison_type = "cryotoxin"
+ poison_type = REAGENT_ID_CRYOTOXIN
heat_resist = -0.50
cold_resist = 0.75
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index 261d37a7c5..420b7a1aa1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -49,7 +49,7 @@
var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
var/infest_target = BP_TORSO // The currently chosen bodypart to infest.
var/mob/living/carbon/host // Our humble host.
- var/list/produceable_chemicals = list(REAGENT_ID_INAPROVALINE,REAGENT_ID_ANTITOXIN,REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_TRAMADOL,REAGENT_ID_KELOTANE,REAGENT_ID_LEPORAZINE,REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
+ var/list/produceable_chemicals = list(REAGENT_ID_INAPROVALINE,REAGENT_ID_ANTITOXIN,REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_TRAMADOL,REAGENT_ID_KELOTANE,REAGENT_ID_LEPORAZINE,REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,REAGENT_ID_FROSTOIL)
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
var/passive_reagent = REAGENT_ID_PARACETAMOL // Reagent passively produced by the leech. Should usually be a painkiller.
@@ -188,7 +188,7 @@
chemicals -= 30
if(host.getToxLoss() >= 30 && chemicals > 50)
- var/randomchem = pickweight(list(REAGENT_ID_TRAMADOL = 7, REAGENT_ID_ANTITOXIN = 15, "frostoil" = 3))
+ var/randomchem = pickweight(list(REAGENT_ID_TRAMADOL = 7, REAGENT_ID_ANTITOXIN = 15, REAGENT_ID_FROSTOIL = 3))
host.reagents.add_reagent(randomchem, 5)
chemicals -= 50
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
index 5dd0edb14d..0feabb6987 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -57,7 +57,7 @@
color = "#19FFFF"
slime_color = "blue"
coretype = /obj/item/slime_extract/blue
- reagent_injected = "cryotoxin"
+ reagent_injected = REAGENT_ID_CRYOTOXIN
cold_resist = 0.50 // Not as strong as dark blue, which has immunity.
description_info = "The slime is resistant to the cold, and attacks from this slime can inject cryotoxin into you. \
diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm
index 752e70cd4a..291bfec6b2 100644
--- a/code/modules/projectiles/projectile/blob.dm
+++ b/code/modules/projectiles/projectile/blob.dm
@@ -64,7 +64,7 @@
my_chems = list(REAGENT_ID_FUEL, REAGENT_ID_MOLD)
/obj/item/projectile/energy/blob/freezing
- my_chems = list("frostoil")
+ my_chems = list(REAGENT_ID_FROSTOIL)
modifier_type_to_apply = /datum/modifier/chilled
modifier_duration = 1 MINUTE
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index a6912dfea7..30072ff930 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -90,65 +90,65 @@
/obj/item/reagent_containers/chem_disp_cartridge/ice
spawn_reagent = "ice"
/obj/item/reagent_containers/chem_disp_cartridge/tea
- spawn_reagent = "tea"
+ spawn_reagent = REAGENT_ID_TEA
/obj/item/reagent_containers/chem_disp_cartridge/icetea
- spawn_reagent = "icetea"
+ spawn_reagent = REAGENT_ID_ICETEA
/obj/item/reagent_containers/chem_disp_cartridge/cola
- spawn_reagent = "cola"
+ spawn_reagent = REAGENT_ID_COLA
/obj/item/reagent_containers/chem_disp_cartridge/smw
- spawn_reagent = "spacemountainwind"
+ spawn_reagent = REAGENT_ID_SPACEMOUNTAINWIND
/obj/item/reagent_containers/chem_disp_cartridge/dr_gibb
- spawn_reagent = "dr_gibb"
+ spawn_reagent = REAGENT_ID_DRGIBB
/obj/item/reagent_containers/chem_disp_cartridge/spaceup
- spawn_reagent = "space_up"
+ spawn_reagent = REAGENT_ID_SPACEUP
/obj/item/reagent_containers/chem_disp_cartridge/tonic
- spawn_reagent = "tonic"
+ spawn_reagent = REAGENT_ID_TONIC
/obj/item/reagent_containers/chem_disp_cartridge/sodawater
- spawn_reagent = "sodawater"
+ spawn_reagent = REAGENT_ID_SODAWATER
/obj/item/reagent_containers/chem_disp_cartridge/lemon_lime
- spawn_reagent = "lemon_lime"
+ spawn_reagent = REAGENT_ID_LEMONLIME
/obj/item/reagent_containers/chem_disp_cartridge/orange
- spawn_reagent = "orangejuice"
+ spawn_reagent = REAGENT_ID_ORANGEJUICE
/obj/item/reagent_containers/chem_disp_cartridge/lime
- spawn_reagent = "limejuice"
+ spawn_reagent = REAGENT_ID_LIMEJUICE
/obj/item/reagent_containers/chem_disp_cartridge/watermelon
- spawn_reagent = "watermelonjuice"
+ spawn_reagent = REAGENT_ID_WATERMELONJUICE
/obj/item/reagent_containers/chem_disp_cartridge/lemon
- spawn_reagent = "lemonjuice"
+ spawn_reagent = REAGENT_ID_LEMONJUICE
/obj/item/reagent_containers/chem_disp_cartridge/grapesoda
- spawn_reagent = "grapesoda"
+ spawn_reagent = REAGENT_ID_GRAPESODA
/obj/item/reagent_containers/chem_disp_cartridge/pineapple
- spawn_reagent = "pineapplejuice"
+ spawn_reagent = REAGENT_ID_PINEAPPLEJUICE
// Bar, coffee
/obj/item/reagent_containers/chem_disp_cartridge/coffee
- spawn_reagent = "coffee"
+ spawn_reagent = REAGENT_ID_COFFEE
/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee
- spawn_reagent = "drip_coffee"
+ spawn_reagent = REAGENT_ID_DRIPCOFFEE
/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte
- spawn_reagent = "cafe_latte"
+ spawn_reagent = REAGENT_ID_CAFELATTE
/obj/item/reagent_containers/chem_disp_cartridge/soy_latte
- spawn_reagent = "soy_latte"
+ spawn_reagent = REAGENT_ID_SOYLATTE
/obj/item/reagent_containers/chem_disp_cartridge/hot_coco
- spawn_reagent = "hot_coco"
+ spawn_reagent = REAGENT_ID_HOTCOCO
/obj/item/reagent_containers/chem_disp_cartridge/milk
- spawn_reagent = "milk"
+ spawn_reagent = REAGENT_ID_MILK
/obj/item/reagent_containers/chem_disp_cartridge/milk_foam
- spawn_reagent = "milk_foam"
+ spawn_reagent = REAGENT_ID_MILKFOAM
/obj/item/reagent_containers/chem_disp_cartridge/cream
- spawn_reagent = "cream"
+ spawn_reagent = REAGENT_ID_CREAM
/obj/item/reagent_containers/chem_disp_cartridge/mint
- spawn_reagent = "mint"
+ spawn_reagent = REAGENT_ID_MINT
/obj/item/reagent_containers/chem_disp_cartridge/berry
- spawn_reagent = "berryjuice"
+ spawn_reagent = REAGENT_ID_BERRYJUICE
/obj/item/reagent_containers/chem_disp_cartridge/greentea
- spawn_reagent = "greentea"
+ spawn_reagent = REAGENT_ID_GREENTEA
/obj/item/reagent_containers/chem_disp_cartridge/decaf
- spawn_reagent = "decaf"
+ spawn_reagent = REAGENT_ID_DECAF
/obj/item/reagent_containers/chem_disp_cartridge/chaitea
- spawn_reagent = "chaitea"
+ spawn_reagent = REAGENT_ID_CHAITEA
/obj/item/reagent_containers/chem_disp_cartridge/decafchai
- spawn_reagent = "chaiteadecaf"
+ spawn_reagent = REAGENT_ID_CHAITEADECAF
// syrups
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin
@@ -172,7 +172,7 @@
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry
spawn_reagent = "syrup_cherry"
/obj/item/reagent_containers/chem_disp_cartridge/grenadine
- spawn_reagent = "grenadine"
+ spawn_reagent = REAGENT_ID_GRENADINE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch
spawn_reagent = "syrup_butterscotch"
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
index e6de541cef..08f50c4898 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
@@ -7,7 +7,7 @@
//Biochem
nutriment spawn_reagent = REAGENT_ID_NUTRIMENT
- protein spawn_reagent = "protein"
+ protein spawn_reagent = REAGENT_ID_PROTEIN
//Special Ops
biomass spawn_reagent = REAGENT_ID_BIOMASS
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index 30dad26e77..675d8e3243 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -46,25 +46,25 @@
/obj/machinery/chemical_dispenser/bar_soft
dispense_reagents = list(
- REAGENT_ID_WATER, "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic",
- "sodawater", "lemonjuice", "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda", "pineapplejuice"
+ REAGENT_ID_WATER, "ice", REAGENT_ID_COFFEE, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICETEA, REAGENT_ID_COLA, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_DRGIBB, REAGENT_ID_SPACEUP, REAGENT_ID_TONIC,
+ REAGENT_ID_SODAWATER, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_WATERMELONJUICE, "thirteenloko", REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE
)
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
- "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
+ REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, "beer", "kahlua",
"whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
)
/obj/machinery/chemical_dispenser/bar_coffee
dispense_reagents = list(
- "coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice", "water",
- "orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf", "greentea", "milk_foam", "drip_coffee"
+ REAGENT_ID_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, "ice", "water",
+ REAGENT_ID_ORANGEJUICE, REAGENT_ID_LEMONJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_BERRYJUICE, REAGENT_ID_MINT, REAGENT_ID_DECAF, REAGENT_ID_GREENTEA, REAGENT_ID_MILKFOAM, REAGENT_ID_DRIPCOFFEE
)
/obj/machinery/chemical_dispenser/bar_syrup
dispense_reagents = list(
"syrup_pumpkin", "syrup_caramel", "syrup_salted_caramel", "syrup_irish", "syrup_almond", "syrup_cinnamon", "syrup_pistachio",
- "syrup_vanilla", "syrup_toffee", "grenadine", "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry",
+ "syrup_vanilla", "syrup_toffee", REAGENT_ID_GRENADINE, "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry",
"syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday"
)
diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
index 3a9ae7e7ed..7814c13f6e 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
@@ -22,7 +22,7 @@
name = "bioproduct dispenser"
ui_title = "Bioproduct Dispenser"
dispense_reagents = list(
- REAGENT_ID_NUTRIMENT, "protein", "milk"
+ REAGENT_ID_NUTRIMENT, REAGENT_ID_PROTEIN, REAGENT_ID_MILK
)
/obj/machinery/chemical_dispenser/biochemistry/full
diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index 4a3fe22e9f..27ceeee2d0 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -307,7 +307,7 @@
/obj/structure/reagent_dispensers/peppertank/Initialize()
. = ..()
- reagents.add_reagent("condensedcapsaicin",1000)
+ reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN,1000)
/obj/structure/reagent_dispensers/virusfood
name = "Virus Food Dispenser"
@@ -320,7 +320,7 @@
/obj/structure/reagent_dispensers/virusfood/Initialize()
. = ..()
- reagents.add_reagent("virusfood", 1000)
+ reagents.add_reagent(REAGENT_ID_VIRUSFOOD, 1000)
/obj/structure/reagent_dispensers/acid
name = "Sulphuric Acid Dispenser"
@@ -527,7 +527,7 @@
/obj/structure/reagent_dispensers/cookingoil/Initialize()
. = ..()
- reagents.add_reagent("cookingoil",5000)
+ reagents.add_reagent(REAGENT_ID_COOKINGOIL,5000)
/obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj)
if(Proj.get_structure_damage())
diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm
index 399e921d24..d6d576c8d7 100644
--- a/code/modules/reagents/machinery/grinder.dm
+++ b/code/modules/reagents/machinery/grinder.dm
@@ -9,15 +9,15 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
/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...
/obj/item/stack/material/glass/reinforced = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_IRON,REAGENT_ID_CARBON),
- /obj/item/stack/material/leather = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein","protein","triglyceride"),
- /obj/item/stack/material/cloth = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein",REAGENT_ID_SODIUM),
- /obj/item/stack/material/fiber = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein",REAGENT_ID_SODIUM),
+ /obj/item/stack/material/leather = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PROTEIN,REAGENT_ID_PROTEIN,REAGENT_ID_TRIGLYCERIDE),
+ /obj/item/stack/material/cloth = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PROTEIN,REAGENT_ID_SODIUM),
+ /obj/item/stack/material/fiber = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PROTEIN,REAGENT_ID_SODIUM),
/obj/item/stack/material/fur = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_SULFUR,REAGENT_ID_SODIUM),
/obj/item/stack/material/deuterium = list(REAGENT_ID_HYDROGEN),
/obj/item/stack/material/glass/phoronrglass = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_PHORON,REAGENT_ID_PHORON),
/obj/item/stack/material/diamond = list(REAGENT_ID_CARBON),
/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/wax = list(REAGENT_ID_ETHANOL,REAGENT_ID_TRIGLYCERIDE),
/obj/item/stack/material/iron = list(REAGENT_ID_IRON),
/obj/item/stack/material/uranium = list(REAGENT_ID_URANIUM),
/obj/item/stack/material/phoron = list(REAGENT_ID_PHORON),
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index 65b32a1440..ef5f5e46dc 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -119,7 +119,7 @@
name = "Distilling Synthplas"
id = "distill_synthplas"
result = REAGENT_ID_SYNTHBLOOD_DILUTE
- required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, REAGENT_ID_BICARIDINE = 1)
+ required_reagents = list(REAGENT_ID_PROTEIN = 2, REAGENT_ID_ANTIBODIES = 1, REAGENT_ID_BICARIDINE = 1)
result_amount = 3
reaction_rate = HALF_LIFE(15)
@@ -174,7 +174,7 @@
name = "Distilling Cryogellatin"
id = "distill_cryoslurry"
result = REAGENT_ID_CRYOSLURRY
- required_reagents = list("frostoil" = 7, "enzyme" = 3, REAGENT_ID_PLASTICIDE = 3, REAGENT_ID_FOAMINGAGENT = 2)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 7, REAGENT_ID_ENZYME = 3, REAGENT_ID_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 4e69751c47..174431ef25 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -1,50 +1,50 @@
/decl/chemical_reaction/instant/drinks/coffee
- name = "Coffee"
- id = "coffee"
- result = "coffee"
- required_reagents = list(REAGENT_ID_WATER = 5, "coffeepowder" = 1)
+ name = REAGENT_COFFEE
+ id = REAGENT_ID_COFFEE
+ result = REAGENT_ID_COFFEE
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COFFEEPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tea
name = "Black tea"
- id = "tea"
- result = "tea"
- required_reagents = list(REAGENT_ID_WATER = 5, "teapowder" = 1)
+ id = REAGENT_ID_TEA
+ result = REAGENT_ID_TEA
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_TEAPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/hot_coco
name = "Hot Coco"
- id = "hot_coco"
- result = "hot_coco"
- required_reagents = list(REAGENT_ID_WATER = 5, "coco" = 1)
+ id = REAGENT_ID_HOTCOCO
+ result = REAGENT_ID_HOTCOCO
+ required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COCO = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/grapejuice
- name = "Grape Juice"
- id = "grapejuice"
- result = "grapejuice"
- required_reagents = list(REAGENT_ID_WATER = 3, "instantgrape" = 1)
+ name = REAGENT_GRAPEJUICE
+ id = REAGENT_ID_GRAPEJUICE
+ result = REAGENT_ID_GRAPEJUICE
+ required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTGRAPE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/orangejuice
- name = "Orange Juice"
- id = "orangejuice"
- result = "orangejuice"
- required_reagents = list(REAGENT_ID_WATER = 3, "instantorange" = 1)
+ name = REAGENT_ORANGEJUICE
+ id = REAGENT_ID_ORANGEJUICE
+ result = REAGENT_ID_ORANGEJUICE
+ required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTORANGE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/watermelonjuice
- name = "Watermelon Juice"
- id = "watermelonjuice"
- result = "watermelonjuice"
- required_reagents = list(REAGENT_ID_WATER = 3, "instantwatermelon" = 1)
+ name = REAGENT_WATERMELONJUICE
+ id = REAGENT_ID_WATERMELONJUICE
+ result = REAGENT_ID_WATERMELONJUICE
+ required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTWATERMELON = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/applejuice
- name = "Apple Juice"
- id = "applejuice"
- result = "applejuice"
- required_reagents = list(REAGENT_ID_WATER = 3, "instantapple" = 1)
+ name = REAGENT_APPLEJUICE
+ id = REAGENT_ID_APPLEJUICE
+ result = REAGENT_ID_APPLEJUICE
+ required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTAPPLE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/goldschlager
@@ -65,112 +65,112 @@
name = "Bilk"
id = "bilk"
result = "bilk"
- required_reagents = list("milk" = 1, "beer" = 1)
+ required_reagents = list(REAGENT_ID_MILK = 1, "beer" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/icetea
- name = "Iced Tea"
- id = "icetea"
- result = "icetea"
- required_reagents = list("ice" = 1, "tea" = 2)
+ name = REAGENT_ICETEA
+ id = REAGENT_ID_ICETEA
+ result = REAGENT_ID_ICETEA
+ required_reagents = list("ice" = 1, REAGENT_ID_TEA = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/icecoffee
- name = "Iced Coffee"
- id = "icecoffee"
- result = "icecoffee"
- required_reagents = list("ice" = 1, "coffee" = 2)
+ name = REAGENT_ICECOFFEE
+ id = REAGENT_ID_ICECOFFEE
+ result = REAGENT_ID_ICECOFFEE
+ required_reagents = list("ice" = 1, REAGENT_ID_COFFEE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/icecoffee/alt
name = "Iced Drip Coffee"
- id = "icecoffee"
- result = "icecoffee"
- required_reagents = list("ice" = 1, "drip_coffee" = 2)
+ id = REAGENT_ID_ICECOFFEE
+ result = REAGENT_ID_ICECOFFEE
+ required_reagents = list("ice" = 1, REAGENT_ID_DRIPCOFFEE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/blackeye
- name = "Black Eye Coffee"
- id = "black_eye"
- result = "black_eye"
- required_reagents = list("drip_coffee" = 1, "coffee" = 1)
+ name = REAGENT_BLACKEYE
+ id = REAGENT_ID_BLACKEYE
+ result = REAGENT_ID_BLACKEYE
+ required_reagents = list(REAGENT_ID_DRIPCOFFEE = 1, REAGENT_ID_COFFEE = 1)
result_amount = 1
/decl/chemical_reaction/instant/drinks/americano
- name = "Americano"
- id = "americano"
- result = "americano"
- required_reagents = list("water" = 1, "long_black" = 2)
+ name = REAGENT_AMERICANO
+ id = REAGENT_ID_AMERICANO
+ result = REAGENT_ID_AMERICANO
+ required_reagents = list("water" = 1, REAGENT_ID_LONGBLACK = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/long_black
- name = "Long Black Coffee"
- id = "long_black"
- result = "long_black"
- required_reagents = list("water" = 1, "coffee" = 1)
+ name = REAGENT_LONGBLACK
+ id = REAGENT_ID_LONGBLACK
+ result = REAGENT_ID_LONGBLACK
+ required_reagents = list("water" = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/macchiato
- name = "Macchiato"
- id = "macchiato"
- result = "macchiato"
- required_reagents = list("milk" = 1, "coffee" = 2)
+ name = REAGENT_MACCHIATO
+ id = REAGENT_ID_MACCHIATO
+ result = REAGENT_ID_MACCHIATO
+ required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_COFFEE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/cortado
- name = "Cortado"
- id = "cortado"
- result = "cortado"
- required_reagents = list("macchiato" = 3, "milk_foam" = 1) // 2 coffee, 1 milk, 1 milk foam
+ name = REAGENT_CORTADO
+ id = REAGENT_ID_CORTADO
+ result = REAGENT_ID_CORTADO
+ required_reagents = list(REAGENT_ID_MACCHIATO = 3, REAGENT_ID_MILKFOAM = 1) // 2 coffee, 1 milk, 1 milk foam
result_amount = 4
/decl/chemical_reaction/instant/drinks/breve
- name = "Breve"
- id = "breve"
- result = "breve"
- required_reagents = list("cortado" = 4, "cream" = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream
+ name = REAGENT_BREVE
+ id = REAGENT_ID_BREVE
+ result = REAGENT_ID_BREVE
+ required_reagents = list(REAGENT_ID_CORTADO = 4, REAGENT_ID_CREAM = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream
result_amount = 5
/decl/chemical_reaction/instant/drinks/cappuccino
- name = "Cappuccino"
- id = "cappuccino"
- result = "cappuccino"
- required_reagents = list("milk" = 1, "milk_foam" = 1, "cortado" = 4) // 2 coffee, 2 milk, 2 milk foam
+ name = REAGENT_CAPPUCCINO
+ id = REAGENT_ID_CAPPUCCINO
+ result = REAGENT_ID_CAPPUCCINO
+ required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_MILKFOAM = 1, REAGENT_ID_CORTADO = 4) // 2 coffee, 2 milk, 2 milk foam
result_amount = 6
/decl/chemical_reaction/instant/drinks/flat_white
- name = "Flat White Coffee"
- id = "flat_white"
- result = "flat_white"
- required_reagents = list("milk" = 2, "drip_coffee" = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions
+ name = REAGENT_FLATWHITE
+ id = REAGENT_ID_FLATWHITE
+ result = REAGENT_ID_FLATWHITE
+ required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_DRIPCOFFEE = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions
result_amount = 3
/decl/chemical_reaction/instant/drinks/mocha
- name = "Mocha"
- id = "mocha"
- result = "mocha"
- required_reagents = list("milk" = 1, "cream" = 1, "milk_foam" = 1, "hot_coco" = 2, "breve" = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
+ name = REAGENT_MOCHA
+ id = REAGENT_ID_MOCHA
+ result = REAGENT_ID_MOCHA
+ required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_MILKFOAM = 1, REAGENT_ID_HOTCOCO = 2, REAGENT_ID_BREVE = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
result_amount = 10
/decl/chemical_reaction/instant/drinks/mocha/alt //incase they use cream before milk
- name = "Mocha"
- id = "mocha"
- result = "mocha"
- required_reagents = list("cream" = 2, "hot_coco" = 2, "cappuccino" = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
+ name = REAGENT_MOCHA
+ id = REAGENT_ID_MOCHA
+ result = REAGENT_ID_MOCHA
+ required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_HOTCOCO = 2, REAGENT_ID_CAPPUCCINO = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
result_amount = 10
/decl/chemical_reaction/instant/drinks/vienna
- name = "Vienna"
- id = "vienna"
- result = "vienna"
- required_reagents = list("cream" = 2, "coffee" = 1)
+ name = REAGENT_VIENNA
+ id = REAGENT_ID_VIENNA
+ result = REAGENT_ID_VIENNA
+ required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_COFFEE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/nuka_cola
name = "Nuclear Cola"
- id = "nuka_cola"
- result = "nuka_cola"
- required_reagents = list(REAGENT_ID_URANIUM = 1, "cola" = 5)
+ id = REAGENT_ID_NUKACOLA
+ result = REAGENT_ID_NUKACOLA
+ required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_COLA = 5)
result_amount = 5
/decl/chemical_reaction/instant/drinks/moonshine
@@ -178,71 +178,71 @@
id = "moonshine"
result = "moonshine"
required_reagents = list(REAGENT_ID_NUTRIMENT = 10)
- catalysts = list("enzyme" = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/grenadine
- name = "Grenadine Syrup"
- id = "grenadine"
- result = "grenadine"
- required_reagents = list("berryjuice" = 10)
- catalysts = list("enzyme" = 5)
+ name = REAGENT_GRENADINE
+ id = REAGENT_ID_GRENADINE
+ result = REAGENT_ID_GRENADINE
+ required_reagents = list(REAGENT_ID_BERRYJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/wine
name = "Wine"
id = "redwine"
result = "redwine"
- required_reagents = list("grapejuice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_GRAPEJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/pwine
name = "Poison Wine"
id = "pwine"
result = "pwine"
- required_reagents = list("poisonberryjuice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_POISONBERRYJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/melonliquor
name = "Melon Liquor"
id = "melonliquor"
result = "melonliquor"
- required_reagents = list("watermelonjuice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_WATERMELONJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/bluecuracao
name = "Blue Curacao"
id = "bluecuracao"
result = "bluecuracao"
- required_reagents = list("orangejuice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_ORANGEJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/spacebeer
name = "Space Beer"
id = "spacebeer"
result = "beer"
- required_reagents = list("cornoil" = 5, "flour" = 5)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_CORNOIL = 5, REAGENT_ID_FLOUR = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/vodka
name = "Vodka"
id = "vodka"
result = "vodka"
- required_reagents = list("potatojuice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_POTATOJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/cider
name = "Cider"
id = "cider"
result = "cider"
- required_reagents = list("applejuice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_APPLEJUICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
@@ -250,37 +250,37 @@
name = "Sake"
id = "sake"
result = "sake"
- required_reagents = list("rice" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_RICE = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/kahlua
name = "Kahlua"
id = "kahlua"
result = "kahlua"
- required_reagents = list("coffee" = 5, REAGENT_ID_SUGAR = 5)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_COFFEE = 5, REAGENT_ID_SUGAR = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 5
/decl/chemical_reaction/instant/drinks/gin_tonic
name = "Gin and Tonic"
id = "gintonic"
result = "gintonic"
- required_reagents = list("gin" = 2, "tonic" = 1)
+ required_reagents = list("gin" = 2, REAGENT_ID_TONIC = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
result = "rumandcola"
- required_reagents = list("rum" = 2, "cola" = 1)
+ required_reagents = list("rum" = 2, REAGENT_ID_COLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/cuba_libre
name = "Cuba Libre"
id = "cubalibre"
result = "cubalibre"
- required_reagents = list("rumandcola" = 3, "limejuice" = 1)
+ required_reagents = list("rumandcola" = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/martini
@@ -302,35 +302,35 @@
name = "White Russian"
id = "whiterussian"
result = "whiterussian"
- required_reagents = list("blackrussian" = 2, "cream" = 1)
+ required_reagents = list("blackrussian" = 2, REAGENT_ID_CREAM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/whiskey_cola
name = "Whiskey Cola"
id = "whiskeycola"
result = "whiskeycola"
- required_reagents = list("whiskey" = 2, "cola" = 1)
+ required_reagents = list("whiskey" = 2, REAGENT_ID_COLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/screwdriver
name = "Screwdriver"
id = "screwdrivercocktail"
result = "screwdrivercocktail"
- required_reagents = list("vodka" = 2, "orangejuice" = 1)
+ required_reagents = list("vodka" = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/bloody_mary
name = "Bloody Mary"
id = "bloodymary"
result = "bloodymary"
- required_reagents = list("vodka" = 2, "tomatojuice" = 3, "limejuice" = 1)
+ required_reagents = list("vodka" = 2, REAGENT_ID_TOMATOJUICE = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
id = "gargleblaster"
result = "gargleblaster"
- required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
+ required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/brave_bull
@@ -344,7 +344,7 @@
name = "Tequilla Sunrise"
id = "tequillasunrise"
result = "tequillasunrise"
- required_reagents = list("tequilla" = 2, "orangejuice" = 1)
+ required_reagents = list("tequilla" = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/phoron_special
@@ -358,21 +358,21 @@
name = "Beepksy Smash"
id = "beepksysmash"
result = "beepskysmash"
- required_reagents = list("limejuice" = 1, "whiskey" = 1, REAGENT_ID_IRON = 1)
+ required_reagents = list(REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_IRON = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/doctor_delight
- name = "The Doctor's Delight"
+ name = REAGENT_DOCTORSDELIGHT
id = "doctordelight"
- result = "doctorsdelight"
- required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, REAGENT_ID_TRICORDRAZINE = 1)
+ result = REAGENT_ID_DOCTORSDELIGHT
+ required_reagents = list(REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_TOMATOJUICE = 1, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_CREAM = 2, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/irish_cream
name = "Irish Cream"
id = "irishcream"
result = "irishcream"
- required_reagents = list("whiskey" = 2, "cream" = 1)
+ required_reagents = list("whiskey" = 2, REAGENT_ID_CREAM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/manly_dorf
@@ -393,7 +393,7 @@
name = "Irish Coffee"
id = "irishcoffee"
result = "irishcoffee"
- required_reagents = list("irishcream" = 1, "coffee" = 1)
+ required_reagents = list("irishcream" = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/b52
@@ -414,7 +414,7 @@
name = "Margarita"
id = "margarita"
result = "margarita"
- required_reagents = list("tequilla" = 2, "limejuice" = 1)
+ required_reagents = list("tequilla" = 2, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/longislandicedtea
@@ -435,7 +435,7 @@
name = "Whiskey Soda"
id = "whiskeysoda"
result = "whiskeysoda"
- required_reagents = list("whiskey" = 2, "sodawater" = 1)
+ required_reagents = list("whiskey" = 2, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/black_russian
@@ -463,21 +463,21 @@
name = "Vodka and Tonic"
id = "vodkatonic"
result = "vodkatonic"
- required_reagents = list("vodka" = 2, "tonic" = 1)
+ required_reagents = list("vodka" = 2, REAGENT_ID_TONIC = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/gin_fizz
name = "Gin Fizz"
id = "ginfizz"
result = "ginfizz"
- required_reagents = list("gin" = 1, "sodawater" = 1, "limejuice" = 1)
+ required_reagents = list("gin" = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/bahama_mama
name = "Bahama mama"
id = "bahama_mama"
result = "bahama_mama"
- required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
+ required_reagents = list("rum" = 2, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, "ice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/singulo
@@ -498,42 +498,42 @@
name = "Demons Blood"
id = "demonsblood"
result = "demonsblood"
- required_reagents = list("rum" = 3, "spacemountainwind" = 1, REAGENT_ID_BLOOD = 1, "dr_gibb" = 1)
+ required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/booger
name = "Booger"
id = "booger"
result = "booger"
- required_reagents = list("cream" = 2, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+ required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, "rum" = 1, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/antifreeze
name = "Anti-freeze"
id = "antifreeze"
result = "antifreeze"
- required_reagents = list("vodka" = 1, "cream" = 1, "ice" = 1)
+ required_reagents = list("vodka" = 1, REAGENT_ID_CREAM = 1, "ice" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/barefoot
name = "Barefoot"
id = "barefoot"
result = "barefoot"
- required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
+ required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, "vermouth" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/grapesoda
- name = "Grape Soda"
- id = "grapesoda"
- result = "grapesoda"
- required_reagents = list("grapejuice" = 2, "cola" = 1)
+ name = REAGENT_GRAPESODA
+ id = REAGENT_ID_GRAPESODA
+ result = REAGENT_ID_GRAPESODA
+ required_reagents = list(REAGENT_ID_GRAPEJUICE = 2, REAGENT_ID_COLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/sbiten
name = "Sbiten"
id = "sbiten"
result = "sbiten"
- required_reagents = list("vodka" = 10, "capsaicin" = 1)
+ required_reagents = list("vodka" = 10, REAGENT_ID_CAPSAICIN = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/red_mead
@@ -548,14 +548,14 @@
id = "mead"
result = "mead"
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
- catalysts = list("enzyme" = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 2
/decl/chemical_reaction/instant/drinks/iced_beer
name = "Iced Beer"
id = "iced_beer"
result = "iced_beer"
- required_reagents = list("beer" = 10, "frostoil" = 1)
+ required_reagents = list("beer" = 10, REAGENT_ID_FROSTOIL = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/iced_beer2
@@ -573,17 +573,17 @@
result_amount = 2
/decl/chemical_reaction/instant/drinks/soy_latte
- name = "Soy Latte"
- id = "soy_latte"
- result = "soy_latte"
- required_reagents = list("coffee" = 1, "soymilk" = 1)
+ name = REAGENT_SOYLATTE
+ id = REAGENT_ID_SOYLATTE
+ result = REAGENT_ID_SOYLATTE
+ required_reagents = list(REAGENT_ID_COFFEE = 1, REAGENT_ID_SOYMILK = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/cafe_latte
- name = "Cafe Latte"
- id = "cafe_latte"
- result = "cafe_latte"
- required_reagents = list("flat_white" = 1, "milk" = 1)
+ name = REAGENT_CAFELATTE
+ id = REAGENT_ID_CAFELATTE
+ result = REAGENT_ID_CAFELATTE
+ required_reagents = list(REAGENT_ID_FLATWHITE = 1, REAGENT_ID_MILK = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/acidspit
@@ -604,28 +604,28 @@
name = "Changeling Sting"
id = "changelingsting"
result = "changelingsting"
- required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
+ required_reagents = list("screwdrivercocktail" = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/aloe
name = "Aloe"
id = "aloe"
result = "aloe"
- required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
+ required_reagents = list(REAGENT_ID_CREAM = 1, "whiskey" = 1, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/andalusia
name = "Andalusia"
id = "andalusia"
result = "andalusia"
- required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
+ required_reagents = list("rum" = 1, "whiskey" = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/snowwhite
name = "Snow White"
id = "snowwhite"
result = "snowwhite"
- required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit
+ required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 1, "rum" = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit
result_amount = 2
/decl/chemical_reaction/instant/drinks/irishcarbomb
@@ -646,7 +646,7 @@
name = "Erika Surprise"
id = "erikasurprise"
result = "erikasurprise"
- required_reagents = list("ale" = 2, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
+ required_reagents = list("ale" = 2, REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_BANANA = 1, "ice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/devilskiss
@@ -667,14 +667,14 @@
name = "Banana Honk"
id = "bananahonk"
result = "bananahonk"
- required_reagents = list("banana" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1)
+ required_reagents = list(REAGENT_ID_BANANA = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/silencer
name = "Silencer"
id = "silencer"
result = "silencer"
- required_reagents = list("nothing" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1)
+ required_reagents = list("nothing" = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/driestmartini
@@ -685,60 +685,60 @@
result_amount = 2
/decl/chemical_reaction/instant/drinks/lemonade
- name = "Lemonade"
- id = "lemonade"
- result = "lemonade"
- required_reagents = list("lemonjuice" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
+ name = REAGENT_LEMONADE
+ id = REAGENT_ID_LEMONADE
+ result = REAGENT_ID_LEMONADE
+ required_reagents = list(REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/melonade
- name = "Melonade"
- id = "melonade"
- result = "melonade"
- required_reagents = list("watermelonjuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1)
+ name = REAGENT_MELONADE
+ id = REAGENT_ID_MELONADE
+ result = REAGENT_ID_MELONADE
+ required_reagents = list(REAGENT_ID_WATERMELONJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/appleade
- name = "Appleade"
- id = "appleade"
- result = "appleade"
- required_reagents = list("applejuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1)
+ name = REAGENT_APPLEADE
+ id = REAGENT_ID_APPLEADE
+ result = REAGENT_ID_APPLEADE
+ required_reagents = list(REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/pineappleade
- name = "Pineappleade"
- id = "pineappleade"
- result = "pineappleade"
- required_reagents = list("pineapplejuice" = 2, "limejuice" = 1, "sodawater" = 2, "honey" = 1)
+ name = REAGENT_PINEAPPLEADE
+ id = REAGENT_ID_PINEAPPLEADE
+ result = REAGENT_ID_PINEAPPLEADE
+ required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_SODAWATER = 2, REAGENT_ID_HONEY = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/driverspunch
name = "Driver`s Punch"
id = "driverspunch"
result = "driverspunch"
- required_reagents = list("appleade" = 2, "orangejuice" = 1, "mint" = 1, "sodawater" = 1)
+ required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/mintapplesparkle
name = "Mint Apple Sparkle"
id = "mintapplesparkle"
result = "mintapplesparkle"
- required_reagents = list("appleade" = 2, "mint" = 1)
- inhibitors = list("sodawater" = 1)
+ required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_MINT = 1)
+ inhibitors = list(REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/berrycordial
name = "Berry Cordial"
id = "berrycordial"
result = "berrycordial"
- required_reagents = list("berryjuice" = 4, REAGENT_ID_SUGAR = 1, "lemonjuice" = 1)
+ required_reagents = list(REAGENT_ID_BERRYJUICE = 4, REAGENT_ID_SUGAR = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tropicalfizz
name = "Tropical Fizz"
id = "tropicalfizz"
result = "tropicalfizz"
- required_reagents = list("sodawater" = 6, "berryjuice" = 1, "mint" = 1, "limejuice" = 1, "lemonjuice" = 1, "pineapplejuice" = 1)
+ required_reagents = list(REAGENT_ID_SODAWATER = 6, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_PINEAPPLEJUICE = 1)
inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 8
@@ -746,14 +746,14 @@
name = "Melon Spritzer"
id = "melonspritzer"
result = "melonspritzer"
- required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1)
+ required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, "redwine" = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fauxfizz
name = "Faux Fizz"
id = "fauxfizz"
result = "fauxfizz"
- required_reagents = list("sodawater" = 2, "berryjuice" = 1, "applejuice" = 1, "limejuice" = 1, "honey" = 1)
+ required_reagents = list(REAGENT_ID_SODAWATER = 2, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_HONEY = 1)
inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 6
@@ -765,150 +765,150 @@
result_amount = 3
/decl/chemical_reaction/instant/drinks/kiraspecial
- name = "Kira Special"
- id = "kiraspecial"
- result = "kiraspecial"
- required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
+ name = REAGENT_KIRASPECIAL
+ id = REAGENT_ID_KIRASPECIAL
+ result = REAGENT_ID_KIRASPECIAL
+ required_reagents = list(REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/brownstar
- name = "Brown Star"
- id = "brownstar"
- result = "brownstar"
- required_reagents = list("orangejuice" = 2, "cola" = 1)
+ name = REAGENT_BROWNSTAR
+ id = REAGENT_ID_BROWNSTAR
+ result = REAGENT_ID_BROWNSTAR
+ required_reagents = list(REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_COLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/brownstar_decaf
- name = "Decaf Brown Star"
- id = "brownstar_decaf"
- result = "brownstar_decaf"
- required_reagents = list("orangejuice" = 2, "decafcola" = 1)
+ name = REAGENT_BROWNSTARDECAF
+ id = REAGENT_ID_BROWNSTARDECAF
+ result = REAGENT_ID_BROWNSTARDECAF
+ required_reagents = list(REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_DECAFCOLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/milkshake
- name = "Milkshake"
- id = "milkshake"
- result = "milkshake"
- required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
+ name = REAGENT_MILKSHAKE
+ id = REAGENT_ID_MILKSHAKE
+ result = REAGENT_ID_MILKSHAKE
+ required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 2, REAGENT_ID_MILK = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/peanutmilkshake
name = "Peanutbutter Milkshake"
- id = "peanutmilkshake"
- result = "peanutmilkshake"
- required_reagents = list("cream" = 1, "ice" = 1, "peanutbutter" = 2, "milk" = 1)
+ id = REAGENT_ID_PEANUTMILKSHAKE
+ result = REAGENT_ID_PEANUTMILKSHAKE
+ required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 1, REAGENT_ID_PEANUTBUTTER = 2, REAGENT_ID_MILK = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/rewriter
- name = "Rewriter"
- id = "rewriter"
- result = "rewriter"
- required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
+ name = REAGENT_REWRITER
+ id = REAGENT_ID_REWRITER
+ result = REAGENT_ID_REWRITER
+ required_reagents = list(REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/suidream
name = "Sui Dream"
id = "suidream"
result = "suidream"
- required_reagents = list("space_up" = 1, "bluecuracao" = 1, "melonliquor" = 1)
+ required_reagents = list(REAGENT_ID_SPACEUP = 1, "bluecuracao" = 1, "melonliquor" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/shirleytemple
- name = "Shirley Temple"
- id = "shirley_temple"
- result = "shirley_temple"
- required_reagents = list("gingerale" = 4, "grenadine" = 1)
+ name = REAGENT_SHIRLEYTEMPLE
+ id = REAGENT_ID_SHIRLEYTEMPLE
+ result = REAGENT_ID_SHIRLEYTEMPLE
+ required_reagents = list(REAGENT_ID_GINGERALE = 4, REAGENT_ID_GRENADINE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/royrogers
- name = "Roy Rogers"
- id = "roy_rogers"
- result = "roy_rogers"
- required_reagents = list("shirley_temple" = 5, "lemon_lime" = 2)
+ name = REAGENT_ROYROGERS
+ id = REAGENT_ID_ROYROGERS
+ result = REAGENT_ID_ROYROGERS
+ required_reagents = list(REAGENT_ID_SHIRLEYTEMPLE = 5, REAGENT_ID_LEMONLIME = 2)
result_amount = 7
/decl/chemical_reaction/instant/drinks/collinsmix
- name = "Collins Mix"
- id = "collins_mix"
- result = "collins_mix"
- required_reagents = list("lemon_lime" = 3, "sodawater" = 1)
+ name = REAGENT_COLLINSMIX
+ id = REAGENT_ID_COLLINSMIX
+ result = REAGENT_ID_COLLINSMIX
+ required_reagents = list(REAGENT_ID_LEMONLIME = 3, REAGENT_ID_SODAWATER = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/arnoldpalmer
- name = "Arnold Palmer"
- id = "arnold_palmer"
- result = "arnold_palmer"
- required_reagents = list("icetea" = 1, "lemonade" = 1)
+ name = REAGENT_ARNOLDPALMER
+ id = REAGENT_ID_ARNOLDPALMER
+ result = REAGENT_ID_ARNOLDPALMER
+ required_reagents = list(REAGENT_ID_ICETEA = 1, REAGENT_ID_LEMONADE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/minttea
- name = "Mint Tea"
- id = "minttea"
- result = "minttea"
- required_reagents = list("tea" = 5, "mint" = 1)
+ name = REAGENT_MINTTEA
+ id = REAGENT_ID_MINTTEA
+ result = REAGENT_ID_MINTTEA
+ required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_MINT = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/minttea_decaf
- name = "Decaf Mint Tea"
+ name = REAGENT_MINTTEADECAF
id = "decafminttea"
- result = "mintteadecaf"
- required_reagents = list("teadecaf" = 5, "mint" = 1)
+ result = REAGENT_ID_MINTTEADECAF
+ required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_MINT = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lemontea
- name = "Lemon Tea"
- id = "lemontea"
- result = "lemontea"
- required_reagents = list("tea" = 5, "lemonjuice" = 1)
+ name = REAGENT_LEMONTEA
+ id = REAGENT_ID_LEMONTEA
+ result = REAGENT_ID_LEMONTEA
+ required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lemontea_decaf
- name = "Decaf Lemon Tea"
+ name = REAGENT_LEMONTEADECAF
id = "decaflemontea"
- result = "lemonteadecaf"
- required_reagents = list("teadecaf" = 5, "lemonjuice" = 1)
+ result = REAGENT_ID_LEMONTEADECAF
+ required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/limetea
- name = "Lime Tea"
- id = "limetea"
- result = "limetea"
- required_reagents = list("tea" = 5, "limejuice" = 1)
+ name = REAGENT_LIMETEA
+ id = REAGENT_ID_LIMETEA
+ result = REAGENT_ID_LIMETEA
+ required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/limetea_decaf
- name = "Decaf Lime Tea"
+ name = REAGENT_LIMETEADECAF
id = "decaflimetea"
- result = "limeteadecaf"
- required_reagents = list("teadecaf" = 5, "limejuice" = 1)
+ result = REAGENT_ID_LIMETEADECAF
+ required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/orangetea
- name = "Orange Tea"
- id = "orangetea"
- result = "orangetea"
- required_reagents = list("tea" = 5, "orangejuice" = 1)
+ name = REAGENT_ORANGETEA
+ id = REAGENT_ID_ORANGETEA
+ result = REAGENT_ID_ORANGETEA
+ required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/orangetea_decaf
name = "Decaf Orange Tea"
id = "decaforangetea"
- result = "orangeteadecaf"
- required_reagents = list("teadecaf" = 5, "orangejuice" = 1)
+ result = REAGENT_ID_ORANGETEADECAF
+ required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/berrytea
- name = "Berry Tea"
- id = "berrytea"
- result = "berrytea"
- required_reagents = list("tea" = 5, "berryjuice" = 1)
+ name = REAGENT_BERRYTEA
+ id = REAGENT_ID_BERRYTEA
+ result = REAGENT_ID_BERRYTEA
+ required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/berrytea_decaf
- name = "Decaf Berry Tea"
+ name = REAGENT_BERRYTEADECAF
id = "decafberrytea"
- result = "berryteadecaf"
- required_reagents = list("teadecaf" = 5, "berryjuice" = 1)
+ result = REAGENT_ID_BERRYTEADECAF
+ required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/sakebomb
@@ -922,21 +922,21 @@
name = "Tamagozake"
id = "tamagozake"
result = "tamagozake"
- required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3)
+ required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result_amount = 15
/decl/chemical_reaction/instant/drinks/ginzamary
name = "Ginza Mary"
id = "ginzamary"
result = "ginzamary"
- required_reagents = list("sake" = 2, "vodka" = 2, "tomatojuice" = 1)
+ required_reagents = list("sake" = 2, "vodka" = 2, REAGENT_ID_TOMATOJUICE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tokyorose
name = "Tokyo Rose"
id = "tokyorose"
result = "tokyorose"
- required_reagents = list("sake" = 1, "berryjuice" = 1)
+ required_reagents = list("sake" = 1, REAGENT_ID_BERRYJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/saketini
@@ -950,7 +950,7 @@
name = "Elysium Facepunch"
id = "elysiumfacepunch"
result = "elysiumfacepunch"
- required_reagents = list("kahlua" = 1, "lemonjuice" = 1)
+ required_reagents = list("kahlua" = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/erebusmoonrise
@@ -964,14 +964,14 @@
name = "Balloon"
id = "balloon"
result = "balloon"
- required_reagents = list("cream" = 1, "bluecuracao" = 1)
+ required_reagents = list(REAGENT_ID_CREAM = 1, "bluecuracao" = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/natunabrandy
name = "Natuna Brandy"
id = "natunabrandy"
result = "natunabrandy"
- required_reagents = list("beer" = 1, "sodawater" = 2)
+ required_reagents = list("beer" = 1, REAGENT_ID_SODAWATER = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/euphoria
@@ -985,21 +985,21 @@
name = "Xanadu Cannon"
id = "xanaducannon"
result = "xanaducannon"
- required_reagents = list("ale" = 1, "dr_gibb" = 1)
+ required_reagents = list("ale" = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/debugger
name = "Debugger"
id = "debugger"
result = "debugger"
- required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, "cookingoil" = 2)
+ required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, REAGENT_ID_COOKINGOIL = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/spacersbrew
name = "Spacer's Brew"
id = "spacersbrew"
result = "spacersbrew"
- required_reagents = list("brownstar" = 4, REAGENT_ID_ETHANOL = 1)
+ required_reagents = list(REAGENT_ID_BROWNSTAR = 4, REAGENT_ID_ETHANOL = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/binmanbliss
@@ -1027,15 +1027,15 @@
name = "Bitters"
id = "bitters"
result = "bitters"
- required_reagents = list("mint" = 5)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_MINT = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 5
/decl/chemical_reaction/instant/drinks/soemmerfire
name = "Soemmer Fire"
id = "soemmerfire"
result = "soemmerfire"
- required_reagents = list("manhattan" = 2, "condensedcapsaicin" = 1)
+ required_reagents = list("manhattan" = 2, REAGENT_ID_CONDENSEDCAPSAICIN = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/winebrandy
@@ -1043,21 +1043,21 @@
id = "winebrandy"
result = "winebrandy"
required_reagents = list("redwine" = 10)
- catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
+ catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
result_amount = 5
/decl/chemical_reaction/instant/drinks/lovepotion
name = "Love Potion"
id = "lovepotion"
result = "lovepotion"
- required_reagents = list("cream" = 1, "berryjuice" = 1, REAGENT_ID_SUGAR = 1)
+ required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/morningafter
name = "Morning After"
id = "morningafter"
result = "morningafter"
- required_reagents = list("sbiten" = 1, "coffee" = 5)
+ required_reagents = list("sbiten" = 1, REAGENT_ID_COFFEE = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/vesper
@@ -1071,14 +1071,14 @@
name = "Rotgut Fever Dream"
id = "rotgut"
result = "rotgut"
- required_reagents = list("vodka" = 3, "rum" = 1, "whiskey" = 1, "cola" = 3)
+ required_reagents = list("vodka" = 3, "rum" = 1, "whiskey" = 1, REAGENT_ID_COLA = 3)
result_amount = 8
/decl/chemical_reaction/instant/drinks/entdraught
name = "Ent's Draught"
id = "entdraught"
result = "entdraught"
- required_reagents = list("tonic" = 1, REAGENT_ID_HOLYWATER = 1, "honey" = 1)
+ required_reagents = list(REAGENT_ID_TONIC = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_HONEY = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/voxdelight
@@ -1092,21 +1092,21 @@
name = "Screaming Viking"
id = "screamingviking"
result = "screamingviking"
- required_reagents = list("martini" = 2, "vodkatonic" = 2, "limejuice" = 1, "rum" = 1)
+ required_reagents = list("martini" = 2, "vodkatonic" = 2, REAGENT_ID_LIMEJUICE = 1, "rum" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/vilelemon
name = "Vile Lemon"
id = "vilelemon"
result = "vilelemon"
- required_reagents = list("lemonade" = 5, "spacemountainwind" = 1)
+ required_reagents = list(REAGENT_ID_LEMONADE = 5, REAGENT_ID_SPACEMOUNTAINWIND = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/dreamcream
name = "Dream Cream"
id = "dreamcream"
result = "dreamcream"
- required_reagents = list("milk" = 2, "cream" = 1, "honey" = 1)
+ required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_CREAM = 1, REAGENT_ID_HONEY = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/robustin
@@ -1124,31 +1124,31 @@
result_amount = 2
/decl/chemical_reaction/instant/drinks/chocoshake
- name = "Chocolate Milkshake"
- id = "chocoshake"
- result = "chocoshake"
- required_reagents = list("milkshake" = 1, "coco" = 1)
+ name = REAGENT_CHOCOSHAKE
+ id = REAGENT_ID_CHOCOSHAKE
+ result = REAGENT_ID_CHOCOSHAKE
+ required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_COCO = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/berryshake
- name = "Berry Milkshake"
- id = "berryshake"
- result = "berryshake"
- required_reagents = list("milkshake" = 1, "berryjuice" = 1)
+ name = REAGENT_BERRYSHAKE
+ id = REAGENT_ID_BERRYSHAKE
+ result = REAGENT_ID_BERRYSHAKE
+ required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_BERRYJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/coffeeshake
- name = "Coffee Milkshake"
- id = "coffeeshake"
- result = "coffeeshake"
- required_reagents = list("milkshake" = 1, "coffee" = 1)
+ name = REAGENT_COFFEESHAKE
+ id = REAGENT_ID_COFFEESHAKE
+ result = REAGENT_ID_COFFEESHAKE
+ required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/jellyshot
name = "Jelly Shot"
id = "jellyshot"
result = "jellyshot"
- required_reagents = list("cherryjelly" = 4, "vodka" = 1)
+ required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, "vodka" = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/slimeshot
@@ -1169,7 +1169,7 @@
name = "Clover Club"
id = "cloverclub"
result = "cloverclub"
- required_reagents = list("berryjuice" = 1, "lemonjuice" = 1, "gin" = 3)
+ required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, "gin" = 3)
result_amount = 5
/decl/chemical_reaction/instant/drinks/oldfashioned
@@ -1183,56 +1183,56 @@
name = "Whiskey Sour"
id = "whiskeysour"
result = "whiskeysour"
- required_reagents = list("whiskey" = 2, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1)
+ required_reagents = list("whiskey" = 2, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/daiquiri
name = "Daiquiri"
id = "daiquiri"
result = "daiquiri"
- required_reagents = list("rum" = 3, "limejuice" = 2, REAGENT_ID_SUGAR = 1)
+ required_reagents = list("rum" = 3, REAGENT_ID_LIMEJUICE = 2, REAGENT_ID_SUGAR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mintjulep
name = "Mint Julep"
id = "mintjulep"
result = "mintjulep"
- required_reagents = list("whiskey" = 2, REAGENT_ID_WATER = 1, "mint" = 1)
+ required_reagents = list("whiskey" = 2, REAGENT_ID_WATER = 1, REAGENT_ID_MINT = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/paloma
name = "Paloma"
id = "paloma"
result = "paloma"
- required_reagents = list("sodawater" = 1, "tequillasunrise" = 2)
+ required_reagents = list(REAGENT_ID_SODAWATER = 1, "tequillasunrise" = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/mojito
name = "Mojito"
id = "mojito"
result = "mojito"
- required_reagents = list("rum" = 3, "limejuice" = 1, "mint" = 1)
+ required_reagents = list("rum" = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/virginmojito
name = "Mojito"
id = "virginmojito"
result = "virginmojito"
- required_reagents = list("sodawater" = 3, "limejuice" = 1, "mint" = 1, REAGENT_ID_SUGAR = 1)
+ required_reagents = list(REAGENT_ID_SODAWATER = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/piscosour
name = "Pisco Sour"
id = "piscosour"
result = "piscosour"
- required_reagents = list("winebrandy" = 1, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1)
+ required_reagents = list("winebrandy" = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/coldfront
name = "Cold Front"
id = "coldfront"
result = "coldfront"
- required_reagents = list("icecoffee" = 1, "whiskey" = 1, "mint" = 1)
+ required_reagents = list(REAGENT_ID_ICECOFFEE = 1, "whiskey" = 1, REAGENT_ID_MINT = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/godsake
@@ -1247,14 +1247,14 @@
id = "godka"
result = "godka"
required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1)
- catalysts = list("enzyme" = 5, REAGENT_ID_HOLYWATER = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5, REAGENT_ID_HOLYWATER = 5)
result_amount = 1
/decl/chemical_reaction/instant/drinks/holywine
name = "Angel Ichor"
id = "holywine"
result = "holywine"
- required_reagents = list("grapejuice" = 5, REAGENT_ID_GOLD = 5)
+ required_reagents = list(REAGENT_ID_GRAPEJUICE = 5, REAGENT_ID_GOLD = 5)
catalysts = list(REAGENT_ID_HOLYWATER = 5)
result_amount = 10
@@ -1262,7 +1262,7 @@
name = "Holy Mary"
id = "holymary"
result = "holymary"
- required_reagents = list("vodka" = 2, "holywine" = 3, "limejuice" = 1)
+ required_reagents = list("vodka" = 2, "holywine" = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/angelskiss
@@ -1276,7 +1276,7 @@
name = "Angels Wrath"
id = "angelswrath"
result = "angelswrath"
- required_reagents = list("rum" = 3, "spacemountainwind" = 1, "holywine" = 1, "dr_gibb" = 1)
+ required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, "holywine" = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/ichor_mead
@@ -1290,21 +1290,21 @@
name = "Oil Slick"
id = "oilslick"
result = "oilslick"
- required_reagents = list("cookingoil" = 2, "honey" = 1)
+ required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_HONEY = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/slimeslam
name = "Slick Slime Slammer"
id = "slimeslammer"
result = "slimeslammer"
- required_reagents = list("cookingoil" = 2, "peanutbutter" = 1)
+ required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_PEANUTBUTTER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/virginsexonthebeach
name = "Virgin Sex On The Beach"
id = "virginsexonthebeach"
result = "virginsexonthebeach"
- required_reagents = list("orangejuice" = 3, "grenadine" = 2)
+ required_reagents = list(REAGENT_ID_ORANGEJUICE = 3, REAGENT_ID_GRENADINE = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/sexonthebeach
@@ -1318,14 +1318,14 @@
name = "Eggnog"
id = "eggnog"
result = "eggnog"
- required_reagents = list("milk" = 5, "cream" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3)
+ required_reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_CREAM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result_amount = 15
/decl/chemical_reaction/instant/drinks/nuclearwaste_radium
name = "Nuclear Waste"
id = "nuclearwasterad"
result = "nuclearwaste"
- required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, "limejuice" = 1)
+ required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/nuclearwaste_uranium
@@ -1339,12 +1339,12 @@
name = "Soda Oil"
id = "sodaoil"
result = "sodaoil"
- required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1)
+ required_reagents = list(REAGENT_ID_COOKINGOIL = 4, REAGENT_ID_SODAWATER = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fusionnaire
name = "Fusionnaire"
id = "fusionnaire"
result = "fusionnaire"
- required_reagents = list("lemonjuice" = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1)
+ required_reagents = list(REAGENT_ID_LEMONJUICE = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1)
result_amount = 9
diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm
index 1bb52e585f..8c86251edd 100644
--- a/code/modules/reagents/reactions/instant/drinks_vr.dm
+++ b/code/modules/reagents/reactions/instant/drinks_vr.dm
@@ -25,7 +25,7 @@
name = REAGENT_MONSTERTAMER
id = REAGENT_ID_MONSTERTAMER
result = REAGENT_ID_MONSTERTAMER
- required_reagents = list("whiskey" = 1, "protein" = 1)
+ required_reagents = list("whiskey" = 1, REAGENT_ID_PROTEIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/bigbeer
@@ -39,7 +39,7 @@
name = "Sweetened Tea"
id = REAGENT_ID_SWEETTEA
result = REAGENT_ID_SWEETTEA
- required_reagents = list("icetea" = 2, REAGENT_ID_SUGAR = 1,)
+ required_reagents = list(REAGENT_ID_ICETEA = 2, REAGENT_ID_SUGAR = 1,)
result_amount = 3
/decl/chemical_reaction/instant/drinks/unsweettea
@@ -60,14 +60,14 @@
name = REAGENT_BULLDOG
id = REAGENT_ID_BULLDOG
result = REAGENT_ID_BULLDOG
- required_reagents = list("whiterussian" = 4, "cola" =1)
+ required_reagents = list("whiterussian" = 4, REAGENT_ID_COLA =1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/sbagliato
name = REAGENT_SBAGLIATO
id = REAGENT_ID_SBAGLIATO
result = REAGENT_ID_SBAGLIATO
- required_reagents = list("redwine" = 1, "vermouth" = 1, "sodawater" =1)
+ required_reagents = list("redwine" = 1, "vermouth" = 1, REAGENT_ID_SODAWATER =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/italiancrisis
@@ -81,7 +81,7 @@
name = REAGENT_SUGARRUSH
id = REAGENT_ID_SUGARRUSH
result = REAGENT_ID_SUGARRUSH
- required_reagents = list(REAGENT_ID_SUGAR = 1, "sodawater" = 1, "vodka" =1)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, "vodka" =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/lotus
@@ -95,7 +95,7 @@
name = REAGENT_SHROOMJUICE
id = REAGENT_ID_SHROOMJUICE
result = REAGENT_ID_SHROOMJUICE
- required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "applejuice" = 1, "limejuice" =1)
+ required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/russianroulette
@@ -109,21 +109,21 @@
name = REAGENT_LOVEMAKER
id = REAGENT_ID_LOVEMAKER
result = REAGENT_ID_LOVEMAKER
- required_reagents = list("honey" = 1, "sexonthebeach" = 5)
+ required_reagents = list(REAGENT_ID_HONEY = 1, "sexonthebeach" = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/honeyshot
name = REAGENT_HONEYSHOT
id = REAGENT_ID_HONEYSHOT
result = REAGENT_ID_HONEYSHOT
- required_reagents = list("honey" = 1, "vodka" = 1, "grenadine" =1)
+ required_reagents = list(REAGENT_ID_HONEY = 1, "vodka" = 1, REAGENT_ID_GRENADINE =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/appletini
name = REAGENT_APPLETINI
id = REAGENT_ID_APPLETINIT
result = REAGENT_ID_APPLETINIT
- required_reagents = list("applejuice" = 2, "vodka" = 1)
+ required_reagents = list(REAGENT_ID_APPLEJUICE = 2, "vodka" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/glowingappletini
@@ -144,8 +144,8 @@
name = REAGENT_CHOCCYMILK
id = REAGENT_ID_CHOCCYMILK
result = REAGENT_ID_CHOCCYMILK
- inhibitors = list("enzyme" = 1)
- required_reagents = list("milk" = 3, "coco" = 1)
+ inhibitors = list(REAGENT_ID_ENZYME = 1)
+ required_reagents = list(REAGENT_ID_MILK = 3, REAGENT_ID_COCO = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/redspaceflush
@@ -159,7 +159,7 @@
name = REAGENT_GRAVEYARD
id = REAGENT_ID_GRAVEYARD
result = REAGENT_ID_GRAVEYARD
- required_reagents = list("cola" = 1, "spacemountainwind" = 1, "dr_gibb" =1, "space_up" = 1)
+ required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_DRGIBB =1, REAGENT_ID_SPACEUP = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/hairoftherat
@@ -173,7 +173,7 @@
name = REAGENT_PINKRUSSIAN
id = REAGENT_ID_PINKRUSSIAN
result = REAGENT_ID_PINKRUSSIAN
- required_reagents = list("blackrussian" = 2, "berryshake" = 1)
+ required_reagents = list("blackrussian" = 2, REAGENT_ID_BERRYSHAKE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/originalsin
@@ -181,21 +181,21 @@
id = REAGENT_ID_ORIGINALSIN
result = REAGENT_ID_ORIGINALSIN
required_reagents = list("holywine" = 1)
- catalysts = list("applejuice" = 1)
+ catalysts = list(REAGENT_ID_APPLEJUICE = 1)
result_amount = 1
/decl/chemical_reaction/instant/drinks/windgarita
name = REAGENT_WINDGARITA
id = REAGENT_ID_WINDGARITA
result = REAGENT_ID_WINDGARITA
- required_reagents = list("margarita" = 3, "spacemountainwind" = 2, "melonliquor" = 1)
+ required_reagents = list("margarita" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, "melonliquor" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/newyorksour
name = REAGENT_NEWYORKSOUR
id = REAGENT_ID_NEWYORKSOUR
result = REAGENT_ID_NEWYORKSOUR
- required_reagents = list("whiskeysour" = 3, "redwine" = 2, "egg" = 1)
+ required_reagents = list("whiskeysour" = 3, "redwine" = 2, REAGENT_ID_EGG = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mudslide
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index fd5d87f89b..92fc398f91 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -2,22 +2,22 @@
name = "Hot Ramen"
id = "hot_ramen"
result = "hot_ramen"
- required_reagents = list(REAGENT_ID_WATER = 1, "dry_ramen" = 3)
+ required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_DRYRAMEN = 3)
result_amount = 3
/decl/chemical_reaction/instant/food/hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
result = "hell_ramen"
- required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
+ required_reagents = list(REAGENT_ID_CAPSAICIN = 1, "hot_ramen" = 6)
result_amount = 6
/decl/chemical_reaction/instant/food/tofu
name = "Tofu"
- id = "tofu"
+ id = REAGENT_ID_TOFU
result = null
- required_reagents = list("soymilk" = 10)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_SOYMILK = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -30,8 +30,8 @@
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
- required_reagents = list("soymilk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_SOYMILK = 2, REAGENT_ID_COCO = 2, REAGENT_ID_SUGAR = 2)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -44,8 +44,8 @@
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
- required_reagents = list("milk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_COCO = 2, REAGENT_ID_SUGAR = 2)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -55,64 +55,64 @@
return
/decl/chemical_reaction/instant/food/cookingoilcorn
- name = "Cooking Oil"
+ name = REAGENT_COOKINGOIL
id = "cookingoilcorn"
- result = "cookingoil"
- required_reagents = list("cornoil" = 10)
- catalysts = list("enzyme" = 5)
+ result = REAGENT_ID_COOKINGOIL
+ required_reagents = list(REAGENT_ID_CORNOIL = 10)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/food/cookingoilpeanut
- name = "Cooking Oil"
+ name = REAGENT_COOKINGOIL
id = "cookingoilpeanut"
- result = "cookingoil"
- required_reagents = list("peanutoil" = 10)
+ result = REAGENT_ID_COOKINGOIL
+ required_reagents = list(REAGENT_ID_PEANUTOIL = 10)
inhibitors = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1)
- catalysts = list("enzyme" = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/food/soysauce
- name = "Soy Sauce"
- id = "soysauce"
- result = "soysauce"
- required_reagents = list("soymilk" = 4, REAGENT_ID_SACID = 1)
+ name = REAGENT_SOYSAUCE
+ id = REAGENT_ID_SOYSAUCE
+ result = REAGENT_ID_SOYSAUCE
+ required_reagents = list(REAGENT_ID_SOYMILK = 4, REAGENT_ID_SACID = 1)
result_amount = 5
/decl/chemical_reaction/instant/food/ketchup
- name = "Ketchup"
- id = "ketchup"
- result = "ketchup"
- required_reagents = list("tomatojuice" = 2, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
+ name = REAGENT_KETCHUP
+ id = REAGENT_ID_KETCHUP
+ result = REAGENT_ID_KETCHUP
+ required_reagents = list(REAGENT_ID_TOMATOJUICE = 2, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
/decl/chemical_reaction/instant/food/barbecue
- name = "Barbeque Sauce"
- id = "barbecue"
- result = "barbecue"
- required_reagents = list("tomatojuice" = 2, "applejuice" = 1, REAGENT_ID_SUGAR = 1, "spacespice" = 1)
+ name = REAGENT_BARBECUE
+ id = REAGENT_ID_BARBECUE
+ result = REAGENT_ID_BARBECUE
+ required_reagents = list(REAGENT_ID_TOMATOJUICE = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SPACESPICE = 1)
result_amount = 4
/decl/chemical_reaction/instant/food/peanutbutter
- name = "Peanut Butter"
- id = "peanutbutter"
- result = "peanutbutter"
- required_reagents = list("peanutoil" = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1)
- catalysts = list("enzyme" = 5)
+ name = REAGENT_PEANUTBUTTER
+ id = REAGENT_ID_PEANUTBUTTER
+ result = REAGENT_ID_PEANUTBUTTER
+ required_reagents = list(REAGENT_ID_PEANUTOIL = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 3
/decl/chemical_reaction/instant/food/mayonnaise
- name = "mayonnaise"
- id = "mayo"
- result = "mayo"
- required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
+ name = REAGENT_MAYO
+ id = REAGENT_ID_MAYO
+ result = REAGENT_ID_MAYO
+ required_reagents = list(REAGENT_ID_EGG = 9, REAGENT_ID_COOKINGOIL = 5, REAGENT_ID_LEMONJUICE = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 15
/decl/chemical_reaction/instant/food/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
result = null
- required_reagents = list("milk" = 40)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_MILK = 40)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -125,8 +125,8 @@
name = "Meatball"
id = "meatball"
result = null
- required_reagents = list("protein" = 3, "flour" = 5)
- catalysts = list("enzyme" = 5)
+ required_reagents = list(REAGENT_ID_PROTEIN = 3, REAGENT_ID_FLOUR = 5)
+ catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 3
/decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -139,7 +139,7 @@
name = "Dough"
id = "dough"
result = null
- required_reagents = list("egg" = 3, "flour" = 10)
+ required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10)
inhibitors = list(REAGENT_ID_WATER = 1, "beer" = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
result_amount = 1
@@ -170,37 +170,37 @@
/decl/chemical_reaction/instant/food/coating/batter
name = "Batter"
- id = "batter"
- result = "batter"
- required_reagents = list("egg" = 3, "flour" = 10, REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
+ id = REAGENT_ID_BATTER
+ result = REAGENT_ID_BATTER
+ required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/coating/beerbatter
name = "Beer Batter"
- id = "beerbatter"
- result = "beerbatter"
- required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
+ id = REAGENT_ID_BEERBATTER
+ result = REAGENT_ID_BEERBATTER
+ required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, "beer" = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/browniemix
- name = "Brownie Mix"
- id = "browniemix"
- result = "browniemix"
- required_reagents = list("flour" = 5, "coco" = 5, REAGENT_ID_SUGAR = 5)
+ name = REAGENT_BROWNIEMIX
+ id = REAGENT_ID_BROWNIEMIX
+ result = REAGENT_ID_BROWNIEMIX
+ required_reagents = list(REAGENT_ID_FLOUR = 5, REAGENT_ID_COCO = 5, REAGENT_ID_SUGAR = 5)
result_amount = 15
/decl/chemical_reaction/instant/food/cakebatter
- name = "Cake Batter"
- id = "cakebatter"
- result = "cakebatter"
- required_reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 15, "egg" = 3)
+ name = REAGENT_CAKEBATTER
+ id = REAGENT_ID_CAKEBATTER
+ result = REAGENT_ID_CAKEBATTER
+ required_reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 15, REAGENT_ID_EGG = 3)
result_amount = 60
/decl/chemical_reaction/instant/food/butter
name = "Butter"
id = "butter"
result = null
- required_reagents = list("cream" = 20, REAGENT_ID_SODIUMCHLORIDE = 1)
+ required_reagents = list(REAGENT_ID_CREAM = 20, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 1
/decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume)
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 0fc3d46542..e6b517b101 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -193,10 +193,10 @@
result_amount = 2
/decl/chemical_reaction/instant/virus_food
- name = "Virus Food"
- id = "virusfood"
- result = "virusfood"
- required_reagents = list(REAGENT_ID_WATER = 1, "milk" = 1)
+ name = REAGENT_VIRUSFOOD
+ id = REAGENT_ID_VIRUSFOOD
+ result = REAGENT_ID_VIRUSFOOD
+ required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_MILK = 1)
result_amount = 5
/decl/chemical_reaction/instant/leporazine
@@ -408,9 +408,9 @@
result_amount = 3
/decl/chemical_reaction/instant/lipozine
- name = "Lipozine"
- id = "Lipozine"
- result = "lipozine"
+ name = REAGENT_LIPOZINE
+ id = REAGENT_ID_LIPOZINE
+ result = REAGENT_ID_LIPOZINE
required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_RADIUM = 1)
result_amount = 3
@@ -475,7 +475,7 @@
name = REAGENT_GLYCEROL
id = REAGENT_ID_GLYCEROL
result = REAGENT_ID_GLYCEROL
- required_reagents = list("cornoil" = 3, REAGENT_ID_SACID = 1)
+ required_reagents = list(REAGENT_ID_CORNOIL = 3, REAGENT_ID_SACID = 1)
result_amount = 1
/decl/chemical_reaction/instant/sodiumchloride
@@ -486,10 +486,10 @@
result_amount = 2
/decl/chemical_reaction/instant/condensedcapsaicin
- name = "Condensed Capsaicin"
- id = "condensedcapsaicin"
- result = "condensedcapsaicin"
- required_reagents = list("capsaicin" = 2)
+ name = REAGENT_CONDENSEDCAPSAICIN
+ id = REAGENT_ID_CONDENSEDCAPSAICIN
+ result = REAGENT_ID_CONDENSEDCAPSAICIN
+ required_reagents = list(REAGENT_ID_CAPSAICIN = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
@@ -556,7 +556,7 @@
name = "Solid Iron"
id = "solidiron"
result = null
- required_reagents = list("frostoil" = 5, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
result_amount = 1
var/sheet_to_give = /obj/item/stack/material/iron
@@ -568,42 +568,42 @@
/decl/chemical_reaction/instant/solidification/phoron
name = "Solid Phoron"
id = "solidphoron"
- required_reagents = list("frostoil" = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/phoron
/decl/chemical_reaction/instant/solidification/silver
name = "Solid Silver"
id = "solidsilver"
- required_reagents = list("frostoil" = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/silver
/decl/chemical_reaction/instant/solidification/gold
name = "Solid Gold"
id = "solidgold"
- required_reagents = list("frostoil" = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/gold
/decl/chemical_reaction/instant/solidification/platinum
name = "Solid Platinum"
id = "solidplatinum"
- required_reagents = list("frostoil" = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/platinum
/decl/chemical_reaction/instant/solidification/uranium
name = "Solid Uranium"
id = "soliduranium"
- required_reagents = list("frostoil" = 5, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/uranium
/decl/chemical_reaction/instant/solidification/hydrogen
name = "Solid Hydrogen"
id = "solidhydrogen"
- required_reagents = list("frostoil" = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/mhydrogen
@@ -611,14 +611,14 @@
/decl/chemical_reaction/instant/solidification/steel
name = "Solid Steel"
id = "solidsteel"
- required_reagents = list("frostoil" = 5, "steel" = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 5, "steel" = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/steel
/decl/chemical_reaction/instant/solidification/plasteel
name = "Solid Plasteel"
id = "solidplasteel"
- required_reagents = list("frostoil" = 10, "plasteel" = REAGENTS_PER_SHEET)
+ required_reagents = list(REAGENT_ID_FROSTOIL = 10, "plasteel" = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/plasteel
@@ -992,7 +992,7 @@
name = "Milk paint"
id = "milk_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "milk" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MILK = 5)
result_amount = 5
/decl/chemical_reaction/instant/milk_paint/send_data()
@@ -1002,7 +1002,7 @@
name = "Orange juice paint"
id = "orange_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ORANGEJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/orange_juice_paint/send_data()
@@ -1012,7 +1012,7 @@
name = "Tomato juice paint"
id = "tomato_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_TOMATOJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/tomato_juice_paint/send_data()
@@ -1022,7 +1022,7 @@
name = "Lime juice paint"
id = "lime_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "limejuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LIMEJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/lime_juice_paint/send_data()
@@ -1032,7 +1032,7 @@
name = "Carrot juice paint"
id = "carrot_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARROTJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/carrot_juice_paint/send_data()
@@ -1042,7 +1042,7 @@
name = "Berry juice paint"
id = "berry_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BERRYJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/berry_juice_paint/send_data()
@@ -1052,7 +1052,7 @@
name = "Grape juice paint"
id = "grape_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_GRAPEJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/grape_juice_paint/send_data()
@@ -1062,7 +1062,7 @@
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POISONBERRYJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/poisonberry_juice_paint/send_data()
@@ -1072,7 +1072,7 @@
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_WATERMELONJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/watermelon_juice_paint/send_data()
@@ -1082,7 +1082,7 @@
name = "Lemon juice paint"
id = "lemon_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LEMONJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/lemon_juice_paint/send_data()
@@ -1092,7 +1092,7 @@
name = "Banana juice paint"
id = "banana_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "banana" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BANANA = 5)
result_amount = 5
/decl/chemical_reaction/instant/banana_juice_paint/send_data()
@@ -1102,7 +1102,7 @@
name = "Potato juice paint"
id = "potato_juice_paint"
result = REAGENT_ID_PAINT
- required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5)
+ required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POTATOJUICE = 5)
result_amount = 5
/decl/chemical_reaction/instant/potato_juice_paint/send_data()
@@ -1140,7 +1140,7 @@
name = "Blue Carpet Dyeing"
id = "carpetdyeblue"
result = REAGENT_ID_LIQUIDCARPETBLU
- required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "frostoil" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_FROSTOIL = 1)
/decl/chemical_reaction/instant/carpetdye/tur
name = "Turqouise Carpet Dyeing"
@@ -1158,19 +1158,19 @@
name = "Clown Carpet Dyeing"
id = "carpetdyeclown"
result = REAGENT_ID_LIQUIDCARPETC
- required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "banana" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_BANANA = 1)
/decl/chemical_reaction/instant/carpetdye/purple
name = "Purple Carpet Dyeing"
id = "carpetdyepurple"
result = REAGENT_ID_LIQUIDCARPETP
- required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "berryjuice" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_BERRYJUICE = 1)
/decl/chemical_reaction/instant/carpetdye/orange
name = "Orange Carpet Dyeing"
id = "carpetdyeorange"
result = REAGENT_ID_LIQUIDCARPETO
- required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "orangejuice" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_ORANGEJUICE = 1)
//R-UST Port
@@ -1217,7 +1217,7 @@
name = REAGENT_BIOMASS
id = REAGENT_ID_BIOMASS
result = REAGENT_ID_BIOMASS
- required_reagents = list("protein" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1)
+ required_reagents = list(REAGENT_ID_PROTEIN = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1)
result_amount = 1 // Roughly 20u per phoron sheet
// Neutralization.
@@ -1225,20 +1225,20 @@
/decl/chemical_reaction/instant/neutralize_neurotoxic_protein
name = "Neutralize Toxic Proteins"
id = "neurotoxic_protein_neutral"
- result = "protein"
+ result = REAGENT_ID_PROTEIN
required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
result_amount = 2
/decl/chemical_reaction/instant/neutralize_carpotoxin
name = "Neutralize Carpotoxin"
id = "carpotoxin_neutral"
- result = "protein"
- required_reagents = list("enzyme" = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1)
+ result = REAGENT_ID_PROTEIN
+ required_reagents = list(REAGENT_ID_ENZYME = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1)
result_amount = 1
/decl/chemical_reaction/instant/neutralize_spidertoxin
name = "Neutralize Spidertoxin"
id = "spidertoxin_neutral"
- result = "protein"
- required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1)
+ result = REAGENT_ID_PROTEIN
+ required_reagents = list(REAGENT_ID_ENZYME = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1)
result_amount = 1
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 8cad988a79..874270734b 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -82,28 +82,28 @@
name = "Bootleg Androrovir"
id = "androrovir_bootleg"
result = REAGENT_ID_ANDROROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "protein" = 10, "capsaicin" = 10)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_PROTEIN = 10, REAGENT_ID_CAPSAICIN = 10)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir_bootleg
name = "Bootleg Gynorovir"
id = "gynorovir_bootleg"
result = REAGENT_ID_GYNOROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "soymilk" = 10, REAGENT_ID_SUGAR = 10)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_SOYMILK = 10, REAGENT_ID_SUGAR = 10)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir_bootleg
name = "Bootleg Androgynorovir"
id = "androgynorovir_bootleg"
result = REAGENT_ID_ANDROGYNOROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "cola" = 10, "berryjuice" = 10)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_COLA = 10, REAGENT_ID_BERRYJUICE = 10)
result_amount = 1
///////////////////////////////////////////////////////////////////////////////////
/// Miscellaneous Reactions
/decl/chemical_reaction/instant/foam/softdrink
- required_reagents = list("cola" = 1, "mint" = 1)
+ required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_MINT = 1)
/decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them
name = REAGENT_FIREFOAM
@@ -136,7 +136,7 @@
name = REAGENT_UNSORBITOL
id = REAGENT_ID_UNSORBITOL
result = REAGENT_ID_UNSORBITOL
- required_reagents = list(REAGENT_ID_MUTAGEN = 3, "lipozine" = 2)
+ required_reagents = list(REAGENT_ID_MUTAGEN = 3, REAGENT_ID_LIPOZINE = 2)
result_amount = 5
///////////////////////////////////////////////////////////////////////////////////
@@ -145,7 +145,7 @@
name = REAGENT_ADRANOL
id = REAGENT_ID_ADRANOL
result = REAGENT_ID_ADRANOL
- required_reagents = list("milk" = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1)
+ required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/vermicetol
@@ -167,30 +167,30 @@
name = REAGENT_LIPOZILASE
id = REAGENT_ID_LIPOZILASE
result = REAGENT_ID_LIPOZILASE
- required_reagents = list("lipozine" = 1, REAGENT_ID_DIETHYLAMINE = 1)
+ required_reagents = list(REAGENT_ID_LIPOZINE = 1, REAGENT_ID_DIETHYLAMINE = 1)
result_amount = 2
/decl/chemical_reaction/instant/lipostipo
name = REAGENT_LIPOSTIPO
id = REAGENT_ID_LIPOSTIPO
result = REAGENT_ID_LIPOSTIPO
- required_reagents = list("lipozine" = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1)
+ required_reagents = list(REAGENT_ID_LIPOZINE = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1)
result_amount = 3
///////////////////////////////////////////////////////////////////////////////////
/// Reagent colonies.
/decl/chemical_reaction/instant/meatcolony
- name = "protein"
+ name = REAGENT_ID_PROTEIN
id = REAGENT_ID_MEATCOLONY
- result = "protein"
- required_reagents = list(REAGENT_ID_MEATCOLONY = 5, "virusfood" = 5)
+ result = REAGENT_ID_PROTEIN
+ required_reagents = list(REAGENT_ID_MEATCOLONY = 5, REAGENT_ID_VIRUSFOOD = 5)
result_amount = 60
/decl/chemical_reaction/instant/plantcolony
name = REAGENT_ID_NUTRIMENT
id = REAGENT_ID_PLANTCOLONY
result = REAGENT_ID_NUTRIMENT
- required_reagents = list(REAGENT_ID_PLANTCOLONY = 5, "virusfood" = 5)
+ required_reagents = list(REAGENT_ID_PLANTCOLONY = 5, REAGENT_ID_VIRUSFOOD = 5)
result_amount = 60
///////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index c2ea1ec0c3..c00f91bdc5 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -2,21 +2,21 @@
name = REAGENT_MUTAGENVIRUSFOOD
id = REAGENT_ID_MUTAGENVIRUSFOOD
result = REAGENT_ID_MUTAGENVIRUSFOOD
- required_reagents = list(REAGENT_ID_MUTAGEN = 1, "virusfood" = 1)
+ required_reagents = list(REAGENT_ID_MUTAGEN = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_adranol
name = REAGENT_ADRANOLVIRUSFOOD
id = REAGENT_ID_ADRANOLVIRUSFOOD
result = REAGENT_ID_ADRANOLVIRUSFOOD
- required_reagents = list(REAGENT_ID_ADRANOL = 1, "virusfood" = 1)
+ required_reagents = list(REAGENT_ID_ADRANOL = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_phoron
name = REAGENT_ADRANOLVIRUSFOOD
id = REAGENT_ID_PHORONVIRUSFOOD
result = REAGENT_ID_PHORONVIRUSFOOD
- required_reagents = list(REAGENT_ID_PHORON = 1, "virusfood" = 1)
+ required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_phoron_adranol
@@ -50,7 +50,7 @@
/decl/chemical_reaction/instant/mix_virus
name = "Mix Virus"
id = "mixvirus"
- required_reagents = list("virusfood" = 1)
+ required_reagents = list(REAGENT_ID_VIRUSFOOD = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
var/level_min = 0
var/level_max = 2
diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm
index 9beec35380..bcc431ec4d 100644
--- a/code/modules/reagents/reagent_containers/borghypo.dm
+++ b/code/modules/reagents/reagent_containers/borghypo.dm
@@ -134,46 +134,46 @@
possible_transfer_amounts = list(5, 10, 20, 30)
reagent_ids = list("ale",
"beer",
- "berryjuice",
+ REAGENT_ID_BERRYJUICE,
"bitters",
"cider",
- "coffee",
+ REAGENT_ID_COFFEE,
"cognac",
- "cola",
- "cream",
- "dr_gibb",
- "egg",
+ REAGENT_ID_COLA,
+ REAGENT_ID_CREAM,
+ REAGENT_ID_DRGIBB,
+ REAGENT_ID_EGG,
"gin",
- "gingerale",
- "hot_coco",
+ REAGENT_ID_GINGERALE,
+ REAGENT_ID_HOTCOCO,
"ice",
- "icetea",
+ REAGENT_ID_ICETEA,
"kahlua",
- "lemonjuice",
- "lemon_lime",
- "limejuice",
+ REAGENT_ID_LEMONJUICE,
+ REAGENT_ID_LEMONLIME,
+ REAGENT_ID_LIMEJUICE,
"mead",
- "milk",
- "mint",
- "orangejuice",
+ REAGENT_ID_MILK,
+ REAGENT_ID_MINT,
+ REAGENT_ID_ORANGEJUICE,
"redwine",
"rum",
"sake",
- "sodawater",
- "soymilk",
- "space_up",
- "spacemountainwind",
- "spacespice",
+ REAGENT_ID_SODAWATER,
+ REAGENT_ID_SOYMILK,
+ REAGENT_ID_SPACEUP,
+ REAGENT_ID_SPACEMOUNTAINWIND,
+ REAGENT_ID_SPACESPICE,
"specialwhiskey",
REAGENT_ID_SUGAR,
- "tea",
+ REAGENT_ID_TEA,
"tequilla",
- "tomatojuice",
- "tonic",
+ REAGENT_ID_TOMATOJUICE,
+ REAGENT_ID_TONIC,
"vermouth",
"vodka",
REAGENT_ID_WATER,
- "watermelonjuice",
+ REAGENT_ID_WATERMELONJUICE,
"whiskey")
/obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index f69d56feb8..0881be3303 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -276,7 +276,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose
name = "glucose hypo"
desc = "A hypoinjector filled with glucose, used for critically malnourished patients and voidsuited workers."
- filled_reagents = list("glucose" = 15)
+ filled_reagents = list(REAGENT_ID_GLUCOSE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm
name = "stimm injector"
@@ -376,7 +376,7 @@
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
The hypospray contains a viral agent inside, as well as a liquid substance that encourages \
the growth of the virus inside."
- filled_reagents = list("virusfood" = 15)
+ filled_reagents = list(REAGENT_ID_VIRUSFOOD = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/do_injection(mob/living/carbon/human/H, mob/living/user)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index a52c847a65..148c5b88f2 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -351,5 +351,5 @@
/obj/item/reagent_containers/pill/diet/Initialize()
. = ..()
- reagents.add_reagent("lipozine", 15) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_LIPOZINE, 15) //VOREStation Edit
color = reagents.get_color()
diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm
index 659792bf79..9c41dee765 100644
--- a/code/modules/reagents/reagent_containers/pill_vr.dm
+++ b/code/modules/reagents/reagent_containers/pill_vr.dm
@@ -14,7 +14,7 @@
/obj/item/reagent_containers/pill/protein/Initialize()
. = ..()
- reagents.add_reagent("protein", 30)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 30)
/obj/item/reagent_containers/pill/rezadone
name = REAGENT_REZADONE + " (5u)"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 078ee4d390..1e4d441393 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -129,7 +129,7 @@
/obj/item/reagent_containers/spray/pepper/Initialize()
. = ..()
- reagents.add_reagent("condensedcapsaicin", 40)
+ reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40)
/obj/item/reagent_containers/spray/pepper/examine(mob/user)
. = ..()
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index 2b2275e31a..b49f125c6b 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -74,8 +74,8 @@
Generally coatings are intended for deep frying foods
*/
/datum/reagent/nutriment/coating
- name = "coating"
- id = "coating"
+ name = REAGENT_COATING
+ id = REAGENT_ID_COATING
nutriment_factor = 6 //Less dense than the food itself, but coatings still add extra calories
var/messaged = 0
var/icon_raw
@@ -121,9 +121,9 @@
data["cooked"] = newdata["cooked"]
/datum/reagent/nutriment/coating/batter
- name = "batter mix"
- cooked_name = "batter"
- id = "batter"
+ name = REAGENT_BATTER
+ cooked_name = REAGENT_ID_BATTER
+ id = REAGENT_ID_BATTER
color = "#f5f4e9"
reagent_state = LIQUID
icon_raw = "batter_raw"
@@ -132,9 +132,9 @@
allergen_type = ALLERGEN_GRAINS | ALLERGEN_EGGS //Made with flour(grain), and eggs(eggs)
/datum/reagent/nutriment/coating/beerbatter
- name = "beer batter mix"
+ name = REAGENT_BEERBATTER
cooked_name = "beer batter"
- id = "beerbatter"
+ id = REAGENT_ID_BEERBATTER
color = "#f5f4e9"
reagent_state = LIQUID
icon_raw = "batter_raw"
@@ -150,8 +150,8 @@
//Fats
//=========================
/datum/reagent/nutriment/triglyceride
- name = "triglyceride"
- id = "triglyceride"
+ name = REAGENT_TRIGLYCERIDE
+ id = REAGENT_ID_TRIGLYCERIDE
description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein"
reagent_state = SOLID
@@ -162,8 +162,8 @@
/datum/reagent/nutriment/triglyceride/oil
//Having this base class incase we want to add more variants of oil
- name = "Oil"
- id = "oil"
+ name = REAGENT_OIL
+ id = REAGENT_ID_OIL
description = "Oils are liquid fats."
reagent_state = LIQUID
taste_description = "oil"
@@ -242,21 +242,21 @@
lastburnmessage = world.time
/datum/reagent/nutriment/triglyceride/oil/cooking
- name = "Cooking Oil"
- id = "cookingoil"
+ name = REAGENT_COOKINGOIL
+ id = REAGENT_ID_COOKINGOIL
description = "A general-purpose cooking oil."
reagent_state = LIQUID
/datum/reagent/nutriment/triglyceride/oil/corn
- name = "Corn Oil"
- id = "cornoil"
+ name = REAGENT_CORNOIL
+ id = REAGENT_ID_CORNOIL
description = "An oil derived from various types of corn."
reagent_state = LIQUID
allergen_type = ALLERGEN_VEGETABLE //Corn is a vegetable
/datum/reagent/nutriment/triglyceride/oil/peanut
- name = "Peanut Oil"
- id = "peanutoil"
+ name = REAGENT_PEANUTOIL
+ id = REAGENT_ID_PEANUTOIL
description = "An oil derived from various types of nuts."
taste_description = "nuts"
taste_mult = 0.3
@@ -267,8 +267,8 @@
// Aurora Cooking Port Insertion End
/datum/reagent/nutriment/glucose
- name = "Glucose"
- id = "glucose"
+ name = REAGENT_GLUCOSE
+ id = REAGENT_ID_GLUCOSE
taste_description = "sweetness"
color = "#FFFFFF"
cup_prefix = "sweetened"
@@ -276,8 +276,8 @@
injectable = 1
/datum/reagent/nutriment/protein // Bad for Skrell!
- name = "animal protein"
- id = "protein"
+ name = REAGENT_PROTEIN
+ id = REAGENT_ID_PROTEIN
taste_description = "some sort of meat"
color = "#440000"
allergen_type = ALLERGEN_MEAT //"Animal protein" implies it comes from animals, therefore meat.
@@ -296,57 +296,57 @@
..()
/datum/reagent/nutriment/protein/tofu
- name = "tofu protein"
- id = "tofu"
+ name = REAGENT_TOFU
+ id = REAGENT_ID_TOFU
color = "#fdffa8"
taste_description = "tofu"
allergen_type = ALLERGEN_BEANS //Made from soy beans
/datum/reagent/nutriment/protein/seafood
- name = "seafood protein"
- id = "seafood"
+ name = REAGENT_SEAFOOD
+ id = REAGENT_ID_SEAFOOD
color = "#f5f4e9"
taste_description = "fish"
allergen_type = ALLERGEN_FISH //I suppose the fish allergy likely refers to seafood in general.
/datum/reagent/nutriment/protein/cheese
- name = "cheese"
- id = "cheese"
+ name = REAGENT_CHEESE
+ id = REAGENT_ID_CHEESE
color = "#EDB91F"
taste_description = "cheese"
allergen_type = ALLERGEN_DAIRY //Cheese is made from dairy
cup_prefix = "cheesy"
/datum/reagent/nutriment/protein/egg
- name = "egg yolk"
- id = "egg"
+ name = REAGENT_EGG
+ id = REAGENT_ID_EGG
taste_description = "egg"
color = "#FFFFAA"
allergen_type = ALLERGEN_EGGS //Eggs contain egg
cup_prefix = "eggy"
/datum/reagent/nutriment/protein/murk
- name = "murkfin protein"
- id = "murk_protein"
+ name = REAGENT_MURK_PROTEIN
+ id = REAGENT_ID_MURK_PROTEIN
taste_description = "mud"
color = "#664330"
allergen_type = ALLERGEN_FISH //Murkfin is fish
/datum/reagent/nutriment/protein/bean
- name = "beans"
- id = "bean_protein"
+ name = REAGENT_BEANPROTEIN
+ id = REAGENT_ID_BEANPROTEIN
taste_description = "beans"
color = "#562e0b"
allergen_type = ALLERGEN_BEANS //Made from soy beans
/datum/reagent/nutriment/honey
- name = "Honey"
- id = "honey"
+ name = REAGENT_HONEY
+ id = REAGENT_ID_HONEY
description = "A golden yellow syrup, loaded with sugary sweetness."
taste_description = "sweetness"
nutriment_factor = 10
color = "#FFFF00"
- cup_prefix = "honey"
+ cup_prefix = REAGENT_ID_HONEY
/datum/reagent/nutriment/honey/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -370,26 +370,26 @@
M.drowsyness = max(M.drowsyness, 60)
/datum/reagent/nutriment/mayo
- name = "mayonnaise"
- id = "mayo"
+ name = REAGENT_MAYO
+ id = REAGENT_ID_MAYO
description = "A thick, bitter sauce."
taste_description = "unmistakably mayonnaise"
nutriment_factor = 10
color = "#FFFFFF"
allergen_type = ALLERGEN_EGGS //Mayo is made from eggs
- cup_prefix = "mayo"
+ cup_prefix = REAGENT_ID_MAYO
/datum/reagent/nutriment/yeast
- name = "Yeast"
- id = "yeast"
+ name = REAGENT_YEAST
+ id = REAGENT_ID_YEAST
description = "For making bread rise!"
taste_description = "yeast"
nutriment_factor = 1
color = "#D3AF70"
/datum/reagent/nutriment/flour
- name = "Flour"
- id = "flour"
+ name = REAGENT_FLOUR
+ id = REAGENT_ID_FLOUR
description = "This is what you rub all over yourself to pretend to be a ghost."
taste_description = "chalky wheat"
reagent_state = SOLID
@@ -403,8 +403,8 @@
new /obj/effect/decal/cleanable/flour(T)
/datum/reagent/nutriment/coffee
- name = "Coffee Powder"
- id = "coffeepowder"
+ name = REAGENT_COFFEEPOWDER
+ id = REAGENT_ID_COFFEEPOWDER
description = "A bitter powder made by grinding coffee beans."
taste_description = "bitterness"
taste_mult = 1.3
@@ -413,8 +413,8 @@
allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Again, coffee contains coffee
/datum/reagent/nutriment/tea
- name = "Tea Powder"
- id = "teapowder"
+ name = REAGENT_TEAPOWDER
+ id = REAGENT_ID_TEAPOWDER
description = "A dark, tart powder made from black tea leaves."
taste_description = "tartness"
taste_mult = 1.3
@@ -423,8 +423,8 @@
allergen_type = ALLERGEN_STIMULANT //Strong enough to contain caffeine
/datum/reagent/nutriment/decaf_tea
- name = "Decaf Tea Powder"
- id = "decafteapowder"
+ name = REAGENT_DECAFTEAPOWDER
+ id = REAGENT_ID_DECAFTEAPOWDER
description = "A dark, tart powder made from black tea leaves, treated to remove caffeine content."
taste_description = "tartness"
taste_mult = 1.3
@@ -432,8 +432,8 @@
color = "#101000"
/datum/reagent/nutriment/coco
- name = "Coco Powder"
- id = "coco"
+ name = REAGENT_COCO
+ id = REAGENT_ID_COCO
description = "A fatty, bitter paste made from coco beans."
taste_description = "bitterness"
taste_mult = 1.3
@@ -441,62 +441,62 @@
nutriment_factor = 5
color = "#302000"
allergen_type = ALLERGEN_CHOCOLATE
- cup_prefix = "coco"
+ cup_prefix = REAGENT_ID_COCO
/datum/reagent/nutriment/chocolate
- name = "Chocolate"
- id = "chocolate"
+ name = REAGENT_CHOCOLATE
+ id = REAGENT_ID_CHOCOLATE
description = "Great for cooking or on its own!"
taste_description = "chocolate"
color = "#582815"
nutriment_factor = 5
taste_mult = 1.3
allergen_type = ALLERGEN_CHOCOLATE
- cup_prefix = "chocolate"
+ cup_prefix = REAGENT_ID_CHOCOLATE
/datum/reagent/nutriment/instantjuice
- name = "Juice Powder"
- id = "instantjuice"
+ name = REAGENT_INSTANTJUICE
+ id = REAGENT_ID_INSTANTJUICE
description = "Dehydrated, powdered juice of some kind."
taste_mult = 1.3
nutriment_factor = 1
allergen_type = ALLERGEN_FRUIT //I suppose it's implied here that the juice is from dehydrated fruit.
/datum/reagent/nutriment/instantjuice/grape
- name = "Grape Juice Powder"
- id = "instantgrape"
+ name = REAGENT_INSTANTGRAPE
+ id = REAGENT_ID_INSTANTGRAPE
description = "Dehydrated, powdered grape juice."
taste_description = "dry grapes"
color = "#863333"
cup_prefix = "grape"
/datum/reagent/nutriment/instantjuice/orange
- name = "Orange Juice Powder"
- id = "instantorange"
+ name = REAGENT_INSTANTORANGE
+ id = REAGENT_ID_INSTANTORANGE
description = "Dehydrated, powdered orange juice."
taste_description = "dry oranges"
color = "#e78108"
cup_prefix = "orange"
/datum/reagent/nutriment/instantjuice/watermelon
- name = "Watermelon Juice Powder"
- id = "instantwatermelon"
+ name = REAGENT_INSTANTWATERMELON
+ id = REAGENT_ID_INSTANTWATERMELON
description = "Dehydrated, powdered watermelon juice."
taste_description = "dry sweet watermelon"
color = "#b83333"
cup_prefix = "melon"
/datum/reagent/nutriment/instantjuice/apple
- name = "Apple Juice Powder"
- id = "instantapple"
+ name = REAGENT_INSTANTAPPLE
+ id = REAGENT_ID_INSTANTAPPLE
description = "Dehydrated, powdered apple juice."
taste_description = "dry sweet apples"
color = "#c07c40"
cup_prefix = "apple"
/datum/reagent/nutriment/soysauce
- name = "Soy Sauce"
- id = "soysauce"
+ name = REAGENT_SOYSAUCE
+ id = REAGENT_ID_SOYSAUCE
description = "A salty sauce made from the soy plant."
taste_description = "umami"
taste_mult = 1.1
@@ -507,8 +507,8 @@
cup_prefix = "umami"
/datum/reagent/nutriment/vinegar
- name = "Vinegar"
- id = "vinegar"
+ name = REAGENT_VINEGAR
+ id = REAGENT_ID_VINEGAR
description = "vinegar, great for fish and pickles."
taste_description = "vinegar"
reagent_state = LIQUID
@@ -517,8 +517,8 @@
cup_prefix = "acidic"
/datum/reagent/nutriment/ketchup
- name = "Ketchup"
- id = "ketchup"
+ name = REAGENT_KETCHUP
+ id = REAGENT_ID_KETCHUP
description = "Ketchup, catsup, whatever. It's tomato paste."
taste_description = "ketchup"
reagent_state = LIQUID
@@ -528,28 +528,28 @@
cup_prefix = "tomato"
/datum/reagent/nutriment/mustard
- name = "Mustard"
- id = "mustard"
+ name = REAGENT_MUSTARD
+ id = REAGENT_ID_MUSTARD
description = "Delicious mustard. Good on Hot Dogs."
taste_description = "mustard"
reagent_state = LIQUID
nutriment_factor = 5
color = "#E3BD00"
- cup_prefix = "mustard"
+ cup_prefix = REAGENT_ID_MUSTARD
/datum/reagent/nutriment/barbecue
- name = "Barbeque Sauce"
- id = "barbecue"
+ name = REAGENT_BARBECUE
+ id = REAGENT_ID_BARBECUE
description = "Barbecue sauce for barbecues and long shifts."
taste_description = "barbeque"
reagent_state = LIQUID
nutriment_factor = 5
color = "#4F330F"
- cup_prefix = "barbecue"
+ cup_prefix = REAGENT_ID_BARBECUE
/datum/reagent/nutriment/rice
- name = "Rice"
- id = "rice"
+ name = REAGENT_RICE
+ id = REAGENT_ID_RICE
description = "Enjoy the great taste of nothing."
taste_description = "rice"
taste_mult = 0.4
@@ -558,8 +558,8 @@
color = "#FFFFFF"
/datum/reagent/nutriment/cherryjelly
- name = "Cherry Jelly"
- id = "cherryjelly"
+ name = REAGENT_CHERRYJELLY
+ id = REAGENT_ID_CHERRYJELLY
description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
taste_description = "cherry"
taste_mult = 1.3
@@ -569,8 +569,8 @@
allergen_type = ALLERGEN_FRUIT //Cherries are fruits
/datum/reagent/nutriment/peanutbutter
- name = "Peanut Butter"
- id = "peanutbutter"
+ name = REAGENT_PEANUTBUTTER
+ id = REAGENT_ID_PEANUTBUTTER
description = "A butter derived from various types of nuts."
taste_description = "peanuts"
taste_mult = 0.5
@@ -581,19 +581,19 @@
cup_prefix = "peanut butter"
/datum/reagent/nutriment/vanilla
- name = "Vanilla Extract"
- id = "vanilla"
+ name = REAGENT_VANILLA
+ id = REAGENT_ID_VANILLA
description = "Vanilla extract. Tastes suspiciously like boring ice-cream."
taste_description = "vanilla"
taste_mult = 5
reagent_state = LIQUID
nutriment_factor = 2
color = "#0F0A00"
- cup_prefix = "vanilla"
+ cup_prefix = REAGENT_ID_VANILLA
/datum/reagent/nutriment/durian
- name = "Durian Paste"
- id = "durianpaste"
+ name = REAGENT_DURIANPASTE
+ id = REAGENT_ID_DURIANPASTE
description = "A strangely sweet and savory paste."
taste_description = "sweet and savory"
color = "#757631"
@@ -619,8 +619,8 @@
return ..()
/datum/reagent/nutriment/virus_food
- name = "Virus Food"
- id = "virusfood"
+ name = REAGENT_VIRUSFOOD
+ id = REAGENT_ID_VIRUSFOOD
description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce."
taste_description = "vomit"
taste_mult = 2
@@ -630,8 +630,8 @@
allergen_type = ALLERGEN_DAIRY //incase anyone is dumb enough to drink it - it does contain milk!
/datum/reagent/nutriment/sprinkles
- name = "Sprinkles"
- id = "sprinkles"
+ name = REAGENT_SPRINKLES
+ id = REAGENT_ID_SPRINKLES
description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
taste_description = "sugar"
nutriment_factor = 1
@@ -639,8 +639,8 @@
cup_prefix = "sprinkled"
/datum/reagent/nutriment/mint
- name = "Mint"
- id = "mint"
+ name = REAGENT_MINT
+ id = REAGENT_ID_MINT
description = "Also known as Mentha."
taste_description = "mint"
reagent_state = LIQUID
@@ -648,8 +648,8 @@
cup_prefix = "minty"
/datum/reagent/lipozine // The anti-nutriment.
- name = "Lipozine"
- id = "lipozine"
+ name = REAGENT_LIPOZINE
+ id = REAGENT_ID_LIPOZINE
description = "A chemical compound that causes a powerful fat-burning reaction."
taste_description = "mothballs"
reagent_state = LIQUID
@@ -683,8 +683,8 @@
affect_blood(M, alien, passthrough)
/datum/reagent/blackpepper
- name = "Black Pepper"
- id = "blackpepper"
+ name = REAGENT_BLACKPEPPER
+ id = REAGENT_ID_BLACKPEPPER
description = "A powder ground from peppercorns. *AAAACHOOO*"
taste_description = "pepper"
reagent_state = SOLID
@@ -693,8 +693,8 @@
cup_prefix = "peppery"
/datum/reagent/enzyme
- name = "Universal Enzyme"
- id = "enzyme"
+ name = REAGENT_ENZYME
+ id = REAGENT_ID_ENZYME
description = "A universal enzyme used in the preperation of certain chemicals and foods."
taste_description = "sweetness"
taste_mult = 0.7
@@ -703,31 +703,31 @@
overdose = REAGENTS_OVERDOSE
/datum/reagent/spacespice
- name = "Wurmwoad"
- id = "spacespice"
+ name = REAGENT_SPACESPICE
+ id = REAGENT_ID_SPACESPICE
description = "An exotic blend of spices for cooking. Definitely not worms."
reagent_state = SOLID
color = "#e08702"
cup_prefix = "spicy"
/datum/reagent/browniemix
- name = "Brownie Mix"
- id = "browniemix"
+ name = REAGENT_BROWNIEMIX
+ id = REAGENT_ID_BROWNIEMIX
description = "A dry mix for making delicious brownies."
reagent_state = SOLID
color = "#441a03"
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/cakebatter
- name = "Cake Batter"
- id = "cakebatter"
+ name = REAGENT_CAKEBATTER
+ id = REAGENT_ID_CAKEBATTER
description = "A batter for making delicious cakes."
reagent_state = LIQUID
color = "#F0EDDA"
/datum/reagent/frostoil
- name = "Frost Oil"
- id = "frostoil"
+ name = REAGENT_FROSTOIL
+ id = REAGENT_ID_FROSTOIL
description = "A special oil that noticably chills the body. Extracted from Ice Peppers."
taste_description = "mint"
taste_mult = 1.5
@@ -741,7 +741,7 @@
M.bodytemperature = min(M.bodytemperature, max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 215))
if(prob(1))
M.emote("shiver")
- holder.remove_reagent("capsaicin", 5)
+ holder.remove_reagent(REAGENT_ID_CAPSAICIN, 5)
/datum/reagent/frostoil/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) // Eating frostoil now acts like capsaicin. Wee!
if(alien == IS_DIONA)
@@ -763,19 +763,19 @@
M.bodytemperature -= rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you cold.
if(prob(5))
M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are freezing!"), span_danger("Your insides feel like they're turning to ice!")))
- // holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
+ // holder.remove_reagent(REAGENT_ID_CAPSAICIN, 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/datum/reagent/frostoil/cryotoxin //A longer lasting version of frost oil.
- name = "Cryotoxin"
- id = "cryotoxin"
+ name = REAGENT_CRYOTOXIN
+ id = REAGENT_ID_CRYOTOXIN
description = "Lowers the body's internal temperature."
reagent_state = LIQUID
color = "#B31008"
metabolism = REM * 0.5
/datum/reagent/capsaicin
- name = "Capsaicin Oil"
- id = "capsaicin"
+ name = REAGENT_CAPSAICIN
+ id = REAGENT_ID_CAPSAICIN
description = "This is what makes chilis hot."
taste_description = "hot peppers"
taste_mult = 1.5
@@ -810,11 +810,11 @@
M.bodytemperature += rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you overheat, too.
if(prob(5))
M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are burning!"), span_danger("You feel like your insides are on fire!"), span_danger("You feel like your belly is full of lava!")))
- // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
+ // holder.remove_reagent(REAGENT_ID_FROSTOIL, 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/datum/reagent/condensedcapsaicin
- name = "Condensed Capsaicin"
- id = "condensedcapsaicin"
+ name = REAGENT_CONDENSEDCAPSAICIN
+ id = REAGENT_ID_CONDENSEDCAPSAICIN
description = "A chemical agent used for self-defense and in police work."
taste_description = "fire"
taste_mult = 10
@@ -955,13 +955,13 @@
M.apply_effect(4, AGONY, 0)
if(prob(5))
M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), span_danger("You feel like your insides are burning!"))
- // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
+ // holder.remove_reagent(REAGENT_ID_FROSTOIL, 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/* Drinks */
/datum/reagent/drink
- name = "Drink"
- id = "drink"
+ name = REAGENT_DRINK
+ id = REAGENT_ID_DRINK
description = "Uh, some kind of drink."
ingest_met = REM
reagent_state = LIQUID
@@ -1002,8 +1002,8 @@
// Juices
/datum/reagent/drink/juice/banana
- name = "Banana Juice"
- id = "banana"
+ name = REAGENT_BANANA
+ id = REAGENT_ID_BANANA
description = "The raw essence of a banana."
taste_description = "banana"
color = "#C3AF00"
@@ -1011,11 +1011,11 @@
glass_name = "banana juice"
glass_desc = "The raw essence of a banana. HONK!"
allergen_type = ALLERGEN_FRUIT //Bananas are fruit
- cup_prefix = "banana"
+ cup_prefix = REAGENT_ID_BANANA
/datum/reagent/drink/juice/berry
- name = "Berry Juice"
- id = "berryjuice"
+ name = REAGENT_BERRYJUICE
+ id = REAGENT_ID_BERRYJUICE
description = "A delicious blend of several different kinds of berries."
taste_description = "berries"
color = "#990066"
@@ -1026,8 +1026,8 @@
cup_prefix = "berry"
/datum/reagent/drink/juice/pineapple
- name = "Pineapple Juice"
- id = "pineapplejuice"
+ name = REAGENT_PINEAPPLEJUICE
+ id = REAGENT_ID_PINEAPPLEJUICE
description = "A sour but refreshing juice from a pineapple."
taste_description = "pineapple"
color = "#C3AF00"
@@ -1038,8 +1038,8 @@
cup_prefix = "pineapple"
/datum/reagent/drink/juice/carrot
- name = "Carrot juice"
- id = "carrotjuice"
+ name = REAGENT_CARROTJUICE
+ id = REAGENT_ID_CARROTJUICE
description = "It is just like a carrot but without crunching."
taste_description = "carrots"
color = "#FF8C00" // rgb: 255, 140, 0
@@ -1054,8 +1054,8 @@
M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, removed * 0.2)
/datum/reagent/drink/juice/lettuce
- name = "Lettuce Juice"
- id = "lettucejuice"
+ name = REAGENT_LETTUCEJUICE
+ id = REAGENT_ID_LETTUCEJUICE
description = "It's mostly water, just a bit more lettucy."
taste_description = "fresh greens"
color = "#29df4b"
@@ -1065,8 +1065,8 @@
cup_prefix = "lettuce"
/datum/reagent/drink/juice
- name = "Grape Juice"
- id = "grapejuice"
+ name = REAGENT_GRAPEJUICE
+ id = REAGENT_ID_GRAPEJUICE
description = "It's grrrrrape!"
taste_description = "grapes"
color = "#863333"
@@ -1100,8 +1100,8 @@
M.drowsyness = max(M.drowsyness, 60)
/datum/reagent/drink/juice/lemon
- name = "Lemon Juice"
- id = "lemonjuice"
+ name = REAGENT_LEMONJUICE
+ id = REAGENT_ID_LEMONJUICE
description = "This juice is VERY sour."
taste_description = "sourness"
taste_mult = 1.1
@@ -1114,8 +1114,8 @@
/datum/reagent/drink/juice/apple
- name = "Apple Juice"
- id = "applejuice"
+ name = REAGENT_APPLEJUICE
+ id = REAGENT_ID_APPLEJUICE
description = "The most basic juice."
taste_description = "crispness"
taste_mult = 1.1
@@ -1127,8 +1127,8 @@
cup_prefix = "apple"
/datum/reagent/drink/juice/lime
- name = "Lime Juice"
- id = "limejuice"
+ name = REAGENT_LIMEJUICE
+ id = REAGENT_ID_LIMEJUICE
description = "The sweet-sour juice of limes."
taste_description = "sourness"
taste_mult = 1.8
@@ -1146,8 +1146,8 @@
M.adjustToxLoss(-0.5 * removed)
/datum/reagent/drink/juice/orange
- name = "Orange juice"
- id = "orangejuice"
+ name = REAGENT_ORANGEJUICE
+ id = REAGENT_ID_ORANGEJUICE
description = "Both delicious AND rich in Vitamin C, what more do you need?"
taste_description = "oranges"
color = "#E78108"
@@ -1164,8 +1164,8 @@
M.adjustOxyLoss(-2 * removed)
/datum/reagent/toxin/poisonberryjuice // It has more in common with toxins than drinks... but it's a juice
- name = "Poison Berry Juice"
- id = "poisonberryjuice"
+ name = REAGENT_POISONBERRYJUICE
+ id = REAGENT_ID_POISONBERRYJUICE
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
taste_description = "berries"
color = "#863353"
@@ -1176,8 +1176,8 @@
cup_prefix = "poison"
/datum/reagent/drink/juice/potato
- name = "Potato Juice"
- id = "potatojuice"
+ name = REAGENT_POTATOJUICE
+ id = REAGENT_ID_POTATOJUICE
description = "Juice of the potato. Bleh."
taste_description = "potatoes"
nutrition = 2
@@ -1190,8 +1190,8 @@
cup_prefix = "potato"
/datum/reagent/drink/juice/turnip
- name = "Turnip Juice"
- id = "turnipjuice"
+ name = REAGENT_TURNIPJUICE
+ id = REAGENT_ID_TURNIPJUICE
description = "Juice of the turnip. A step below the potato."
taste_description = "turnips"
nutrition = 2
@@ -1204,8 +1204,8 @@
cup_prefix = "turnip"
/datum/reagent/drink/juice/tomato
- name = "Tomato Juice"
- id = "tomatojuice"
+ name = REAGENT_TOMATOJUICE
+ id = REAGENT_ID_TOMATOJUICE
description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
taste_description = "tomatoes"
color = "#731008"
@@ -1223,8 +1223,8 @@
M.heal_organ_damage(0, 0.5 * removed)
/datum/reagent/drink/juice/watermelon
- name = "Watermelon Juice"
- id = "watermelonjuice"
+ name = REAGENT_WATERMELONJUICE
+ id = REAGENT_ID_WATERMELONJUICE
description = "Delicious juice made from watermelon."
taste_description = "sweet watermelon"
color = "#B83333"
@@ -1237,23 +1237,23 @@
// Everything else
/datum/reagent/drink/milk
- name = "Milk"
- id = "milk"
+ name = REAGENT_MILK
+ id = REAGENT_ID_MILK
description = "An opaque white liquid produced by the mammary glands of mammals."
taste_description = "milk"
color = "#DFDFDF"
- glass_name = "milk"
+ glass_name = REAGENT_ID_MILK
glass_desc = "White and nutritious goodness!"
cup_icon_state = "cup_cream"
- cup_name = "milk"
+ cup_name = REAGENT_ID_MILK
cup_desc = "White and nutritious goodness!"
allergen_type = ALLERGEN_DAIRY //Milk is dairy
/datum/reagent/drink/milk/chocolate
- name = "Chocolate Milk"
- id = "chocolate_milk"
+ name = REAGENT_CHOCOLATEMILK
+ id = REAGENT_ID_CHOCOLATEMILK
description = "A delicious mixture of perfectly healthy mix and terrible chocolate."
taste_description = "chocolate milk"
color = "#74533b"
@@ -1271,7 +1271,7 @@
if(alien == IS_DIONA)
return
M.heal_organ_damage(0.5 * removed, 0)
- holder.remove_reagent("capsaicin", 10 * removed)
+ holder.remove_reagent(REAGENT_ID_CAPSAICIN, 10 * removed)
//VOREStation Edit
if(ishuman(M) && rand(1,10000) == 1)
var/mob/living/carbon/human/H = M
@@ -1284,23 +1284,23 @@
//VOREStation Edit End
/datum/reagent/drink/milk/cream
- name = "Cream"
- id = "cream"
+ name = REAGENT_CREAM
+ id = REAGENT_ID_CREAM
description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
taste_description = "thick milk"
color = "#DFD7AF"
- glass_name = "cream"
+ glass_name = REAGENT_ID_CREAM
glass_desc = "Ewwww..."
cup_icon_state = "cup_cream"
- cup_name = "cream"
+ cup_name = REAGENT_ID_CREAM
cup_desc = "Ewwww..."
allergen_type = ALLERGEN_DAIRY //Cream is dairy
/datum/reagent/drink/milk/soymilk
- name = "Soy Milk"
- id = "soymilk"
+ name = REAGENT_SOYMILK
+ id = REAGENT_ID_SOYMILK
description = "An opaque white liquid made from soybeans."
taste_description = "soy milk"
color = "#DFDFC7"
@@ -1309,13 +1309,13 @@
glass_desc = "White and nutritious soy goodness!"
cup_icon_state = "cup_cream"
- cup_name = "milk"
+ cup_name = REAGENT_ID_MILK
cup_desc = "White and nutritious goodness!"
allergen_type = ALLERGEN_BEANS //Would be made from soy beans
/datum/reagent/drink/milk/foam
- name = "Milk Foam"
- id = "milk_foam"
+ name = REAGENT_MILKFOAM
+ id = REAGENT_ID_MILKFOAM
description = "Light and airy foamed milk."
taste_description = "airy milk"
color = "#eeebdf"
@@ -1330,8 +1330,8 @@
/datum/reagent/drink/tea
- name = "Tea"
- id = "tea"
+ name = REAGENT_TEA
+ id = REAGENT_ID_TEA
description = "Tasty black tea, it has antioxidants, it's good for you!"
taste_description = "black tea"
color = "#832700"
@@ -1344,7 +1344,7 @@
glass_desc = "Tasty black tea, it has antioxidants, it's good for you!"
cup_icon_state = "cup_tea"
- cup_name = "tea"
+ cup_name = REAGENT_ID_TEA
cup_desc = "Tasty black tea, it has antioxidants, it's good for you!"
allergen_type = ALLERGEN_STIMULANT //Black tea strong enough to have significant caffeine content
@@ -1355,8 +1355,8 @@
M.adjustToxLoss(-0.5 * removed)
/datum/reagent/drink/tea/decaf
- name = "Decaf Tea"
- id = "teadecaf"
+ name = REAGENT_TEADECAF
+ id = REAGENT_ID_TEADECAF
description = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!"
color = "#832700"
adj_dizzy = 0
@@ -1372,8 +1372,8 @@
/datum/reagent/drink/tea/icetea
- name = "Iced Tea"
- id = "icetea"
+ name = REAGENT_ICETEA
+ id = REAGENT_ID_ICETEA
description = "No relation to a certain rap artist/ actor."
taste_description = "sweet tea"
color = "#AC7F24" // rgb: 16, 64, 56
@@ -1406,18 +1406,18 @@
//M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/tea/icetea/decaf
- name = "Decaf Iced Tea"
+ name = REAGENT_ICETEADECAF
+ id = REAGENT_ID_ICETEADECAF
glass_name = "decaf iced tea"
cup_name = "decaf iced tea"
- id = "iceteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = null
/datum/reagent/drink/tea/minttea
- name = "Mint Tea"
- id = "minttea"
+ name = REAGENT_MINTTEA
+ id = REAGENT_ID_MINTTEA
description = "A tasty mixture of mint and tea. It's apparently good for you!"
color = "#A8442C"
taste_description = "black tea with tones of mint"
@@ -1429,18 +1429,18 @@
cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
/datum/reagent/drink/tea/minttea/decaf
- name = "Decaf Mint Tea"
+ name = REAGENT_MINTTEADECAF
+ id = REAGENT_ID_MINTTEADECAF
glass_name = "decaf mint tea"
cup_name = "decaf mint tea"
- id = "mintteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = null
/datum/reagent/drink/tea/lemontea
- name = "Lemon Tea"
- id = "lemontea"
+ name = REAGENT_LEMONTEA
+ id = REAGENT_ID_LEMONTEA
description = "A tasty mixture of lemon and tea. It's apparently good for you!"
color = "#FC6A00"
taste_description = "black tea with tones of lemon"
@@ -1453,18 +1453,18 @@
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon juice, still tea
/datum/reagent/drink/tea/lemontea/decaf
- name = "Decaf Lemon Tea"
+ name = REAGENT_LEMONTEADECAF
+ id = REAGENT_ID_LEMONTEADECAF
glass_name = "decaf lemon tea"
cup_name = "decaf lemon tea"
- id = "lemonteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still lemon.
/datum/reagent/drink/tea/limetea
- name = "Lime Tea"
- id = "limetea"
+ name = REAGENT_LIMETEA
+ id = REAGENT_ID_LIMETEA
description = "A tasty mixture of lime and tea. It's apparently good for you!"
color = "#DE4300"
taste_description = "black tea with tones of lime"
@@ -1477,18 +1477,18 @@
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lime juice, still tea
/datum/reagent/drink/tea/limetea/decaf
- name = "Decaf Lime Tea"
+ name = REAGENT_LIMETEADECAF
+ id = REAGENT_ID_LIMETEADECAF
glass_name = "decaf lime tea"
cup_name = "decaf lime tea"
- id = "limeteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still lime.
/datum/reagent/drink/tea/orangetea
- name = "Orange Tea"
- id = "orangetea"
+ name = REAGENT_ORANGETEA
+ id = REAGENT_ID_ORANGETEA
description = "A tasty mixture of orange and tea. It's apparently good for you!"
color = "#FB4F06"
taste_description = "black tea with tones of orange"
@@ -1501,18 +1501,18 @@
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orange juice, still tea
/datum/reagent/drink/tea/orangetea/decaf
- name = "Decaf orange Tea"
+ name = REAGENT_ORANGETEADECAF
+ id = REAGENT_ID_ORANGETEADECAF
glass_name = "decaf orange tea"
cup_name = "decaf orange tea"
- id = "orangeteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still orange.
/datum/reagent/drink/tea/berrytea
- name = "Berry Tea"
- id = "berrytea"
+ name = REAGENT_BERRYTEA
+ id = REAGENT_ID_BERRYTEA
description = "A tasty mixture of berries and tea. It's apparently good for you!"
color = "#A60735"
taste_description = "black tea with tones of berries"
@@ -1525,18 +1525,18 @@
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with berry juice, still tea
/datum/reagent/drink/tea/berrytea/decaf
- name = "Decaf Berry Tea"
+ name = REAGENT_BERRYTEADECAF
+ id = REAGENT_ID_BERRYTEADECAF
glass_name = "decaf berry tea"
cup_name = "decaf berry tea"
- id = "berryteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still berries.
/datum/reagent/drink/greentea
- name = "Green Tea"
- id = "greentea"
+ name = REAGENT_GREENTEA
+ id = REAGENT_ID_GREENTEA
description = "A subtle blend of green tea. It's apparently good for you!"
color = "#A8442C"
taste_description = "green tea"
@@ -1548,8 +1548,8 @@
cup_desc = "A subtle blend of green tea. It's apparently good for you!"
/datum/reagent/drink/tea/chaitea
- name = "Chai Tea"
- id = "chaitea"
+ name = REAGENT_CHAITEA
+ id = REAGENT_ID_CHAITEA
description = "A milky tea spiced with cinnamon and cloves."
color = "#A8442C"
taste_description = "creamy cinnamon and spice"
@@ -1562,18 +1562,18 @@
allergen_type = ALLERGEN_STIMULANT|ALLERGEN_DAIRY //Made with milk and tea.
/datum/reagent/drink/tea/chaitea/decaf
- name = "Decaf Chai Tea"
+ name = REAGENT_CHAITEADECAF
+ id = REAGENT_ID_CHAITEADECAF
glass_name = "decaf chai tea"
cup_name = "decaf chai tea"
- id = "chaiteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_DAIRY //No caffeine, still milk.
/datum/reagent/drink/coffee
- name = "Coffee"
- id = "coffee"
+ name = REAGENT_COFFEE
+ id = REAGENT_ID_COFFEE
description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
taste_description = "coffee"
taste_mult = 1.3
@@ -1585,10 +1585,10 @@
overdose = 45
cup_icon_state = "cup_coffee"
- cup_name = "coffee"
+ cup_name = REAGENT_ID_COFFEE
cup_desc = "Don't drop it, or you'll send scalding liquid and ceramic shards everywhere."
- glass_name = "coffee"
+ glass_name = REAGENT_ID_COFFEE
glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Apparently coffee contains coffee
@@ -1601,7 +1601,7 @@
//M.adjustToxLoss(0.5 * removed)
//M.make_jittery(4) //extra sensitive to caffine
if(adj_temp > 0)
- holder.remove_reagent("frostoil", 10 * removed)
+ holder.remove_reagent(REAGENT_ID_FROSTOIL, 10 * removed)
/datum/reagent/drink/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -1620,8 +1620,8 @@
M.make_jittery(5)
/datum/reagent/drink/coffee/icecoffee
- name = "Iced Coffee"
- id = "icecoffee"
+ name = REAGENT_ICECOFFEE
+ id = REAGENT_ID_ICECOFFEE
description = "Coffee and ice, refreshing and cool."
color = "#102838"
adj_temp = -5
@@ -1649,8 +1649,8 @@
//M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/coffee/soy_latte
- name = "Soy Latte"
- id = "soy_latte"
+ name = REAGENT_SOYLATTE
+ id = REAGENT_ID_SOYLATTE
description = "A nice and tasty beverage while you are reading your hippie books."
taste_description = "creamy coffee"
color = "#C65905"
@@ -1669,8 +1669,8 @@
M.heal_organ_damage(0.5 * removed, 0)
/datum/reagent/drink/coffee/cafe_latte
- name = "Cafe Latte"
- id = "cafe_latte"
+ name = REAGENT_CAFELATTE
+ id = REAGENT_ID_CAFELATTE
description = "A nice, strong and tasty beverage while you are reading."
taste_description = "bitter cream"
color = "#C65905"
@@ -1689,8 +1689,8 @@
M.heal_organ_damage(0.5 * removed, 0)
/datum/reagent/drink/decaf
- name = "Decaf Coffee"
- id = "decaf"
+ name = REAGENT_DECAF
+ id = REAGENT_ID_DECAF
description = "Coffee with all the wake-up sucked out."
taste_description = "bad coffee"
taste_mult = 1.3
@@ -1698,7 +1698,7 @@
adj_temp = 25
cup_icon_state = "cup_coffee"
- cup_name = "decaf"
+ cup_name = REAGENT_ID_DECAF
cup_desc = "Basically just brown, bitter water."
glass_name = "decaf coffee"
@@ -1706,8 +1706,8 @@
allergen_type = ALLERGEN_COFFEE //Decaf coffee is still coffee, just less stimulating.
/datum/reagent/drink/hot_coco
- name = "Hot Chocolate"
- id = "hot_coco"
+ name = REAGENT_HOTCOCO
+ id = REAGENT_ID_HOTCOCO
description = "Made with love! And cocoa beans."
taste_description = "creamy chocolate"
reagent_state = LIQUID
@@ -1724,8 +1724,8 @@
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/drink/coffee/blackeye
- name = "Black Eye Coffee"
- id = "black_eye"
+ name = REAGENT_BLACKEYE
+ id = REAGENT_ID_BLACKEYE
description = "Coffee but with more coffee for that extra coffee kick."
taste_description = "very concentrated coffee"
color = "#241001"
@@ -1740,8 +1740,8 @@
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/drip
- name = "Drip Coffee"
- id = "drip_coffee"
+ name = REAGENT_DRIPCOFFEE
+ id = REAGENT_ID_DRIPCOFFEE
description = "Coffee made by soaking beans in hot water and allowing it seep through."
taste_description = "very concentrated coffee"
color = "#3d1a00"
@@ -1756,31 +1756,31 @@
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/americano
- name = "Americano"
- id = "americano"
+ name = REAGENT_AMERICANO
+ id = REAGENT_ID_AMERICANO
description = "A traditional coffee that is more dilute and perfect for a gentle start to the day."
taste_description = "pleasant coffee"
color = "#6d3205"
adj_temp = 5
glass_desc = "A traditional coffee that is more dilute and perfect for a gentle start to the day."
- glass_name = "americano"
+ glass_name = REAGENT_ID_AMERICANO
cup_icon_state = "cup_coffee"
- cup_name = "americano"
+ cup_name = REAGENT_ID_AMERICANO
cup_desc = "A traditional coffee that is more dilute and perfect for a gentle start to the day."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/long_black
- name = "Long Black Coffee"
- id = "long_black"
+ name = REAGENT_LONGBLACK
+ id = REAGENT_ID_LONGBLACK
description = "A traditional coffee with a little more kick."
taste_description = "modestly bitter coffee"
color = "#6d3205"
adj_temp = 5
glass_desc = "A traditional coffee with a little more kick."
- glass_name = "long_black"
+ glass_name = REAGENT_ID_LONGBLACK
cup_icon_state = "cup_coffee"
cup_name = "long black coffee"
@@ -1788,79 +1788,79 @@
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/macchiato
- name = "Macchiato"
- id = "macchiato"
+ name = REAGENT_MACCHIATO
+ id = REAGENT_ID_MACCHIATO
description = "A coffee mixed with steamed milk, it has swirling patterns on top."
taste_description = "milky coffee"
color = "#ad5817"
adj_temp = 5
glass_desc = "A coffee mixed with steamed milk, it has swirling patterns on top."
- glass_name = "macchiato"
+ glass_name = REAGENT_ID_MACCHIATO
cup_icon_state = "cup_latte"
- cup_name = "macchiato"
+ cup_name = REAGENT_ID_MACCHIATO
cup_desc = "A coffee mixed with steamed milk, it has swirling patterns on top."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/cortado
- name = "Cortado"
- id = "cortado"
+ name = REAGENT_CORTADO
+ id = REAGENT_ID_CORTADO
description = "Espresso mixed with equal parts milk and a layer of foam on top."
taste_description = "milky coffee"
color = "#ad5817"
adj_temp = 5
glass_desc = "Espresso mixed with equal parts milk and a layer of foam on top."
- glass_name = "macchiato"
+ glass_name = REAGENT_ID_CORTADO
cup_icon_state = "cup_latte"
- cup_name = "cortado"
+ cup_name = REAGENT_ID_CORTADO
cup_desc = "Espresso mixed with equal parts milk and a layer of foam on top."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/breve
- name = "Breve"
- id = "breve"
+ name = REAGENT_BREVE
+ id = REAGENT_ID_BREVE
description = "Espresso topped with half-and-half, with a layer of foam on top."
taste_description = "creamy coffee"
color = "#d1905e"
adj_temp = 5
glass_desc = "Espresso topped with half-and-half, with a layer of foam on top."
- glass_name = "breve"
+ glass_name = REAGENT_ID_BREVE
cup_icon_state = "cup_cream"
- cup_name = "breve"
+ cup_name = REAGENT_ID_BREVE
cup_desc = "Espresso topped with half-and-half, with a layer of foam on top."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/cappuccino
- name = "Cappuccino"
- id = "cappuccino"
+ name = REAGENT_CAPPUCCINO
+ id = REAGENT_ID_CAPPUCCINO
description = "Espresso with a large portion of milk and a hefty layer of foam."
taste_description = "classic coffee"
color = "#d1905e"
adj_temp = 5
glass_desc = "Espresso with a large portion of milk and a hefty layer of foam."
- glass_name = "cappuccino"
+ glass_name = REAGENT_ID_CAPPUCCINO
cup_icon_state = "cup_cream"
- cup_name = "cappuccino"
+ cup_name = REAGENT_ID_CAPPUCCINO
cup_desc = "Espresso with a large portion of milk and a hefty layer of foam."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/flat_white
- name = "Flat White Coffee"
- id = "flat_white"
+ name = REAGENT_FLATWHITE
+ id = REAGENT_ID_FLATWHITE
description = "A very milky coffee that is particularly light and airy."
taste_description = "very milky coffee"
color = "#ed9f64"
adj_temp = 5
glass_desc = "A very milky coffee that is particularly light and airy."
- glass_name = "flat_white"
+ glass_name = REAGENT_ID_FLATWHITE
cup_icon_state = "cup_latte"
cup_name = "flat white coffee"
@@ -1868,40 +1868,40 @@
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/mocha
- name = "Mocha"
- id = "mocha"
+ name = REAGENT_MOCHA
+ id = REAGENT_ID_MOCHA
description = "A chocolate and coffee mix topped with a lot of milk and foam."
taste_description = "chocolatey coffee"
color = "#984201"
adj_temp = 5
glass_desc = "A chocolate and coffee mix topped with a lot of milk and foam."
- glass_name = "mocha"
+ glass_name = REAGENT_ID_MOCHA
cup_icon_state = "cup_cream"
- cup_name = "mocha"
+ cup_name = REAGENT_ID_MOCHA
cup_desc = "A chocolate and coffee mix topped with a lot of milk and foam."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/coffee/vienna
- name = "Vienna"
- id = "vienna"
+ name = REAGENT_VIENNA
+ id = REAGENT_ID_VIENNA
description = "A very sweet espresso topped with a lot of whipped cream."
taste_description = "super sweet and creamy coffee"
color = "#8e7059"
adj_temp = 5
glass_desc = "A very sweet espresso topped with a lot of whipped cream."
- glass_name = "vienna"
+ glass_name = REAGENT_ID_VIENNA
cup_icon_state = "cup_cream"
- cup_name = "vienna"
+ cup_name = REAGENT_ID_VIENNA
cup_desc = "A very sweet espresso topped with a lot of whipped cream."
allergen_type = ALLERGEN_COFFEE
/datum/reagent/drink/soda/sodawater
- name = "Soda Water"
- id = "sodawater"
+ name = REAGENT_SODAWATER
+ id = REAGENT_ID_SODAWATER
description = "A can of club soda. Why not make a scotch and soda?"
taste_description = "carbonated water"
color = "#619494"
@@ -1915,8 +1915,8 @@
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/grapesoda
- name = "Grape Soda"
- id = "grapesoda"
+ name = REAGENT_GRAPESODA
+ id = REAGENT_ID_GRAPESODA
description = "Grapes made into a fine drank."
taste_description = "grape soda"
color = "#421C52"
@@ -1929,12 +1929,12 @@
allergen_type = ALLERGEN_FRUIT //Made with grape juice
/datum/reagent/drink/soda/tonic
- name = "Tonic Water"
- id = "tonic"
+ name = REAGENT_TONIC
+ id = REAGENT_ID_TONIC
description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
taste_description = "tart and fresh"
color = "#619494"
- cup_prefix = "tonic"
+ cup_prefix = REAGENT_ID_TONIC
adj_dizzy = -5
adj_drowsy = -3
@@ -1945,106 +1945,106 @@
glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
/datum/reagent/drink/soda/lemonade
- name = "Lemonade"
- id = "lemonade"
+ name = REAGENT_LEMONADE
+ id = REAGENT_ID_LEMONADE
description = "Oh the nostalgia..."
- taste_description = "lemonade"
+ taste_description = REAGENT_ID_LEMONADE
color = "#FFFF00"
adj_temp = -5
- cup_prefix = "lemonade"
+ cup_prefix = REAGENT_ID_LEMONADE
- glass_name = "lemonade"
+ glass_name = REAGENT_ID_LEMONADE
glass_desc = "Oh the nostalgia..."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with lemon juice
/datum/reagent/drink/soda/melonade
- name = "Melonade"
- id = "melonade"
+ name = REAGENT_MELONADE
+ id = REAGENT_ID_MELONADE
description = "Oh the.. nostalgia?"
taste_description = "watermelon"
color = "#FFB3BB"
adj_temp = -5
- cup_prefix = "melonade"
+ cup_prefix = REAGENT_ID_MELONADE
- glass_name = "melonade"
+ glass_name = REAGENT_ID_MELONADE
glass_desc = "Oh the.. nostalgia?"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with watermelon juice
/datum/reagent/drink/soda/appleade
- name = "Appleade"
- id = "appleade"
+ name = REAGENT_APPLEADE
+ id = REAGENT_ID_APPLEADE
description = "Applejuice, improved."
taste_description = "apples"
color = "#FFD1B3"
adj_temp = -5
- cup_prefix = "appleade"
+ cup_prefix = REAGENT_ID_APPLEADE
- glass_name = "appleade"
+ glass_name = REAGENT_ID_APPLEADE
glass_desc = "Applejuice, improved."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with apple juice
/datum/reagent/drink/soda/pineappleade
- name = "Pineappleade"
- id = "pineappleade"
+ name = REAGENT_PINEAPPLEADE
+ id = REAGENT_ID_PINEAPPLEADE
description = "Pineapple, juiced up."
taste_description = "sweet`n`sour pineapples"
color = "#FFFF00"
adj_temp = -5
- cup_prefix = "pineappleade"
+ cup_prefix = REAGENT_ID_PINEAPPLEADE
- glass_name = "pineappleade"
+ glass_name = REAGENT_ID_PINEAPPLEADE
glass_desc = "Pineapple, juiced up."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with pineapple juice
/datum/reagent/drink/soda/kiraspecial
- name = "Kira Special"
- id = "kiraspecial"
+ name = REAGENT_KIRASPECIAL
+ id = REAGENT_ID_KIRASPECIAL
description = "Long live the guy who everyone had mistaken for a girl. Baka!"
taste_description = "fruity sweetness"
color = "#CCCC99"
adj_temp = -5
- glass_name = "Kira Special"
+ glass_name = REAGENT_KIRASPECIAL
glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made from orange and lime juice
/datum/reagent/drink/soda/brownstar
- name = "Brown Star"
- id = "brownstar"
+ name = REAGENT_BROWNSTAR
+ id = REAGENT_ID_BROWNSTAR
description = "It's not what it sounds like..."
taste_description = "orange and cola soda"
color = "#9F3400"
adj_temp = -2
- glass_name = "Brown Star"
+ glass_name = REAGENT_BROWNSTAR
glass_desc = "It's not what it sounds like..."
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orangejuice and cola
/datum/reagent/drink/soda/brownstar_decaf //For decaf starkist
- name = "Decaf Brown Star"
- id = "brownstar_decaf"
+ name = REAGENT_BROWNSTARDECAF
+ id = REAGENT_ID_BROWNSTARDECAF
description = "It's not what it sounds like..."
taste_description = "orange and cola soda"
color = "#9F3400"
adj_temp = -2
- glass_name = "Brown Star"
+ glass_name = REAGENT_BROWNSTAR
glass_desc = "It's not what it sounds like..."
/datum/reagent/drink/milkshake
- name = "Milkshake"
- id = "milkshake"
+ name = REAGENT_MILKSHAKE
+ id = REAGENT_ID_MILKSHAKE
description = "Glorious brainfreezing mixture."
taste_description = "vanilla milkshake"
color = "#AEE5E4"
adj_temp = -9
- glass_name = "milkshake"
+ glass_name = REAGENT_ID_MILKSHAKE
glass_desc = "Glorious brainfreezing mixture."
allergen_type = ALLERGEN_DAIRY //Made with dairy products
@@ -2070,32 +2070,32 @@
M.drowsyness = max(M.drowsyness, 60)
/datum/reagent/drink/milkshake/chocoshake
- name = "Chocolate Milkshake"
- id = "chocoshake"
+ name = REAGENT_CHOCOSHAKE
+ id = REAGENT_ID_CHOCOSHAKE
description = "A refreshing chocolate milkshake."
taste_description = "cold refreshing chocolate and cream"
color = "#8e6f44" // rgb(142, 111, 68)
adj_temp = -9
- glass_name = "Chocolate Milkshake"
+ glass_name = REAGENT_CHOCOSHAKE
glass_desc = "A refreshing chocolate milkshake, just like mom used to make."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_CHOCOLATE //Made with dairy products
/datum/reagent/drink/milkshake/berryshake
- name = "Berry Milkshake"
- id = "berryshake"
+ name = REAGENT_BERRYSHAKE
+ id = REAGENT_ID_BERRYSHAKE
description = "A refreshing berry milkshake."
taste_description = "cold refreshing berries and cream"
color = "#ffb2b2" // rgb(255, 178, 178)
adj_temp = -9
- glass_name = "Berry Milkshake"
+ glass_name = REAGENT_BERRYSHAKE
glass_desc = "A refreshing berry milkshake, just like mom used to make."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made with berry juice and dairy products
/datum/reagent/drink/milkshake/coffeeshake
- name = "Coffee Milkshake"
- id = "coffeeshake"
+ name = REAGENT_COFFEESHAKE
+ id = REAGENT_ID_COFFEESHAKE
description = "A refreshing coffee milkshake."
taste_description = "cold energizing coffee and cream"
color = "#8e6f44" // rgb(142, 111, 68)
@@ -2104,7 +2104,7 @@
adj_drowsy = -3
adj_sleepy = -2
- glass_name = "Coffee Milkshake"
+ glass_name = REAGENT_COFFEESHAKE
glass_desc = "An energizing coffee milkshake, perfect for hot days at work.."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_COFFEE //Made with coffee and dairy products
@@ -2112,25 +2112,25 @@
M.make_jittery(5)
/datum/reagent/drink/milkshake/peanutshake
- name = "Peanut Milkshake"
- id = "peanutmilkshake"
+ name = REAGENT_PEANUTMILKSHAKE
+ id = REAGENT_ID_PEANUTMILKSHAKE
description = "Savory cream in an ice-cold stature."
taste_description = "cold peanuts and cream"
color = "#8e6f44"
- glass_name = "Peanut Milkshake"
+ glass_name = REAGENT_PEANUTMILKSHAKE
glass_desc = "Savory cream in an ice-cold stature."
allergen_type = ALLERGEN_SEEDS|ALLERGEN_DAIRY //Made with peanutbutter(seeds) and dairy products
/datum/reagent/drink/rewriter
- name = "Rewriter"
- id = "rewriter"
+ name = REAGENT_REWRITER
+ id = REAGENT_ID_REWRITER
description = "The secret of the sanctuary of the Libarian..."
taste_description = "citrus and coffee"
color = "#485000"
adj_temp = -5
- glass_name = "Rewriter"
+ glass_name = REAGENT_REWRITER
glass_desc = "The secret of the sanctuary of the Libarian..."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made with space mountain wind (Fruit, caffeine)
@@ -2139,8 +2139,8 @@
M.make_jittery(5)
/datum/reagent/drink/soda/nuka_cola
- name = "Nuka Cola"
- id = "nuka_cola"
+ name = REAGENT_NUKACOLA
+ id = REAGENT_ID_NUKACOLA
description = "Cola, cola never changes."
taste_description = "cola"
color = "#100800"
@@ -2161,8 +2161,8 @@
M.drowsyness = 0
/datum/reagent/drink/grenadine //Description implies that the grenadine we would be working with does not contain fruit, so no allergens.
- name = "Grenadine Syrup"
- id = "grenadine"
+ name = REAGENT_GRENADINE
+ id = REAGENT_ID_GRENADINE
description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?"
taste_description = "100% pure pomegranate"
color = "#FF004F"
@@ -2172,8 +2172,8 @@
glass_desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
/datum/reagent/drink/soda/space_cola
- name = "Space Cola"
- id = "cola"
+ name = REAGENT_COLA
+ id = REAGENT_ID_COLA
description = "A refreshing beverage."
taste_description = "cola"
reagent_state = LIQUID
@@ -2181,27 +2181,27 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Space Cola"
+ glass_name = REAGENT_COLA
glass_desc = "A glass of refreshing Space Cola"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_STIMULANT //Cola is typically caffeinated.
/datum/reagent/drink/soda/decaf_cola
- name = "Space Cola Free"
- id = "decafcola"
+ name = REAGENT_DECAFCOLA
+ id = REAGENT_ID_DECAFCOLA
description = "A refreshing beverage with none of the jitters."
taste_description = "cola"
reagent_state = LIQUID
color = "#100800"
adj_temp = -5
- glass_name = "Space Cola Free"
+ glass_name = REAGENT_DECAFCOLA
glass_desc = "A glass of refreshing Space Cola Free"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/lemon_soda
- name = "Lemon Soda"
- id = "lemonsoda"
+ name = REAGENT_LEMONSODA
+ id = REAGENT_ID_LEMONSODA
description = "Soda made using lemon concentrate. Sour."
taste_description = "strong sourness"
reagent_state = LIQUID
@@ -2215,8 +2215,8 @@
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/apple_soda
- name = "Apple Soda"
- id = "applesoda"
+ name = REAGENT_APPLESODA
+ id = REAGENT_ID_APPLESODA
description = "Soda made using fresh apples."
taste_description = "crisp juiciness"
reagent_state = LIQUID
@@ -2224,15 +2224,15 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Apple Soda"
+ glass_name = REAGENT_APPLESODA
glass_desc = "A glass of refreshing Apple Soda. Crisp!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/straw_soda
- name = "Strawberry Soda"
- id = "strawsoda"
+ name = REAGENT_STRAWSODA
+ id = REAGENT_ID_STRAWSODA
description = "Soda made using sweet berries."
taste_description = "oddly bland"
reagent_state = LIQUID
@@ -2240,14 +2240,14 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Strawberry Soda"
+ glass_name = REAGENT_STRAWSODA
glass_desc = "A glass of refreshing Strawberry Soda"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/orangesoda
- name = "Orange Soda"
- id = "orangesoda"
+ name = REAGENT_ORANGESODA
+ id = REAGENT_ID_ORANGESODA
description = "Soda made using fresh picked oranges."
taste_description = "sweet and citrusy"
reagent_state = LIQUID
@@ -2255,14 +2255,14 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Orange Soda"
+ glass_name = REAGENT_ORANGESODA
glass_desc = "A glass of refreshing Orange Soda. Delicious!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/grapesoda
- name = "Grape Soda"
- id = "grapesoda"
+ name = REAGENT_GRAPESODA
+ id = REAGENT_ID_GRAPESODA
description = "Soda made of carbonated grapejuice."
taste_description = "tangy goodness"
reagent_state = LIQUID
@@ -2270,14 +2270,14 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Grape Soda"
+ glass_name = REAGENT_GRAPESODA
glass_desc = "A glass of refreshing Grape Soda. Tangy!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/sarsaparilla
- name = "Sarsaparilla"
- id = "sarsaparilla"
+ name = REAGENT_SARSAPARILLA
+ id = REAGENT_ID_SARSAPARILLA
description = "Soda made from genetically modified Mexican sarsaparilla plants."
taste_description = "licorice and caramel"
reagent_state = LIQUID
@@ -2285,13 +2285,13 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Sarsaparilla"
+ glass_name = REAGENT_SARSAPARILLA
glass_desc = "A glass of refreshing Sarsaparilla. Delicious!"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/pork_soda
- name = "Bacon Soda"
- id = "porksoda"
+ name = REAGENT_PORKSODA
+ id = REAGENT_ID_PORKSODA
description = "Soda made using pork like flavoring."
taste_description = "sugar coated bacon"
reagent_state = LIQUID
@@ -2299,13 +2299,13 @@
adj_drowsy = -3
adj_temp = -5
- glass_name = "Bacon Soda"
+ glass_name = REAGENT_PORKSODA
glass_desc = "A glass of Bacon Soda, very odd..."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/spacemountainwind
- name = "Mountain Wind"
- id = "spacemountainwind"
+ name = REAGENT_SPACEMOUNTAINWIND
+ id = REAGENT_ID_SPACEMOUNTAINWIND
description = "Blows right through you like a space wind."
taste_description = "sweet citrus soda"
color = "#102000"
@@ -2319,21 +2319,21 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Citrus, and caffeination
/datum/reagent/drink/soda/dr_gibb
- name = "Dr. Gibb"
- id = "dr_gibb"
+ name = REAGENT_DRGIBB
+ id = REAGENT_ID_DRGIBB
description = "A delicious blend of 42 different flavors."
taste_description = "cherry soda"
color = "#102000"
adj_drowsy = -6
adj_temp = -5
- glass_name = "Dr. Gibb"
+ glass_name = REAGENT_DRGIBB
glass_desc = "Dr. Gibb. Not as dangerous as the name might imply."
allergen_type = ALLERGEN_STIMULANT
/datum/reagent/drink/soda/space_up
- name = "Space-Up"
- id = "space_up"
+ name = REAGENT_SPACEUP
+ id = REAGENT_ID_SPACEUP
description = "Tastes like a hull breach in your mouth."
taste_description = "citrus soda"
color = "#202800"
@@ -2345,8 +2345,8 @@
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/lemon_lime
- name = "Lemon-Lime"
- id = "lemon_lime"
+ name = REAGENT_LEMONLIME
+ id = REAGENT_ID_LEMONLIME
description = "A tangy substance made of 0.5% natural citrus!"
taste_description = "tangy lime and lemon soda"
color = "#878F00"
@@ -2358,8 +2358,8 @@
allergen_type = ALLERGEN_FRUIT //Made with lemon and lime juice
/datum/reagent/drink/soda/gingerale
- name = "Ginger Ale"
- id = "gingerale"
+ name = REAGENT_GINGERALE
+ id = REAGENT_ID_GINGERALE
description = "The original."
taste_description = "somewhat tangy ginger ale"
color = "#edcf8f"
@@ -2370,8 +2370,8 @@
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/root_beer
- name = "R&D Root Beer"
- id = "rootbeer"
+ name = REAGENT_ROOTBEER
+ id = REAGENT_ID_ROOTBEER
color = "#211100"
adj_drowsy = -6
taste_description = "sassafras and anise soda"
@@ -2380,8 +2380,8 @@
glass_desc = "A glass of bubbly R&D Root Beer."
/datum/reagent/drink/dr_gibb_diet
- name = "Diet Dr. Gibb"
- id = "diet_dr_gibb"
+ name = REAGENT_DIETDRGIBB
+ id = REAGENT_ID_DIETDRGIBB
color = "#102000"
taste_description = "chemically sweetened cherry soda"
@@ -2390,8 +2390,8 @@
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/shirley_temple
- name = "Shirley Temple"
- id = "shirley_temple"
+ name = REAGENT_SHIRLEYTEMPLE
+ id = REAGENT_ID_SHIRLEYTEMPLE
description = "A sweet concotion hated even by its namesake."
taste_description = "sweet ginger ale"
color = "#EF304F"
@@ -2402,8 +2402,8 @@
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/roy_rogers
- name = "Roy Rogers"
- id = "roy_rogers"
+ name = REAGENT_ROYROGERS
+ id = REAGENT_ID_ROYROGERS
description = "I'm a cowboy, on a steel horse I ride."
taste_description = "cola and fruit"
color = "#4F1811"
@@ -2415,8 +2415,8 @@
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon lime and cola
/datum/reagent/drink/collins_mix
- name = "Collins Mix"
- id = "collins_mix"
+ name = REAGENT_COLLINSMIX
+ id = REAGENT_ID_COLLINSMIX
description = "Best hope it isn't a hoax."
taste_description = "gin and lemonade"
color = "#D7D0B3"
@@ -2428,8 +2428,8 @@
allergen_type = ALLERGEN_FRUIT //Made with lemon lime
/datum/reagent/drink/arnold_palmer
- name = "Arnold Palmer"
- id = "arnold_palmer"
+ name = REAGENT_ARNOLDPALMER
+ id = REAGENT_ID_ARNOLDPALMER
description = "Tastes just like the old man."
taste_description = "lemon and sweet tea"
color = "#AF5517"
@@ -2441,15 +2441,15 @@
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemonade and tea
/datum/reagent/drink/doctor_delight
- name = "The Doctor's Delight"
- id = "doctorsdelight"
+ name = REAGENT_DOCTORSDELIGHT
+ id = REAGENT_ID_DOCTORSDELIGHT
description = "A gulp a day keeps the MediBot away. That's probably for the best."
taste_description = "homely fruit smoothie"
reagent_state = LIQUID
color = "#FF8CFF"
nutrition = 1
- glass_name = "The Doctor's Delight"
+ glass_name = REAGENT_DOCTORSDELIGHT
glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from several fruit juices, and cream.
@@ -2466,8 +2466,8 @@
M.Confuse(-5)
/datum/reagent/drink/dry_ramen
- name = "Dry Ramen"
- id = "dry_ramen"
+ name = REAGENT_DRYRAMEN
+ id = REAGENT_ID_DRYRAMEN
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
taste_description = "dry cheap noodles"
reagent_state = SOLID
@@ -2863,7 +2863,7 @@
description = "A sugary syrup that tastes of vanilla."
taste_description = "vanilla"
color = "#eaebd1"
- cup_prefix = "vanilla"
+ cup_prefix = REAGENT_ID_VANILLA
/datum/reagent/drink/syrup/toffee
name = "toffee syrup"
@@ -2895,9 +2895,9 @@
name = "chocolate syrup"
id = "syrup_chocolate"
description = "A sugary syrup that tastes of chocolate."
- taste_description = "chocolate"
+ taste_description = REAGENT_ID_CHOCOLATE
color = "#873600"
- cup_prefix = "chocolate"
+ cup_prefix = REAGENT_ID_CHOCOLATE
allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE
diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm
index 5876a319f2..f2f187b0d0 100644
--- a/code/modules/reagents/reagents/medicine.dm
+++ b/code/modules/reagents/reagents/medicine.dm
@@ -623,7 +623,7 @@
/datum/reagent/alkysine
name = REAGENT_ALKYSINE
id = REAGENT_ID_ALKYSINE
- description = REAGENT_ALKYSINE " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ description = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FFFF66"
diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm
index 608b326ca4..fcb225609c 100644
--- a/code/modules/vore/fluffstuff/custom_implants_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm
@@ -1,8 +1,8 @@
//WickedTempest: Chakat Tempest
/obj/item/implant/reagent_generator/tempest
- generated_reagents = list("milk" = 2)
- reagent_name = "milk"
+ generated_reagents = list(REAGENT_ID_MILK = 2)
+ reagent_name = REAGENT_ID_MILK
usable_volume = 1000
empty_message = list("Your breasts are almost completely drained!")
@@ -19,8 +19,8 @@
//Hottokeeki: Belle Day
/obj/item/implant/reagent_generator/belle
- generated_reagents = list("milk" = 2)
- reagent_name = "milk"
+ generated_reagents = list(REAGENT_ID_MILK = 2)
+ reagent_name = REAGENT_ID_MILK
usable_volume = 5000
empty_message = list("Your breasts and or udder feel almost completely drained!", "You're feeling a liittle on the empty side...")
@@ -39,8 +39,8 @@
/obj/item/implant/reagent_generator/eldi
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
- generated_reagents = list("milk" = 2)
- reagent_name = "milk"
+ generated_reagents = list(REAGENT_ID_MILK = 2)
+ reagent_name = REAGENT_ID_MILK
usable_volume = 1000
empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.")
@@ -56,7 +56,7 @@
//Vorrarkul: Theodora Lindt
/obj/item/implant/reagent_generator/vorrarkul
- generated_reagents = list("chocolate_milk" = 2)
+ generated_reagents = list(REAGENT_ID_CHOCOLATEMILK = 2)
reagent_name = "chocalate milk"
usable_volume = 1000
@@ -73,8 +73,8 @@
//Lycanthorph: Savannah Dixon
/obj/item/implant/reagent_generator/savannah
- generated_reagents = list("milk" = 2)
- reagent_name = "milk"
+ generated_reagents = list(REAGENT_ID_MILK = 2)
+ reagent_name = REAGENT_ID_MILK
usable_volume = 1000
empty_message = list("Your nipples are sore from being milked!", "Your breasts feel drained, milk is no longer leaking from your nipples!")
@@ -95,7 +95,7 @@
/obj/item/implant/reagent_generator/roiz
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
- generated_reagents = list("egg" = 2)
+ generated_reagents = list(REAGENT_ID_EGG = 2)
usable_volume = 500
transfer_amount = 50
@@ -164,7 +164,7 @@
/obj/item/implant/reagent_generator/jasmine
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
- generated_reagents = list("egg" = 2)
+ generated_reagents = list(REAGENT_ID_EGG = 2)
usable_volume = 500
transfer_amount = 50
@@ -233,7 +233,7 @@
/obj/item/implant/reagent_generator/yonra
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
- generated_reagents = list("egg" = 2)
+ generated_reagents = list(REAGENT_ID_EGG = 2)
usable_volume = 500
transfer_amount = 50
@@ -308,7 +308,7 @@
/obj/item/reagent_containers/food/snacks/egg/teshari/New()
..()
- reagents.add_reagent("egg", 10)
+ reagents.add_reagent(REAGENT_ID_EGG, 10)
bitesize = 2
/obj/item/reagent_containers/food/snacks/egg/teshari/tesh2
@@ -318,7 +318,7 @@
/obj/item/implant/reagent_generator/rischi
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
- generated_reagents = list("egg" = 2)
+ generated_reagents = list(REAGENT_ID_EGG = 2)
usable_volume = 3000 //They requested 1 egg every ~30 minutes.
transfer_amount = 3000
@@ -385,8 +385,8 @@
/*
/obj/item/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up.
- generated_reagents = list("honey" = 2)
- reagent_name = "honey"
+ generated_reagents = list(REAGENT_ID_HONEY = 2)
+ reagent_name = REAGENT_ID_HONEY
usable_volume = 5000
empty_message = list("You appear to be all out of nectar", "You feel as though you are lacking a majority of your nectar.")
@@ -411,7 +411,7 @@
/obj/item/reagent_containers/food/snacks/egg/roiz/New()
..()
- reagents.add_reagent("egg", 9)
+ reagents.add_reagent(REAGENT_ID_EGG, 9)
bitesize = 2
/obj/item/reagent_containers/food/snacks/egg/roiz/attackby(obj/item/W as obj, mob/user as mob)
@@ -441,7 +441,7 @@
/obj/item/reagent_containers/food/snacks/friedegg/roiz/New()
..()
- reagents.add_reagent("protein", 9)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 9)
bitesize = 2
/obj/item/reagent_containers/food/snacks/boiledegg/roiz
@@ -453,7 +453,7 @@
/obj/item/reagent_containers/food/snacks/boiledegg/roiz/New()
..()
- reagents.add_reagent("protein", 6)
+ reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
bitesize = 2
/obj/item/reagent_containers/food/snacks/chocolateegg/roiz
@@ -463,14 +463,14 @@
icon_state = "chocolateegg_roiz"
filling_color = "#7D5F46"
nutriment_amt = 3
- nutriment_desc = list("chocolate" = 5)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5)
volume = 18
/obj/item/reagent_containers/food/snacks/chocolateegg/roiz/New()
..()
reagents.add_reagent(REAGENT_ID_SUGAR, 6)
- reagents.add_reagent("coco", 6)
- reagents.add_reagent("milk", 2)
+ reagents.add_reagent(REAGENT_ID_COCO, 6)
+ reagents.add_reagent(REAGENT_ID_MILK, 2)
bitesize = 2
//SilverTalisman: Evian
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 2110834bbf..c23a3d89da 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1275,8 +1275,8 @@
/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize()
. = ..()
- reagents.add_reagent("tea", 40)
- reagents.add_reagent("milk", 20)
+ reagents.add_reagent(REAGENT_ID_TEA, 40)
+ reagents.add_reagent(REAGENT_ID_MILK, 20)
/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/update_icon()
..()
diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
index e08717ec61..47dff61520 100644
--- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
@@ -47,9 +47,9 @@
..()
create_reagents(500)
coolant_reagents_purity[REAGENT_ID_WATER] = 0.5
- coolant_reagents_purity["icecoffee"] = 0.6
- coolant_reagents_purity["icetea"] = 0.6
- coolant_reagents_purity["milkshake"] = 0.6
+ coolant_reagents_purity[REAGENT_ID_ICECOFFEE] = 0.6
+ coolant_reagents_purity[REAGENT_ID_ICETEA] = 0.6
+ coolant_reagents_purity[REAGENT_ID_MILKSHAKE] = 0.6
coolant_reagents_purity[REAGENT_ID_LEPORAZINE] = 0.7
coolant_reagents_purity[REAGENT_ID_KELOTANE] = 0.7
coolant_reagents_purity[REAGENT_ID_STERILIZINE] = 0.7
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index b7e89a3c95..79982b7fd9 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -263,7 +263,7 @@
/decl/chemical_reaction/instant/slime/blue_frostoil
name = "Slime Frost Oil"
id = "m_frostoil"
- result = "frostoil"
+ result = REAGENT_ID_FROSTOIL
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 20
required = /obj/item/slime_extract/blue
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index 82082d5d30..1d007ff494 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -193,7 +193,7 @@
/decl/chemical_reaction/instant/slime/blue_frostoil
name = "Slime Frost Oil"
id = "m_blue_frostoil"
- result = "frostoil"
+ result = REAGENT_ID_FROSTOIL
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/blue
@@ -247,7 +247,7 @@
/decl/chemical_reaction/instant/slime/blue_cryotoxin
name = "Slime Cryotoxin"
id = "m_blue_cryotoxin"
- result = "cryotoxin"
+ result = REAGENT_ID_CRYOTOXIN
required_reagents = list(REAGENT_ID_SLIMEJELLY = 5)
result_amount = 30
required = /obj/item/slime_extract/blue
@@ -881,7 +881,7 @@
/decl/chemical_reaction/instant/slime/red_hotsauce
name = "Slime Hot Sauce"
id = "m_red_hotsauce"
- result = "capsaicin"
+ result = REAGENT_ID_CAPSAICIN
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/red
@@ -1041,7 +1041,7 @@
/decl/chemical_reaction/instant/slime/oil_oil
name = "Slime Oil"
id = "m_oil_oil"
- result = "cookingoil"
+ result = REAGENT_ID_COOKINGOIL
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/oil
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index 89b4b9acc9..5390fb716e 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -55,11 +55,11 @@
xenoChemList += REAGENT_ID_COOLANT
xenoChemList += REAGENT_ID_LUMINOL
xenoChemList += REAGENT_ID_NUTRIMENT
- xenoChemList += "cornoil"
- xenoChemList += "lipozine"
+ xenoChemList += REAGENT_ID_CORNOIL
+ xenoChemList += REAGENT_ID_LIPOZINE
xenoChemList += REAGENT_ID_SODIUMCHLORIDE
- xenoChemList += "frostoil"
- xenoChemList += "capsaicin"
- xenoChemList += "condensedcapsaicin"
+ xenoChemList += REAGENT_ID_FROSTOIL
+ xenoChemList += REAGENT_ID_CAPSAICIN
+ xenoChemList += REAGENT_ID_CONDENSEDCAPSAICIN
xenoChemList += "neurotoxin"
return 1
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index dde4267802..d0251b28cc 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -50,12 +50,12 @@ Slime definitions, Life and New live here.
REAGENT_ID_RADIUM = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
REAGENT_ID_MUTAGEN = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
REAGENT_ID_WATER = list(XENO_CHEM_NUTRI = -0.1),
- "milk" = list(XENO_CHEM_NUTRI = 0.3),
+ REAGENT_ID_MILK = list(XENO_CHEM_NUTRI = 0.3),
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),
REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5),
- "sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1),
+ REAGENT_ID_SODAWATER = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1),
"beer" = list(XENO_CHEM_NUTRI = 0.6),
REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9),
REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
@@ -63,13 +63,13 @@ Slime definitions, Life and New live here.
REAGENT_ID_CRYOXADONE = list(XENO_CHEM_TOXIC = 0.4),
"flourine" = list(XENO_CHEM_TOXIC = 0.1),
REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5),
- "glucose" = list(XENO_CHEM_NUTRI = 0.5),
+ REAGENT_ID_GLUCOSE = list(XENO_CHEM_NUTRI = 0.5),
REAGENT_ID_BLOOD = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
REAGENT_ID_FUEL = list(XENO_CHEM_TOXIC = 0.4),
REAGENT_ID_TOXIN = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_CARPOTOXIN = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
- "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
+ REAGENT_ID_VIRUSFOOD = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
REAGENT_ID_CYANIDE = list(XENO_CHEM_TOXIC = 3.5),
REAGENT_ID_SLIMEJELLY = list(XENO_CHEM_NUTRI = 0.5),
"amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3),
diff --git a/vorestation.dme b/vorestation.dme
index d7335f56c8..0b3fd1d5fe 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -28,6 +28,7 @@
#include "code\__defines\_planes+layers.dm"
#include "code\__defines\_planes+layers_vr.dm"
#include "code\__defines\_protect.dm"
+#include "code\__defines\_reagents.dm"
#include "code\__defines\_tick.dm"
#include "code\__defines\action.dm"
#include "code\__defines\admin.dm"
@@ -114,7 +115,6 @@
#include "code\__defines\projectiles.dm"
#include "code\__defines\qdel.dm"
#include "code\__defines\radio.dm"
-#include "code\__defines\reagents.dm"
#include "code\__defines\recipe.dm"
#include "code\__defines\request_console.dm"
#include "code\__defines\research.dm"
From 4e7742e3c8a14f71d866fd0524c8d6bee9d5a6d2 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 04:26:19 +0100
Subject: [PATCH 12/29] food.dm
---
code/__defines/_reagents.dm | 407 ++++++-
code/__defines/chemistry.dm | 4 +-
code/modules/casino/casino_prize_vendor.dm | 6 +-
.../food/drinkingglass/drinkingglass.dm | 4 +-
code/modules/food/food/cans.dm | 8 +-
code/modules/food/food/drinks.dm | 2 +-
code/modules/food/food/drinks/bottle.dm | 66 +-
code/modules/food/food/superfoods.dm | 4 +-
code/modules/food/kitchen/icecream.dm | 10 +-
code/modules/food/recipes_microwave.dm | 10 +-
code/modules/hydroponics/seed.dm | 2 +-
code/modules/hydroponics/seedtypes/gnomes.dm | 2 +-
code/modules/hydroponics/seedtypes/telriis.dm | 2 +-
.../modules/hydroponics/seedtypes/tomatoes.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 6 +-
.../equipment_vendor.dm | 8 +-
.../ore_redemption_machine/survey_vendor.dm | 8 +-
.../living/silicon/robot/sprites/civilian.dm | 4 +-
.../machinery/dispenser/cartridge_presets.dm | 70 +-
.../machinery/dispenser/dispenser2_energy.dm | 16 +-
.../machinery/dispenser/reagent_tank.dm | 4 +-
code/modules/reagents/machinery/pump.dm | 2 +-
.../reactions/distilling/distilling.dm | 6 +-
.../reagents/reactions/instant/drinks.dm | 1008 ++++++++---------
.../reagents/reactions/instant/drinks_vr.dm | 46 +-
.../reagents/reactions/instant/food.dm | 18 +-
.../reagents/reactions/instant/instant.dm | 10 +-
.../reagents/reagent_containers/borghypo.dm | 34 +-
.../reagents/reagent_containers/glass_vr.dm | 2 +-
code/modules/reagents/reagents/food_drinks.dm | 967 ++++++++--------
code/modules/reagents/reagents/toxins.dm | 2 +-
.../vore/fluffstuff/custom_items_vr.dm | 2 +-
code/modules/xenoarcheaology/effect_master.dm | 4 +-
code/modules/xenoarcheaology/finds/special.dm | 2 +-
code/modules/xenobio/items/extracts_vr.dm | 2 +-
code/modules/xenobio2/_xeno_setup_vr.dm | 2 +-
code/modules/xenobio2/mob/slime/slime.dm | 2 +-
37 files changed, 1536 insertions(+), 1218 deletions(-)
diff --git a/code/__defines/_reagents.dm b/code/__defines/_reagents.dm
index 62db7c2493..820fb303f3 100644
--- a/code/__defines/_reagents.dm
+++ b/code/__defines/_reagents.dm
@@ -864,35 +864,376 @@
#define REAGENT_ID_DOCTORSDELIGHT "doctorsdelight"
#define REAGENT_DRYRAMEN "Dry Ramen"
#define REAGENT_ID_DRYRAMEN "dry_ramen"
+#define REAGENT_HOTRAMEN "Hot Ramen"
+#define REAGENT_ID_HOTRAMEN "hot_ramen"
+#define REAGENT_HELLRAMEN "Hell Ramen"
+#define REAGENT_ID_HELLRAMEN "hell_ramen"
+#define REAGENT_DESSERTRAMEN "Dessert Ramen"
+#define REAGENT_ID_DESSERTRAMEN "dessertramen"
+#define REAGENT_ICE "Ice"
+#define REAGENT_ID_ICE "ice"
+#define REAGENT_NOTHING "Nothing"
+#define REAGENT_ID_NOTHING "nothing"
+#define REAGENT_DREAMCREAM "Dream Cream"
+#define REAGENT_ID_DREAMCREAM "dreamcream"
+#define REAGENT_VILELEMON "Vile Lemon"
+#define REAGENT_ID_VILELEMON "vilelemon"
+#define REAGENT_ENTDRAUGHT "Ent's Draught"
+#define REAGENT_ID_ENTDRAUGHT "entdraught"
+#define REAGENT_LOVEPOTION "Love Potion"
+#define REAGENT_ID_LOVEPOTION "lovepotion"
+#define REAGENT_OILSLICK "Oil Slick"
+#define REAGENT_ID_OILSLICK "oilslick"
+#define REAGENT_SLIMESLAMMER "Slick Slimes Slammer"
+#define REAGENT_ID_SLIMESLAMMER "slimeslammer"
+#define REAGENT_EGGNOG "Eggnog"
+#define REAGENT_ID_EGGNOG "eggnog"
+#define REAGENT_NUCLEARWASTE "Nuclear Waste"
+#define REAGENT_ID_NUCLEARWASTE "nuclearwaste"
+#define REAGENT_SODAOIL "Soda Oil"
+#define REAGENT_ID_SODAOIL "sodaoil"
+#define REAGENT_VIRGINMOJITO "Mojito"
+#define REAGENT_ID_VIRGINMOJITO "virginmojito"
+#define REAGENT_VIRGINSEXONTHEBEACH "Virgin Sex On The Beach"
+#define REAGENT_ID_VIRGINSEXONTHEBEACH "virginsexonthebeach"
+#define REAGENT_DRIVERSPUNCH "Driver's Punch"
+#define REAGENT_ID_DRIVERSPUNCH "driverspunch"
+#define REAGENT_MINTAPPLESPARKLE "Mint Apple Sparkle"
+#define REAGENT_ID_MINTAPPLESPARKLE "mintapplesparkle"
+#define REAGENT_BERRYCORDIAL "Berry Cordial"
+#define REAGENT_ID_BERRYCORDIAL "berrycordial"
+#define REAGENT_TROPICALFIZZ "Tropical Fizz"
+#define REAGENT_ID_TROPICALFIZZ "tropicalfizz"
+#define REAGENT_FAUXFIZZ "Faux Fizz"
+#define REAGENT_ID_FAUXFIZZ "fauxfizz"
+#define REAGENT_SYRUP "syrup"
+#define REAGENT_ID_SYRUP "syrup"
+#define REAGENT_SYRUPPUMPKIN "pumpkin spice syrup"
+#define REAGENT_ID_SYRUPPUMPKIN "syrup_pumpkin"
+#define REAGENT_SYRUPCARAMEL "caramel syrup"
+#define REAGENT_ID_SYRUPCARAMEL "syrup_caramel"
+#define REAGENT_SYRUPSALTEDCARAMEL "salted caramel syrup"
+#define REAGENT_ID_SYRUPSALTEDCARAMEL "syrup_salted_caramel"
+#define REAGENT_SYRUPIRISH "irish cream syrup"
+#define REAGENT_ID_SYRUPIRISH "syrup_irish"
+#define REAGENT_SYRUPALMOND "almond syrup"
+#define REAGENT_ID_SYRUPALMOND "syrup_almond"
+#define REAGENT_SYRUPCINNAMON "cinnamon syrup"
+#define REAGENT_ID_SYRUPCINNAMON "syrup_cinnamon"
+#define REAGENT_SYRUPPISTACHIO "pistachio syrup"
+#define REAGENT_ID_SYRUPPISTACHIO "syrup_pistachio"
+#define REAGENT_SYRUPVANILLA "vanilla syrup"
+#define REAGENT_ID_SYRUPVANILLA "syrup_vanilla"
+#define REAGENT_SYRUPTOFFEE "toffee syrup"
+#define REAGENT_ID_SYRUPTOFFEE "syrup_toffee"
+#define REAGENT_SYRUPCHERRY "cherry syrup"
+#define REAGENT_ID_SYRUPCHERRY "syrup_cherry"
+#define REAGENT_SYRUPBUTTERSCOTCH "butterscotch syrup"
+#define REAGENT_ID_SYRUPBUTTERSCOTCH "syrup_butterscotch"
+#define REAGENT_SYRUPCHOCOLATE "chocolate syrup"
+#define REAGENT_ID_SYRUPCHOCOLATE "syrup_chocolate"
+#define REAGENT_SYRUPWHITECHOCOLATE "white chocolate syrup"
+#define REAGENT_ID_SYRUPWHITECHOCOLATE "syrup_white_chocolate"
+#define REAGENT_SYRUPSTRAWBERRY "strawberry syrup"
+#define REAGENT_ID_SYRUPSTRAWBERRY "syrup_strawberry"
+#define REAGENT_SYRUPCOCONUT "coconut syrup"
+#define REAGENT_ID_SYRUPCOCONUT "syrup_coconut"
+#define REAGENT_SYRUPGINGER "ginger syrup"
+#define REAGENT_ID_SYRUPGINGER "syrup_ginger"
+#define REAGENT_SYRUPGINGERBREAD "gingerbread syrup"
+#define REAGENT_ID_SYRUPGINGERBREAD "syrup_gingerbread"
+#define REAGENT_SYRUPPEPPERMINT "peppermint syrup"
+#define REAGENT_ID_SYRUPPEPPERMINT "syrup_peppermint"
+#define REAGENT_SYRUPBIRTHDAY "birthday cake syrup"
+#define REAGENT_ID_SYRUPBIRTHDAY "syrup_birthday"
+// Alcohol
+#define REAGENT_ABSINTHE "Absinthe"
+#define REAGENT_ID_ABSINTHE "absinthe"
+#define REAGENT_ALE "Ale"
+#define REAGENT_ID_ALE "ale"
+#define REAGENT_BEER "Beer"
+#define REAGENT_ID_BEER "beer"
+#define REAGENT_LITEBEER "Lite Beer"
+#define REAGENT_ID_LITEBEER "litebeer"
+#define REAGENT_BLUECURACAO "Blue Curacao"
+#define REAGENT_ID_BLUECURACAO "bluecuracao"
+#define REAGENT_COGNAC "Cognac"
+#define REAGENT_ID_COGNAC "cognac"
+#define REAGENT_DEADRUM "Deadrum"
+#define REAGENT_ID_DEADRUM "deadrum"
+#define REAGENT_FIREPUNCH "Fire Punch"
+#define REAGENT_ID_FIREPUNCH "firepunch"
+#define REAGENT_GIN "Gin"
+#define REAGENT_ID_GIN "gin"
+#define REAGENT_KAHLUA "Kahlua"
+#define REAGENT_ID_KAHLUA "kahlua"
+#define REAGENT_MELONLIQUOR "Melon Liquor"
+#define REAGENT_ID_MELONLIQUOR "melonliquor"
+#define REAGENT_MELONSPRITZER "Melon Spritzer"
+#define REAGENT_ID_MELONSPRITZER "melonspritzer"
+#define REAGENT_RUM "Rum"
+#define REAGENT_ID_RUM "rum"
+#define REAGENT_SAKE "Sake"
+#define REAGENT_ID_SAKE "sake"
+#define REAGENT_SEXONTHEBEACH "Sex On The Beach"
+#define REAGENT_ID_SEXONTHEBEACH "sexonthebeach"
+#define REAGENT_TEQUILLA "Tequila"
+#define REAGENT_ID_TEQUILLA "tequilla"
+#define REAGENT_THIRTEENLOKO "Thirteen Loko"
+#define REAGENT_ID_THIRTEENLOKO "thirteenloko"
+#define REAGENT_VERMOUTH "Vermouth"
+#define REAGENT_ID_VERMOUTH "vermouth"
+#define REAGENT_VODKA "Vodka"
+#define REAGENT_ID_VODKA "vodka"
+#define REAGENT_WHISKEY "Whiskey"
+#define REAGENT_ID_WHISKEY "whiskey"
+#define REAGENT_REDWINE "Red Wine"
+#define REAGENT_ID_REDWINE "redwine"
+#define REAGENT_WHITEWINE "White Wine"
+#define REAGENT_ID_WHITEWINE "whitewine"
+#define REAGENT_CARNOTH "Carnoth"
+#define REAGENT_ID_CARNOTH "carnoth"
+#define REAGENT_PWINE "Poison Wine"
+#define REAGENT_ID_PWINE "pwine"
+#define REAGENT_CHAMPAGNE "Champagne"
+#define REAGENT_ID_CHAMPAGNE "champagne"
+#define REAGENT_CIDER "Cider"
+#define REAGENT_ID_CIDER "cider"
-
-
-#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_
-#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_
-
-
-
-
-
+// Cocktails
+#define REAGENT_ACIDSPIT "Acid Spit"
+#define REAGENT_ID_ACIDSPIT "acidspit"
+#define REAGENT_ALLIESCOCKTAIL "Allies Cocktail"
+#define REAGENT_ID_ALLIESCOCKTAIL "alliescocktail"
+#define REAGENT_ALOE "Aloe"
+#define REAGENT_ID_ALOE "aloe"
+#define REAGENT_AMASEC "Amasec"
+#define REAGENT_ID_AMASEC "amasec"
+#define REAGENT_ANDALUSIA "Andalusia"
+#define REAGENT_ID_ANDALUSIA "andalusia"
+#define REAGENT_ANTIFREEZE "Anti-freeze"
+#define REAGENT_ID_ANTIFREEZE "antifreeze"
+#define REAGENT_ATOMICBOMB "Atomic Bomb"
+#define REAGENT_ID_ATOMICBOMB "atomicbomb"
+#define REAGENT_B52 "B-52"
+#define REAGENT_ID_B52 "b52"
+#define REAGENT_BAHAMAMAMA "Bahama mama"
+#define REAGENT_ID_BAHAMAMAMA "bahama_mama"
+#define REAGENT_BANANAHONK "Banana Mama"
+#define REAGENT_ID_BANANAHONK "bananahonk"
+#define REAGENT_BAREFOOT "Barefoot"
+#define REAGENT_ID_BAREFOOT "barefoot"
+#define REAGENT_BEEPSKYSMASH "Beepsky Smash"
+#define REAGENT_ID_BEEPSKYSMASH "beepskysmash"
+#define REAGENT_BILK "Bilk"
+#define REAGENT_ID_BILK "bilk"
+#define REAGENT_BLACKRUSSIAN "Black Russian"
+#define REAGENT_ID_BLACKRUSSIAN "blackrussian"
+#define REAGENT_BLOODYMARY "Bloody Mary"
+#define REAGENT_ID_BLOODYMARY "bloodymary"
+#define REAGENT_BOOGER "Booger"
+#define REAGENT_ID_BOOGER "booger"
+#define REAGENT_BRAVEBULL "Brave Bull"
+#define REAGENT_ID_BRAVEBULL "bravebull"
+#define REAGENT_CHANGELINGSTING "Changeling Sting"
+#define REAGENT_ID_CHANGELINGSTING "changelingsting"
+#define REAGENT_MARTINI "Classic Martini"
+#define REAGENT_ID_MARTINI "martini"
+#define REAGENT_CUBALIBRE "Cuba Libre"
+#define REAGENT_ID_CUBALIBRE "cubalibre"
+#define REAGENT_RUMANDCOLA "Rum and Cola"
+#define REAGENT_ID_RUMANDCOLA "rumandcola"
+#define REAGENT_DEMONSBLOOD "Demons Blood"
+#define REAGENT_ID_DEMONSBLOOD "demonsblood"
+#define REAGENT_DEVILSKISS "Devils Kiss"
+#define REAGENT_ID_DEVILSKISS "devilskiss"
+#define REAGENT_DRIESTMARTINI "Driest Martini"
+#define REAGENT_ID_DRIESTMARTINI "driestmartini"
+#define REAGENT_GINFIZZ "Gin Fizz"
+#define REAGENT_ID_GINFIZZ "ginfizz"
+#define REAGENT_GROG "Grog"
+#define REAGENT_ID_GROG "grog"
+#define REAGENT_ERIKASURPRISE "Erika Surprise"
+#define REAGENT_ID_ERIKASURPRISE "erikasurprise"
+#define REAGENT_GARGLEBLASTER "Pan-Galactic Gargle Blaster"
+#define REAGENT_ID_GARGLEBLASTER "gargleblaster"
+#define REAGENT_GINTONIC "Gin and Tonic"
+#define REAGENT_ID_GINTONIC "gintonic"
+#define REAGENT_GOLDSCHLAGER "Goldschlager"
+#define REAGENT_ID_GOLDSCHLAGER "goldschlager"
+#define REAGENT_HIPPIESDELIGHT "Hippies' Delight"
+#define REAGENT_ID_HIPPIESDELIGHT "hippiesdelight"
+#define REAGENT_HOOCH "Hooch"
+#define REAGENT_ID_HOOCH "hooch"
+#define REAGENT_ICEDBEER "Iced Beer"
+#define REAGENT_ID_ICEDBEER "iced_beer"
+#define REAGENT_IRISHCARBOMB "Irish Car Bomb"
+#define REAGENT_ID_IRISHCARBOMB "irishcarbomb"
+#define REAGENT_IRISHCOFFEE "Irish Coffee"
+#define REAGENT_ID_IRISHCOFFEE "irishcoffee"
+#define REAGENT_IRISHCREAM "Irish Cream"
+#define REAGENT_ID_IRISHCREAM "irishcream"
+#define REAGENT_LONGISLANDICEDTEA "Long Island Iced Tea"
+#define REAGENT_ID_LONGISLANDICEDTEA "longislandicedtea"
+#define REAGENT_MANHATTAN "Manhattan"
+#define REAGENT_ID_MANHATTAN "manhattan"
+#define REAGENT_MANHATTANPROJ "Manhattan Project"
+#define REAGENT_ID_MANHATTANPROJ "manhattan_proj"
+#define REAGENT_MANLYDORF "The Manly Dorf"
+#define REAGENT_ID_MANLYDORF "manlydorf"
+#define REAGENT_MARGARITA "Margarita"
+#define REAGENT_ID_MARGARITA "margarita"
+#define REAGENT_MEAD "Mead"
+#define REAGENT_ID_MEAD "mead"
+#define REAGENT_MOONSHINE "Moonshine"
+#define REAGENT_ID_MOONSHINE "moonshine"
+#define REAGENT_NEUROTOXIN "Neurotoxin"
+#define REAGENT_ID_NEUROTOXIN "neurotoxin"
+#define REAGENT_PATRON "Patron"
+#define REAGENT_ID_PATRON "patron"
+#define REAGENT_REDMEAD "Red Mead"
+#define REAGENT_ID_REDMEAD "red_mead"
+#define REAGENT_SBITEN "Sbiten"
+#define REAGENT_ID_SBITEN "sbiten"
+#define REAGENT_SCREWDRIVERCOCKTAIL "Screwdriver"
+#define REAGENT_ID_SCREWDRIVERCOCKTAIL "screwdrivercocktail"
+#define REAGENT_SILENCER "Silencer"
+#define REAGENT_ID_SILENCER "silencer"
+#define REAGENT_SINGULO "Singulo"
+#define REAGENT_ID_SINGULO "singulo"
+#define REAGENT_SNOWWHITE "Snow White"
+#define REAGENT_ID_SNOWWHITE "snowwhite"
+#define REAGENT_SUIDREAM "Sui Dream"
+#define REAGENT_ID_SUIDREAM "suidream"
+#define REAGENT_SYNDICATEBOMB "Syndicate Bomb"
+#define REAGENT_ID_SYNDICATEBOMB "syndicatebomb"
+#define REAGENT_TEQUILLASUNRISE "Tequila Sunrise"
+#define REAGENT_ID_TEQUILLASUNRISE "tequillasunrise"
+#define REAGENT_THREEMILEISLAND "Three Mile Island Iced Tea"
+#define REAGENT_ID_THREEMILEISLAND "threemileisland"
+#define REAGENT_PHORONSPECIAL "Toxins Special"
+#define REAGENT_ID_PHORONSPECIAL "phoronspecial"
+#define REAGENT_VODKAMARTINI "Vodka Martini"
+#define REAGENT_ID_VODKAMARTINI "vodkamartini"
+#define REAGENT_VODKATONIC "Vodka and Tonic"
+#define REAGENT_ID_VODKATONIC "vodkatonic"
+#define REAGENT_WHITERUSSIAN "White Russian"
+#define REAGENT_ID_WHITERUSSIAN "whiterussian"
+#define REAGENT_WHISKEYCOLA "Whiskey Cola"
+#define REAGENT_ID_WHISKEYCOLA "whiskeycola"
+#define REAGENT_WHISKEYSODA "Whiskey Soda"
+#define REAGENT_ID_WHISKEYSODA "whiskeysoda"
+#define REAGENT_SPECIALWHISKEY "Special Blend Whiskey"
+#define REAGENT_ID_SPECIALWHISKEY "specialwhiskey"
+#define REAGENT_UNATHILIQUOR "Redeemer's Brew"
+#define REAGENT_ID_UNATHILIQUOR "unathiliquor"
+#define REAGENT_SAKEBOMB "Sake Bomb"
+#define REAGENT_ID_SAKEBOMB "sakebomb"
+#define REAGENT_TAMAGOZAKE "Tamagozake"
+#define REAGENT_ID_TAMAGOZAKE "tamagozake"
+#define REAGENT_GINZAMARY "Ginza Mary"
+#define REAGENT_ID_GINZAMARY "ginzamary"
+#define REAGENT_TOKYOROSE "Tokyo Rose"
+#define REAGENT_ID_TOKYOROSE "tokyorose"
+#define REAGENT_SAKETINI "Saketini"
+#define REAGENT_ID_SAKETINI "saketini"
+#define REAGENT_ELYSIUMFACEPUNCH "Elysium Facepunch"
+#define REAGENT_ID_ELYSIUMFACEPUNCH "elysiumfacepunch"
+#define REAGENT_EREBUSMOONRISE "Erebus Moonrise"
+#define REAGENT_ID_EREBUSMOONRISE "erebusmoonrise"
+#define REAGENT_BALLOON "Balloon"
+#define REAGENT_ID_BALLOON "balloon"
+#define REAGENT_NATUNABRANDY "Natuna Brandy"
+#define REAGENT_ID_NATUNABRANDY "natunabrandy"
+#define REAGENT_EUPHORIA "Euphoria"
+#define REAGENT_ID_EUPHORIA "euphoria"
+#define REAGENT_XANADUCANNON "Xanadu Cannon"
+#define REAGENT_ID_XANADUCANNON "xanaducannon"
+#define REAGENT_DEBUGGER "Debugger"
+#define REAGENT_ID_DEBUGGER "debugger"
+#define REAGENT_SPACERSBREW "Spacer's Brew"
+#define REAGENT_ID_SPACERSBREW "spacersbrew"
+#define REAGENT_BINMANBLISS "Binman Bliss"
+#define REAGENT_ID_BINMANBLISS "binmanbliss"
+#define REAGENT_CHRYSANTHEMUM "Chrysanthemum"
+#define REAGENT_ID_CHRYSANTHEMUM "chrysanthemum"
+#define REAGENT_BITTERS "Bitters"
+#define REAGENT_ID_BITTERS "bitters"
+#define REAGENT_SOEMMERFIRE "Soemmer Fire"
+#define REAGENT_ID_SOEMMERFIRE "soemmerfire"
+#define REAGENT_WINEBRANDY "Wine Brandy"
+#define REAGENT_ID_WINEBRANDY "winebrandy"
+#define REAGENT_MORNINGAFTER "Morning After"
+#define REAGENT_ID_MORNINGAFTER "morningafter"
+#define REAGENT_VESPER "Vesper"
+#define REAGENT_ID_VESPER "vesper"
+#define REAGENT_ROTGUT "Rotgut Fever Dream"
+#define REAGENT_ID_ROTGUT "rotgut"
+#define REAGENT_VOXDELIGHT "Vox's Delight"
+#define REAGENT_ID_VOXDELIGHT "voxdelight"
+#define REAGENT_SCREAMINGVIKING "Screaming Viking"
+#define REAGENT_ID_SCREAMINGVIKING "screamingviking"
+#define REAGENT_ROBUSTIN "Robustin"
+#define REAGENT_ID_ROBUSTIN "robustin"
+#define REAGENT_VIRGINSIP "Virgin Sip"
+#define REAGENT_ID_VIRGINSIP "virginsip"
+#define REAGENT_JELLYSHOT "Jelly Shot"
+#define REAGENT_ID_JELLYSHOT "jellyshot"
+#define REAGENT_SLIMESHOT "Named Bullet"
+#define REAGENT_ID_SLIMESHOT "slimeshot"
+#define REAGENT_CLOVERCLUB "Clover Club"
+#define REAGENT_ID_CLOVERCLUB "cloverclub"
+#define REAGENT_NEGRONI "Negroni"
+#define REAGENT_ID_NEGRONI "negroni"
+#define REAGENT_WHISKEYSOUR "Whiskey Sour"
+#define REAGENT_ID_WHISKEYSOUR "whiskeysour"
+#define REAGENT_OLDFASHIONED "Old Fashioned"
+#define REAGENT_ID_OLDFASHIONED "oldfashioned"
+#define REAGENT_DAIQUIRI "Daiquiri"
+#define REAGENT_ID_DAIQUIRI "daiquiri"
+#define REAGENT_MOJITO "Mojito"
+#define REAGENT_ID_MOJITO "mojito"
+#define REAGENT_PALOMA "Paloma"
+#define REAGENT_ID_PALOMA "paloma"
+#define REAGENT_PISCOSOUR "Pisco Sour"
+#define REAGENT_ID_PISCOSOUR "piscosour"
+#define REAGENT_COLDFRONT "Cold Front"
+#define REAGENT_ID_COLDFRONT "coldfront"
+#define REAGENT_MINTJULEP "Mint Julep"
+#define REAGENT_ID_MINTJULEP "mintjulep"
+#define REAGENT_GODSAKE "Gods Sake"
+#define REAGENT_ID_GODSAKE "godsake"
+#define REAGENT_GODKA "Godka"
+#define REAGENT_ID_GODKA "godka"
+#define REAGENT_HOLYWINE "Angel Ichor"
+#define REAGENT_ID_HOLYWINE "holywine"
+#define REAGENT_HOLYMARY "Holy Mary"
+#define REAGENT_ID_HOLYMARY "holymary"
+#define REAGENT_ANGELSWRATH "Angels Wrath"
+#define REAGENT_ID_ANGELSWRATH "angelswrath"
+#define REAGENT_ANGELSKISS "Angels Kiss"
+#define REAGENT_ID_ANGELSKISS "angelskiss"
+#define REAGENT_ICHORMEAD "Ichor Mead"
+#define REAGENT_ID_ICHORMEAD "ichor_mead"
+#define REAGENT_SCHNAPPSPEP "Peppermint Schnapps"
+#define REAGENT_ID_SCHNAPPSPEP "schnapps_pep"
+#define REAGENT_SCHNAPPSPEA "Peach Schnapps"
+#define REAGENT_ID_SCHNAPPSPEA "schnapps_pea"
+#define REAGENT_SCHNAPPSLEM "Lemonade Schnapps"
+#define REAGENT_ID_SCHNAPPSLEM "schnapps_lem"
+#define REAGENT_JAGER "Schuss Konig"
+#define REAGENT_ID_JAGER "jager"
+#define REAGENT_FUSIONNAIRE "Fusionnaire"
+#define REAGENT_ID_FUSIONNAIRE "fusionnaire"
+#define REAGENT_DEATHBELL "Deathbell"
+#define REAGENT_ID_DEATHBELL "deathbell"
+#define REAGENT_MAGICDUST "Magic Dust"
+#define REAGENT_ID_MAGICDUST "magicdust"
+#define REAGENT_KOMPOT "Kompot"
+#define REAGENT_ID_KOMPOT "kompot"
+#define REAGENT_KVASS "Kvass"
+#define REAGENT_ID_KVASS "kvass"
// Toxins
@@ -986,15 +1327,3 @@
#define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites"
#define REAGENT_SALMONELLA "Salmonella"
#define REAGENT_ID_SALMONELLA "salmonella"
-
-
-
-
-
-
-
-Files left: food_drinks.dm,
-includes: .dm
-excludes: reagents.dm,ores.dm,materials.dm,mre.dm
-
- id = "lemon_juice_paint"
diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index af2301e265..8073d6a8ca 100644
--- a/code/__defines/chemistry.dm
+++ b/code/__defines/chemistry.dm
@@ -49,8 +49,8 @@
#define ANTIBIO_SUPER 3
// Chemistry lists.
-var/list/tachycardics = list(REAGENT_ID_COFFEE, REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
-var/list/bradycardics = list("neurotoxin", REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
+var/list/tachycardics = list(REAGENT_ID_COFFEE, REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN,REAGENT_ID_THIRTEENLOKO, REAGENT_ID_NICOTINE) // Increase heart rate.
+var/list/bradycardics = list(REAGENT_ID_NEUROTOXIN, REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
var/list/heartstopper = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart.
var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE) // This stops the heart when overdose is met. -- c = conditional
diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm
index bf4acaa1f0..a526ef697c 100644
--- a/code/modules/casino/casino_prize_vendor.dm
+++ b/code/modules/casino/casino_prize_vendor.dm
@@ -157,10 +157,10 @@
item_list["Drinks"] = list(
CASINO_PRIZE("Redeemer's brew", /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, 1, 150, "drinks"),
CASINO_PRIZE("Poison wine", /obj/item/reagent_containers/food/drinks/bottle/pwine, 1, 150, "drinks"),
- CASINO_PRIZE("Patron", /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"),
+ CASINO_PRIZE(REAGENT_PATRON, /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"),
CASINO_PRIZE("Holy water", /obj/item/reagent_containers/food/drinks/bottle/holywater, 1, 150, "drinks"),
- CASINO_PRIZE("Goldschlager", /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"),
- CASINO_PRIZE("Champagne", /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"),
+ CASINO_PRIZE(REAGENT_GOLDSCHLAGER, /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"),
+ CASINO_PRIZE(REAGENT_CHAMPAGNE, /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"),
CASINO_PRIZE("Bottle of Nothing", /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, 1, 150, "drinks"),
CASINO_PRIZE("Whiskey bliss", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 1, 150, "drinks"),
)
diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm
index 2e5b5035dd..cb9f4ffb8b 100644
--- a/code/modules/food/drinkingglass/drinkingglass.dm
+++ b/code/modules/food/drinkingglass/drinkingglass.dm
@@ -45,8 +45,8 @@
/obj/item/reagent_containers/food/drinks/glass2/proc/has_ice()
if(reagents.reagent_list.len > 0)
var/datum/reagent/R = reagents.get_master_reagent()
- if(!((R.id == "ice") || ("ice" in R.glass_special))) // if it's not a cup of ice, and it's not already supposed to have ice in, see if the bartender's put ice in it
- if(reagents.has_reagent("ice", reagents.total_volume / 10)) // 10% ice by volume
+ if(!((R.id == REAGENT_ID_ICE) || (REAGENT_ID_ICE in R.glass_special))) // if it's not a cup of ice, and it's not already supposed to have ice in, see if the bartender's put ice in it
+ if(reagents.has_reagent(REAGENT_ID_ICE, reagents.total_volume / 10)) // 10% ice by volume
return 1
return 0
diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
index f88e09cf79..3220666e32 100644
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -206,7 +206,7 @@
/obj/item/reagent_containers/food/drinks/cans/kvass/Initialize()
. = ..()
- reagents.add_reagent("kvass", 30)
+ reagents.add_reagent(REAGENT_ID_KVASS, 30)
/obj/item/reagent_containers/food/drinks/cans/kompot
name = "\improper Kompot"
@@ -217,7 +217,7 @@
/obj/item/reagent_containers/food/drinks/cans/kompot/Initialize()
. = ..()
- reagents.add_reagent("kompot", 30)
+ reagents.add_reagent(REAGENT_ID_KOMPOT, 30)
/obj/item/reagent_containers/food/drinks/cans/boda
name = "\improper Boda"
@@ -437,7 +437,7 @@
/obj/item/reagent_containers/food/drinks/cans/beercan/Initialize()
. = ..()
- reagents.add_reagent("beer", 30)
+ reagents.add_reagent(REAGENT_ID_BEER, 30)
/obj/item/reagent_containers/food/drinks/cans/alecan
name = "\improper Spacecastle Pale Ale"
@@ -447,7 +447,7 @@
/obj/item/reagent_containers/food/drinks/cans/alecan/Initialize()
. = ..()
- reagents.add_reagent("ale", 30)
+ reagents.add_reagent(REAGENT_ID_ALE, 30)
/////////////////////////ENERGY DRINKS/////////////////////////
diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
index 49cdf76562..700659cab9 100644
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -349,7 +349,7 @@
center_of_mass = list("x"=15, "y"=10)
/obj/item/reagent_containers/food/drinks/ice/Initialize()
. = ..()
- reagents.add_reagent("ice", 30)
+ reagents.add_reagent(REAGENT_ID_ICE, 30)
/obj/item/reagent_containers/food/drinks/h_chocolate
name = "cup of Counselor's Choice hot cocoa"
diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm
index ae3c7ebae3..2eebe2f38d 100644
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -228,7 +228,7 @@
/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize()
. = ..()
- reagents.add_reagent("gin", 100)
+ reagents.add_reagent(REAGENT_ID_GIN, 100)
/obj/item/reagent_containers/food/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
@@ -238,17 +238,17 @@
/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize()
. = ..()
- reagents.add_reagent("whiskey", 100)
+ reagents.add_reagent(REAGENT_ID_WHISKEY, 100)
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey
- name = "Special Blend Whiskey"
+ name = REAGENT_SPECIALWHISKEY
desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
icon_state = "whiskeybottle2"
center_of_mass = list("x"=16, "y"=3)
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize()
. = ..()
- reagents.add_reagent("specialwhiskey", 100)
+ reagents.add_reagent(REAGENT_ID_SPECIALWHISKEY, 100)
/obj/item/reagent_containers/food/drinks/bottle/vodka
name = "Tunguska Triple Distilled"
@@ -258,7 +258,7 @@
/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize()
. = ..()
- reagents.add_reagent("vodka", 100)
+ reagents.add_reagent(REAGENT_ID_VODKA, 100)
/obj/item/reagent_containers/food/drinks/bottle/tequilla
name = "Caccavo Guaranteed Quality Tequilla"
@@ -268,7 +268,7 @@
/obj/item/reagent_containers/food/drinks/bottle/tequilla/Initialize()
. = ..()
- reagents.add_reagent("tequilla", 100)
+ reagents.add_reagent(REAGENT_ID_TEQUILLA, 100)
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
@@ -278,7 +278,7 @@
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize()
. = ..()
- reagents.add_reagent("nothing", 100)
+ reagents.add_reagent(REAGENT_ID_NOTHING, 100)
/obj/item/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
@@ -288,7 +288,7 @@
/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize()
. = ..()
- reagents.add_reagent("patron", 100)
+ reagents.add_reagent(REAGENT_ID_PATRON, 100)
/obj/item/reagent_containers/food/drinks/bottle/rum
name = "Captain Pete's Cuban Spiced Rum"
@@ -298,7 +298,7 @@
/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize()
. = ..()
- reagents.add_reagent("rum", 100)
+ reagents.add_reagent(REAGENT_ID_RUM, 100)
/obj/item/reagent_containers/food/drinks/bottle/holywater
name = "Flask of Holy Water"
@@ -318,7 +318,7 @@
/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize()
. = ..()
- reagents.add_reagent("vermouth", 100)
+ reagents.add_reagent(REAGENT_ID_VERMOUTH, 100)
/obj/item/reagent_containers/food/drinks/bottle/kahlua
name = "Robert Robust's Coffee Liqueur"
@@ -328,7 +328,7 @@
/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize()
. = ..()
- reagents.add_reagent("kahlua", 100)
+ reagents.add_reagent(REAGENT_ID_KAHLUA, 100)
/obj/item/reagent_containers/food/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
@@ -338,7 +338,7 @@
/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize()
. = ..()
- reagents.add_reagent("goldschlager", 100)
+ reagents.add_reagent(REAGENT_ID_GOLDSCHLAGER, 100)
/obj/item/reagent_containers/food/drinks/bottle/cognac
name = "Chateau De Baton Premium Cognac"
@@ -348,7 +348,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize()
. = ..()
- reagents.add_reagent("cognac", 100)
+ reagents.add_reagent(REAGENT_ID_COGNAC, 100)
/obj/item/reagent_containers/food/drinks/bottle/absinthe
name = "Jailbreaker Verte"
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
. = ..()
- reagents.add_reagent("absinthe", 100)
+ reagents.add_reagent(REAGENT_ID_ABSINTHE, 100)
/obj/item/reagent_containers/food/drinks/bottle/melonliquor //MODIFIED ON 04/21/2021
name = "Emeraldine Melon Liqueur"
@@ -368,7 +368,7 @@
/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize()
. = ..()
- reagents.add_reagent("melonliquor", 100)
+ reagents.add_reagent(REAGENT_ID_MELONLIQUOR, 100)
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao //MODIFIED ON 04/21/2021
name = "Miss Blue Curacao"
@@ -378,17 +378,17 @@
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize()
. = ..()
- reagents.add_reagent("bluecuracao", 100)
+ reagents.add_reagent(REAGENT_ID_BLUECURACAO, 100)
/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew
- name = "Redeemer's Brew"
+ name = REAGENT_UNATHILIQUOR
desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart."
icon_state = "redeemersbrew"
center_of_mass = list("x"=16, "y"=3)
/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize()
. = ..()
- reagents.add_reagent("unathiliquor", 100)
+ reagents.add_reagent(REAGENT_ID_UNATHILIQUOR, 100)
/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps
name = "Dr. Bone's Peppermint Schnapps"
@@ -398,7 +398,7 @@
/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize()
. = ..()
- reagents.add_reagent("schnapps_pep", 100)
+ reagents.add_reagent(REAGENT_ID_SCHNAPPSPEP, 100)
/obj/item/reagent_containers/food/drinks/bottle/peachschnapps
name = "Dr. Bone's Peach Schnapps"
@@ -408,7 +408,7 @@
/obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize()
. = ..()
- reagents.add_reagent("schnapps_pea", 100)
+ reagents.add_reagent(REAGENT_ID_SCHNAPPSPEA, 100)
/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps
name = "Dr. Bone's Lemonade Schnapps"
@@ -418,7 +418,7 @@
/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
. = ..()
- reagents.add_reagent("schnapps_lem", 100)
+ reagents.add_reagent(REAGENT_ID_SCHNAPPSLEM, 100)
/obj/item/reagent_containers/food/drinks/bottle/jager
name = "Schusskonig"
@@ -428,7 +428,7 @@
/obj/item/reagent_containers/food/drinks/bottle/jager/Initialize()
. = ..()
- reagents.add_reagent("jager", 100)
+ reagents.add_reagent(REAGENT_ID_JAGER, 100)
/////////////////////////WINES/////////////////////////
@@ -440,7 +440,7 @@
/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize()
. = ..()
- reagents.add_reagent("redwine", 100)
+ reagents.add_reagent(REAGENT_ID_REDWINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/whitewine
name = "Doublebeard Bearded Special White"
@@ -450,7 +450,7 @@
/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize()
. = ..()
- reagents.add_reagent("whitewine", 100)
+ reagents.add_reagent(REAGENT_ID_WHITEWINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/carnoth //anagram of 'ntcahors' where the bottle sprite originated from
name = "NanoTrasen Carnoth Red"
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize()
. = ..()
- reagents.add_reagent("carnoth", 100)
+ reagents.add_reagent(REAGENT_ID_CARNOTH, 100)
/obj/item/reagent_containers/food/drinks/bottle/pwine
name = "Warlock's Velvet"
@@ -470,7 +470,7 @@
/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize()
. = ..()
- reagents.add_reagent("pwine", 100)
+ reagents.add_reagent(REAGENT_ID_PWINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/champagne
name = "Gilthari Luxury Champagne"
@@ -480,7 +480,7 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize()
. = ..()
- reagents.add_reagent("champagne", 100)
+ reagents.add_reagent(REAGENT_ID_CHAMPAGNE, 100)
/obj/item/reagent_containers/food/drinks/bottle/sake
name = "Mono-No-Aware Luxury Sake"
@@ -490,7 +490,7 @@
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
. = ..()
- reagents.add_reagent("sake", 100)
+ reagents.add_reagent(REAGENT_ID_SAKE, 100)
//////////////////////////JUICES AND STUFF///////////////////////
@@ -665,7 +665,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize()
. = ..()
- reagents.add_reagent("beer", 50)
+ reagents.add_reagent(REAGENT_ID_BEER, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/beer/silverdragon
name = "Silver Dragon pilsner"
@@ -687,7 +687,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/litebeer/Initialize()
. = ..()
- reagents.add_reagent("litebeer", 50)
+ reagents.add_reagent(REAGENT_ID_LITEBEER, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/cider
name = "Crisp's Cider"
@@ -697,7 +697,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize()
. = ..()
- reagents.add_reagent("cider", 50)
+ reagents.add_reagent(REAGENT_ID_CIDER, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/ale
name = "\improper Magm-Ale"
@@ -708,7 +708,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize()
. = ..()
- reagents.add_reagent("ale", 50)
+ reagents.add_reagent(REAGENT_ID_ALE, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper
name = "Hushed Whisper IPA"
@@ -718,7 +718,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize()
. = ..()
- reagents.add_reagent("ale", 50)
+ reagents.add_reagent(REAGENT_ID_ALE, 50)
//////////////////////////SMALL BOTTLED SODA///////////////////////
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 42a789a30b..696a13581a 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -23,7 +23,7 @@
result = /obj/item/chaoscake_layer
/datum/recipe/chaoscake_layerthree
- reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, "deathbell" = 10)
+ reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_DEATHBELL = 10)
fruit = list("grapes" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -62,7 +62,7 @@
result = /obj/item/chaoscake_layer/six
/datum/recipe/chaoscake_layerseven
- reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, "devilskiss" = 20)
+ reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_DEVILSKISS = 20)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm
index d38bbdc653..e764fff2ec 100644
--- a/code/modules/food/kitchen/icecream.dm
+++ b/code/modules/food/kitchen/icecream.dm
@@ -24,17 +24,17 @@
/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type)
switch(type)
if(ICECREAM_CHOCOLATE)
- return list(REAGENT_ID_MILK, "ice", REAGENT_ID_COCO)
+ return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_COCO)
if(ICECREAM_STRAWBERRY)
- return list(REAGENT_ID_MILK, "ice", REAGENT_ID_BERRYJUICE)
+ return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_BERRYJUICE)
if(ICECREAM_BLUE)
- return list(REAGENT_ID_MILK, "ice", "singulo")
+ return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_SINGULO)
if(CONE_WAFFLE)
return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR)
if(CONE_CHOC)
return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR, REAGENT_ID_COCO)
else
- return list(REAGENT_ID_MILK, "ice")
+ return list(REAGENT_ID_MILK, REAGENT_ID_ICE)
/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type)
switch(flavour_type)
@@ -59,7 +59,7 @@
reagents.add_reagent(REAGENT_ID_MILK, 5)
reagents.add_reagent(REAGENT_ID_FLOUR, 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
- reagents.add_reagent("ice", 5)
+ reagents.add_reagent(REAGENT_ID_ICE, 5)
/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
user.set_machine(src)
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index afcae6ebe3..635745047d 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -170,11 +170,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/meatsteak
/datum/recipe/spacylibertyduff
- reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_PSILOCYBIN = 5)
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
- reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_AMATOXIN = 5)
+ reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_AMATOXIN = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
@@ -352,7 +352,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
- reagents = list("redwine" = 5)
+ reagents = list(REAGENT_ID_REDWINE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
@@ -502,7 +502,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/mashedpotato
/datum/recipe/icecreamsandwich
- reagents = list(REAGENT_ID_MILK = 5, "ice" = 5)
+ reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_ICE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/icecream
)
@@ -833,7 +833,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/chilicheesefries
/datum/recipe/risotto
- reagents = list("redwine" = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1)
+ reagents = list(REAGENT_ID_REDWINE = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1)
fruit = list("mushroom" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here
result = /obj/item/reagent_containers/food/snacks/risotto
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 321a32386a..11f55f8f83 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -467,7 +467,7 @@
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
- "magicdust"
+ REAGENT_ID_MAGICDUST
)
// VOREStation Edit End: Modified exclusion list
diff --git a/code/modules/hydroponics/seedtypes/gnomes.dm b/code/modules/hydroponics/seedtypes/gnomes.dm
index 2ee0901926..0b6170f72e 100644
--- a/code/modules/hydroponics/seedtypes/gnomes.dm
+++ b/code/modules/hydroponics/seedtypes/gnomes.dm
@@ -4,7 +4,7 @@
seed_name = "gnomes"
display_name = "gnomes"
force_layer = 3
- chems = list("magicdust" = list(5,20))
+ chems = list(REAGENT_ID_MAGICDUST = list(5,20))
/datum/seed/gnomes/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/telriis.dm b/code/modules/hydroponics/seedtypes/telriis.dm
index 49b573453a..127f496f26 100644
--- a/code/modules/hydroponics/seedtypes/telriis.dm
+++ b/code/modules/hydroponics/seedtypes/telriis.dm
@@ -3,7 +3,7 @@
seed_name = "telriis"
display_name = "telriis grass"
kitchen_tag = "telriis"
- chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
+ chems = list(REAGENT_ID_PWINE = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/telriis/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm
index ce45ff774c..26a712677c 100644
--- a/code/modules/hydroponics/seedtypes/tomatoes.dm
+++ b/code/modules/hydroponics/seedtypes/tomatoes.dm
@@ -65,7 +65,7 @@
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SINGULO = list(10,5))
/datum/seed/tomato/blue/teleport/New()
..()
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index f0defd9f45..c2da430b5f 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -67,7 +67,7 @@
)
var/static/list/nutrient_reagents = list(
REAGENT_ID_MILK = 0.1,
- "beer" = 0.25,
+ REAGENT_ID_BEER = 0.25,
REAGENT_ID_PHOSPHORUS = 0.1,
REAGENT_ID_SUGAR = 0.1,
REAGENT_ID_SODAWATER = 0.1,
@@ -98,7 +98,7 @@
REAGENT_ID_WATER = 1,
REAGENT_ID_ADMINORDRAZINE = 1,
REAGENT_ID_MILK = 0.9,
- "beer" = 0.7,
+ REAGENT_ID_BEER = 0.7,
REAGENT_ID_FLUORINE = -0.5,
REAGENT_ID_CHLORINE = -0.5,
REAGENT_ID_PHOSPHORUS = -0.5,
@@ -108,7 +108,7 @@
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
var/static/list/beneficial_reagents = list(
- "beer" = list( -0.05, 0, 0 ),
+ REAGENT_ID_BEER = list( -0.05, 0, 0 ),
REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
REAGENT_ID_CHLORINE = list( -1, 0, 0 ),
REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ),
diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
index 798c8eea57..a31d6ba190 100644
--- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
@@ -19,8 +19,8 @@
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
- new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
- new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
+ new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
+ new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 900),
@@ -153,7 +153,7 @@
EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000),
)
prize_list["Miscellaneous"] = list(
- EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
+ EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
@@ -165,7 +165,7 @@
EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000),
EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000),
EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200),
- EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
+ EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500),
)
prize_list["Extra"] = list() // Used in child vendors
diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm
index 8dc21454b4..54f708f7a3 100644
--- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm
@@ -12,8 +12,8 @@
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
- new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120),
- new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
+ new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120),
+ new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90),
@@ -96,8 +96,8 @@
EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars,40),
)
prize_list["Miscellaneous"] = list(
- EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10),
- EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10),
+ EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10),
+ EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100),
diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm
index 0f3f6ed639..2c4923e00d 100644
--- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm
@@ -206,12 +206,12 @@
rest_sprite_options = list("Default")
has_extra_customization = TRUE
- var/list/booze_options = list("Beer" = "booze",
+ var/list/booze_options = list(REAGENT_BEER = "booze",
"Space Mountain Wind" = "boozegreen",
"Curacao" = "boozeblue",
REAGENT_GRAPESODA = "boozepurple",
"Demon's Blood" = "boozered",
- "Whiskey Soda" = "boozeorange",
+ REAGENT_WHISKEYSODA = "boozeorange",
REAGENT_COFFEE = "boozebrown")
/datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index 30072ff930..d2cbfa6d9a 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -56,39 +56,39 @@
// Bar, alcoholic
/obj/item/reagent_containers/chem_disp_cartridge/beer
- spawn_reagent = "beer"
+ spawn_reagent = REAGENT_ID_BEER
/obj/item/reagent_containers/chem_disp_cartridge/kahlua
- spawn_reagent = "kahlua"
+ spawn_reagent = REAGENT_ID_KAHLUA
/obj/item/reagent_containers/chem_disp_cartridge/whiskey
- spawn_reagent = "whiskey"
+ spawn_reagent = REAGENT_ID_WHISKEY
/obj/item/reagent_containers/chem_disp_cartridge/redwine
- spawn_reagent = "redwine"
+ spawn_reagent = REAGENT_ID_REDWINE
/obj/item/reagent_containers/chem_disp_cartridge/whitewine
- spawn_reagent = "whitewine"
+ spawn_reagent = REAGENT_ID_WHITEWINE
/obj/item/reagent_containers/chem_disp_cartridge/vodka
- spawn_reagent = "vodka"
+ spawn_reagent = REAGENT_ID_VODKA
/obj/item/reagent_containers/chem_disp_cartridge/gin
- spawn_reagent = "gin"
+ spawn_reagent = REAGENT_ID_GIN
/obj/item/reagent_containers/chem_disp_cartridge/rum
- spawn_reagent = "rum"
+ spawn_reagent = REAGENT_ID_RUM
/obj/item/reagent_containers/chem_disp_cartridge/tequila
- spawn_reagent = "tequilla"
+ spawn_reagent = REAGENT_ID_TEQUILLA
/obj/item/reagent_containers/chem_disp_cartridge/vermouth
- spawn_reagent = "vermouth"
+ spawn_reagent = REAGENT_ID_VERMOUTH
/obj/item/reagent_containers/chem_disp_cartridge/cognac
- spawn_reagent = "cognac"
+ spawn_reagent = REAGENT_ID_COGNAC
/obj/item/reagent_containers/chem_disp_cartridge/ale
- spawn_reagent = "ale"
+ spawn_reagent = REAGENT_ID_ALE
/obj/item/reagent_containers/chem_disp_cartridge/mead
- spawn_reagent = "mead"
+ spawn_reagent = REAGENT_ID_MEAD
/obj/item/reagent_containers/chem_disp_cartridge/bitters
- spawn_reagent = "bitters"
+ spawn_reagent = REAGENT_ID_BITTERS
/obj/item/reagent_containers/chem_disp_cartridge/cider
- spawn_reagent = "cider"
+ spawn_reagent = REAGENT_ID_CIDER
// Bar, soft
/obj/item/reagent_containers/chem_disp_cartridge/ice
- spawn_reagent = "ice"
+ spawn_reagent = REAGENT_ID_ICE
/obj/item/reagent_containers/chem_disp_cartridge/tea
spawn_reagent = REAGENT_ID_TEA
/obj/item/reagent_containers/chem_disp_cartridge/icetea
@@ -152,45 +152,45 @@
// syrups
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin
- spawn_reagent = "syrup_pumpkin"
+ spawn_reagent = REAGENT_ID_SYRUPPUMPKIN
/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel
- spawn_reagent = "syrup_caramel"
+ spawn_reagent = REAGENT_ID_SYRUPCARAMEL
/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel
- spawn_reagent = "syrup_salted_caramel"
+ spawn_reagent = REAGENT_ID_SYRUPSALTEDCARAMEL
/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish
- spawn_reagent = "syrup_irish"
+ spawn_reagent = REAGENT_ID_SYRUPIRISH
/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond
- spawn_reagent = "syrup_almond"
+ spawn_reagent = REAGENT_ID_SYRUPALMOND
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon
- spawn_reagent = "syrup_cinnamon"
+ spawn_reagent = REAGENT_ID_SYRUPCINNAMON
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio
- spawn_reagent = "syrup_pistachio"
+ spawn_reagent = REAGENT_ID_SYRUPPISTACHIO
/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla
- spawn_reagent = "syrup_vanilla"
+ spawn_reagent = REAGENT_ID_SYRUPVANILLA
/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee
- spawn_reagent = "syrup_toffee"
+ spawn_reagent = REAGENT_ID_SYRUPTOFFEE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry
- spawn_reagent = "syrup_cherry"
+ spawn_reagent = REAGENT_ID_SYRUPCHERRY
/obj/item/reagent_containers/chem_disp_cartridge/grenadine
spawn_reagent = REAGENT_ID_GRENADINE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch
- spawn_reagent = "syrup_butterscotch"
+ spawn_reagent = REAGENT_ID_SYRUPBUTTERSCOTCH
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate
- spawn_reagent = "syrup_chocolate"
+ spawn_reagent = REAGENT_ID_SYRUPCHOCOLATE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate
- spawn_reagent = "syrup_white_chocolate"
+ spawn_reagent = REAGENT_ID_SYRUPWHITECHOCOLATE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry
- spawn_reagent = "syrup_strawberry"
+ spawn_reagent = REAGENT_ID_SYRUPSTRAWBERRY
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut
- spawn_reagent = "syrup_coconut"
+ spawn_reagent = REAGENT_ID_SYRUPCOCONUT
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger
- spawn_reagent = "syrup_ginger"
+ spawn_reagent = REAGENT_ID_SYRUPGINGER
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread
- spawn_reagent = "syrup_gingerbread"
+ spawn_reagent = REAGENT_ID_SYRUPGINGERBREAD
/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint
- spawn_reagent = "syrup_peppermint"
+ spawn_reagent = REAGENT_ID_SYRUPPEPPERMINT
/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
- spawn_reagent = "syrup_birthday"
+ spawn_reagent = REAGENT_ID_SYRUPBIRTHDAY
// ERT
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index 675d8e3243..21a164d4eb 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -46,25 +46,25 @@
/obj/machinery/chemical_dispenser/bar_soft
dispense_reagents = list(
- REAGENT_ID_WATER, "ice", REAGENT_ID_COFFEE, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICETEA, REAGENT_ID_COLA, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_DRGIBB, REAGENT_ID_SPACEUP, REAGENT_ID_TONIC,
- REAGENT_ID_SODAWATER, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_WATERMELONJUICE, "thirteenloko", REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE
+ REAGENT_ID_WATER, REAGENT_ID_ICE, REAGENT_ID_COFFEE, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICETEA, REAGENT_ID_COLA, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_DRGIBB, REAGENT_ID_SPACEUP, REAGENT_ID_TONIC,
+ REAGENT_ID_SODAWATER, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_WATERMELONJUICE,REAGENT_ID_THIRTEENLOKO, REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE
)
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
- REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, "beer", "kahlua",
- "whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
+ REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, REAGENT_ID_BEER, REAGENT_ID_KAHLUA,
+ REAGENT_ID_WHISKEY, REAGENT_ID_REDWINE, REAGENT_ID_WHITEWINE, REAGENT_ID_VODKA, REAGENT_ID_CIDER, REAGENT_ID_GIN, REAGENT_ID_RUM, REAGENT_ID_TEQUILLA, REAGENT_ID_VERMOUTH, REAGENT_ID_COGNAC, REAGENT_ID_ALE, REAGENT_ID_MEAD, REAGENT_ID_BITTERS
)
/obj/machinery/chemical_dispenser/bar_coffee
dispense_reagents = list(
- REAGENT_ID_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, "ice", "water",
+ REAGENT_ID_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICE, "water",
REAGENT_ID_ORANGEJUICE, REAGENT_ID_LEMONJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_BERRYJUICE, REAGENT_ID_MINT, REAGENT_ID_DECAF, REAGENT_ID_GREENTEA, REAGENT_ID_MILKFOAM, REAGENT_ID_DRIPCOFFEE
)
/obj/machinery/chemical_dispenser/bar_syrup
dispense_reagents = list(
- "syrup_pumpkin", "syrup_caramel", "syrup_salted_caramel", "syrup_irish", "syrup_almond", "syrup_cinnamon", "syrup_pistachio",
- "syrup_vanilla", "syrup_toffee", REAGENT_ID_GRENADINE, "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry",
- "syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday"
+ REAGENT_ID_SYRUPPUMPKIN, REAGENT_ID_SYRUPCARAMEL, REAGENT_ID_SYRUPSALTEDCARAMEL, REAGENT_ID_SYRUPIRISH, REAGENT_ID_SYRUPALMOND, REAGENT_ID_SYRUPCINNAMON, REAGENT_ID_SYRUPPISTACHIO,
+ REAGENT_ID_SYRUPVANILLA, REAGENT_ID_SYRUPTOFFEE, REAGENT_ID_GRENADINE, REAGENT_ID_SYRUPCHERRY, REAGENT_ID_SYRUPBUTTERSCOTCH, REAGENT_ID_SYRUPCHOCOLATE, REAGENT_ID_SYRUPWHITECHOCOLATE, REAGENT_ID_SYRUPSTRAWBERRY,
+ REAGENT_ID_SYRUPCOCONUT, REAGENT_ID_SYRUPGINGER, REAGENT_ID_SYRUPGINGERBREAD, REAGENT_ID_SYRUPPEPPERMINT, REAGENT_ID_SYRUPBIRTHDAY
)
diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index 27ceeee2d0..a729f57922 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -495,7 +495,7 @@
/obj/structure/reagent_dispensers/beerkeg/Initialize()
. = ..()
- reagents.add_reagent("beer",1000)
+ reagents.add_reagent(REAGENT_ID_BEER,1000)
/obj/structure/reagent_dispensers/beerkeg/wood
name = "beer keg"
@@ -509,7 +509,7 @@
/obj/structure/reagent_dispensers/beerkeg/wine/Initialize()
. = ..()
- reagents.add_reagent("redwine",1000)
+ reagents.add_reagent(REAGENT_ID_REDWINE,1000)
/obj/structure/reagent_dispensers/beerkeg/fakenuke
name = "nuclear beer keg"
diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm
index b9dc010aec..d47e053486 100644
--- a/code/modules/reagents/machinery/pump.dm
+++ b/code/modules/reagents/machinery/pump.dm
@@ -194,7 +194,7 @@
var/datum/gas_mixture/air = return_air() // v
if(air.temperature <= T0C) // Uses the current air temp, instead of the turf starting temp
- R.add_reagent("ice", round(volume / 2, 0.1))
+ R.add_reagent(REAGENT_ID_ICE, round(volume / 2, 0.1))
for(var/turf/simulated/mineral/M in orange(5,src)) // Uses the turf as center instead of an unset usr
if(M.mineral && prob(40)) // v
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index ef5f5e46dc..69525eb940 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -130,7 +130,7 @@
/decl/chemical_reaction/distilling/beer
name = "Distilling Beer"
id = "distill_beer"
- result = "beer"
+ result = REAGENT_ID_BEER
required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
@@ -141,8 +141,8 @@
/decl/chemical_reaction/distilling/ale
name = "Distilling Ale"
id = "distill_ale"
- result = "ale"
- required_reagents = list(REAGENT_ID_NUTRIMENT = 1, "beer" = 1)
+ result = REAGENT_ID_ALE
+ required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_BEER = 1)
inhibitors = list(REAGENT_ID_WATER = 1)
result_amount = 2
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 174431ef25..9621712283 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -48,45 +48,45 @@
result_amount = 3
/decl/chemical_reaction/instant/drinks/goldschlager
- name = "Goldschlager"
- id = "goldschlager"
- result = "goldschlager"
- required_reagents = list("vodka" = 10, REAGENT_ID_GOLD = 1)
+ name = REAGENT_GOLDSCHLAGER
+ id = REAGENT_ID_GOLDSCHLAGER
+ result = REAGENT_ID_GOLDSCHLAGER
+ required_reagents = list(REAGENT_ID_VODKA = 10, REAGENT_ID_GOLD = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/patron
- name = "Patron"
- id = "patron"
- result = "patron"
- required_reagents = list("tequilla" = 10, REAGENT_ID_SILVER = 1)
+ name = REAGENT_PATRON
+ id = REAGENT_ID_PATRON
+ result = REAGENT_ID_PATRON
+ required_reagents = list(REAGENT_ID_TEQUILLA = 10, REAGENT_ID_SILVER = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/bilk
- name = "Bilk"
- id = "bilk"
- result = "bilk"
- required_reagents = list(REAGENT_ID_MILK = 1, "beer" = 1)
+ name = REAGENT_BILK
+ id = REAGENT_ID_BILK
+ result = REAGENT_ID_BILK
+ required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_BEER = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/icetea
name = REAGENT_ICETEA
id = REAGENT_ID_ICETEA
result = REAGENT_ID_ICETEA
- required_reagents = list("ice" = 1, REAGENT_ID_TEA = 2)
+ required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_TEA = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/icecoffee
name = REAGENT_ICECOFFEE
id = REAGENT_ID_ICECOFFEE
result = REAGENT_ID_ICECOFFEE
- required_reagents = list("ice" = 1, REAGENT_ID_COFFEE = 2)
+ required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_COFFEE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/icecoffee/alt
name = "Iced Drip Coffee"
id = REAGENT_ID_ICECOFFEE
result = REAGENT_ID_ICECOFFEE
- required_reagents = list("ice" = 1, REAGENT_ID_DRIPCOFFEE = 2)
+ required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_DRIPCOFFEE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/blackeye
@@ -174,9 +174,9 @@
result_amount = 5
/decl/chemical_reaction/instant/drinks/moonshine
- name = "Moonshine"
- id = "moonshine"
- result = "moonshine"
+ name = REAGENT_MOONSHINE
+ id = REAGENT_ID_MOONSHINE
+ result = REAGENT_ID_MOONSHINE
required_reagents = list(REAGENT_ID_NUTRIMENT = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
@@ -191,32 +191,32 @@
/decl/chemical_reaction/instant/drinks/wine
name = "Wine"
- id = "redwine"
- result = "redwine"
+ id = REAGENT_ID_REDWINE
+ result = REAGENT_ID_REDWINE
required_reagents = list(REAGENT_ID_GRAPEJUICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/pwine
- name = "Poison Wine"
- id = "pwine"
- result = "pwine"
+ name = REAGENT_PWINE
+ id = REAGENT_ID_PWINE
+ result = REAGENT_ID_PWINE
required_reagents = list(REAGENT_ID_POISONBERRYJUICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/melonliquor
- name = "Melon Liquor"
- id = "melonliquor"
- result = "melonliquor"
+ name = REAGENT_MELONLIQUOR
+ id = REAGENT_ID_MELONLIQUOR
+ result = REAGENT_ID_MELONLIQUOR
required_reagents = list(REAGENT_ID_WATERMELONJUICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/bluecuracao
- name = "Blue Curacao"
- id = "bluecuracao"
- result = "bluecuracao"
+ name = REAGENT_BLUECURACAO
+ id = REAGENT_ID_BLUECURACAO
+ result = REAGENT_ID_BLUECURACAO
required_reagents = list(REAGENT_ID_ORANGEJUICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
@@ -224,141 +224,141 @@
/decl/chemical_reaction/instant/drinks/spacebeer
name = "Space Beer"
id = "spacebeer"
- result = "beer"
+ result = REAGENT_ID_BEER
required_reagents = list(REAGENT_ID_CORNOIL = 5, REAGENT_ID_FLOUR = 5)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/vodka
- name = "Vodka"
- id = "vodka"
- result = "vodka"
+ name = REAGENT_VODKA
+ id = REAGENT_ID_VODKA
+ result = REAGENT_ID_VODKA
required_reagents = list(REAGENT_ID_POTATOJUICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/cider
- name = "Cider"
- id = "cider"
- result = "cider"
+ name = REAGENT_CIDER
+ id = REAGENT_ID_CIDER
+ result = REAGENT_ID_CIDER
required_reagents = list(REAGENT_ID_APPLEJUICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/sake
- name = "Sake"
- id = "sake"
- result = "sake"
+ name = REAGENT_SAKE
+ id = REAGENT_ID_SAKE
+ result = REAGENT_ID_SAKE
required_reagents = list(REAGENT_ID_RICE = 10)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/kahlua
- name = "Kahlua"
- id = "kahlua"
- result = "kahlua"
+ name = REAGENT_KAHLUA
+ id = REAGENT_ID_KAHLUA
+ result = REAGENT_ID_KAHLUA
required_reagents = list(REAGENT_ID_COFFEE = 5, REAGENT_ID_SUGAR = 5)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 5
/decl/chemical_reaction/instant/drinks/gin_tonic
- name = "Gin and Tonic"
- id = "gintonic"
- result = "gintonic"
- required_reagents = list("gin" = 2, REAGENT_ID_TONIC = 1)
+ name = REAGENT_GINTONIC
+ id = REAGENT_ID_GINTONIC
+ result = REAGENT_ID_GINTONIC
+ required_reagents = list(REAGENT_ID_GIN = 2, REAGENT_ID_TONIC = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/rum_and_cola
- name = "Rum and Cola"
- id = "rumandcola"
- result = "rumandcola"
- required_reagents = list("rum" = 2, REAGENT_ID_COLA = 1)
+ name = REAGENT_RUMANDCOLA
+ id = REAGENT_ID_RUMANDCOLA
+ result = REAGENT_ID_RUMANDCOLA
+ required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_COLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/cuba_libre
- name = "Cuba Libre"
- id = "cubalibre"
- result = "cubalibre"
- required_reagents = list("rumandcola" = 3, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_CUBALIBRE
+ id = REAGENT_ID_CUBALIBRE
+ result = REAGENT_ID_CUBALIBRE
+ required_reagents = list(REAGENT_ID_RUMANDCOLA = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/martini
- name = "Classic Martini"
- id = "martini"
- result = "martini"
- inhibitors = list("bitters" = 1)
- required_reagents = list("gin" = 2, "vermouth" = 1)
+ name = REAGENT_MARTINI
+ id = REAGENT_ID_MARTINI
+ result = REAGENT_ID_MARTINI
+ inhibitors = list(REAGENT_ID_BITTERS = 1)
+ required_reagents = list(REAGENT_ID_GIN = 2, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/vodkamartini
- name = "Vodka Martini"
- id = "vodkamartini"
- result = "vodkamartini"
- required_reagents = list("vodka" = 2, "vermouth" = 1)
+ name = REAGENT_VODKAMARTINI
+ id = REAGENT_ID_VODKAMARTINI
+ result = REAGENT_ID_VODKAMARTINI
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/white_russian
- name = "White Russian"
- id = "whiterussian"
- result = "whiterussian"
- required_reagents = list("blackrussian" = 2, REAGENT_ID_CREAM = 1)
+ name = REAGENT_WHITERUSSIAN
+ id = REAGENT_ID_WHITERUSSIAN
+ result = REAGENT_ID_WHITERUSSIAN
+ required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_CREAM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/whiskey_cola
- name = "Whiskey Cola"
- id = "whiskeycola"
- result = "whiskeycola"
- required_reagents = list("whiskey" = 2, REAGENT_ID_COLA = 1)
+ name = REAGENT_WHISKEYCOLA
+ id = REAGENT_ID_WHISKEYCOLA
+ result = REAGENT_ID_WHISKEYCOLA
+ required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_COLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/screwdriver
- name = "Screwdriver"
- id = "screwdrivercocktail"
- result = "screwdrivercocktail"
- required_reagents = list("vodka" = 2, REAGENT_ID_ORANGEJUICE = 1)
+ name = REAGENT_SCREWDRIVERCOCKTAIL
+ id = REAGENT_ID_SCREWDRIVERCOCKTAIL
+ result = REAGENT_ID_SCREWDRIVERCOCKTAIL
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/bloody_mary
- name = "Bloody Mary"
- id = "bloodymary"
- result = "bloodymary"
- required_reagents = list("vodka" = 2, REAGENT_ID_TOMATOJUICE = 3, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_BLOODYMARY
+ id = REAGENT_ID_BLOODYMARY
+ result = REAGENT_ID_BLOODYMARY
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_TOMATOJUICE = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/gargle_blaster
- name = "Pan-Galactic Gargle Blaster"
- id = "gargleblaster"
- result = "gargleblaster"
- required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_GARGLEBLASTER
+ id = REAGENT_ID_GARGLEBLASTER
+ result = REAGENT_ID_GARGLEBLASTER
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_GIN = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_COGNAC = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/brave_bull
- name = "Brave Bull"
- id = "bravebull"
- result = "bravebull"
- required_reagents = list("tequilla" = 2, "kahlua" = 1)
+ name = REAGENT_BRAVEBULL
+ id = REAGENT_ID_BRAVEBULL
+ result = REAGENT_ID_BRAVEBULL
+ required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_KAHLUA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/tequilla_sunrise
name = "Tequilla Sunrise"
- id = "tequillasunrise"
- result = "tequillasunrise"
- required_reagents = list("tequilla" = 2, REAGENT_ID_ORANGEJUICE = 1)
+ id = REAGENT_ID_TEQUILLASUNRISE
+ result = REAGENT_ID_TEQUILLASUNRISE
+ required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/phoron_special
- name = "Toxins Special"
- id = "phoronspecial"
- result = "phoronspecial"
- required_reagents = list("rum" = 2, "vermouth" = 2, REAGENT_ID_PHORON = 2)
+ name = REAGENT_PHORONSPECIAL
+ id = REAGENT_ID_PHORONSPECIAL
+ result = REAGENT_ID_PHORONSPECIAL
+ required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_VERMOUTH = 2, REAGENT_ID_PHORON = 2)
result_amount = 6
/decl/chemical_reaction/instant/drinks/beepsky_smash
name = "Beepksy Smash"
id = "beepksysmash"
- result = "beepskysmash"
- required_reagents = list(REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_IRON = 1)
+ result = REAGENT_ID_BEEPSKYSMASH
+ required_reagents = list(REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_IRON = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/doctor_delight
@@ -369,157 +369,157 @@
result_amount = 6
/decl/chemical_reaction/instant/drinks/irish_cream
- name = "Irish Cream"
- id = "irishcream"
- result = "irishcream"
- required_reagents = list("whiskey" = 2, REAGENT_ID_CREAM = 1)
+ name = REAGENT_IRISHCREAM
+ id = REAGENT_ID_IRISHCREAM
+ result = REAGENT_ID_IRISHCREAM
+ required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_CREAM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/manly_dorf
- name = "The Manly Dorf"
- id = "manlydorf"
- result = "manlydorf"
- required_reagents = list ("beer" = 1, "ale" = 2)
+ name = REAGENT_MANLYDORF
+ id = REAGENT_ID_MANLYDORF
+ result = REAGENT_ID_MANLYDORF
+ required_reagents = list (REAGENT_ID_BEER = 1, REAGENT_ID_ALE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/hooch
- name = "Hooch"
- id = "hooch"
- result = "hooch"
+ name = REAGENT_HOOCH
+ id = REAGENT_ID_HOOCH
+ result = REAGENT_ID_HOOCH
required_reagents = list (REAGENT_ID_SUGAR = 1, REAGENT_ID_ETHANOL = 2, REAGENT_ID_FUEL = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/irish_coffee
- name = "Irish Coffee"
- id = "irishcoffee"
- result = "irishcoffee"
- required_reagents = list("irishcream" = 1, REAGENT_ID_COFFEE = 1)
+ name = REAGENT_IRISHCOFFEE
+ id = REAGENT_ID_IRISHCOFFEE
+ result = REAGENT_ID_IRISHCOFFEE
+ required_reagents = list(REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_COFFEE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/b52
- name = "B-52"
- id = "b52"
- result = "b52"
- required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
+ name = REAGENT_B52
+ id = REAGENT_ID_B52
+ result = REAGENT_ID_B52
+ required_reagents = list(REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_COGNAC = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/atomicbomb
- name = "Atomic Bomb"
- id = "atomicbomb"
- result = "atomicbomb"
- required_reagents = list("b52" = 10, REAGENT_ID_URANIUM = 1)
+ name = REAGENT_ATOMICBOMB
+ id = REAGENT_ID_ATOMICBOMB
+ result = REAGENT_ID_ATOMICBOMB
+ required_reagents = list(REAGENT_ID_B52 = 10, REAGENT_ID_URANIUM = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/margarita
- name = "Margarita"
- id = "margarita"
- result = "margarita"
- required_reagents = list("tequilla" = 2, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_MARGARITA
+ id = REAGENT_ID_MARGARITA
+ result = REAGENT_ID_MARGARITA
+ required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/longislandicedtea
- name = "Long Island Iced Tea"
- id = "longislandicedtea"
- result = "longislandicedtea"
- required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumandcola" = 3)
+ name = REAGENT_LONGISLANDICEDTEA
+ id = REAGENT_ID_LONGISLANDICEDTEA
+ result = REAGENT_ID_LONGISLANDICEDTEA
+ required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_GIN = 1, REAGENT_ID_TEQUILLA = 1, REAGENT_ID_RUMANDCOLA = 3)
result_amount = 6
/decl/chemical_reaction/instant/drinks/threemileisland
- name = "Three Mile Island Iced Tea"
- id = "threemileisland"
- result = "threemileisland"
- required_reagents = list("longislandicedtea" = 10, REAGENT_ID_URANIUM = 1)
+ name = REAGENT_THREEMILEISLAND
+ id = REAGENT_ID_THREEMILEISLAND
+ result = REAGENT_ID_THREEMILEISLAND
+ required_reagents = list(REAGENT_ID_LONGISLANDICEDTEA = 10, REAGENT_ID_URANIUM = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/whiskeysoda
- name = "Whiskey Soda"
- id = "whiskeysoda"
- result = "whiskeysoda"
- required_reagents = list("whiskey" = 2, REAGENT_ID_SODAWATER = 1)
+ name = REAGENT_WHISKEYSODA
+ id = REAGENT_ID_WHISKEYSODA
+ result = REAGENT_ID_WHISKEYSODA
+ required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/black_russian
- name = "Black Russian"
- id = "blackrussian"
- result = "blackrussian"
- required_reagents = list("vodka" = 2, "kahlua" = 1)
+ name = REAGENT_BLACKRUSSIAN
+ id = REAGENT_ID_BLACKRUSSIAN
+ result = REAGENT_ID_BLACKRUSSIAN
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_KAHLUA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/manhattan
- name = "Manhattan"
- id = "manhattan"
- result = "manhattan"
- required_reagents = list("whiskey" = 2, "vermouth" = 1)
+ name = REAGENT_MANHATTAN
+ id = REAGENT_ID_MANHATTAN
+ result = REAGENT_ID_MANHATTAN
+ required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/manhattan_proj
- name = "Manhattan Project"
- id = "manhattan_proj"
- result = "manhattan_proj"
- required_reagents = list("manhattan" = 10, REAGENT_ID_URANIUM = 1)
+ name = REAGENT_MANHATTANPROJ
+ id = REAGENT_ID_MANHATTANPROJ
+ result = REAGENT_ID_MANHATTANPROJ
+ required_reagents = list(REAGENT_ID_MANHATTAN = 10, REAGENT_ID_URANIUM = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/vodka_tonic
- name = "Vodka and Tonic"
- id = "vodkatonic"
- result = "vodkatonic"
- required_reagents = list("vodka" = 2, REAGENT_ID_TONIC = 1)
+ name = REAGENT_VODKATONIC
+ id = REAGENT_ID_VODKATONIC
+ result = REAGENT_ID_VODKATONIC
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_TONIC = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/gin_fizz
- name = "Gin Fizz"
- id = "ginfizz"
- result = "ginfizz"
- required_reagents = list("gin" = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_GINFIZZ
+ id = REAGENT_ID_GINFIZZ
+ result = REAGENT_ID_GINFIZZ
+ required_reagents = list(REAGENT_ID_GIN = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/bahama_mama
- name = "Bahama mama"
- id = "bahama_mama"
- result = "bahama_mama"
- required_reagents = list("rum" = 2, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, "ice" = 1)
+ name = REAGENT_BAHAMAMAMA
+ id = REAGENT_ID_BAHAMAMAMA
+ result = REAGENT_ID_BAHAMAMAMA
+ required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_ICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/singulo
- name = "Singulo"
- id = "singulo"
- result = "singulo"
- required_reagents = list("vodka" = 5, REAGENT_ID_RADIUM = 1, "redwine" = 5)
+ name = REAGENT_SINGULO
+ id = REAGENT_ID_SINGULO
+ result = REAGENT_ID_SINGULO
+ required_reagents = list(REAGENT_ID_VODKA = 5, REAGENT_ID_RADIUM = 1, REAGENT_ID_REDWINE = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/alliescocktail
- name = "Allies Cocktail"
- id = "alliescocktail"
- result = "alliescocktail"
- required_reagents = list("martini" = 1, "vodka" = 1)
+ name = REAGENT_ALLIESCOCKTAIL
+ id = REAGENT_ID_ALLIESCOCKTAIL
+ result = REAGENT_ID_ALLIESCOCKTAIL
+ required_reagents = list(REAGENT_ID_MARTINI = 1, REAGENT_ID_VODKA = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/demonsblood
- name = "Demons Blood"
- id = "demonsblood"
- result = "demonsblood"
- required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_DRGIBB = 1)
+ name = REAGENT_DEMONSBLOOD
+ id = REAGENT_ID_DEMONSBLOOD
+ result = REAGENT_ID_DEMONSBLOOD
+ required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/booger
- name = "Booger"
- id = "booger"
- result = "booger"
- required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, "rum" = 1, REAGENT_ID_WATERMELONJUICE = 1)
+ name = REAGENT_BOOGER
+ id = REAGENT_ID_BOOGER
+ result = REAGENT_ID_BOOGER
+ required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, REAGENT_ID_RUM = 1, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/antifreeze
- name = "Anti-freeze"
- id = "antifreeze"
- result = "antifreeze"
- required_reagents = list("vodka" = 1, REAGENT_ID_CREAM = 1, "ice" = 1)
+ name = REAGENT_ANTIFREEZE
+ id = REAGENT_ID_ANTIFREEZE
+ result = REAGENT_ID_ANTIFREEZE
+ required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/barefoot
- name = "Barefoot"
- id = "barefoot"
- result = "barefoot"
- required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, "vermouth" = 1)
+ name = REAGENT_BAREFOOT
+ id = REAGENT_ID_BAREFOOT
+ result = REAGENT_ID_BAREFOOT
+ required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/grapesoda
@@ -530,46 +530,46 @@
result_amount = 3
/decl/chemical_reaction/instant/drinks/sbiten
- name = "Sbiten"
- id = "sbiten"
- result = "sbiten"
- required_reagents = list("vodka" = 10, REAGENT_ID_CAPSAICIN = 1)
+ name = REAGENT_SBITEN
+ id = REAGENT_ID_SBITEN
+ result = REAGENT_ID_SBITEN
+ required_reagents = list(REAGENT_ID_VODKA = 10, REAGENT_ID_CAPSAICIN = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/red_mead
- name = "Red Mead"
- id = "red_mead"
- result = "red_mead"
- required_reagents = list(REAGENT_ID_BLOOD = 1, "mead" = 1)
+ name = REAGENT_REDMEAD
+ id = REAGENT_ID_REDMEAD
+ result = REAGENT_ID_REDMEAD
+ required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_MEAD = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/mead
- name = "Mead"
- id = "mead"
- result = "mead"
+ name = REAGENT_MEAD
+ id = REAGENT_ID_MEAD
+ result = REAGENT_ID_MEAD
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 2
/decl/chemical_reaction/instant/drinks/iced_beer
- name = "Iced Beer"
- id = "iced_beer"
- result = "iced_beer"
- required_reagents = list("beer" = 10, REAGENT_ID_FROSTOIL = 1)
+ name = REAGENT_ICEDBEER
+ id = REAGENT_ID_ICEDBEER
+ result = REAGENT_ID_ICEDBEER
+ required_reagents = list(REAGENT_ID_BEER = 10, REAGENT_ID_FROSTOIL = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/iced_beer2
- name = "Iced Beer"
- id = "iced_beer"
- result = "iced_beer"
- required_reagents = list("beer" = 5, "ice" = 1)
+ name = REAGENT_ICEDBEER
+ id = REAGENT_ID_ICEDBEER
+ result = REAGENT_ID_ICEDBEER
+ required_reagents = list(REAGENT_ID_BEER = 5, REAGENT_ID_ICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/grog
- name = "Grog"
- id = "grog"
- result = "grog"
- required_reagents = list("rum" = 1, REAGENT_ID_WATER = 1)
+ name = REAGENT_GROG
+ id = REAGENT_ID_GROG
+ result = REAGENT_ID_GROG
+ required_reagents = list(REAGENT_ID_RUM = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/soy_latte
@@ -587,101 +587,101 @@
result_amount = 2
/decl/chemical_reaction/instant/drinks/acidspit
- name = "Acid Spit"
- id = "acidspit"
- result = "acidspit"
- required_reagents = list(REAGENT_ID_SACID = 1, "redwine" = 5)
+ name = REAGENT_ACIDSPIT
+ id = REAGENT_ID_ACIDSPIT
+ result = REAGENT_ID_ACIDSPIT
+ required_reagents = list(REAGENT_ID_SACID = 1, REAGENT_ID_REDWINE = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/amasec
- name = "Amasec"
- id = "amasec"
- result = "amasec"
- required_reagents = list(REAGENT_ID_IRON = 1, "redwine" = 5, "vodka" = 5)
+ name = REAGENT_AMASEC
+ id = REAGENT_ID_AMASEC
+ result = REAGENT_ID_AMASEC
+ required_reagents = list(REAGENT_ID_IRON = 1, REAGENT_ID_REDWINE = 5, REAGENT_ID_VODKA = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/changelingsting
- name = "Changeling Sting"
- id = "changelingsting"
- result = "changelingsting"
- required_reagents = list("screwdrivercocktail" = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1)
+ name = REAGENT_CHANGELINGSTING
+ id = REAGENT_ID_CHANGELINGSTING
+ result = REAGENT_ID_CHANGELINGSTING
+ required_reagents = list(REAGENT_ID_SCREWDRIVERCOCKTAIL = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/aloe
- name = "Aloe"
- id = "aloe"
- result = "aloe"
- required_reagents = list(REAGENT_ID_CREAM = 1, "whiskey" = 1, REAGENT_ID_WATERMELONJUICE = 1)
+ name = REAGENT_ALOE
+ id = REAGENT_ID_ALOE
+ result = REAGENT_ID_ALOE
+ required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_WATERMELONJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/andalusia
- name = "Andalusia"
- id = "andalusia"
- result = "andalusia"
- required_reagents = list("rum" = 1, "whiskey" = 1, REAGENT_ID_LEMONJUICE = 1)
+ name = REAGENT_ANDALUSIA
+ id = REAGENT_ID_ANDALUSIA
+ result = REAGENT_ID_ANDALUSIA
+ required_reagents = list(REAGENT_ID_RUM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/snowwhite
- name = "Snow White"
- id = "snowwhite"
- result = "snowwhite"
- required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 1, "rum" = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit
+ name = REAGENT_SNOWWHITE
+ id = REAGENT_ID_SNOWWHITE
+ result = REAGENT_ID_SNOWWHITE
+ required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 1, REAGENT_ID_RUM = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit
result_amount = 2
/decl/chemical_reaction/instant/drinks/irishcarbomb
- name = "Irish Car Bomb"
- id = "irishcarbomb"
- result = "irishcarbomb"
- required_reagents = list("ale" = 1, "irishcream" = 1)
+ name = REAGENT_IRISHCARBOMB
+ id = REAGENT_ID_IRISHCARBOMB
+ result = REAGENT_ID_IRISHCARBOMB
+ required_reagents = list(REAGENT_ID_ALE = 1, REAGENT_ID_IRISHCREAM = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/syndicatebomb
- name = "Syndicate Bomb"
- id = "syndicatebomb"
- result = "syndicatebomb"
- required_reagents = list("beer" = 1, "whiskeycola" = 1)
+ name = REAGENT_SYNDICATEBOMB
+ id = REAGENT_ID_SYNDICATEBOMB
+ result = REAGENT_ID_SYNDICATEBOMB
+ required_reagents = list(REAGENT_ID_BEER = 1, REAGENT_ID_WHISKEYCOLA = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/erikasurprise
- name = "Erika Surprise"
- id = "erikasurprise"
- result = "erikasurprise"
- required_reagents = list("ale" = 2, REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_BANANA = 1, "ice" = 1)
+ name = REAGENT_ERIKASURPRISE
+ id = REAGENT_ID_ERIKASURPRISE
+ result = REAGENT_ID_ERIKASURPRISE
+ required_reagents = list(REAGENT_ID_ALE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_BANANA = 1, REAGENT_ID_ICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/devilskiss
- name = "Devils Kiss"
- id = "devilskiss"
- result = "devilskiss"
- required_reagents = list(REAGENT_ID_BLOOD = 1, "kahlua" = 1, "rum" = 1)
+ name = REAGENT_DEVILSKISS
+ id = REAGENT_ID_DEVILSKISS
+ result = REAGENT_ID_DEVILSKISS
+ required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_RUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/hippiesdelight
name = "Hippies Delight"
- id = "hippiesdelight"
- result = "hippiesdelight"
- required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "gargleblaster" = 1)
+ id = REAGENT_ID_HIPPIESDELIGHT
+ result = REAGENT_ID_HIPPIESDELIGHT
+ required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, REAGENT_ID_GARGLEBLASTER = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/bananahonk
name = "Banana Honk"
- id = "bananahonk"
- result = "bananahonk"
+ id = REAGENT_ID_BANANAHONK
+ result = REAGENT_ID_BANANAHONK
required_reagents = list(REAGENT_ID_BANANA = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/silencer
- name = "Silencer"
- id = "silencer"
- result = "silencer"
- required_reagents = list("nothing" = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
+ name = REAGENT_SILENCER
+ id = REAGENT_ID_SILENCER
+ result = REAGENT_ID_SILENCER
+ required_reagents = list(REAGENT_ID_NOTHING = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/driestmartini
- name = "Driest Martini"
- id = "driestmartini"
- result = "driestmartini"
- required_reagents = list("nothing" = 1, "gin" = 1)
+ name = REAGENT_DRIESTMARTINI
+ id = REAGENT_ID_DRIESTMARTINI
+ result = REAGENT_ID_DRIESTMARTINI
+ required_reagents = list(REAGENT_ID_NOTHING = 1, REAGENT_ID_GIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/lemonade
@@ -714,54 +714,54 @@
/decl/chemical_reaction/instant/drinks/driverspunch
name = "Driver`s Punch"
- id = "driverspunch"
- result = "driverspunch"
+ id = REAGENT_ID_DRIVERSPUNCH
+ result = REAGENT_ID_DRIVERSPUNCH
required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/mintapplesparkle
- name = "Mint Apple Sparkle"
- id = "mintapplesparkle"
- result = "mintapplesparkle"
+ name = REAGENT_MINTAPPLESPARKLE
+ id = REAGENT_ID_MINTAPPLESPARKLE
+ result = REAGENT_ID_MINTAPPLESPARKLE
required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_MINT = 1)
inhibitors = list(REAGENT_ID_SODAWATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/berrycordial
- name = "Berry Cordial"
- id = "berrycordial"
- result = "berrycordial"
+ name = REAGENT_BERRYCORDIAL
+ id = REAGENT_ID_BERRYCORDIAL
+ result = REAGENT_ID_BERRYCORDIAL
required_reagents = list(REAGENT_ID_BERRYJUICE = 4, REAGENT_ID_SUGAR = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tropicalfizz
- name = "Tropical Fizz"
- id = "tropicalfizz"
- result = "tropicalfizz"
+ name = REAGENT_TROPICALFIZZ
+ id = REAGENT_ID_TROPICALFIZZ
+ result = REAGENT_ID_TROPICALFIZZ
required_reagents = list(REAGENT_ID_SODAWATER = 6, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_PINEAPPLEJUICE = 1)
inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 8
/decl/chemical_reaction/instant/drinks/melonspritzer
- name = "Melon Spritzer"
- id = "melonspritzer"
- result = "melonspritzer"
- required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, "redwine" = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_MELONSPRITZER
+ id = REAGENT_ID_MELONSPRITZER
+ result = REAGENT_ID_MELONSPRITZER
+ required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, REAGENT_ID_REDWINE = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fauxfizz
- name = "Faux Fizz"
- id = "fauxfizz"
- result = "fauxfizz"
+ name = REAGENT_FAUXFIZZ
+ id = REAGENT_ID_FAUXFIZZ
+ result = REAGENT_ID_FAUXFIZZ
required_reagents = list(REAGENT_ID_SODAWATER = 2, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_HONEY = 1)
inhibitors = list(REAGENT_ID_SUGAR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/firepunch
- name = "Fire Punch"
- id = "firepunch"
- result = "firepunch"
- required_reagents = list(REAGENT_ID_SUGAR = 1, "rum" = 2)
+ name = REAGENT_FIREPUNCH
+ id = REAGENT_ID_FIREPUNCH
+ result = REAGENT_ID_FIREPUNCH
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_RUM = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/kiraspecial
@@ -789,14 +789,14 @@
name = REAGENT_MILKSHAKE
id = REAGENT_ID_MILKSHAKE
result = REAGENT_ID_MILKSHAKE
- required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 2, REAGENT_ID_MILK = 2)
+ required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 2, REAGENT_ID_MILK = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/peanutmilkshake
name = "Peanutbutter Milkshake"
id = REAGENT_ID_PEANUTMILKSHAKE
result = REAGENT_ID_PEANUTMILKSHAKE
- required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 1, REAGENT_ID_PEANUTBUTTER = 2, REAGENT_ID_MILK = 1)
+ required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 1, REAGENT_ID_PEANUTBUTTER = 2, REAGENT_ID_MILK = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/rewriter
@@ -807,10 +807,10 @@
result_amount = 2
/decl/chemical_reaction/instant/drinks/suidream
- name = "Sui Dream"
- id = "suidream"
- result = "suidream"
- required_reagents = list(REAGENT_ID_SPACEUP = 1, "bluecuracao" = 1, "melonliquor" = 1)
+ name = REAGENT_SUIDREAM
+ id = REAGENT_ID_SUIDREAM
+ result = REAGENT_ID_SUIDREAM
+ required_reagents = list(REAGENT_ID_SPACEUP = 1, REAGENT_ID_BLUECURACAO = 1, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/shirleytemple
@@ -912,215 +912,215 @@
result_amount = 6
/decl/chemical_reaction/instant/drinks/sakebomb
- name = "Sake Bomb"
- id = "sakebomb"
- result = "sakebomb"
- required_reagents = list("beer" = 2, "sake" = 1)
+ name = REAGENT_SAKEBOMB
+ id = REAGENT_ID_SAKEBOMB
+ result = REAGENT_ID_SAKEBOMB
+ required_reagents = list(REAGENT_ID_BEER = 2, REAGENT_ID_SAKE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/tamagozake
- name = "Tamagozake"
- id = "tamagozake"
- result = "tamagozake"
- required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
+ name = REAGENT_TAMAGOZAKE
+ id = REAGENT_ID_TAMAGOZAKE
+ result = REAGENT_ID_TAMAGOZAKE
+ required_reagents = list(REAGENT_ID_SAKE = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result_amount = 15
/decl/chemical_reaction/instant/drinks/ginzamary
- name = "Ginza Mary"
- id = "ginzamary"
- result = "ginzamary"
- required_reagents = list("sake" = 2, "vodka" = 2, REAGENT_ID_TOMATOJUICE = 1)
+ name = REAGENT_GINZAMARY
+ id = REAGENT_ID_GINZAMARY
+ result = REAGENT_ID_GINZAMARY
+ required_reagents = list(REAGENT_ID_SAKE = 2, REAGENT_ID_VODKA = 2, REAGENT_ID_TOMATOJUICE = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tokyorose
- name = "Tokyo Rose"
- id = "tokyorose"
- result = "tokyorose"
- required_reagents = list("sake" = 1, REAGENT_ID_BERRYJUICE = 1)
+ name = REAGENT_TOKYOROSE
+ id = REAGENT_ID_TOKYOROSE
+ result = REAGENT_ID_TOKYOROSE
+ required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_BERRYJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/saketini
- name = "Saketini"
- id = "saketini"
- result = "saketini"
- required_reagents = list("sake" = 1, "gin" = 1)
+ name = REAGENT_SAKETINI
+ id = REAGENT_ID_SAKETINI
+ result = REAGENT_ID_SAKETINI
+ required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_GIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/elysiumfacepunch
- name = "Elysium Facepunch"
- id = "elysiumfacepunch"
- result = "elysiumfacepunch"
- required_reagents = list("kahlua" = 1, REAGENT_ID_LEMONJUICE = 1)
+ name = REAGENT_ELYSIUMFACEPUNCH
+ id = REAGENT_ID_ELYSIUMFACEPUNCH
+ result = REAGENT_ID_ELYSIUMFACEPUNCH
+ required_reagents = list(REAGENT_ID_KAHLUA = 1, REAGENT_ID_LEMONJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/erebusmoonrise
- name = "Erebus Moonrise"
- id = "erebusmoonrise"
- result = "erebusmoonrise"
- required_reagents = list("whiskey" = 1, "vodka" = 1, "tequilla" = 1)
+ name = REAGENT_EREBUSMOONRISE
+ id = REAGENT_ID_EREBUSMOONRISE
+ result = REAGENT_ID_EREBUSMOONRISE
+ required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_TEQUILLA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/balloon
- name = "Balloon"
- id = "balloon"
- result = "balloon"
- required_reagents = list(REAGENT_ID_CREAM = 1, "bluecuracao" = 1)
+ name = REAGENT_BALLOON
+ id = REAGENT_ID_BALLOON
+ result = REAGENT_ID_BALLOON
+ required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BLUECURACAO = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/natunabrandy
- name = "Natuna Brandy"
- id = "natunabrandy"
- result = "natunabrandy"
- required_reagents = list("beer" = 1, REAGENT_ID_SODAWATER = 2)
+ name = REAGENT_NATUNABRANDY
+ id = REAGENT_ID_NATUNABRANDY
+ result = REAGENT_ID_NATUNABRANDY
+ required_reagents = list(REAGENT_ID_BEER = 1, REAGENT_ID_SODAWATER = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/euphoria
- name = "Euphoria"
- id = "euphoria"
- result = "euphoria"
- required_reagents = list("specialwhiskey" = 1, "cognac" = 2)
+ name = REAGENT_EUPHORIA
+ id = REAGENT_ID_EUPHORIA
+ result = REAGENT_ID_EUPHORIA
+ required_reagents = list(REAGENT_ID_SPECIALWHISKEY = 1, REAGENT_ID_COGNAC = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/xanaducannon
- name = "Xanadu Cannon"
- id = "xanaducannon"
- result = "xanaducannon"
- required_reagents = list("ale" = 1, REAGENT_ID_DRGIBB = 1)
+ name = REAGENT_XANADUCANNON
+ id = REAGENT_ID_XANADUCANNON
+ result = REAGENT_ID_XANADUCANNON
+ required_reagents = list(REAGENT_ID_ALE = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/debugger
- name = "Debugger"
- id = "debugger"
- result = "debugger"
+ name = REAGENT_DEBUGGER
+ id = REAGENT_ID_DEBUGGER
+ result = REAGENT_ID_DEBUGGER
required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, REAGENT_ID_COOKINGOIL = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/spacersbrew
- name = "Spacer's Brew"
- id = "spacersbrew"
- result = "spacersbrew"
+ name = REAGENT_SPACERSBREW
+ id = REAGENT_ID_SPACERSBREW
+ result = REAGENT_ID_SPACERSBREW
required_reagents = list(REAGENT_ID_BROWNSTAR = 4, REAGENT_ID_ETHANOL = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/binmanbliss
- name = "Binman Bliss"
- id = "binmanbliss"
- result = "binmanbliss"
- required_reagents = list("sake" = 1, "tequilla" = 1)
+ name = REAGENT_BINMANBLISS
+ id = REAGENT_ID_BINMANBLISS
+ result = REAGENT_ID_BINMANBLISS
+ required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_TEQUILLA = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/chrysanthemum
- name = "Chrysanthemum"
- id = "chrysanthemum"
- result = "chrysanthemum"
- required_reagents = list("sake" = 1, "melonliquor" = 1)
+ name = REAGENT_CHRYSANTHEMUM
+ id = REAGENT_ID_CHRYSANTHEMUM
+ result = REAGENT_ID_CHRYSANTHEMUM
+ required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/deathbell
- name = "Deathbell"
- id = "deathbell"
- result = "deathbell"
- required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1)
+ name = REAGENT_DEATHBELL
+ id = REAGENT_ID_DEATHBELL
+ result = REAGENT_ID_DEATHBELL
+ required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/bitters
- name = "Bitters"
- id = "bitters"
- result = "bitters"
+ name = REAGENT_BITTERS
+ id = REAGENT_ID_BITTERS
+ result = REAGENT_ID_BITTERS
required_reagents = list(REAGENT_ID_MINT = 5)
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 5
/decl/chemical_reaction/instant/drinks/soemmerfire
- name = "Soemmer Fire"
- id = "soemmerfire"
- result = "soemmerfire"
- required_reagents = list("manhattan" = 2, REAGENT_ID_CONDENSEDCAPSAICIN = 1)
+ name = REAGENT_SOEMMERFIRE
+ id = REAGENT_ID_SOEMMERFIRE
+ result = REAGENT_ID_SOEMMERFIRE
+ required_reagents = list(REAGENT_ID_MANHATTAN = 2, REAGENT_ID_CONDENSEDCAPSAICIN = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/winebrandy
name = "Wine brandy"
- id = "winebrandy"
- result = "winebrandy"
- required_reagents = list("redwine" = 10)
+ id = REAGENT_ID_WINEBRANDY
+ result = REAGENT_ID_WINEBRANDY
+ required_reagents = list(REAGENT_ID_REDWINE = 10)
catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
result_amount = 5
/decl/chemical_reaction/instant/drinks/lovepotion
- name = "Love Potion"
- id = "lovepotion"
- result = "lovepotion"
+ name = REAGENT_LOVEPOTION
+ id = REAGENT_ID_LOVEPOTION
+ result = REAGENT_ID_LOVEPOTION
required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/morningafter
- name = "Morning After"
- id = "morningafter"
- result = "morningafter"
- required_reagents = list("sbiten" = 1, REAGENT_ID_COFFEE = 5)
+ name = REAGENT_MORNINGAFTER
+ id = REAGENT_ID_MORNINGAFTER
+ result = REAGENT_ID_MORNINGAFTER
+ required_reagents = list(REAGENT_ID_SBITEN = 1, REAGENT_ID_COFFEE = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/vesper
- name = "Vesper"
- id = "vesper"
- result = "vesper"
- required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1)
+ name = REAGENT_VESPER
+ id = REAGENT_ID_VESPER
+ result = REAGENT_ID_VESPER
+ required_reagents = list(REAGENT_ID_GIN = 3, REAGENT_ID_VODKA = 1, REAGENT_ID_REDWINE = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/rotgut
- name = "Rotgut Fever Dream"
- id = "rotgut"
- result = "rotgut"
- required_reagents = list("vodka" = 3, "rum" = 1, "whiskey" = 1, REAGENT_ID_COLA = 3)
+ name = REAGENT_ROTGUT
+ id = REAGENT_ID_ROTGUT
+ result = REAGENT_ID_ROTGUT
+ required_reagents = list(REAGENT_ID_VODKA = 3, REAGENT_ID_RUM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_COLA = 3)
result_amount = 8
/decl/chemical_reaction/instant/drinks/entdraught
- name = "Ent's Draught"
- id = "entdraught"
- result = "entdraught"
+ name = REAGENT_ENTDRAUGHT
+ id = REAGENT_ID_ENTDRAUGHT
+ result = REAGENT_ID_ENTDRAUGHT
required_reagents = list(REAGENT_ID_TONIC = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_HONEY = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/voxdelight
- name = "Vox's Delight"
- id = "voxdelight"
- result = "voxdelight"
+ name = REAGENT_VOXDELIGHT
+ id = REAGENT_ID_VOXDELIGHT
+ result = REAGENT_ID_VOXDELIGHT
required_reagents = list(REAGENT_ID_PHORON = 3, REAGENT_ID_FUEL = 1, REAGENT_ID_WATER = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/screamingviking
- name = "Screaming Viking"
- id = "screamingviking"
- result = "screamingviking"
- required_reagents = list("martini" = 2, "vodkatonic" = 2, REAGENT_ID_LIMEJUICE = 1, "rum" = 1)
+ name =REAGENT_SCREAMINGVIKING
+ id = REAGENT_ID_SCREAMINGVIKING
+ result = REAGENT_ID_SCREAMINGVIKING
+ required_reagents = list(REAGENT_ID_MARTINI = 2, REAGENT_ID_VODKATONIC = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_RUM = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/vilelemon
- name = "Vile Lemon"
- id = "vilelemon"
- result = "vilelemon"
+ name = REAGENT_VILELEMON
+ id = REAGENT_ID_VILELEMON
+ result = REAGENT_ID_VILELEMON
required_reagents = list(REAGENT_ID_LEMONADE = 5, REAGENT_ID_SPACEMOUNTAINWIND = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/dreamcream
- name = "Dream Cream"
- id = "dreamcream"
- result = "dreamcream"
+ name = REAGENT_DREAMCREAM
+ id = REAGENT_ID_DREAMCREAM
+ result = REAGENT_ID_DREAMCREAM
required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_CREAM = 1, REAGENT_ID_HONEY = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/robustin
- name = "Robustin"
- id = "robustin"
- result = "robustin"
- required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, "vodka" = 1)
+ name = REAGENT_ROBUSTIN
+ id = REAGENT_ID_ROBUSTIN
+ result = REAGENT_ID_ROBUSTIN
+ required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, REAGENT_ID_VODKA = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/virginsip
- name = "Virgin Sip"
- id = "virginsip"
- result = "virginsip"
- required_reagents = list("driestmartini" = 1, REAGENT_ID_WATER = 1)
+ name = REAGENT_VIRGINSIP
+ id = REAGENT_ID_VIRGINSIP
+ result = REAGENT_ID_VIRGINSIP
+ required_reagents = list(REAGENT_ID_DRIESTMARTINI = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/chocoshake
@@ -1145,206 +1145,206 @@
result_amount = 2
/decl/chemical_reaction/instant/drinks/jellyshot
- name = "Jelly Shot"
- id = "jellyshot"
- result = "jellyshot"
- required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, "vodka" = 1)
+ name = REAGENT_JELLYSHOT
+ id = REAGENT_ID_JELLYSHOT
+ result = REAGENT_ID_JELLYSHOT
+ required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, REAGENT_ID_VODKA = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/slimeshot
- name = "Named Bullet"
- id = "slimeshot"
- result = "slimeshot"
- required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, "vodka" = 1)
+ name = REAGENT_SLIMESHOT
+ id = REAGENT_ID_SLIMESHOT
+ result = REAGENT_ID_SLIMESHOT
+ required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, REAGENT_ID_VODKA = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/negroni
- name = "Negroni"
- id = "negroni"
- result = "negroni"
- required_reagents = list("gin" = 1, "bitters" = 1, "vermouth" = 1)
+ name = REAGENT_NEGRONI
+ id = REAGENT_ID_NEGRONI
+ result = REAGENT_ID_NEGRONI
+ required_reagents = list(REAGENT_ID_GIN = 1, REAGENT_ID_BITTERS = 1, REAGENT_ID_VERMOUTH = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/cloverclub
- name = "Clover Club"
- id = "cloverclub"
- result = "cloverclub"
- required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, "gin" = 3)
+ name = REAGENT_CLOVERCLUB
+ id = REAGENT_ID_CLOVERCLUB
+ result = REAGENT_ID_CLOVERCLUB
+ required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_GIN = 3)
result_amount = 5
/decl/chemical_reaction/instant/drinks/oldfashioned
- name = "Old Fashioned"
- id = "oldfashioned"
- result = "oldfashioned"
- required_reagents = list("whiskey" = 3, "bitters" = 1, REAGENT_ID_SUGAR = 1)
+ name = REAGENT_OLDFASHIONED
+ id = REAGENT_ID_OLDFASHIONED
+ result = REAGENT_ID_OLDFASHIONED
+ required_reagents = list(REAGENT_ID_WHISKEY = 3, REAGENT_ID_BITTERS = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/whiskeysour
- name = "Whiskey Sour"
- id = "whiskeysour"
- result = "whiskeysour"
- required_reagents = list("whiskey" = 2, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
+ name = REAGENT_WHISKEYSOUR
+ id = REAGENT_ID_WHISKEYSOUR
+ result = REAGENT_ID_WHISKEYSOUR
+ required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/daiquiri
- name = "Daiquiri"
- id = "daiquiri"
- result = "daiquiri"
- required_reagents = list("rum" = 3, REAGENT_ID_LIMEJUICE = 2, REAGENT_ID_SUGAR = 1)
+ name = REAGENT_DAIQUIRI
+ id = REAGENT_ID_DAIQUIRI
+ result = REAGENT_ID_DAIQUIRI
+ required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_LIMEJUICE = 2, REAGENT_ID_SUGAR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mintjulep
- name = "Mint Julep"
- id = "mintjulep"
- result = "mintjulep"
- required_reagents = list("whiskey" = 2, REAGENT_ID_WATER = 1, REAGENT_ID_MINT = 1)
+ name = REAGENT_MINTJULEP
+ id = REAGENT_ID_MINTJULEP
+ result = REAGENT_ID_MINTJULEP
+ required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_WATER = 1, REAGENT_ID_MINT = 1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/paloma
- name = "Paloma"
- id = "paloma"
- result = "paloma"
- required_reagents = list(REAGENT_ID_SODAWATER = 1, "tequillasunrise" = 2)
+ name = REAGENT_PALOMA
+ id = REAGENT_ID_PALOMA
+ result = REAGENT_ID_PALOMA
+ required_reagents = list(REAGENT_ID_SODAWATER = 1, REAGENT_ID_TEQUILLASUNRISE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/mojito
- name = "Mojito"
- id = "mojito"
- result = "mojito"
- required_reagents = list("rum" = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1)
+ name = REAGENT_MOJITO
+ id = REAGENT_ID_MOJITO
+ result = REAGENT_ID_MOJITO
+ required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/virginmojito
- name = "Mojito"
- id = "virginmojito"
- result = "virginmojito"
+ name = REAGENT_VIRGINMOJITO
+ id = REAGENT_ID_VIRGINMOJITO
+ result = REAGENT_ID_VIRGINMOJITO
required_reagents = list(REAGENT_ID_SODAWATER = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SUGAR = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/piscosour
- name = "Pisco Sour"
- id = "piscosour"
- result = "piscosour"
- required_reagents = list("winebrandy" = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
+ name = REAGENT_PISCOSOUR
+ id = REAGENT_ID_PISCOSOUR
+ result = REAGENT_ID_PISCOSOUR
+ required_reagents = list(REAGENT_ID_WINEBRANDY = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/coldfront
- name = "Cold Front"
- id = "coldfront"
- result = "coldfront"
- required_reagents = list(REAGENT_ID_ICECOFFEE = 1, "whiskey" = 1, REAGENT_ID_MINT = 1)
+ name = REAGENT_COLDFRONT
+ id = REAGENT_ID_COLDFRONT
+ result = REAGENT_ID_COLDFRONT
+ required_reagents = list(REAGENT_ID_ICECOFFEE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_MINT = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/godsake
- name = "Gods Sake"
- id = "godsake"
- result = "godsake"
- required_reagents = list("sake" = 2, REAGENT_ID_HOLYWATER = 1)
+ name = REAGENT_GODSAKE
+ id = REAGENT_ID_GODSAKE
+ result = REAGENT_ID_GODSAKE
+ required_reagents = list(REAGENT_ID_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, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1)
+ name = REAGENT_GODKA
+ id = REAGENT_ID_GODKA
+ result = REAGENT_ID_GODKA
+ required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1)
catalysts = list(REAGENT_ID_ENZYME = 5, REAGENT_ID_HOLYWATER = 5)
result_amount = 1
/decl/chemical_reaction/instant/drinks/holywine
- name = "Angel Ichor"
- id = "holywine"
- result = "holywine"
+ name = REAGENT_HOLYWINE
+ id = REAGENT_ID_HOLYWINE
+ result = REAGENT_ID_HOLYWINE
required_reagents = list(REAGENT_ID_GRAPEJUICE = 5, REAGENT_ID_GOLD = 5)
catalysts = list(REAGENT_ID_HOLYWATER = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/holy_mary
- name = "Holy Mary"
- id = "holymary"
- result = "holymary"
- required_reagents = list("vodka" = 2, "holywine" = 3, REAGENT_ID_LIMEJUICE = 1)
+ name = REAGENT_HOLYMARY
+ id = REAGENT_ID_HOLYMARY
+ result = REAGENT_ID_HOLYMARY
+ required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_HOLYWINE = 3, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/angelskiss
- name = "Angels Kiss"
- id = "angelskiss"
- result = "angelskiss"
- required_reagents = list("holywine" = 1, "kahlua" = 1, "rum" = 1)
+ name = REAGENT_ANGELSKISS
+ id = REAGENT_ID_ANGELSKISS
+ result = REAGENT_ID_ANGELSKISS
+ required_reagents = list(REAGENT_ID_HOLYWINE = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_RUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/angelswrath
- name = "Angels Wrath"
- id = "angelswrath"
- result = "angelswrath"
- required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, "holywine" = 1, REAGENT_ID_DRGIBB = 1)
+ name = REAGENT_ANGELSWRATH
+ id = REAGENT_ID_ANGELSWRATH
+ result = REAGENT_ID_ANGELSWRATH
+ required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_HOLYWINE = 1, REAGENT_ID_DRGIBB = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/ichor_mead
- name = "Ichor Mead"
- id = "ichor_mead"
- result = "ichor_mead"
- required_reagents = list("holywine" = 1, "mead" = 1)
+ name = REAGENT_ICHORMEAD
+ id = REAGENT_ID_ICHORMEAD
+ result = REAGENT_ID_ICHORMEAD
+ required_reagents = list(REAGENT_ID_HOLYWINE = 1, REAGENT_ID_MEAD = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/oilslick
- name = "Oil Slick"
- id = "oilslick"
- result = "oilslick"
+ name = REAGENT_OILSLICK
+ id = REAGENT_ID_OILSLICK
+ result = REAGENT_ID_OILSLICK
required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_HONEY = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/slimeslam
name = "Slick Slime Slammer"
- id = "slimeslammer"
- result = "slimeslammer"
+ id = REAGENT_ID_SLIMESLAMMER
+ result = REAGENT_ID_SLIMESLAMMER
required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_PEANUTBUTTER = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/virginsexonthebeach
- name = "Virgin Sex On The Beach"
- id = "virginsexonthebeach"
- result = "virginsexonthebeach"
+ name = REAGENT_VIRGINSEXONTHEBEACH
+ id = REAGENT_ID_VIRGINSEXONTHEBEACH
+ result = REAGENT_ID_VIRGINSEXONTHEBEACH
required_reagents = list(REAGENT_ID_ORANGEJUICE = 3, REAGENT_ID_GRENADINE = 2)
result_amount = 5
/decl/chemical_reaction/instant/drinks/sexonthebeach
- name = "Sex On The Beach"
- id = "sexonthebeach"
- result = "sexonthebeach"
- required_reagents = list("virginsexonthebeach" = 5, "vodka" = 1)
+ name = REAGENT_SEXONTHEBEACH
+ id = REAGENT_ID_SEXONTHEBEACH
+ result = REAGENT_ID_SEXONTHEBEACH
+ required_reagents = list(REAGENT_ID_VIRGINSEXONTHEBEACH = 5, REAGENT_ID_VODKA = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/eggnog
- name = "Eggnog"
- id = "eggnog"
- result = "eggnog"
+ name = REAGENT_EGGNOG
+ id = REAGENT_ID_EGGNOG
+ result = REAGENT_ID_EGGNOG
required_reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_CREAM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3)
result_amount = 15
/decl/chemical_reaction/instant/drinks/nuclearwaste_radium
- name = "Nuclear Waste"
+ name = REAGENT_NUCLEARWASTE
id = "nuclearwasterad"
- result = "nuclearwaste"
- required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1)
+ result = REAGENT_ID_NUCLEARWASTE
+ required_reagents = list(REAGENT_ID_OILSLICK = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/nuclearwaste_uranium
- name = "Nuclear Waste"
+ name = REAGENT_NUCLEARWASTE
id = "nuclearwasteuran"
- result = "nuclearwaste"
- required_reagents = list("oilslick" = 2, REAGENT_ID_URANIUM = 1)
+ result = REAGENT_ID_NUCLEARWASTE
+ required_reagents = list(REAGENT_ID_OILSLICK = 2, REAGENT_ID_URANIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/sodaoil
- name = "Soda Oil"
- id = "sodaoil"
- result = "sodaoil"
+ name = REAGENT_SODAOIL
+ id = REAGENT_ID_SODAOIL
+ result = REAGENT_ID_SODAOIL
required_reagents = list(REAGENT_ID_COOKINGOIL = 4, REAGENT_ID_SODAWATER = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fusionnaire
- name = "Fusionnaire"
- id = "fusionnaire"
- result = "fusionnaire"
- required_reagents = list(REAGENT_ID_LEMONJUICE = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1)
+ name = REAGENT_FUSIONNAIRE
+ id = REAGENT_ID_FUSIONNAIRE
+ result = REAGENT_ID_FUSIONNAIRE
+ required_reagents = list(REAGENT_ID_LEMONJUICE = 3, REAGENT_ID_VODKA = 2, REAGENT_ID_SCHNAPPSPEP = 1, REAGENT_ID_SCHNAPPSLEM = 1, REAGENT_ID_RUM = 1, REAGENT_ID_ICE = 1)
result_amount = 9
diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm
index 8c86251edd..6653e8bea5 100644
--- a/code/modules/reagents/reactions/instant/drinks_vr.dm
+++ b/code/modules/reagents/reactions/instant/drinks_vr.dm
@@ -8,31 +8,31 @@
result_amount = 30
/decl/chemical_reaction/instant/drinks/deathbell
- name = "Deathbell"
- id = "deathbell"
- result = "deathbell"
- required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1)
+ name = REAGENT_DEATHBELL
+ id = REAGENT_ID_DEATHBELL
+ result = REAGENT_ID_DEATHBELL
+ required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/burnout
name = REAGENT_BURNOUT
id = REAGENT_ID_BURNOUT
result = REAGENT_ID_BURNOUT
- required_reagents = list("antifreeze" = 1, "deathbell" = 1, REAGENT_ID_LOVEMAKER =1)
+ required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_DEATHBELL = 1, REAGENT_ID_LOVEMAKER =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/monstertamer
name = REAGENT_MONSTERTAMER
id = REAGENT_ID_MONSTERTAMER
result = REAGENT_ID_MONSTERTAMER
- required_reagents = list("whiskey" = 1, REAGENT_ID_PROTEIN = 1)
+ required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_PROTEIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/bigbeer
name = REAGENT_BIGBEER
id = REAGENT_ID_BIGBEER
result = REAGENT_ID_BIGBEER
- required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1)
+ required_reagents = list(REAGENT_ID_SYNDICATEBOMB = 1, REAGENT_ID_MANLYDORF = 1, REAGENT_ID_GROG =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/sweettea
@@ -53,21 +53,21 @@
name = REAGENT_GALACTICPANIC
id = REAGENT_ID_GALACTICPANIC
result = REAGENT_ID_GALACTICPANIC
- required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1)
+ required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SINGULO = 1, REAGENT_ID_PHORONSPECIAL =1, REAGENT_ID_NEUROTOXIN = 1, REAGENT_ID_ATOMICBOMB = 1, REAGENT_ID_HIPPIESDELIGHT = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/bulldog
name = REAGENT_BULLDOG
id = REAGENT_ID_BULLDOG
result = REAGENT_ID_BULLDOG
- required_reagents = list("whiterussian" = 4, REAGENT_ID_COLA =1)
+ required_reagents = list(REAGENT_ID_WHITERUSSIAN = 4, REAGENT_ID_COLA =1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/sbagliato
name = REAGENT_SBAGLIATO
id = REAGENT_ID_SBAGLIATO
result = REAGENT_ID_SBAGLIATO
- required_reagents = list("redwine" = 1, "vermouth" = 1, REAGENT_ID_SODAWATER =1)
+ required_reagents = list(REAGENT_ID_REDWINE = 1, REAGENT_ID_VERMOUTH = 1, REAGENT_ID_SODAWATER =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/italiancrisis
@@ -81,7 +81,7 @@
name = REAGENT_SUGARRUSH
id = REAGENT_ID_SUGARRUSH
result = REAGENT_ID_SUGARRUSH
- required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, "vodka" =1)
+ required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_VODKA =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/lotus
@@ -102,28 +102,28 @@
name = REAGENT_RUSSIANROULETTE
id =REAGENT_ID_RUSSIANROULETTE
result =REAGENT_ID_RUSSIANROULETTE
- required_reagents = list("whiterussian" = 5, REAGENT_ID_IRON = 1)
+ required_reagents = list(REAGENT_ID_WHITERUSSIAN = 5, REAGENT_ID_IRON = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lovemaker
name = REAGENT_LOVEMAKER
id = REAGENT_ID_LOVEMAKER
result = REAGENT_ID_LOVEMAKER
- required_reagents = list(REAGENT_ID_HONEY = 1, "sexonthebeach" = 5)
+ required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_SEXONTHEBEACH = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/honeyshot
name = REAGENT_HONEYSHOT
id = REAGENT_ID_HONEYSHOT
result = REAGENT_ID_HONEYSHOT
- required_reagents = list(REAGENT_ID_HONEY = 1, "vodka" = 1, REAGENT_ID_GRENADINE =1)
+ required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_GRENADINE =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/appletini
name = REAGENT_APPLETINI
id = REAGENT_ID_APPLETINIT
result = REAGENT_ID_APPLETINIT
- required_reagents = list(REAGENT_ID_APPLEJUICE = 2, "vodka" = 1)
+ required_reagents = list(REAGENT_ID_APPLEJUICE = 2, REAGENT_ID_VODKA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/glowingappletini
@@ -137,7 +137,7 @@
name = REAGENT_SCSATW
id = REAGENT_ID_SCSATW
result = REAGENT_ID_SCSATW
- required_reagents = list("screwdrivercocktail" = 3, "rum" =1, "whiskey" =1, "gin" =1)
+ required_reagents = list(REAGENT_ID_SCREWDRIVERCOCKTAIL = 3, REAGENT_ID_RUM =1, REAGENT_ID_WHISKEY =1, REAGENT_ID_GIN =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/choccymilk
@@ -152,7 +152,7 @@
name = "Redspace Flush"
id = REAGENT_ID_REDSPACEFLUSH
result = REAGENT_ID_REDSPACEFLUSH
- required_reagents = list("rum" = 2, "whiskey" = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1)
+ required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_WHISKEY = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/graveyard
@@ -173,14 +173,14 @@
name = REAGENT_PINKRUSSIAN
id = REAGENT_ID_PINKRUSSIAN
result = REAGENT_ID_PINKRUSSIAN
- required_reagents = list("blackrussian" = 2, REAGENT_ID_BERRYSHAKE = 1)
+ required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_BERRYSHAKE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/originalsin
name = REAGENT_ORIGINALSIN
id = REAGENT_ID_ORIGINALSIN
result = REAGENT_ID_ORIGINALSIN
- required_reagents = list("holywine" = 1)
+ required_reagents = list(REAGENT_ID_HOLYWINE = 1)
catalysts = list(REAGENT_ID_APPLEJUICE = 1)
result_amount = 1
@@ -188,21 +188,21 @@
name = REAGENT_WINDGARITA
id = REAGENT_ID_WINDGARITA
result = REAGENT_ID_WINDGARITA
- required_reagents = list("margarita" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, "melonliquor" = 1)
+ required_reagents = list(REAGENT_ID_MARGARITA = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/newyorksour
name = REAGENT_NEWYORKSOUR
id = REAGENT_ID_NEWYORKSOUR
result = REAGENT_ID_NEWYORKSOUR
- required_reagents = list("whiskeysour" = 3, "redwine" = 2, REAGENT_ID_EGG = 1)
+ required_reagents = list(REAGENT_ID_WHISKEYSOUR = 3, REAGENT_ID_REDWINE = 2, REAGENT_ID_EGG = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mudslide
name = REAGENT_MUDSLIDE
id = REAGENT_ID_MUDSLIDE
result = REAGENT_ID_MUDSLIDE
- required_reagents = list("blackrussian" = 1, "irishcream" = 1)
+ required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 1, REAGENT_ID_IRISHCREAM = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/protein_shake
@@ -244,5 +244,5 @@
name = REAGENT_MANAGERSUMMONER
id = REAGENT_ID_MANAGERSUMMONER
result = REAGENT_ID_MANAGERSUMMONER
- required_reagents = list("margarita" = 1, "redwine" = 1, REAGENT_ID_ESSENTIALOIL = 1)
+ required_reagents = list(REAGENT_ID_MARGARITA = 1, REAGENT_ID_REDWINE = 1, REAGENT_ID_ESSENTIALOIL = 1)
result_amount = 3
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index 92fc398f91..c6d9773008 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -1,15 +1,15 @@
/decl/chemical_reaction/instant/food/hot_ramen
- name = "Hot Ramen"
- id = "hot_ramen"
- result = "hot_ramen"
+ name = REAGENT_HOTRAMEN
+ id = REAGENT_ID_HOTRAMEN
+ result = REAGENT_ID_HOTRAMEN
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_DRYRAMEN = 3)
result_amount = 3
/decl/chemical_reaction/instant/food/hell_ramen
- name = "Hell Ramen"
- id = "hell_ramen"
- result = "hell_ramen"
- required_reagents = list(REAGENT_ID_CAPSAICIN = 1, "hot_ramen" = 6)
+ name = REAGENT_HELLRAMEN
+ id = REAGENT_ID_HELLRAMEN
+ result = REAGENT_ID_HELLRAMEN
+ required_reagents = list(REAGENT_ID_CAPSAICIN = 1, REAGENT_ID_HOTRAMEN = 6)
result_amount = 6
/decl/chemical_reaction/instant/food/tofu
@@ -140,7 +140,7 @@
id = "dough"
result = null
required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10)
- inhibitors = list(REAGENT_ID_WATER = 1, "beer" = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
+ inhibitors = list(REAGENT_ID_WATER = 1, REAGENT_ID_BEER = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
result_amount = 1
/decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -179,7 +179,7 @@
name = "Beer Batter"
id = REAGENT_ID_BEERBATTER
result = REAGENT_ID_BEERBATTER
- required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, "beer" = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
+ required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, REAGENT_ID_BEER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/browniemix
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index e6b517b101..19af8aeb6f 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -537,10 +537,10 @@
result_amount = 3
/decl/chemical_reaction/instant/neurotoxin
- name = "Neurotoxin"
- id = "neurotoxin"
- result = "neurotoxin"
- required_reagents = list("gargleblaster" = 1, REAGENT_ID_STOXIN = 1)
+ name = REAGENT_NEUROTOXIN
+ id = REAGENT_ID_NEUROTOXIN
+ result = REAGENT_ID_NEUROTOXIN
+ required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_STOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/luminol
@@ -1152,7 +1152,7 @@
name = "Silver Blue Carpet Dyeing"
id = "carpetdyesblu"
result = REAGENT_ID_LIQUIDCARPETSBLU
- required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "ice" = 1)
+ required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_ICE = 1)
/decl/chemical_reaction/instant/carpetdye/clown
name = "Clown Carpet Dyeing"
diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm
index bcc431ec4d..822ec33a5f 100644
--- a/code/modules/reagents/reagent_containers/borghypo.dm
+++ b/code/modules/reagents/reagent_containers/borghypo.dm
@@ -132,49 +132,49 @@
recharge_time = 3
volume = 60
possible_transfer_amounts = list(5, 10, 20, 30)
- reagent_ids = list("ale",
- "beer",
+ reagent_ids = list(REAGENT_ID_ALE,
+ REAGENT_ID_BEER,
REAGENT_ID_BERRYJUICE,
- "bitters",
- "cider",
+ REAGENT_ID_BITTERS,
+ REAGENT_ID_CIDER,
REAGENT_ID_COFFEE,
- "cognac",
+ REAGENT_ID_COGNAC,
REAGENT_ID_COLA,
REAGENT_ID_CREAM,
REAGENT_ID_DRGIBB,
REAGENT_ID_EGG,
- "gin",
+ REAGENT_ID_GIN,
REAGENT_ID_GINGERALE,
REAGENT_ID_HOTCOCO,
- "ice",
+ REAGENT_ID_ICE,
REAGENT_ID_ICETEA,
- "kahlua",
+ REAGENT_ID_KAHLUA,
REAGENT_ID_LEMONJUICE,
REAGENT_ID_LEMONLIME,
REAGENT_ID_LIMEJUICE,
- "mead",
+ REAGENT_ID_MEAD,
REAGENT_ID_MILK,
REAGENT_ID_MINT,
REAGENT_ID_ORANGEJUICE,
- "redwine",
- "rum",
- "sake",
+ REAGENT_ID_REDWINE,
+ REAGENT_ID_RUM,
+ REAGENT_ID_SAKE,
REAGENT_ID_SODAWATER,
REAGENT_ID_SOYMILK,
REAGENT_ID_SPACEUP,
REAGENT_ID_SPACEMOUNTAINWIND,
REAGENT_ID_SPACESPICE,
- "specialwhiskey",
+ REAGENT_ID_SPECIALWHISKEY,
REAGENT_ID_SUGAR,
REAGENT_ID_TEA,
- "tequilla",
+ REAGENT_ID_TEQUILLA,
REAGENT_ID_TOMATOJUICE,
REAGENT_ID_TONIC,
- "vermouth",
- "vodka",
+ REAGENT_ID_VERMOUTH,
+ REAGENT_ID_VODKA,
REAGENT_ID_WATER,
REAGENT_ID_WATERMELONJUICE,
- "whiskey")
+ REAGENT_ID_WHISKEY)
/obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
return
diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm
index 246cd5eec0..1e368776a1 100644
--- a/code/modules/reagents/reagent_containers/glass_vr.dm
+++ b/code/modules/reagents/reagent_containers/glass_vr.dm
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/glass/beaker/neurotoxin
- prefill = list("neurotoxin" = 50)
+ prefill = list(REAGENT_ID_NEUROTOXIN = 50)
/obj/item/reagent_containers/glass/beaker/vial/bicaridine
name = "vial (" + REAGENT_ID_BICARIDINE + ")"
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index b49f125c6b..419b7f4656 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -2475,8 +2475,8 @@
color = "#302000"
/datum/reagent/drink/hot_ramen
- name = "Hot Ramen"
- id = "hot_ramen"
+ name = REAGENT_HOTRAMEN
+ id = REAGENT_ID_HOTRAMEN
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
taste_description = "noodles and salt"
reagent_state = LIQUID
@@ -2485,8 +2485,8 @@
adj_temp = 5
/datum/reagent/drink/hell_ramen
- name = "Hell Ramen"
- id = "hell_ramen"
+ name = REAGENT_HELLRAMEN
+ id = REAGENT_ID_HELLRAMEN
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
taste_description = "noodles and spice"
taste_mult = 1.7
@@ -2501,8 +2501,8 @@
M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
/datum/reagent/drink/sweetsundaeramen
- name = "Dessert Ramen"
- id = "dessertramen"
+ name = REAGENT_DESSERTRAMEN
+ id = REAGENT_ID_DESSERTRAMEN
description = "How many things can you add to a cup of ramen before it begins to question its existance?"
taste_description = "unbearable sweetness"
color = "#4444FF"
@@ -2512,15 +2512,15 @@
glass_desc = "How many things can you add to a cup of ramen before it begins to question its existance?"
/datum/reagent/drink/ice
- name = "Ice"
- id = "ice"
+ name = REAGENT_ICE
+ id = REAGENT_ID_ICE
description = "Frozen water, your dentist wouldn't like you chewing this."
taste_description = "ice"
reagent_state = SOLID
color = "#619494"
adj_temp = -5
- glass_name = "ice"
+ glass_name = REAGENT_ID_ICE
glass_desc = "Generally, you're supposed to put something else in there too..."
glass_icon = DRINK_ICON_NOISY
@@ -2543,75 +2543,75 @@
//M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/nothing
- name = "Nothing"
- id = "nothing"
+ name = REAGENT_NOTHING
+ id = REAGENT_ID_NOTHING
description = "Absolutely nothing."
- taste_description = "nothing"
+ taste_description = REAGENT_ID_NOTHING
- glass_name = "nothing"
+ glass_name = REAGENT_ID_NOTHING
glass_desc = "Absolutely nothing."
/datum/reagent/drink/dreamcream
- name = "Dream Cream"
- id = "dreamcream"
+ name = REAGENT_DREAMCREAM
+ id = REAGENT_ID_DREAMCREAM
description = "A smoothy, silky mix of honey and dairy."
taste_description = "sweet, soothing dairy"
color = "#fcfcc9" // rgb(252, 252, 201)
- glass_name = "Dream Cream"
+ glass_name = REAGENT_DREAMCREAM
glass_desc = "A smoothy, silky mix of honey and dairy."
allergen_type = ALLERGEN_DAIRY //Made using dairy
/datum/reagent/drink/soda/vilelemon
- name = "Vile Lemon"
- id = "vilelemon"
+ name = REAGENT_VILELEMON
+ id = REAGENT_ID_VILELEMON
description = "A fizzy, sour lemonade mix."
taste_description = "fizzy, sour lemon"
color = "#c6c603" // rgb(198, 198, 3)
- glass_name = "Vile Lemon"
+ glass_name = REAGENT_VILELEMON
glass_desc = "A sour, fizzy drink with lemonade and lemonlime."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from lemonade and mtn wind(caffeine)
/datum/reagent/drink/entdraught
- name = "Ent's Draught"
- id = "entdraught"
+ name = REAGENT_ENTDRAUGHT
+ id = REAGENT_ID_ENTDRAUGHT
description = "A natural, earthy combination of all things peaceful."
taste_description = "fresh rain and sweet memories"
color = "#3a6617" // rgb(58, 102, 23)
- glass_name = "Ent's Draught"
+ glass_name = REAGENT_ENTDRAUGHT
glass_desc = "You can almost smell the tranquility emanating from this."
//allergen_type = ALLERGEN_FRUIT Sorry to break the news, chief. Honey is not a fruit.
/datum/reagent/drink/lovepotion
- name = "Love Potion"
- id = "lovepotion"
+ name = REAGENT_LOVEPOTION
+ id = REAGENT_ID_LOVEPOTION
description = "Creamy strawberries and sugar, simple and sweet."
taste_description = "strawberries and cream"
color = "#fc8a8a" // rgb(252, 138, 138)
- glass_name = "Love Potion"
+ glass_name = REAGENT_LOVEPOTION
glass_desc = "Love me tender, love me sweet."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from cream(dairy) and berryjuice(fruit)
/datum/reagent/drink/oilslick
- name = "Oil Slick"
- id = "oilslick"
+ name = REAGENT_OILSLICK
+ id = REAGENT_ID_OILSLICK
description = "A viscous, but sweet, ooze."
taste_description = "honey"
color = "#FDF5E6" // rgb(253,245,230)
water_based = FALSE
- glass_name = "Oil Slick"
+ glass_name = REAGENT_OILSLICK
glass_desc = "A concoction that should probably be in an engine, rather than your stomach."
glass_icon = DRINK_ICON_NOISY
allergen_type = ALLERGEN_VEGETABLE //Made from corn oil
/datum/reagent/drink/slimeslammer
- name = "Slick Slimes Slammer"
- id = "slimeslammer"
+ name = REAGENT_SLIMESLAMMER
+ id = REAGENT_ID_SLIMESLAMMER
description = "A viscous, but savory, ooze."
taste_description = "peanuts`n`slime"
color = "#93604D"
@@ -2623,25 +2623,25 @@
allergen_type = ALLERGEN_VEGETABLE|ALLERGEN_SEEDS //Made from corn oil and peanutbutter
/datum/reagent/drink/eggnog
- name = "Eggnog"
- id = "eggnog"
+ name = REAGENT_EGGNOG
+ id = REAGENT_ID_EGGNOG
description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays."
taste_description = "thick cream and vanilla"
color = "#fff3c1" // rgb(255, 243, 193)
- glass_name = "Eggnog"
+ glass_name = REAGENT_EGGNOG
glass_desc = "You can't egg-nore the holiday cheer all around you"
allergen_type = ALLERGEN_DAIRY|ALLERGEN_EGGS //Eggnog is made with dairy and eggs.
/datum/reagent/drink/nuclearwaste
- name = "Nuclear Waste"
- id = "nuclearwaste"
+ name = REAGENT_NUCLEARWASTE
+ id = REAGENT_ID_NUCLEARWASTE
description = "A viscous, glowing slurry."
taste_description = "sour honey drops"
color = "#7FFF00" // rgb(127,255,0)
water_based = FALSE
- glass_name = "Nuclear Waste"
+ glass_name = REAGENT_NUCLEARWASTE
glass_desc = "Sadly, no super powers."
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)
@@ -2660,14 +2660,14 @@
M.ingested.add_reagent(REAGENT_ID_RADIUM, 0.25)
/datum/reagent/drink/sodaoil //Mixed with normal drinks to make a 'potable' version for Prometheans if mixed 1-1. Dilution is key.
- name = "Soda Oil"
- id = "sodaoil"
+ name = REAGENT_SODAOIL
+ id = REAGENT_ID_SODAOIL
description = "A thick, bubbling soda."
taste_description = "chewy water"
color = "#F0FFF0" // rgb(245,255,250)
water_based = FALSE
- glass_name = "Soda Oil"
+ glass_name = REAGENT_SODAOIL
glass_desc = "A pitiful sludge that looks vaguely like a soda.. if you look at it a certain way."
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)
@@ -2692,20 +2692,20 @@
M.adjustToxLoss(removed * -2)
/datum/reagent/drink/mojito
- name = "Mojito"
- id = "virginmojito"
+ name = REAGENT_VIRGINMOJITO
+ id = REAGENT_ID_VIRGINMOJITO
description = "Mint, bubbly water, and citrus, made for sailing."
taste_description = "mint and lime"
color = "#FFF7B3"
- glass_name = "mojito"
+ glass_name = REAGENT_ID_MOJITO
glass_desc = "Mint, bubbly water, and citrus, made for sailing."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with lime juice
/datum/reagent/drink/sexonthebeach
- name = "Virgin Sex On The Beach"
- id = "virginsexonthebeach"
+ name = REAGENT_VIRGINSEXONTHEBEACH
+ id = REAGENT_ID_VIRGINSEXONTHEBEACH
description = "A secret combination of orange juice and pomegranate."
taste_description = "60% orange juice, 40% pomegranate"
color = "#7051E3"
@@ -2715,8 +2715,8 @@
allergen_type = ALLERGEN_FRUIT //Made with orange juice
/datum/reagent/drink/driverspunch
- name = "Driver's Punch"
- id = "driverspunch"
+ name = REAGENT_DRIVERSPUNCH
+ id = REAGENT_ID_DRIVERSPUNCH
description = "A fruity punch!"
taste_description = "sharp, sour apples"
color = "#D2BA6E"
@@ -2727,8 +2727,8 @@
allergen_type = ALLERGEN_FRUIT //Made with appleade and orange juice
/datum/reagent/drink/mintapplesparkle
- name = "Mint Apple Sparkle"
- id = "mintapplesparkle"
+ name = REAGENT_MINTAPPLESPARKLE
+ id = REAGENT_ID_MINTAPPLESPARKLE
description = "Delicious appleade with a touch of mint."
taste_description = "minty apples"
color = "#FDDA98"
@@ -2739,8 +2739,8 @@
allergen_type = ALLERGEN_FRUIT //Made with appleade
/datum/reagent/drink/berrycordial
- name = "Berry Cordial"
- id = "berrycordial"
+ name = REAGENT_BERRYCORDIAL
+ id = REAGENT_ID_BERRYCORDIAL
description = "How berry cordial of you."
taste_description = "sweet chivalry"
color = "#D26EB8"
@@ -2751,8 +2751,8 @@
allergen_type = ALLERGEN_FRUIT //Made with berry and lemonjuice
/datum/reagent/drink/tropicalfizz
- name = "Tropical Fizz"
- id = "tropicalfizz"
+ name = REAGENT_TROPICALFIZZ
+ id = REAGENT_ID_TROPICALFIZZ
description = "One sip and you're in the bahamas."
taste_description = "tropical"
color = "#69375C"
@@ -2764,8 +2764,8 @@
allergen_type = ALLERGEN_FRUIT //Made with several fruit juices
/datum/reagent/drink/fauxfizz
- name = "Faux Fizz"
- id = "fauxfizz"
+ name = REAGENT_FAUXFIZZ
+ id = REAGENT_ID_FAUXFIZZ
description = "One sip and you're in the bahamas... maybe."
taste_description = "slightly tropical"
color = "#69375C"
@@ -2777,14 +2777,14 @@
allergen_type = ALLERGEN_FRUIT //made with several fruit juices
/datum/reagent/drink/syrup
- name = "syrup"
- id = "syrup"
+ name = REAGENT_SYRUP
+ id = REAGENT_ID_SYRUP
description = "A generic, sugary syrup."
taste_description = "sweetness"
color = "#fffbe8"
cup_prefix = "extra sweet"
- glass_name = "syrup"
+ glass_name = REAGENT_ID_SYRUP
glass_desc = "That is just way too much syrup to drink on its own."
allergen_type = ALLERGEN_SUGARS
@@ -2796,8 +2796,8 @@
M.make_dizzy(1)
/datum/reagent/drink/syrup/pumpkin
- name = "pumpkin spice syrup"
- id = "syrup_pumpkin"
+ name = REAGENT_SYRUPPUMPKIN
+ id = REAGENT_ID_SYRUPPUMPKIN
description = "A sugary syrup that tastes of pumpkin spice."
taste_description = "pumpkin spice"
color = "#e0b439"
@@ -2806,32 +2806,32 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
/datum/reagent/drink/syrup/caramel
- name = "caramel syrup"
- id = "syrup_caramel"
+ name = REAGENT_SYRUPCARAMEL
+ id = REAGENT_ID_SYRUPCARAMEL
description = "A sugary syrup that tastes of caramel."
taste_description = "caramel"
color = "#b47921"
cup_prefix = "caramel"
/datum/reagent/drink/syrup/scaramel
- name = "salted caramel syrup"
- id = "syrup_salted_caramel"
+ name = REAGENT_SYRUPSALTEDCARAMEL
+ id = REAGENT_ID_SYRUPSALTEDCARAMEL
description = "A sugary syrup that tastes of salted caramel."
taste_description = "salty caramel"
color = "#9f6714"
cup_prefix = "salted caramel"
/datum/reagent/drink/syrup/irish
- name = "irish cream syrup"
- id = "syrup_irish"
+ name = REAGENT_SYRUPIRISH
+ id = REAGENT_ID_SYRUPIRISH
description = "A sugary syrup that tastes of a light, sweet cream."
taste_description = "creaminess"
color = "#ead3b0"
cup_prefix = "irish"
/datum/reagent/drink/syrup/almond
- name = "almond syrup"
- id = "syrup_almond"
+ name = REAGENT_SYRUPALMOND
+ id = REAGENT_ID_SYRUPALMOND
description = "A sugary syrup that tastes of almonds."
taste_description = "almonds"
color = "#ffb64a"
@@ -2840,16 +2840,16 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_SEEDS
/datum/reagent/drink/syrup/cinnamon
- name = "cinnamon syrup"
- id = "syrup_cinnamon"
+ name = REAGENT_SYRUPCINNAMON
+ id = REAGENT_ID_SYRUPCINNAMON
description = "A sugary syrup that tastes of cinnamon."
taste_description = "cinnamon"
color = "#ec612a"
cup_prefix = "cinnamon"
/datum/reagent/drink/syrup/pistachio
- name = "pistachio syrup"
- id = "syrup_pistachio"
+ name = REAGENT_SYRUPPISTACHIO
+ id = REAGENT_ID_SYRUPPISTACHIO
description = "A sugary syrup that tastes of pistachio."
taste_description = "pistachio"
color = "#c9eb59"
@@ -2858,24 +2858,24 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_SEEDS
/datum/reagent/drink/syrup/vanilla
- name = "vanilla syrup"
- id = "syrup_vanilla"
+ name = REAGENT_SYRUPVANILLA
+ id = REAGENT_ID_SYRUPVANILLA
description = "A sugary syrup that tastes of vanilla."
taste_description = "vanilla"
color = "#eaebd1"
cup_prefix = REAGENT_ID_VANILLA
/datum/reagent/drink/syrup/toffee
- name = "toffee syrup"
- id = "syrup_toffee"
+ name = REAGENT_SYRUPTOFFEE
+ id = REAGENT_ID_SYRUPTOFFEE
description = "A sugary syrup that tastes of toffee."
taste_description = "toffee"
color = "#aa7143"
cup_prefix = "toffee"
/datum/reagent/drink/syrup/cherry
- name = "cherry syrup"
- id = "syrup_cherry"
+ name = REAGENT_SYRUPCHERRY
+ id = REAGENT_ID_SYRUPCHERRY
description = "A sugary syrup that tastes of cherries."
taste_description = "cherries"
color = "#ff0000"
@@ -2884,16 +2884,16 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
/datum/reagent/drink/syrup/butterscotch
- name = "butterscotch syrup"
- id = "syrup_butterscotch"
+ name = REAGENT_SYRUPBUTTERSCOTCH
+ id = REAGENT_ID_SYRUPBUTTERSCOTCH
description = "A sugary syrup that tastes of butterscotch."
taste_description = "butterscotch"
color = "#e6924e"
cup_prefix = "butterscotch"
/datum/reagent/drink/syrup/chocolate
- name = "chocolate syrup"
- id = "syrup_chocolate"
+ name = REAGENT_SYRUPCHOCOLATE
+ id = REAGENT_ID_SYRUPCHOCOLATE
description = "A sugary syrup that tastes of chocolate."
taste_description = REAGENT_ID_CHOCOLATE
color = "#873600"
@@ -2902,8 +2902,8 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE
/datum/reagent/drink/syrup/wchocolate
- name = "white chocolate syrup"
- id = "syrup_white_chocolate"
+ name = REAGENT_SYRUPWHITECHOCOLATE
+ id = REAGENT_ID_SYRUPWHITECHOCOLATE
description = "A sugary syrup that tastes of white chocolate."
taste_description = "white chocolate"
color = "#c4c6a5"
@@ -2912,8 +2912,8 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE
/datum/reagent/drink/syrup/strawberry
- name = "strawberry syrup"
- id = "syrup_strawberry"
+ name = REAGENT_SYRUPSTRAWBERRY
+ id = REAGENT_ID_SYRUPSTRAWBERRY
description = "A sugary syrup that tastes of strawberries."
taste_description = "strawberries"
color = "#ff2244"
@@ -2922,8 +2922,8 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
/datum/reagent/drink/syrup/coconut
- name = "coconut syrup"
- id = "syrup_coconut"
+ name = REAGENT_SYRUPCOCONUT
+ id = REAGENT_ID_SYRUPCOCONUT
description = "A sugary syrup that tastes of coconut."
taste_description = "coconut"
color = "#ffffff"
@@ -2932,32 +2932,32 @@
allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
/datum/reagent/drink/syrup/ginger
- name = "ginger syrup"
- id = "syrup_ginger"
+ name = REAGENT_SYRUPGINGER
+ id = REAGENT_ID_SYRUPGINGER
description = "A sugary syrup that tastes of ginger."
taste_description = "ginger"
color = "#d09740"
cup_prefix = "ginger"
/datum/reagent/drink/syrup/gingerbread
- name = "gingerbread syrup"
- id = "syrup_gingerbread"
+ name = REAGENT_SYRUPGINGERBREAD
+ id = REAGENT_ID_SYRUPGINGERBREAD
description = "A sugary syrup that tastes of gingerbread."
taste_description = "gingerbread"
color = "#b6790f"
cup_prefix = "gingerbread"
/datum/reagent/drink/syrup/peppermint
- name = "peppermint syrup"
- id = "syrup_peppermint"
+ name = REAGENT_SYRUPPEPPERMINT
+ id = REAGENT_ID_SYRUPPEPPERMINT
description = "A sugary syrup that tastes of peppermint."
taste_description = "peppermint"
color = "#9ce06e"
cup_prefix = "peppermint"
/datum/reagent/drink/syrup/birthday_cake
- name = "birthday cake syrup"
- id = "syrup_birthday"
+ name = REAGENT_SYRUPBIRTHDAY
+ id = REAGENT_ID_SYRUPBIRTHDAY
description = "A sugary syrup that tastes of an overload of sweetness."
taste_description = "far too much sugar"
color = "#ff00e6"
@@ -2968,40 +2968,40 @@
// Basic
/datum/reagent/ethanol/absinthe
- name = "Absinthe"
- id = "absinthe"
+ name = REAGENT_ABSINTHE
+ id = REAGENT_ID_ABSINTHE
description = "Watch out that the Green Fairy doesn't come for you!"
taste_description = "licorice"
taste_mult = 1.5
color = "#33EE00"
strength = 12
- glass_name = "absinthe"
+ glass_name = REAGENT_ID_ABSINTHE
glass_desc = "Wormwood, anise, oh my."
/datum/reagent/ethanol/ale
- name = "Ale"
- id = "ale"
+ name = REAGENT_ALE
+ id = REAGENT_ID_ALE
description = "A dark alcoholic beverage made by malted barley and yeast."
taste_description = "hearty barley ale"
color = "#4C3100"
strength = 50
- glass_name = "ale"
+ glass_name = REAGENT_ID_ALE
glass_desc = "A freezing pint of delicious ale"
allergen_type = ALLERGEN_GRAINS //Barley is grain
/datum/reagent/ethanol/beer
- name = "Beer"
- id = "beer"
+ name = REAGENT_BEER
+ id = REAGENT_ID_BEER
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
taste_description = "beer"
color = "#FFD300"
strength = 50
nutriment_factor = 1
- glass_name = "beer"
+ glass_name = REAGENT_ID_BEER
glass_desc = "A freezing pint of beer"
allergen_type = ALLERGEN_GRAINS //Made from grains
@@ -3015,8 +3015,8 @@
M.jitteriness = max(M.jitteriness - 3, 0)
/datum/reagent/ethanol/beer/lite
- name = "Lite Beer"
- id = "litebeer"
+ name = REAGENT_LITEBEER
+ id = REAGENT_ID_LITEBEER
description = "An alcoholic beverage made from malted grains, hops, yeast, water, and water."
taste_description = "bad beer"
color = "#FFD300"
@@ -3029,8 +3029,8 @@
allergen_type = ALLERGEN_GRAINS //Made from grains
/datum/reagent/ethanol/bluecuracao
- name = "Blue Curacao"
- id = "bluecuracao"
+ name = REAGENT_BLUECURACAO
+ id = REAGENT_ID_BLUECURACAO
description = "Exotically blue, fruity drink, distilled from oranges."
taste_description = "oranges"
taste_mult = 1.1
@@ -3043,22 +3043,22 @@
allergen_type = ALLERGEN_FRUIT //Made from oranges(fruit)
/datum/reagent/ethanol/cognac
- name = "Cognac"
- id = "cognac"
+ name = REAGENT_COGNAC
+ id = REAGENT_ID_COGNAC
description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
taste_description = "rich and smooth alcohol"
taste_mult = 1.1
color = "#AB3C05"
strength = 15
- glass_name = "cognac"
+ glass_name = REAGENT_ID_COGNAC
glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
allergen_type = ALLERGEN_FRUIT //Cognac is made from wine which is made from grapes.
/datum/reagent/ethanol/deadrum
- name = "Deadrum"
- id = "deadrum"
+ name = REAGENT_DEADRUM
+ id = REAGENT_ID_DEADRUM
description = "Popular with the sailors. Not very popular with everyone else."
taste_description = "butterscotch and salt"
taste_mult = 1.1
@@ -3076,8 +3076,8 @@
M.dizziness +=5
/datum/reagent/ethanol/firepunch
- name = "Fire Punch"
- id = "firepunch"
+ name = REAGENT_FIREPUNCH
+ id = REAGENT_ID_FIREPUNCH
description = "Yo ho ho and a jar of honey."
taste_description = "sharp butterscotch"
color = "#ECB633"
@@ -3087,14 +3087,14 @@
glass_desc = "Yo ho ho and a jar of honey."
/datum/reagent/ethanol/gin
- name = "Gin"
- id = "gin"
+ name = REAGENT_GIN
+ id = REAGENT_ID_GIN
description = "It's gin. In space. I say, good sir."
taste_description = "an alcoholic christmas tree"
color = "#0064C6"
strength = 50
- glass_name = "gin"
+ glass_name = REAGENT_ID_GIN
glass_desc = "A crystal clear glass of Griffeater gin."
allergen_type = ALLERGEN_FRUIT //Made from juniper berries
@@ -3135,8 +3135,8 @@
M.make_jittery(5)
/datum/reagent/ethanol/coffee/kahlua
- name = "Kahlua"
- id = "kahlua"
+ name = REAGENT_KAHLUA
+ id = REAGENT_ID_KAHLUA
description = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!"
taste_description = "spiked latte"
taste_mult = 1.1
@@ -3148,8 +3148,8 @@
// glass_desc = "DAMN, THIS THING LOOKS ROBUST" //If this isn't what our players should talk like, it isn't what our game should say to them.
/datum/reagent/ethanol/melonliquor
- name = "Melon Liquor"
- id = "melonliquor"
+ name = REAGENT_MELONLIQUOR
+ id = REAGENT_ID_MELONLIQUOR
description = "A relatively sweet and fruity 46 proof liquor."
taste_description = "fruity alcohol"
color = "#138808" // rgb: 19, 136, 8
@@ -3161,8 +3161,8 @@
allergen_type = ALLERGEN_FRUIT //Made from watermelons
/datum/reagent/ethanol/melonspritzer
- name = "Melon Spritzer"
- id = "melonspritzer"
+ name = REAGENT_MELONSPRITZER
+ id = REAGENT_ID_MELONSPRITZER
description = "Melons: Citrus style."
taste_description = "sour melon"
color = "#934D5D"
@@ -3175,31 +3175,31 @@
allergen_type = ALLERGEN_FRUIT //Made from watermelon juice, apple juice, and lime juice
/datum/reagent/ethanol/rum
- name = "Rum"
- id = "rum"
+ name = REAGENT_RUM
+ id = REAGENT_ID_RUM
description = "Yo-ho-ho and all that."
taste_description = "spiked butterscotch"
taste_mult = 1.1
color = "#ECB633"
strength = 15
- glass_name = "rum"
+ glass_name = REAGENT_ID_RUM
glass_desc = "Makes you want to buy a ship and just go pillaging."
/datum/reagent/ethanol/sake //Made from rice, yes. Rice is technically a grain, but also kinda a psuedo-grain, so I don't count it for grain allergies.
- name = "Sake"
- id = "sake"
+ name = REAGENT_SAKE
+ id = REAGENT_ID_SAKE
description = "Anime's favorite drink."
taste_description = "dry alcohol"
color = "#DDDDDD"
strength = 25
- glass_name = "sake"
+ glass_name = REAGENT_ID_SAKE
glass_desc = "A glass of sake."
/datum/reagent/ethanol/sexonthebeach
- name = "Sex On The Beach"
- id = "sexonthebeach"
+ name = REAGENT_SEXONTHEBEACH
+ id = REAGENT_ID_SEXONTHEBEACH
description = "A concoction of vodka and a secret combination of orange juice and pomegranate."
taste_description = "60% orange juice, 40% pomegranate, 100% alcohol"
color = "#7051E3"
@@ -3211,8 +3211,8 @@
allergen_type = ALLERGEN_FRUIT //Made from orange juice
/datum/reagent/ethanol/tequila
- name = "Tequila"
- id = "tequilla"
+ name = REAGENT_TEQUILLA
+ id = REAGENT_ID_TEQUILLA
description = "A strong and mildly flavored, Mexican produced spirit. Feeling thirsty hombre?"
taste_description = "paint thinner"
color = "#FFFF91"
@@ -3222,15 +3222,15 @@
glass_desc = "Now all that's missing is the weird colored shades!"
/datum/reagent/ethanol/thirteenloko
- name = "Thirteen Loko"
- id = "thirteenloko"
+ name = REAGENT_THIRTEENLOKO
+ id =REAGENT_ID_THIRTEENLOKO
description = "A potent mixture of caffeine and alcohol."
taste_description = "battery acid"
color = "#102000"
strength = 25
nutriment_factor = 1
- glass_name = "Thirteen Loko"
+ glass_name = REAGENT_THIRTEENLOKO
glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
allergen_type = ALLERGEN_STIMULANT //Holy shit dude.
@@ -3246,27 +3246,27 @@
M.make_jittery(5)
/datum/reagent/ethanol/vermouth
- name = "Vermouth"
- id = "vermouth"
+ name = REAGENT_VERMOUTH
+ id = REAGENT_ID_VERMOUTH
description = "You suddenly feel a craving for a martini..."
taste_description = "dry alcohol"
taste_mult = 1.3
color = "#91FF91" // rgb: 145, 255, 145
strength = 15
- glass_name = "vermouth"
+ glass_name = REAGENT_ID_VERMOUTH
glass_desc = "You wonder why you're even drinking this straight."
allergen_type = ALLERGEN_FRUIT //Vermouth is made from wine which is made from grapes(fruit)
/datum/reagent/ethanol/vodka
- name = "Vodka"
- id = "vodka"
+ name = REAGENT_VODKA
+ id = REAGENT_ID_VODKA
description = "Number one drink AND fueling choice for Russians worldwide."
taste_description = "grain alcohol"
color = "#0064C8" // rgb: 0, 100, 200
strength = 15
- glass_name = "vodka"
+ glass_name = REAGENT_ID_VODKA
glass_desc = "The glass contain wodka. Xynta."
allergen_type = ALLERGEN_GRAINS //Vodka is made from grains
@@ -3277,21 +3277,21 @@
M.apply_effect(max(M.radiation - 1 * removed, 0), IRRADIATE, check_protection = 0)
/datum/reagent/ethanol/whiskey
- name = "Whiskey"
- id = "whiskey"
+ name = REAGENT_WHISKEY
+ id = REAGENT_ID_WHISKEY
description = "A superb and well-aged single-malt whiskey. Damn."
taste_description = "molasses"
color = "#4C3100"
strength = 25
- glass_name = "whiskey"
+ glass_name = REAGENT_ID_WHISKEY
glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
allergen_type = ALLERGEN_GRAINS //Whiskey is also made from grain.
/datum/reagent/ethanol/redwine
- name = "Red Wine"
- id = "redwine"
+ name = REAGENT_REDWINE
+ id = REAGENT_ID_REDWINE
description = "An premium alchoholic beverage made from distilled grape juice."
taste_description = "bitter sweetness"
color = "#7E4043" // rgb: 126, 64, 67
@@ -3303,8 +3303,8 @@
allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
/datum/reagent/ethanol/whitewine
- name = "White Wine"
- id = "whitewine"
+ name = REAGENT_WHITEWINE
+ id = REAGENT_ID_WHITEWINE
description = "An premium alchoholic beverage made from fermenting of the non-coloured pulp of grapes."
taste_description = "light fruity flavor"
color = "#F4EFB0" // rgb: 244, 239, 176
@@ -3316,21 +3316,21 @@
allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
/datum/reagent/ethanol/carnoth
- name = "Carnoth"
- id = "carnoth"
+ name = REAGENT_CARNOTH
+ id = REAGENT_ID_CARNOTH
description = "An premium alchoholic beverage made with multiple hybridized species of grapes that give it a dark maroon coloration."
taste_description = "alcoholic sweet flavor"
color = "#5B0000" // rgb: 0, 100, 35
strength = 20
- glass_name = "carnoth"
+ glass_name = REAGENT_ID_CARNOTH
glass_desc = "A very classy looking drink."
allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
/datum/reagent/ethanol/pwine
- name = "Poison Wine"
- id = "pwine"
+ name = REAGENT_PWINE
+ id = REAGENT_ID_PWINE
description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
color = "#000000"
strength = 10
@@ -3357,26 +3357,26 @@
L.take_damage(100, 0)
/datum/reagent/ethanol/wine/champagne
- name = "Champagne"
- id = "champagne"
+ name = REAGENT_CHAMPAGNE
+ id = REAGENT_ID_CHAMPAGNE
description = "A sparkling wine made with Pinot Noir, Pinot Meunier, and Chardonnay."
taste_description = "fizzy bitter sweetness"
color = "#D1B166"
- glass_name = "champagne"
+ glass_name = REAGENT_ID_CHAMPAGNE
glass_desc = "An even classier looking drink."
allergen_type = ALLERGEN_FRUIT //Still wine, and still made from grapes (fruit)
/datum/reagent/ethanol/cider
- name = "Cider"
- id = "cider"
+ name = REAGENT_CIDER
+ id = REAGENT_ID_CIDER
description = "Hard? Soft? No-one knows but it'll get you drunk."
taste_description = "tartness"
color = "#CE9C00" // rgb: 206, 156, 0
strength = 10
- glass_name = "cider"
+ glass_name = REAGENT_ID_CIDER
glass_desc = "The second most Irish drink."
glass_special = list(DRINK_FIZZ)
@@ -3386,22 +3386,22 @@
/datum/reagent/ethanol/acid_spit
- name = "Acid Spit"
- id = "acidspit"
+ name = REAGENT_ACIDSPIT
+ id = REAGENT_ID_ACIDSPIT
description = "A drink for the daring, can be deadly if incorrectly prepared!"
taste_description = "bitter tang"
reagent_state = LIQUID
color = "#365000"
strength = 30
- glass_name = "Acid Spit"
+ glass_name = REAGENT_ACIDSPIT
glass_desc = "A drink from the company archives. Made from live aliens."
allergen_type = ALLERGEN_FRUIT //Made from wine (fruit)
/datum/reagent/ethanol/alliescocktail
- name = "Allies Cocktail"
- id = "alliescocktail"
+ name = REAGENT_ALLIESCOCKTAIL
+ id = REAGENT_ID_ALLIESCOCKTAIL
description = "A drink made from your allies, not as sweet as when made from your enemies."
taste_description = "bitter sweetness"
color = "#D8AC45"
@@ -3413,48 +3413,48 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka(grain) as well as martini(vermouth(fruit) and gin(fruit))
/datum/reagent/ethanol/aloe
- name = "Aloe"
- id = "aloe"
+ name = REAGENT_ALOE
+ id = REAGENT_ID_ALOE
description = "So very, very, very good."
taste_description = "sweet and creamy"
color = "#B7EA75"
strength = 15
- glass_name = "Aloe"
+ glass_name = REAGENT_ALOE
glass_desc = "Very, very, very good."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from cream(dairy), whiskey(grains), and watermelon juice(fruit)
/datum/reagent/ethanol/amasec
- name = "Amasec"
- id = "amasec"
+ name = REAGENT_AMASEC
+ id = REAGENT_ID_AMASEC
description = "Official drink of the Gun Club!"
taste_description = "dark and metallic"
reagent_state = LIQUID
color = "#FF975D"
strength = 25
- glass_name = "Amasec"
+ glass_name = REAGENT_AMASEC
glass_desc = "Always handy before combat!"
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from wine(fruit) and vodka(grains)
/datum/reagent/ethanol/andalusia
- name = "Andalusia"
- id = "andalusia"
+ name = REAGENT_ANDALUSIA
+ id = REAGENT_ID_ANDALUSIA
description = "A nice, strangely named drink."
taste_description = "lemons"
color = "#F4EA4A"
strength = 15
- glass_name = "Andalusia"
+ glass_name = REAGENT_ANDALUSIA
glass_desc = "A nice, strange named drink."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from whiskey(grains) and lemonjuice (fruit)
/datum/reagent/ethanol/antifreeze
- name = "Anti-freeze"
- id = "antifreeze"
+ name = REAGENT_ANTIFREEZE
+ id = REAGENT_ID_ANTIFREEZE
description = "Ultimate refreshment."
taste_description = "ice cold vodka"
color = "#56DEEA"
@@ -3462,14 +3462,14 @@
adj_temp = 20
targ_temp = 330
- glass_name = "Anti-freeze"
+ glass_name = REAGENT_ANTIFREEZE
glass_desc = "The ultimate refreshment."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from vodka(grains) and cream(dairy)
/datum/reagent/ethanol/atomicbomb
- name = "Atomic Bomb"
- id = "atomicbomb"
+ name = REAGENT_ATOMICBOMB
+ id = REAGENT_ID_ATOMICBOMB
description = "Nuclear proliferation never tasted so good."
taste_description = "coffee, almonds, and whiskey, with a kick"
reagent_state = LIQUID
@@ -3477,28 +3477,28 @@
strength = 10
druggy = 50
- glass_name = "Atomic Bomb"
+ glass_name = REAGENT_ATOMICBOMB
glass_desc = "We cannot take legal responsibility for your actions after imbibing."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from b52 which contains kahlua(coffee/caffeine), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy))
/datum/reagent/ethanol/coffee/b52
- name = "B-52"
- id = "b52"
+ name = REAGENT_B52
+ id = REAGENT_ID_B52
description = "Kahlua, Irish cream, and cognac. You will get bombed."
taste_description = "coffee, almonds, and whiskey"
taste_mult = 1.3
color = "#997650"
strength = 12
- glass_name = "B-52"
+ glass_name = REAGENT_B52
glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from kahlua(coffee/caffeine), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy))
/datum/reagent/ethanol/bahama_mama
- name = "Bahama mama"
- id = "bahama_mama"
+ name = REAGENT_BAHAMAMAMA
+ id = REAGENT_ID_BAHAMAMAMA
description = "Tropical cocktail."
taste_description = "lime and orange"
color = "#FF7F3B"
@@ -3510,8 +3510,8 @@
allergen_type = ALLERGEN_FRUIT //Made from orange juice and lime juice
/datum/reagent/ethanol/bananahonk
- name = "Banana Mama"
- id = "bananahonk"
+ name = REAGENT_BANANAHONK
+ id = REAGENT_ID_BANANAHONK
description = "A drink from " + JOB_CLOWN + " Heaven."
taste_description = "bananas and sugar"
nutriment_factor = 1
@@ -3524,21 +3524,21 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from banana juice(fruit) and cream(dairy)
/datum/reagent/ethanol/barefoot
- name = "Barefoot"
- id = "barefoot"
+ name = REAGENT_BAREFOOT
+ id = REAGENT_ID_BAREFOOT
description = "Barefoot and pregnant."
taste_description = "creamy berries"
color = "#FFCDEA"
strength = 30
- glass_name = "Barefoot"
+ glass_name = REAGENT_BAREFOOT
glass_desc = "Barefoot and pregnant."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from berry juice (fruit), cream(dairy), and vermouth(fruit)
/datum/reagent/ethanol/beepsky_smash
- name = "Beepsky Smash"
- id = "beepskysmash"
+ name = REAGENT_BEEPSKYSMASH
+ id = REAGENT_ID_BEEPSKYSMASH
description = "Deny drinking this and prepare for THE LAW."
taste_description = "whiskey and citrus"
taste_mult = 2
@@ -3546,7 +3546,7 @@
color = "#404040"
strength = 12
- glass_name = "Beepsky Smash"
+ glass_name = REAGENT_BEEPSKYSMASH
glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from whiskey(grains), and limejuice(fruit)
@@ -3558,86 +3558,86 @@
M.Stun(2)
/datum/reagent/ethanol/bilk
- name = "Bilk"
- id = "bilk"
+ name = REAGENT_BILK
+ id = REAGENT_ID_BILK
description = "This appears to be beer mixed with milk. Disgusting."
taste_description = "sour milk"
color = "#895C4C"
strength = 50
nutriment_factor = 2
- glass_name = "bilk"
+ glass_name = REAGENT_ID_BILK
glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from milk(dairy) and beer(grains)
/datum/reagent/ethanol/black_russian
- name = "Black Russian"
- id = "blackrussian"
+ name = REAGENT_BLACKRUSSIAN
+ id = REAGENT_ID_BLACKRUSSIAN
description = "For the lactose-intolerant. Still as classy as a White Russian."
taste_description = "coffee"
color = "#360000"
strength = 15
- glass_name = "Black Russian"
+ glass_name = REAGENT_BLACKRUSSIAN
glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from vodka(grains) and kahlua(coffee/caffeine)
/datum/reagent/ethanol/bloody_mary
- name = "Bloody Mary"
- id = "bloodymary"
+ name = REAGENT_BLOODYMARY
+ id = REAGENT_ID_BLOODYMARY
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
taste_description = "tomatoes with a hint of lime"
color = "#B40000"
strength = 15
- glass_name = "Bloody Mary"
+ glass_name = REAGENT_BLOODYMARY
glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka (grains), tomato juice(fruit), and lime juice(fruit)
/datum/reagent/ethanol/booger
- name = "Booger"
- id = "booger"
+ name = REAGENT_BOOGER
+ id = REAGENT_ID_BOOGER
description = "Ewww..."
taste_description = "sweet 'n creamy"
color = "#8CFF8C"
strength = 30
- glass_name = "Booger"
+ glass_name = REAGENT_BOOGER
glass_desc = "Ewww..."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from cream(dairy), banana juice(fruit), and watermelon juice(fruit)
/datum/reagent/ethanol/coffee/brave_bull //Since it's under the /coffee subtype, it already has coffee and caffeine allergens.
- name = "Brave Bull"
- id = "bravebull"
+ name = REAGENT_BRAVEBULL
+ id = REAGENT_ID_BRAVEBULL
description = "It's just as effective as Dutch-Courage!"
taste_description = "coffee and paint thinner"
taste_mult = 1.1
color = "#4C3100"
strength = 15
- glass_name = "Brave Bull"
+ glass_name = REAGENT_BRAVEBULL
glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up."
/datum/reagent/ethanol/changelingsting
- name = "Changeling Sting"
- id = "changelingsting"
+ name = REAGENT_CHANGELINGSTING
+ id = REAGENT_ID_CHANGELINGSTING
description = "You take a tiny sip and feel a burning sensation..."
taste_description = "constantly changing flavors"
color = "#2E6671"
strength = 10
- glass_name = "Changeling Sting"
+ glass_name = REAGENT_CHANGELINGSTING
glass_desc = "A stingy drink."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from screwdriver(vodka(grains), orange juice(fruit)), lime juice(fruit), and lemon juice(fruit)
/datum/reagent/ethanol/martini
- name = "Classic Martini"
- id = "martini"
+ name = REAGENT_MARTINI
+ id = REAGENT_ID_MARTINI
description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
taste_description = "dry class"
color = "#0064C8"
@@ -3649,31 +3649,20 @@
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and vermouth(fruit)
/datum/reagent/ethanol/cuba_libre
- name = "Cuba Libre"
- id = "cubalibre"
+ name = REAGENT_CUBALIBRE
+ id = REAGENT_ID_CUBALIBRE
description = "Rum, mixed with cola and a splash of lime. Viva la revolucion."
taste_description = "cola with lime"
color = "#3E1B00"
strength = 30
- glass_name = "Cuba Libre"
+ glass_name = REAGENT_CUBALIBRE
glass_desc = "A classic mix of rum, cola, and lime."
allergen_type = ALLERGEN_STIMULANT //Cola
/datum/reagent/ethanol/rum_and_cola
- name = "Rum and Cola"
- id = "rumandcola"
- description = "A classic mix of sugar with more sugar."
- taste_description = "cola"
- color = "#3E1B00"
- strength = 30
-
- glass_name = "Cuba Libre"
- glass_desc = "A classic mix of rum, cola, and lime."
-
-/datum/reagent/ethanol/rum_and_cola
- name = "Rum and Cola"
- id = "rumandcola"
+ name = REAGENT_RUMANDCOLA
+ id = REAGENT_ID_RUMANDCOLA
description = "A classic mix of sugar with more sugar."
taste_description = "cola"
color = "#3E1B00"
@@ -3684,8 +3673,8 @@
allergen_type = ALLERGEN_STIMULANT // Cola
/datum/reagent/ethanol/demonsblood
- name = "Demons Blood"
- id = "demonsblood"
+ name = REAGENT_DEMONSBLOOD
+ id = REAGENT_ID_DEMONSBLOOD
description = "This thing makes the hair on the back of your neck stand up."
taste_description = "sweet tasting iron"
taste_mult = 1.5
@@ -3697,8 +3686,8 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from space mountain wind(fruit) and dr.gibb(caffeine)
/datum/reagent/ethanol/devilskiss
- name = "Devils Kiss"
- id = "devilskiss"
+ name = REAGENT_DEVILSKISS
+ id = REAGENT_ID_DEVILSKISS
description = "Creepy time!"
taste_description = "bitter iron"
color = "#A68310"
@@ -3709,21 +3698,21 @@
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from kahlua (Coffee)
/datum/reagent/ethanol/driestmartini
- name = "Driest Martini"
- id = "driestmartini"
+ name = REAGENT_DRIESTMARTINI
+ id = REAGENT_ID_DRIESTMARTINI
description = "Only for the experienced. You think you see sand floating in the glass."
taste_description = "a beach"
nutriment_factor = 1
color = "#2E6671"
strength = 12
- glass_name = "Driest Martini"
+ glass_name = REAGENT_DRIESTMARTINI
glass_desc = "Only for the experienced. You think you see sand floating in the glass."
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit)
/datum/reagent/ethanol/ginfizz
- name = "Gin Fizz"
- id = "ginfizz"
+ name = REAGENT_GINFIZZ
+ id = REAGENT_ID_GINFIZZ
description = "Refreshingly lemony, deliciously dry."
taste_description = "dry, tart lemons"
color = "#FFFFAE"
@@ -3735,33 +3724,33 @@
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and lime juice(fruit)
/datum/reagent/ethanol/grog
- name = "Grog"
- id = "grog"
+ name = REAGENT_GROG
+ id = REAGENT_ID_GROG
description = "Watered-down rum, pirate approved!"
taste_description = "a poor excuse for alcohol"
reagent_state = LIQUID
color = "#FFBB00"
strength = 100
- glass_name = "grog"
+ glass_name = REAGENT_ID_GROG
glass_desc = "A fine and cepa drink for Space."
/datum/reagent/ethanol/erikasurprise
- name = "Erika Surprise"
- id = "erikasurprise"
+ name = REAGENT_ERIKASURPRISE
+ id = REAGENT_ID_ERIKASURPRISE
description = "The surprise is, it's green!"
taste_description = "tartness and bananas"
color = "#2E6671"
strength = 15
- glass_name = "Erika Surprise"
+ glass_name = REAGENT_ERIKASURPRISE
glass_desc = "The surprise is, it's green!"
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from ale (grains), lime juice (fruit), whiskey(grains), banana juice(fruit)
/datum/reagent/ethanol/gargle_blaster
- name = "Pan-Galactic Gargle Blaster"
- id = "gargleblaster"
+ name = REAGENT_GARGLEBLASTER
+ id = REAGENT_ID_GARGLEBLASTER
description = "Whoah, this stuff looks volatile!"
taste_description = "your brains smashed out by a lemon wrapped around a gold brick"
taste_mult = 5
@@ -3770,14 +3759,14 @@
strength = 10
druggy = 15
- glass_name = "Pan-Galactic Gargle Blaster"
+ glass_name = REAGENT_GARGLEBLASTER
glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grains), gin(fruit), whiskey(grains), cognac(fruit), and lime juice(fruit)
/datum/reagent/ethanol/gintonic
- name = "Gin and Tonic"
- id = "gintonic"
+ name = REAGENT_GINTONIC
+ id = REAGENT_ID_GINTONIC
description = "An all time classic, mild cocktail."
taste_description = "mild and tart"
color = "#0064C8"
@@ -3789,22 +3778,22 @@
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit)
/datum/reagent/ethanol/goldschlager
- name = "Goldschlager"
- id = "goldschlager"
+ name = REAGENT_GOLDSCHLAGER
+ id = REAGENT_ID_GOLDSCHLAGER
description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
taste_description = "burning cinnamon"
taste_mult = 1.3
color = "#F4E46D"
strength = 15
- glass_name = "Goldschlager"
+ glass_name = REAGENT_GOLDSCHLAGER
glass_desc = "100 proof that teen girls will drink anything with gold in it."
allergen_type = ALLERGEN_GRAINS //Made from vodka(grains)
/datum/reagent/ethanol/hippies_delight
- name = "Hippies' Delight"
- id = "hippiesdelight"
+ name = REAGENT_HIPPIESDELIGHT
+ id = REAGENT_ID_HIPPIESDELIGHT
description = "You just don't get it maaaan."
taste_description = "giving peace a chance"
reagent_state = LIQUID
@@ -3819,20 +3808,20 @@
//Also, yes. Mushrooms produce psilocybin; however, it's also still just a chemical compound, and not necessarily going to trigger a fungi allergy.
/datum/reagent/ethanol/hooch
- name = "Hooch"
- id = "hooch"
+ name = REAGENT_HOOCH
+ id = REAGENT_ID_HOOCH
description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?"
taste_description = "pure alcohol"
color = "#4C3100"
strength = 25
toxicity = 2
- glass_name = "Hooch"
+ glass_name = REAGENT_HOOCH
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
/datum/reagent/ethanol/iced_beer
- name = "Iced Beer"
- id = "iced_beer"
+ name = REAGENT_ICEDBEER
+ id = REAGENT_ID_ICEDBEER
description = "A beer which is so cold the air around it freezes."
taste_description = "refreshingly cold"
color = "#FFD300"
@@ -3846,21 +3835,21 @@
allergen_type = ALLERGEN_GRAINS //Made from beer(grains)
/datum/reagent/ethanol/irishcarbomb
- name = "Irish Car Bomb"
- id = "irishcarbomb"
+ name = REAGENT_IRISHCARBOMB
+ id = REAGENT_ID_IRISHCARBOMB
description = "Mmm, tastes like chocolate cake..."
taste_description = "delicious anger"
color = "#2E6671"
strength = 15
- glass_name = "Irish Car Bomb"
+ glass_name = REAGENT_IRISHCARBOMB
glass_desc = "An irish car bomb."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from ale(grains) and irish cream(whiskey(grains), cream(dairy))
/datum/reagent/ethanol/coffee/irishcoffee
- name = "Irish Coffee"
- id = "irishcoffee"
+ name = REAGENT_IRISHCOFFEE
+ id = REAGENT_ID_IRISHCOFFEE
description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
taste_description = "giving up on the day"
color = "#4C3100"
@@ -3872,8 +3861,8 @@
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from Coffee(coffee/caffeine) and irish cream(whiskey(grains), cream(dairy))
/datum/reagent/ethanol/irish_cream
- name = "Irish Cream"
- id = "irishcream"
+ name = REAGENT_IRISHCREAM
+ id = REAGENT_ID_IRISHCREAM
description = "Whiskey-imbued cream, what else would you expect from the Irish."
taste_description = "creamy alcohol"
color = "#DDD9A3"
@@ -3885,8 +3874,8 @@
allergen_type = ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from cream(dairy) and whiskey(grains)
/datum/reagent/ethanol/longislandicedtea
- name = "Long Island Iced Tea"
- id = "longislandicedtea"
+ name = REAGENT_LONGISLANDICEDTEA
+ id = REAGENT_ID_LONGISLANDICEDTEA
description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
taste_description = "sweet tea, with a kick"
color = "#895B1F"
@@ -3898,60 +3887,60 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from vodka(grains), cola(caffeine) and gin(fruit)
/datum/reagent/ethanol/manhattan
- name = "Manhattan"
- id = "manhattan"
+ name = REAGENT_MANHATTAN
+ id = REAGENT_ID_MANHATTAN
description = "The Detective's undercover drink of choice. He never could stomach gin..."
taste_description = "mild dryness"
color = "#C13600"
strength = 15
- glass_name = "Manhattan"
+ glass_name = REAGENT_MANHATTAN
glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from whiskey(grains), and vermouth(fruit)
/datum/reagent/ethanol/manhattan_proj
- name = "Manhattan Project"
- id = "manhattan_proj"
+ name = REAGENT_MANHATTANPROJ
+ id = REAGENT_ID_MANHATTANPROJ
description = "A scientist's drink of choice, for pondering ways to blow up the station."
taste_description = "death, the destroyer of worlds"
color = "#C15D00"
strength = 10
druggy = 30
- glass_name = "Manhattan Project"
+ glass_name = REAGENT_MANHATTANPROJ
glass_desc = "A scientist's drink of choice, for thinking how to blow up the station."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from manhattan which is made from whiskey(grains), and vermouth(fruit)
/datum/reagent/ethanol/manly_dorf
- name = "The Manly Dorf"
- id = "manlydorf"
+ name = REAGENT_MANLYDORF
+ id = REAGENT_ID_MANLYDORF
description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
taste_description = "hair on your chest and your chin"
color = "#4C3100"
strength = 25
- glass_name = "The Manly Dorf"
+ glass_name = REAGENT_MANLYDORF
glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only."
allergen_type = ALLERGEN_GRAINS //Made from beer(grains) and ale(grains)
/datum/reagent/ethanol/margarita
- name = "Margarita"
- id = "margarita"
+ name = REAGENT_MARGARITA
+ id = REAGENT_ID_MARGARITA
description = "On the rocks with salt on the rim. Arriba~!"
taste_description = "dry and salty"
color = "#8CFF8C"
strength = 15
- glass_name = "margarita"
+ glass_name = REAGENT_ID_MARGARITA
glass_desc = "On the rocks with salt on the rim. Arriba~!"
allergen_type = ALLERGEN_FRUIT //Made from lime juice(fruit)
/datum/reagent/ethanol/mead
- name = "Mead"
- id = "mead"
+ name = REAGENT_MEAD
+ id = REAGENT_ID_MEAD
description = "A Viking's drink, though a cheap one."
taste_description = "sweet yet alcoholic"
reagent_state = LIQUID
@@ -3959,31 +3948,31 @@
strength = 30
nutriment_factor = 1
- glass_name = "mead"
+ glass_name = REAGENT_ID_MEAD
glass_desc = "A Viking's beverage, though a cheap one."
/datum/reagent/ethanol/moonshine
- name = "Moonshine"
- id = "moonshine"
+ name = REAGENT_MOONSHINE
+ id = REAGENT_ID_MOONSHINE
description = "You've really hit rock bottom now... your liver packed its bags and left last night."
taste_description = "bitterness"
taste_mult = 2.5
color = "#0064C8"
strength = 12
- glass_name = "moonshine"
+ glass_name = REAGENT_ID_MOONSHINE
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
/datum/reagent/ethanol/neurotoxin
- name = "Neurotoxin"
- id = "neurotoxin"
+ name = REAGENT_NEUROTOXIN
+ id = REAGENT_ID_NEUROTOXIN
description = "A strong neurotoxin that puts the subject into a death-like state."
taste_description = "a numbing sensation"
reagent_state = LIQUID
color = "#2E2E61"
strength = 10
- glass_name = "Neurotoxin"
+ glass_name = REAGENT_NEUROTOXIN
glass_desc = "A drink that is guaranteed to knock you silly."
glass_icon = DRINK_ICON_NOISY
glass_special = list("neuroright")
@@ -3997,19 +3986,19 @@
M.Weaken(3)
/datum/reagent/ethanol/patron
- name = "Patron"
- id = "patron"
+ name = REAGENT_PATRON
+ id = REAGENT_ID_PATRON
description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
taste_description = "metallic paint thinner"
color = "#585840"
strength = 30
- glass_name = "Patron"
+ glass_name = REAGENT_PATRON
glass_desc = "Drinking patron in the bar, with all the subpar ladies."
/datum/reagent/ethanol/red_mead
- name = "Red Mead"
- id = "red_mead"
+ name = REAGENT_REDMEAD
+ id = REAGENT_ID_REDMEAD
description = "The true Viking's drink! Even though it has a strange red color."
taste_description = "sweet and salty alcohol"
color = "#C73C00"
@@ -4019,8 +4008,8 @@
glass_desc = "A true Viking's beverage, though its color is strange."
/datum/reagent/ethanol/sbiten
- name = "Sbiten"
- id = "sbiten"
+ name = REAGENT_SBITEN
+ id = REAGENT_ID_SBITEN
description = "A spicy Vodka! Might be a bit hot for the little guys!"
taste_description = "hot and spice"
color = "#FFA371"
@@ -4028,27 +4017,27 @@
adj_temp = 50
targ_temp = 360
- glass_name = "Sbiten"
+ glass_name = REAGENT_SBITEN
glass_desc = "A spicy mix of Vodka and Spice. Very hot."
allergen_type = ALLERGEN_GRAINS //Made from vodka(grains)
/datum/reagent/ethanol/screwdrivercocktail
- name = "Screwdriver"
- id = "screwdrivercocktail"
+ name = REAGENT_SCREWDRIVERCOCKTAIL
+ id = REAGENT_ID_SCREWDRIVERCOCKTAIL
description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
taste_description = "oranges"
color = "#A68310"
strength = 15
- glass_name = "Screwdriver"
+ glass_name = REAGENT_SCREWDRIVERCOCKTAIL
glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grains) and orange juice(fruit)
/datum/reagent/ethanol/silencer
- name = "Silencer"
- id = "silencer"
+ name = REAGENT_SILENCER
+ id = REAGENT_ID_SILENCER
description = "A drink from " + JOB_MIME + " Heaven."
taste_description = "a pencil eraser"
taste_mult = 1.2
@@ -4056,65 +4045,65 @@
color = "#FFFFFF"
strength = 12
- glass_name = "Silencer"
+ glass_name = REAGENT_SILENCER
glass_desc = "A drink from mime Heaven."
allergen_type = ALLERGEN_DAIRY //Made from cream (dairy)
/datum/reagent/ethanol/singulo
- name = "Singulo"
- id = "singulo"
+ name = REAGENT_SINGULO
+ id = REAGENT_ID_SINGULO
description = "A blue-space beverage!"
taste_description = "concentrated matter"
color = "#2E6671"
strength = 10
- glass_name = "Singulo"
+ glass_name = REAGENT_SINGULO
glass_desc = "A blue-space beverage."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka(grains) and wine(fruit)
/datum/reagent/ethanol/snowwhite
- name = "Snow White"
- id = "snowwhite"
+ name = REAGENT_SNOWWHITE
+ id = REAGENT_ID_SNOWWHITE
description = "A cold refreshment"
taste_description = "refreshing cold"
color = "#FFFFFF"
strength = 30
- glass_name = "Snow White"
+ glass_name = REAGENT_SNOWWHITE
glass_desc = "A cold refreshment."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //made from Pineapple juice(fruit), lemon_lime(fruit), and kahlua(coffee/caffine)
/datum/reagent/ethanol/suidream
- name = "Sui Dream"
- id = "suidream"
+ name = REAGENT_SUIDREAM
+ id = REAGENT_ID_SUIDREAM
description = "Comprised of: White soda, blue curacao, melon liquor."
taste_description = "fruit"
color = "#00A86B"
strength = 100
- glass_name = "Sui Dream"
+ glass_name = REAGENT_SUIDREAM
glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame."
allergen_type = ALLERGEN_FRUIT //Made from blue curacao(fruit) and melon liquor(fruit)
/datum/reagent/ethanol/syndicatebomb
- name = "Syndicate Bomb"
- id = "syndicatebomb"
+ name = REAGENT_SYNDICATEBOMB
+ id = REAGENT_ID_SYNDICATEBOMB
description = "Tastes like terrorism!"
taste_description = "strong alcohol"
color = "#2E6671"
strength = 10
- glass_name = "Syndicate Bomb"
+ glass_name = REAGENT_SYNDICATEBOMB
glass_desc = "Tastes like terrorism!"
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from beer(grain) and whiskeycola(whiskey(grain) and cola(caffeine))
/datum/reagent/ethanol/tequilla_sunrise
- name = "Tequila Sunrise"
- id = "tequillasunrise"
+ name = REAGENT_TEQUILLASUNRISE
+ id = REAGENT_ID_TEQUILLASUNRISE
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~."
taste_description = "oranges"
color = "#FFE48C"
@@ -4124,8 +4113,8 @@
glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..."
/datum/reagent/ethanol/threemileisland
- name = "Three Mile Island Iced Tea"
- id = "threemileisland"
+ name = REAGENT_THREEMILEISLAND
+ id = REAGENT_ID_THREEMILEISLAND
description = "Made for a woman, strong enough for a man."
taste_description = "dry"
color = "#666340"
@@ -4138,8 +4127,8 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from long island iced tea(vodka(grains) and gin(fruit))
/datum/reagent/ethanol/toxins_special
- name = "Toxins Special"
- id = "phoronspecial"
+ name = REAGENT_PHORONSPECIAL
+ id = REAGENT_ID_PHORONSPECIAL
description = "This thing is literally on fire!"
taste_description = "spicy toxins"
reagent_state = LIQUID
@@ -4148,14 +4137,14 @@
adj_temp = 15
targ_temp = 330
- glass_name = "Toxins Special"
+ glass_name = REAGENT_PHORONSPECIAL
glass_desc = "Whoah, this thing is on fire!"
allergen_type = ALLERGEN_FRUIT //Made from vermouth(fruit)
/datum/reagent/ethanol/vodkamartini
- name = "Vodka Martini"
- id = "vodkamartini"
+ name = REAGENT_VODKAMARTINI
+ id = REAGENT_ID_VODKAMARTINI
description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
taste_description = "shaken, not stirred"
color = "#0064C8"
@@ -4167,8 +4156,8 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //made from vodka(grains) and vermouth(fruit)
/datum/reagent/ethanol/vodkatonic
- name = "Vodka and Tonic"
- id = "vodkatonic"
+ name = REAGENT_VODKATONIC
+ id = REAGENT_ID_VODKATONIC
description = "For when a gin and tonic isn't Russian enough."
taste_description = "tart bitterness"
color = "#0064C8" // rgb: 0, 100, 200
@@ -4180,21 +4169,21 @@
allergen_type = ALLERGEN_GRAINS //Made from vodka(grains)
/datum/reagent/ethanol/white_russian
- name = "White Russian"
- id = "whiterussian"
+ name = REAGENT_WHITERUSSIAN
+ id = REAGENT_ID_WHITERUSSIAN
description = "That's just, like, your opinion, man..."
taste_description = "coffee icecream"
color = "#A68340"
strength = 15
- glass_name = "White Russian"
+ glass_name = REAGENT_WHITERUSSIAN
glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_STIMULANT //Made from black russian(vodka(grains), kahlua(coffee/caffeine)) and cream(dairy)
/datum/reagent/ethanol/whiskey_cola
- name = "Whiskey Cola"
- id = "whiskeycola"
+ name = REAGENT_WHISKEYCOLA
+ id = REAGENT_ID_WHISKEYCOLA
description = "Whiskey, mixed with cola. Surprisingly refreshing."
taste_description = "cola with an alcoholic undertone"
color = "#3E1B00"
@@ -4206,8 +4195,8 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from whiskey(grains) and cola(caffeine)
/datum/reagent/ethanol/whiskeysoda
- name = "Whiskey Soda"
- id = "whiskeysoda"
+ name = REAGENT_WHISKEYSODA
+ id = REAGENT_ID_WHISKEYSODA
description = "Ultimate refreshment."
taste_description = "carbonated whiskey"
color = "#EAB300"
@@ -4219,8 +4208,8 @@
allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains)
/datum/reagent/ethanol/specialwhiskey // I have no idea what this is and where it comes from
- name = "Special Blend Whiskey"
- id = "specialwhiskey"
+ name = REAGENT_SPECIALWHISKEY
+ id = REAGENT_ID_SPECIALWHISKEY
description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils."
taste_description = "unspeakable whiskey bliss"
color = "#523600"
@@ -4232,8 +4221,8 @@
allergen_type = ALLERGEN_GRAINS //Whiskey(grains)
/datum/reagent/ethanol/unathiliquor
- name = "Redeemer's Brew"
- id = "unathiliquor"
+ name = REAGENT_UNATHILIQUOR
+ id = REAGENT_ID_UNATHILIQUOR
description = "This barely qualifies as a drink, and could give jet fuel a run for its money. Also known to cause feelings of euphoria and numbness."
taste_description = "spiced numbness"
color = "#242424"
@@ -4258,219 +4247,219 @@
step(M, pick(cardinal))
/datum/reagent/ethanol/sakebomb
- name = "Sake Bomb"
- id = "sakebomb"
+ name = REAGENT_SAKEBOMB
+ id = REAGENT_ID_SAKEBOMB
description = "Alcohol in more alcohol."
taste_description = "thick, dry alcohol"
color = "#FFFF7F"
strength = 12
nutriment_factor = 1
- glass_name = "Sake Bomb"
+ glass_name = REAGENT_SAKEBOMB
glass_desc = "Some sake mixed into a pint of beer."
allergen_type = ALLERGEN_GRAINS //Made from beer(grains)
/datum/reagent/ethanol/tamagozake
- name = "Tamagozake"
- id = "tamagozake"
+ name = REAGENT_TAMAGOZAKE
+ id = REAGENT_ID_TAMAGOZAKE
description = "Sake, egg, and sugar. A disgusting folk cure."
taste_description = "eggy booze"
color = "#E8C477"
strength = 30
nutriment_factor = 3
- glass_name = "Tamagozake"
+ glass_name = REAGENT_TAMAGOZAKE
glass_desc = "An egg cracked into sake and sugar."
allergen_type = ALLERGEN_EGGS //Made with eggs
/datum/reagent/ethanol/ginzamary
- name = "Ginza Mary"
- id = "ginzamary"
+ name = REAGENT_GINZAMARY
+ id = REAGENT_ID_GINZAMARY
description = "An alcoholic drink made with vodka, sake, and juices."
taste_description = "spicy tomato sake"
color = "#FF3232"
strength = 25
- glass_name = "Ginza Mary"
+ glass_name = REAGENT_GINZAMARY
glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grains) and tomatojuice(fruit)
/datum/reagent/ethanol/tokyorose
- name = "Tokyo Rose"
- id = "tokyorose"
+ name = REAGENT_TOKYOROSE
+ id = REAGENT_ID_TOKYOROSE
description = "A pale pink cocktail made with sake and berry juice."
taste_description = "fruity booze"
color = "#FA8072"
strength = 35
- glass_name = "Tokyo Rose"
+ glass_name = REAGENT_TOKYOROSE
glass_desc = "It's kinda pretty!"
allergen_type = ALLERGEN_FRUIT //Made from berryjuice
/datum/reagent/ethanol/saketini
- name = "Saketini"
- id = "saketini"
+ name = REAGENT_SAKETINI
+ id = REAGENT_ID_SAKETINI
description = "For when you're too weeb for a real martini."
taste_description = "dry alcohol"
color = "#0064C8"
strength = 15
- glass_name = "Saketini"
+ glass_name = REAGENT_SAKETINI
glass_desc = "What are you doing drinking this outside of New Kyoto?"
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit)
/datum/reagent/ethanol/coffee/elysiumfacepunch
- name = "Elysium Facepunch"
- id = "elysiumfacepunch"
+ name = REAGENT_ELYSIUMFACEPUNCH
+ id = REAGENT_ID_ELYSIUMFACEPUNCH
description = "A loathesome cocktail favored by Heaven's skeleton shift workers."
taste_description = "sour coffee"
color = "#8f7729"
strength = 20
- glass_name = "Elysium Facepunch"
+ glass_name = REAGENT_ELYSIUMFACEPUNCH
glass_desc = "A loathesome cocktail favored by Heaven's skeleton shift workers."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from kahlua(Coffee/caffeine) and lemonjuice(fruit)
/datum/reagent/ethanol/erebusmoonrise
- name = "Erebus Moonrise"
- id = "erebusmoonrise"
+ name = REAGENT_EREBUSMOONRISE
+ id = REAGENT_ID_EREBUSMOONRISE
description = "A deeply alcoholic mix, popular in Nyx."
taste_description = "hard alcohol"
color = "#947459"
strength = 10
- glass_name = "Erebus Moonrise"
+ glass_name = REAGENT_EREBUSMOONRISE
glass_desc = "A deeply alcoholic mix, popular in Nyx."
allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains) and Vodka(grains)
/datum/reagent/ethanol/balloon
- name = "Balloon"
- id = "balloon"
+ name = REAGENT_BALLOON
+ id = REAGENT_ID_BALLOON
description = "A strange drink invented in the aerostats of Venus."
taste_description = "strange alcohol"
color = "#FAEBD7"
strength = 66
- glass_name = "Balloon"
+ glass_name = REAGENT_BALLOON
glass_desc = "A strange drink invented in the aerostats of Venus."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from blue curacao(fruit) and cream(dairy)
/datum/reagent/ethanol/natunabrandy
- name = "Natuna Brandy"
- id = "natunabrandy"
+ name = REAGENT_NATUNABRANDY
+ id = REAGENT_ID_NATUNABRANDY
description = "On Natuna, they do the best with what they have."
taste_description = "watered-down beer"
color = "#FFFFCC"
strength = 80
- glass_name = "Natuna Brandy"
+ glass_name = REAGENT_NATUNABRANDY
glass_desc = "On Natuna, they do the best with what they have."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_GRAINS //Made from beer(grains)
/datum/reagent/ethanol/euphoria
- name = "Euphoria"
- id = "euphoria"
+ name = REAGENT_EUPHORIA
+ id = REAGENT_ID_EUPHORIA
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
taste_description = "impossibly rich alcohol"
color = "#614126"
strength = 9
- glass_name = "Euphoria"
+ glass_name = REAGENT_EUPHORIA
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from specialwhiskey(grain) and cognac(fruit)
/datum/reagent/ethanol/xanaducannon
- name = "Xanadu Cannon"
- id = "xanaducannon"
+ name = REAGENT_XANADUCANNON
+ id = REAGENT_ID_XANADUCANNON
description = "Common in the entertainment districts of Titan."
taste_description = "sweet alcohol"
color = "#614126"
strength = 50
- glass_name = "Xanadu Cannon"
+ glass_name = REAGENT_XANADUCANNON
glass_desc = "Common in the entertainment districts of Titan."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from ale(grain) and dr.gibb(caffeine)
/datum/reagent/ethanol/debugger
- name = "Debugger"
- id = "debugger"
+ name = REAGENT_DEBUGGER
+ id = REAGENT_ID_DEBUGGER
description = "From Shelf. Not for human consumption."
taste_description = "oily bitterness"
color = "#d3d3d3"
strength = 32
- glass_name = "Debugger"
+ glass_name = REAGENT_DEBUGGER
glass_desc = "From Shelf. Not for human consumption."
allergen_type = ALLERGEN_VEGETABLE //Made from corn oil(vegetable)
/datum/reagent/ethanol/spacersbrew
- name = "Spacer's Brew"
- id = "spacersbrew"
+ name = REAGENT_SPACERSBREW
+ id = REAGENT_ID_SPACERSBREW
description = "Ethanol and orange soda. A common emergency drink on frontier colonies."
taste_description = "bitter oranges"
color = "#ffc04c"
strength = 43
- glass_name = "Spacer's Brew"
+ glass_name = REAGENT_SPACERSBREW
glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from brownstar(orange juice(fruit) + cola(caffeine)
/datum/reagent/ethanol/binmanbliss
- name = "Binman Bliss"
- id = "binmanbliss"
+ name = REAGENT_BINMANBLISS
+ id = REAGENT_ID_BINMANBLISS
description = "A dry cocktail popular on Binma."
taste_description = "very dry alcohol"
color = "#c3c3c3"
strength = 24
- glass_name = "Binman Bliss"
+ glass_name = REAGENT_BINMANBLISS
glass_desc = "A dry cocktail popular on Binma."
/datum/reagent/ethanol/chrysanthemum
- name = "Chrysanthemum"
- id = "chrysanthemum"
+ name = REAGENT_CHRYSANTHEMUM
+ id = REAGENT_ID_CHRYSANTHEMUM
description = "An exotic cocktail from New Kyoto."
taste_description = "fruity liquor"
color = "#9999FF"
strength = 35
- glass_name = "Chrysanthemum"
+ glass_name = REAGENT_CHRYSANTHEMUM
glass_desc = "An exotic cocktail from New Kyoto."
allergen_type = ALLERGEN_FRUIT //Made from melon liquor(fruit)
/datum/reagent/ethanol/bitters
- name = "Bitters"
- id = "bitters"
+ name = REAGENT_BITTERS
+ id = REAGENT_ID_BITTERS
description = "An aromatic, typically alcohol-based infusions of bittering botanticals and flavoring agents like fruit peels, spices, dried flowers, and herbs."
taste_description = "sharp bitterness"
color = "#9b6241" // rgb(155, 98, 65)
strength = 50
- glass_name = "Bitters"
+ glass_name = REAGENT_BITTERS
glass_desc = "An aromatic, typically alcohol-based infusions of bittering botanticals and flavoring agents like fruit peels, spices, dried flowers, and herbs."
/datum/reagent/ethanol/soemmerfire
- name = "Soemmer Fire"
- id = "soemmerfire"
+ name = REAGENT_SOEMMERFIRE
+ id = REAGENT_ID_SOEMMERFIRE
description = "A painfully hot mixed drink, for when you absolutely need to hurt right now."
taste_description = "pure fire"
color = "#d13b21" // rgb(209, 59, 33)
strength = 25
- glass_name = "Soemmer Fire"
+ glass_name = REAGENT_SOEMMERFIRE
glass_desc = "A painfully hot mixed drink, for when you absolutely need to hurt right now."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from manhattan(whiskey(grains), vermouth(fruit))
@@ -4482,66 +4471,66 @@
M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
/datum/reagent/ethanol/winebrandy
- name = "Wine Brandy"
- id = "winebrandy"
+ name = REAGENT_WINEBRANDY
+ id = REAGENT_ID_WINEBRANDY
description = "A premium spirit made from distilled wine."
taste_description = "very sweet dried fruit with many elegant notes"
color = "#4C130B" // rgb(76,19,11)
strength = 20
- glass_name = "Wine Brandy"
+ glass_name = REAGENT_WINEBRANDY
glass_desc = "A very classy looking after-dinner drink."
allergen_type = ALLERGEN_FRUIT //Made from wine, which is made from fruit
/datum/reagent/ethanol/morningafter
- name = "Morning After"
- id = "morningafter"
+ name = REAGENT_MORNINGAFTER
+ id = REAGENT_ID_MORNINGAFTER
description = "The finest hair of the dog, coming up!"
taste_description = "bitter regrets"
color = "#482000" // rgb(72, 32, 0)
strength = 60
- glass_name = "Morning After"
+ glass_name = REAGENT_MORNINGAFTER
glass_desc = "The finest hair of the dog, coming up!"
allergen_type = ALLERGEN_GRAINS|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from sbiten(vodka(grain)) and coffee(coffee/caffine)
/datum/reagent/ethanol/vesper
- name = "Vesper"
- id = "vesper"
+ name = REAGENT_VESPER
+ id = REAGENT_ID_VESPER
description = "A dry martini, ice cold and well shaken."
taste_description = "lemony class"
color = "#cca01c" // rgb(204, 160, 28)
strength = 20
- glass_name = "Vesper"
+ glass_name = REAGENT_VESPER
glass_desc = "A dry martini, ice cold and well shaken."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from wine(fruit), vodka(grain), and gin(fruit)
/datum/reagent/ethanol/rotgut
- name = "Rotgut Fever Dream"
- id = "rotgut"
+ name = REAGENT_ROTGUT
+ id = REAGENT_ID_ROTGUT
description = "A heinous combination of clashing flavors."
taste_description = "plague and coldsweats"
color = "#3a6617" // rgb(58, 102, 23)
strength = 10
- glass_name = "Rotgut Fever Dream"
+ glass_name = REAGENT_ROTGUT
glass_desc = "Why are you doing this to yourself?"
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from whiskey(grains), cola (caffeine) and vodka(grains)
/datum/reagent/ethanol/voxdelight
- name = "Vox's Delight"
- id = "voxdelight"
+ name = REAGENT_VOXDELIGHT
+ id = REAGENT_ID_VOXDELIGHT
description = "A dangerous combination of all things flammable. Why would you drink this?"
taste_description = "corrosive death"
color = "#7c003a" // rgb(124, 0, 58)
strength = 10
- glass_name = "Vox's Delight"
+ glass_name = REAGENT_VOXDELIGHT
glass_desc = "Not recommended if you enjoy having organs."
/datum/reagent/ethanol/voxdelight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -4554,66 +4543,66 @@
M.adjustToxLoss(3 * removed)
/datum/reagent/ethanol/screamingviking
- name = "Screaming Viking"
- id = "screamingviking"
+ name =REAGENT_SCREAMINGVIKING
+ id = REAGENT_ID_SCREAMINGVIKING
description = "A boozy, citrus-packed brew."
taste_description = "the bartender's frustration"
color = "#c6c603" // rgb(198, 198, 3)
strength = 9
- glass_name = "Screaming Viking"
+ glass_name =REAGENT_SCREAMINGVIKING
glass_desc = "A boozy, citrus-packed brew."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from martini(gin(fruit), vermouth(fruit)), vodka tonic(vodka(grain)), and lime juice(fruit)
/datum/reagent/ethanol/robustin
- name = "Robustin"
- id = "robustin"
+ name = REAGENT_ROBUSTIN
+ id = REAGENT_ID_ROBUSTIN
description = "A bootleg brew of all the worst things on station."
taste_description = "cough syrup and fire"
color = "#6b0145" // rgb(107, 1, 69)
strength = 10
- glass_name = "Robustin"
+ glass_name = REAGENT_ROBUSTIN
glass_desc = "A bootleg brew of all the worst things on station."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from antifreeze(vodka(grains),cream(dairy)) and vodka(grains)
/datum/reagent/ethanol/virginsip
- name = "Virgin Sip"
- id = "virginsip"
+ name = REAGENT_VIRGINSIP
+ id = REAGENT_ID_VIRGINSIP
description = "A perfect martini, watered down and ruined."
taste_description = "emasculation and failure"
color = "#2E6671" // rgb(46, 102, 113)
strength = 60
- glass_name = "Virgin Sip"
+ glass_name = REAGENT_VIRGINSIP
glass_desc = "A perfect martini, watered down and ruined."
allergen_type = ALLERGEN_FRUIT //Made from driest martini(gin(fruit))
/datum/reagent/ethanol/jellyshot
- name = "Jelly Shot"
- id = "jellyshot"
+ name = REAGENT_JELLYSHOT
+ id = REAGENT_ID_JELLYSHOT
description = "A thick and vibrant alcoholic gel, perfect for the night life."
taste_description = "thick, alcoholic cherry gel"
color = "#e00b0b" // rgb(224, 11, 11)
strength = 10
- glass_name = "Jelly Shot"
+ glass_name = REAGENT_JELLYSHOT
glass_desc = "A thick and vibrant alcoholic gel, perfect for the night life."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from cherry jelly(fruit), and vodka(grains)
/datum/reagent/ethanol/slimeshot
- name = "Named Bullet"
- id = "slimeshot"
+ name = REAGENT_SLIMESHOT
+ id = REAGENT_ID_SLIMESHOT
description = "A thick and toxic slime jelly shot."
taste_description = "liquified organs"
color = "#6fa300" // rgb(111, 163, 0)
strength = 10
- glass_name = "Named Bullet"
+ glass_name = REAGENT_SLIMESHOT
glass_desc = "A thick slime jelly shot. You can feel your death approaching."
allergen_type = ALLERGEN_GRAINS //Made from vodka(grains)
@@ -4625,114 +4614,114 @@
M.reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 0.25)
/datum/reagent/ethanol/cloverclub
- name = "Clover Club"
- id = "cloverclub"
+ name = REAGENT_CLOVERCLUB
+ id = REAGENT_ID_CLOVERCLUB
description = "A light and refreshing raspberry cocktail."
taste_description = "sweet raspberry"
color = "#dd00a6" // rgb(221, 0, 166)
strength = 30
- glass_name = "Clover Club"
+ glass_name = REAGENT_CLOVERCLUB
glass_desc = "A light and refreshing raspberry cocktail."
allergen_type = ALLERGEN_FRUIT //Made from berry juice(fruit), lemon juice(fruit), and gin(fruit)
/datum/reagent/ethanol/negroni
- name = "Negroni"
- id = "negroni"
+ name = REAGENT_NEGRONI
+ id = REAGENT_ID_NEGRONI
description = "A dark, complicated mix of gin and campari... classy."
taste_description = "summer nights and wood smoke"
color = "#77000d" // rgb(119, 0, 13)
strength = 25
- glass_name = "Negroni"
+ glass_name = REAGENT_NEGRONI
glass_desc = "A dark, complicated blend, perfect for relaxing nights by the fire."
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and vermouth(fruit)
/datum/reagent/ethanol/whiskeysour
- name = "Whiskey Sour"
- id = "whiskeysour"
+ name = REAGENT_WHISKEYSOUR
+ id = REAGENT_ID_WHISKEYSOUR
description = "A smokey, refreshing lemoned whiskey."
taste_description = "smoke and citrus"
color = "#a0692e" // rgb(160, 105, 46)
strength = 20
- glass_name = "Whiskey Sour"
+ glass_name = REAGENT_WHISKEYSOUR
glass_desc = "A smokey, refreshing lemoned whiskey."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from whiskey(grains) and lemon juice(fruit)
/datum/reagent/ethanol/oldfashioned
- name = "Old Fashioned"
- id = "oldfashioned"
+ name = REAGENT_OLDFASHIONED
+ id = REAGENT_ID_OLDFASHIONED
description = "A classic mix of whiskey and sugar... simple and direct."
taste_description = "smokey, divine whiskey"
color = "#774410" // rgb(119, 68, 16)
strength = 15
- glass_name = "Old Fashioned"
+ glass_name = REAGENT_OLDFASHIONED
glass_desc = "A classic mix of whiskey and sugar... simple and direct."
allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains)
/datum/reagent/ethanol/daiquiri
- name = "Daiquiri"
- id = "daiquiri"
+ name = REAGENT_DAIQUIRI
+ id = REAGENT_ID_DAIQUIRI
description = "Refeshing rum and citrus. Time for a tropical get away."
taste_description = "refreshing citrus and rum"
color = "#d1ff49" // rgb(209, 255, 73
strength = 25
- glass_name = "Daiquiri"
+ glass_name = REAGENT_DAIQUIRI
glass_desc = "Refeshing rum and citrus. Time for a tropical get away."
allergen_type = ALLERGEN_FRUIT //Made from lime juice(fruit)
/datum/reagent/ethanol/mojito
- name = "Mojito"
- id = "mojito"
+ name = REAGENT_MOJITO
+ id = REAGENT_ID_MOJITO
description = "Minty rum and citrus, made for sailing."
taste_description = "minty rum and lime"
color = "#d1ff49" // rgb(209, 255, 73
strength = 30
- glass_name = "Mojito"
+ glass_name = REAGENT_MOJITO
glass_desc = "Minty rum and citrus, made for sailing."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made from lime juice(fruit)
/datum/reagent/ethanol/paloma
- name = "Paloma"
- id = "paloma"
+ name = REAGENT_PALOMA
+ id = REAGENT_ID_PALOMA
description = "Tequila and citrus, iced just right..."
taste_description = "grapefruit and cold fire"
color = "#ffb070" // rgb(255, 176, 112)
strength = 20
- glass_name = "Paloma"
+ glass_name = REAGENT_PALOMA
glass_desc = "Tequila and citrus, iced just right..."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made from orange juice(fruit)
/datum/reagent/ethanol/piscosour
- name = "Pisco Sour"
- id = "piscosour"
+ name = REAGENT_PISCOSOUR
+ id = REAGENT_ID_PISCOSOUR
description = "Wine Brandy, Lemon, and a dream. A South American classic"
taste_description = "light sweetness"
color = "#f9f96b" // rgb(249, 249, 107)
strength = 30
- glass_name = "Pisco Sour"
+ glass_name = REAGENT_PISCOSOUR
glass_desc = "South American bliss, served ice cold."
allergen_type = ALLERGEN_FRUIT //Made from wine brandy(fruit), and lemon juice(fruit)
/datum/reagent/ethanol/coldfront
- name = "Cold Front"
- id = "coldfront"
+ name = REAGENT_COLDFRONT
+ id = REAGENT_ID_COLDFRONT
description = "Minty, rich, and painfully cold. It's a blizzard in a cup."
taste_description = "biting cold"
color = "#ffe8c4" // rgb(255, 232, 196)
@@ -4740,26 +4729,26 @@
adj_temp = -20
targ_temp = 220 //Dangerous to certain races. Drink in moderation.
- glass_name = "Cold Front"
+ glass_name = REAGENT_COLDFRONT
glass_desc = "Minty, rich, and painfully cold. It's a blizzard in a cup."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from iced coffee(coffee)
/datum/reagent/ethanol/mintjulep
- name = "Mint Julep"
- id = "mintjulep"
+ name = REAGENT_MINTJULEP
+ id = REAGENT_ID_MINTJULEP
description = "Minty and refreshing, perfect for a hot day."
taste_description = "refreshing mint"
color = "#bbfc8a" // rgb(187, 252, 138)
strength = 25
adj_temp = -5
- glass_name = "Mint Julep"
+ glass_name = REAGENT_MINTJULEP
glass_desc = "Minty and refreshing, perfect for a hot day."
/datum/reagent/ethanol/godsake
- name = "Gods Sake"
- id = "godsake"
+ name = REAGENT_GODSAKE
+ id = REAGENT_ID_GODSAKE
description = "Anime's favorite drink."
taste_description = "the power of god and anime"
color = "#DDDDDD"
@@ -4769,14 +4758,14 @@
glass_desc = "A glass of sake."
/datum/reagent/ethanol/godka
- name = "Godka"
- id = "godka"
+ name = REAGENT_GODKA
+ id = REAGENT_ID_GODKA
description = "Number one drink AND fueling choice for Russians multiverse-wide."
taste_description = "russian steel and a hint of grain"
color = "#0064C8"
strength = 50
- glass_name = "Godka"
+ glass_name = REAGENT_GODKA
glass_desc = "The glass is barely able to contain the wodka. Xynta."
glass_special = list(DRINK_FIZZ)
@@ -4801,35 +4790,35 @@
M.adjustToxLoss(adjust_tox * removed)
/datum/reagent/ethanol/holywine
- name = "Angel Ichor"
- id = "holywine"
+ name = REAGENT_HOLYWINE
+ id = REAGENT_ID_HOLYWINE
description = "A premium alcoholic beverage made from distilled angel blood."
taste_description = "wings in a glass, and a hint of grape"
color = "#C4921E"
strength = 20
- glass_name = "Angel Ichor"
+ glass_name = REAGENT_HOLYWINE
glass_desc = "A very pious looking drink."
glass_icon = DRINK_ICON_NOISY
allergen_type = ALLERGEN_FRUIT //Made from grapes(fruit)
/datum/reagent/ethanol/holy_mary
- name = "Holy Mary"
- id = "holymary"
+ name = REAGENT_HOLYMARY
+ id = REAGENT_ID_HOLYMARY
description = "A strange yet pleasurable mixture made of vodka, angel's ichor and lime juice. Or at least you THINK the yellow stuff is angel's ichor."
taste_description = "grapes with a hint of lime"
color = "#DCAE12"
strength = 20
- glass_name = "Holy Mary"
+ glass_name = REAGENT_HOLYMARY
glass_desc = "Angel's Ichor, mixed with Vodka and a lil' bit of lime. Tastes like liquid ascension."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grain), holy wine(fruit), and lime juice(fruit)
/datum/reagent/ethanol/angelswrath
- name = "Angels Wrath"
- id = "angelswrath"
+ name = REAGENT_ANGELSWRATH
+ id = REAGENT_ID_ANGELSWRATH
description = "This thing makes the hair on the back of your neck stand up."
taste_description = "sweet victory and sour iron"
taste_mult = 1.5
@@ -4844,8 +4833,8 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from space mountain wind(fruit), dr.gibb(caffine) and holy wine(fruit)
/datum/reagent/ethanol/angelskiss
- name = "Angels Kiss"
- id = "angelskiss"
+ name = REAGENT_ANGELSKISS
+ id = REAGENT_ID_ANGELSKISS
description = "Miracle time!"
taste_description = "sweet forgiveness and bitter iron"
color = "#AD772B"
@@ -4857,21 +4846,21 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from holy wine(fruit), and kahlua(coffee)
/datum/reagent/ethanol/ichor_mead
- name = "Ichor Mead"
- id = "ichor_mead"
+ name = REAGENT_ICHORMEAD
+ id = REAGENT_ID_ICHORMEAD
description = "A trip to Valhalla."
taste_description = "valhalla"
color = "#955B37"
strength = 30
- glass_name = "Ichor Mead"
+ glass_name = REAGENT_ICHORMEAD
glass_desc = "A trip to Valhalla."
allergen_type = ALLERGEN_FRUIT //Made from holy wine(fruit)
/datum/reagent/ethanol/schnapps_pep
- name = "Peppermint Schnapps"
- id = "schnapps_pep"
+ name = REAGENT_SCHNAPPSPEP
+ id = REAGENT_ID_SCHNAPPSPEP
description = "Achtung, pfefferminze."
taste_description = "minty alcohol"
color = "#8FC468"
@@ -4881,8 +4870,8 @@
glass_desc = "A glass of peppermint schnapps. It seems like it'd be better, mixed."
/datum/reagent/ethanol/schnapps_pea
- name = "Peach Schnapps"
- id = "schnapps_pea"
+ name = REAGENT_SCHNAPPSPEA
+ id = REAGENT_ID_SCHNAPPSPEA
description = "Achtung, fruchtig."
taste_description = "peaches"
color = "#d67d4d"
@@ -4894,8 +4883,8 @@
allergen_type = ALLERGEN_FRUIT //Made from peach(fruit)
/datum/reagent/ethanol/schnapps_lem
- name = "Lemonade Schnapps"
- id = "schnapps_lem"
+ name = REAGENT_SCHNAPPSLEM
+ id = REAGENT_ID_SCHNAPPSLEM
description = "Childhood memories are not included."
taste_description = "sweet, lemon-y alcohol"
color = "#FFFF00"
@@ -4907,8 +4896,8 @@
allergen_type = ALLERGEN_FRUIT //Made from lemons(fruit)
/datum/reagent/ethanol/jager
- name = "Schuss Konig"
- id = "jager"
+ name = REAGENT_JAGER
+ id = REAGENT_ID_JAGER
description = "A complex alcohol that leaves you feeling all warm inside."
taste_description = "complex, rich alcohol"
color = "#7f6906"
@@ -4918,21 +4907,21 @@
glass_desc = "A glass of schusskonig digestif. Good for shooting or mixing."
/datum/reagent/ethanol/fusionnaire
- name = "Fusionnaire"
- id = "fusionnaire"
+ name = REAGENT_FUSIONNAIRE
+ id = REAGENT_ID_FUSIONNAIRE
description = "A drink for the brave."
taste_description = "a painfully alcoholic lemon soda with an undertone of mint"
color = "#6BB486"
strength = 9
- glass_name = "fusionnaire"
+ glass_name = REAGENT_ID_FUSIONNAIRE
glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from lemon juice(fruit), vodka(grains), and lemon schnapps(fruit)
/datum/reagent/ethanol/deathbell
- name = "Deathbell"
- id = "deathbell"
+ name = REAGENT_DEATHBELL
+ id = REAGENT_ID_DEATHBELL
description = "A successful experiment to make the most alcoholic thing possible."
taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol"
color = "#9f6aff"
@@ -4941,7 +4930,7 @@
adj_temp = 10
targ_temp = 330
- glass_name = "Deathbell"
+ glass_name = REAGENT_DEATHBELL
glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from antifreeze(vodka(grains),cream(dairy)), gargleblaster(vodka(grains),gin(fruit),whiskey(grains),cognac(fruit),lime juice(fruit)), and syndicate bomb(beer(grain),whiskeycola(whiskey(grain)))
@@ -4956,8 +4945,8 @@
M.slurring = max(M.slurring, 30)
/datum/reagent/nutriment/magicdust
- name = "Magic Dust"
- id = "magicdust"
+ name = REAGENT_MAGICDUST
+ id = REAGENT_ID_MAGICDUST
description = "A dust harvested from gnomes, aptly named by pre-industrial civilizations."
taste_description = "something tingly"
taste_mult = 2
@@ -4972,24 +4961,24 @@
to_chat(M, span_warning("You feel like you've been gnomed..."))
/datum/reagent/drink/soda/kompot
- name = "Kompot"
- id = "kompot"
+ name = REAGENT_KOMPOT
+ id = REAGENT_ID_KOMPOT
description = "A traditional Eastern European beverage once used to preserve fruit in the 1980s"
taste_description = "refreshingly sweet and fruity"
color = "#ed9415" // rgb: 237, 148, 21
adj_drowsy = -1
adj_temp = -6
- glass_name = "kompot"
+ glass_name = REAGENT_ID_KOMPOT
glass_desc = "A glass of refreshing kompot."
glass_special = list(DRINK_FIZZ)
/datum/reagent/ethanol/kvass
- name = "Kvass"
- id = "kvass"
+ name = REAGENT_KVASS
+ id = REAGENT_ID_KVASS
description = "A traditional fermented Slavic and Baltic beverage commonly made from rye bread."
taste_description = "a warm summer day at babushka's cabin"
color = "#b78315" // rgb: 183, 131, 21
strength = 95 //It's just soda to Russians
nutriment_factor = 2
- glass_name = "kvass"
+ glass_name = REAGENT_ID_KVASS
glass_desc = "A hearty glass of Slavic brew."
diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm
index 444e1b7a28..9f7cae2c7f 100644
--- a/code/modules/reagents/reagents/toxins.dm
+++ b/code/modules/reagents/reagents/toxins.dm
@@ -757,7 +757,7 @@
reagent_state = LIQUID
color = "#FFD300"
- glass_name = "beer"
+ glass_name = REAGENT_ID_BEER
glass_desc = "A freezing pint of beer"
/* Drugs */
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index c23a3d89da..8b485cfc77 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1160,7 +1160,7 @@
/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize()
. = ..()
- reagents.add_reagent("pwine", 60)
+ reagents.add_reagent(REAGENT_ID_PWINE, 60)
//RadiantAurora: Tiemli Kroto
/obj/item/clothing/glasses/welding/tiemgogs
diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm
index 00455f05e5..f6954f4090 100644
--- a/code/modules/xenoarcheaology/effect_master.dm
+++ b/code/modules/xenoarcheaology/effect_master.dm
@@ -305,7 +305,7 @@
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(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent("neurotoxin", 1))
+ else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_NEUROTOXIN, 1))
if(my_effect.trigger == TRIGGER_TOXIN)
my_effect.ToggleActivate()
else if(istype(W,/obj/item/melee/baton) && W:status ||\
@@ -330,7 +330,7 @@
var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER)
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(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,"neurotoxin")
+ var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,REAGENT_ID_NEUROTOXIN)
for(var/datum/artifact_effect/my_effect in my_effects)
if(Touching.id in water)
diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm
index e6b476c7bd..0892dd4ebc 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,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER)
+ spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,REAGENT_ID_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/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index 1d007ff494..722d21ce3c 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -801,7 +801,7 @@
/decl/chemical_reaction/instant/slime/dark_blue_ice
name = "Slime Ice"
id = "m_darkblue_ice"
- result = "ice"
+ result = REAGENT_ID_ICE
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 5
required = /obj/item/slime_extract/dark_blue
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index 5390fb716e..b7d0e67f90 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -61,5 +61,5 @@
xenoChemList += REAGENT_ID_FROSTOIL
xenoChemList += REAGENT_ID_CAPSAICIN
xenoChemList += REAGENT_ID_CONDENSEDCAPSAICIN
- xenoChemList += "neurotoxin"
+ xenoChemList += REAGENT_ID_NEUROTOXIN
return 1
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index d0251b28cc..2d56f2800b 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -56,7 +56,7 @@ Slime definitions, Life and New live here.
REAGENT_ID_CHLORINE = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_SODAWATER = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1),
- "beer" = list(XENO_CHEM_NUTRI = 0.6),
+ REAGENT_ID_BEER = list(XENO_CHEM_NUTRI = 0.6),
REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9),
REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),
From 1a2c2c0764bedc641b88381bc0bb5743278bf760 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 05:51:35 +0100
Subject: [PATCH 13/29] plants
---
code/__defines/_fruits.dm | 99 +++++++++
code/__defines/plants.dm | 6 +-
code/global_vr.dm | 76 +++----
code/modules/clothing/head/flowercrowns.dm | 6 +-
code/modules/clothing/spacesuits/breaches.dm | 2 +-
code/modules/fishing/fishing_rod.dm | 6 +-
code/modules/food/food/snacks.dm | 78 +++----
code/modules/food/food/snacks/meat.dm | 2 +-
code/modules/food/food/snacks_vr.dm | 16 +-
code/modules/food/food/superfoods.dm | 18 +-
code/modules/food/recipes_fryer.dm | 12 +-
code/modules/food/recipes_grill.dm | 4 +-
code/modules/food/recipes_microwave.dm | 112 +++++------
code/modules/food/recipes_microwave_vr.dm | 28 +--
code/modules/food/recipes_oven.dm | 68 +++----
code/modules/hydroponics/fruit_spawner.dm | 150 +++++++-------
code/modules/hydroponics/grown.dm | 18 +-
code/modules/hydroponics/grown_predefined.dm | 4 +-
code/modules/hydroponics/grown_sif.dm | 6 +-
code/modules/hydroponics/seed_datums_vr.dm | 12 +-
code/modules/hydroponics/seed_packets.dm | 190 +++++++++---------
code/modules/hydroponics/seed_packets_vr.dm | 5 -
code/modules/hydroponics/seedtypes/amauri.dm | 6 +-
.../modules/hydroponics/seedtypes/ambrosia.dm | 20 +-
code/modules/hydroponics/seedtypes/apples.dm | 18 +-
code/modules/hydroponics/seedtypes/banana.dm | 6 +-
code/modules/hydroponics/seedtypes/berries.dm | 20 +-
code/modules/hydroponics/seedtypes/cabbage.dm | 6 +-
code/modules/hydroponics/seedtypes/carrots.dm | 6 +-
code/modules/hydroponics/seedtypes/celery.dm | 8 +-
.../modules/hydroponics/seedtypes/cherries.dm | 4 +-
code/modules/hydroponics/seedtypes/chili.dm | 16 +-
code/modules/hydroponics/seedtypes/citrus.dm | 18 +-
code/modules/hydroponics/seedtypes/cocoa.dm | 4 +-
code/modules/hydroponics/seedtypes/corn.dm | 6 +-
code/modules/hydroponics/seedtypes/diona.dm | 6 +-
code/modules/hydroponics/seedtypes/durian.dm | 8 +-
.../modules/hydroponics/seedtypes/eggplant.dm | 14 +-
code/modules/hydroponics/seedtypes/flowers.dm | 36 ++--
code/modules/hydroponics/seedtypes/gelthi.dm | 6 +-
code/modules/hydroponics/seedtypes/gnomes.dm | 6 +-
code/modules/hydroponics/seedtypes/grapes.dm | 8 +-
code/modules/hydroponics/seedtypes/grass.dm | 18 +-
code/modules/hydroponics/seedtypes/jurlmah.dm | 4 +-
code/modules/hydroponics/seedtypes/kudzu.dm | 6 +-
code/modules/hydroponics/seedtypes/lettuce.dm | 10 +-
.../hydroponics/seedtypes/malanitear.dm | 4 +-
.../hydroponics/seedtypes/mushrooms.dm | 42 ++--
code/modules/hydroponics/seedtypes/nettles.dm | 12 +-
code/modules/hydroponics/seedtypes/onion.dm | 6 +-
code/modules/hydroponics/seedtypes/peanuts.dm | 6 +-
.../hydroponics/seedtypes/pineapple.dm | 18 +-
code/modules/hydroponics/seedtypes/potato.dm | 6 +-
code/modules/hydroponics/seedtypes/pumpkin.dm | 6 +-
code/modules/hydroponics/seedtypes/rhubarb.dm | 8 +-
code/modules/hydroponics/seedtypes/rice.dm | 6 +-
.../hydroponics/seedtypes/selemhand.dm | 4 +-
code/modules/hydroponics/seedtypes/soybean.dm | 4 +-
.../hydroponics/seedtypes/sugarcane.dm | 4 +-
code/modules/hydroponics/seedtypes/surik.dm | 6 +-
code/modules/hydroponics/seedtypes/telriis.dm | 6 +-
code/modules/hydroponics/seedtypes/thaadra.dm | 4 +-
code/modules/hydroponics/seedtypes/tobacco.dm | 8 +-
.../modules/hydroponics/seedtypes/tomatoes.dm | 20 +-
code/modules/hydroponics/seedtypes/vale.dm | 6 +-
code/modules/hydroponics/seedtypes/vanilla.dm | 8 +-
code/modules/hydroponics/seedtypes/wabback.dm | 10 +-
.../hydroponics/seedtypes/watermelon.dm | 6 +-
code/modules/hydroponics/seedtypes/weeds.dm | 6 +-
code/modules/hydroponics/seedtypes/wheat.dm | 6 +-
.../hydroponics/seedtypes/whitebeets.dm | 4 +-
.../modules/hydroponics/seedtypes/wurmwoad.dm | 6 +-
.../hydroponics/spreading/spreading.dm | 2 +-
code/modules/hydroponics/trays/tray.dm | 2 +-
code/modules/materials/materials/plastic.dm | 2 +-
code/modules/materials/sheets/plastic.dm | 4 +-
.../carbon/human/species/station/alraune.dm | 2 +-
.../silicon/robot/dogborg/dog_sleeper_vr.dm | 6 +-
.../subtypes/animal/farm animals/chicken.dm | 2 +-
.../subtypes/animal/sif/glitterfly.dm | 2 +-
.../simple_mob/subtypes/plant/tomato.dm | 2 +-
code/modules/organs/subtypes/diona.dm | 2 +-
.../projectiles/guns/launcher/crossbow.dm | 2 +-
vorestation.dme | 2 +-
84 files changed, 765 insertions(+), 665 deletions(-)
create mode 100644 code/__defines/_fruits.dm
delete mode 100644 code/modules/hydroponics/seed_packets_vr.dm
diff --git a/code/__defines/_fruits.dm b/code/__defines/_fruits.dm
new file mode 100644
index 0000000000..f8d36bab40
--- /dev/null
+++ b/code/__defines/_fruits.dm
@@ -0,0 +1,99 @@
+#define PLANT_AMBROSIA "ambrosia"
+#define PLANT_APPLE "apple"
+#define PLANT_BANANA "banana"
+#define PLANT_BERRIES "berries"
+#define PLANT_CABBAGE "cabbage"
+#define PLANT_CARROT "carrot"
+#define PLANT_CELERY "celery"
+#define PLANT_CHERRY "cherry"
+#define PLANT_CHILI "chili"
+#define PLANT_COCOA "cocoa"
+#define PLANT_CORN "corn"
+#define PLANT_DURIAN "durian"
+#define PLANT_EGGPLANT "eggplant"
+#define PLANT_GRAPES "grapes"
+#define PLANT_GREENGRAPES "greengrapes"
+#define PLANT_HAREBELLS "harebells"
+#define PLANT_LAVENDER "lavender"
+#define PLANT_LEMON "lemon"
+#define PLANT_LETTUCE "lettuce"
+#define PLANT_LIME "lime"
+#define PLANT_ONION "onion"
+#define PLANT_ORANGE "orange"
+#define PLANT_PEANUT "peanut"
+#define PLANT_POPPIES "poppies"
+#define PLANT_POTATO "potato"
+#define PLANT_PUMPKIN "pumpkin"
+#define PLANT_RICE "rice"
+#define PLANT_ROSE "rose"
+#define PLANT_RHUBARB "rhubarb"
+#define PLANT_SOYBEAN "soybean"
+#define PLANT_SPINEAPPLE "spineapple"
+#define PLANT_SUGARCANE "sugarcane"
+#define PLANT_SUNFLOWERS "sunflowers"
+#define PLANT_TOMATO "tomato"
+#define PLANT_VANILLA "vanilla"
+#define PLANT_WATERMELON "watermelon"
+#define PLANT_WHEAT "wheat"
+#define PLANT_WHITEBEET "whitebeet"
+#define PLANT_DIONA "diona"
+#define PLANT_GHOSTCHILI "ghostchili"
+#define PLANT_PLASTIC "plastic"
+#define PLANT_SHAND "shand"
+#define PLANT_MTEAR "mtear"
+#define PLANT_GLOWBERRIES "glowberries"
+#define PLANT_PEPPERCORNS "peppercorns"
+#define PLANT_BLOODTOMATO "bloodtomato"
+#define PLANT_KILLERTOMATO "killertomato"
+#define PLANT_BLUETOMATO "bluetomato"
+#define PLANT_BLUESPACETOMATO "bluespacetomato"
+#define PLANT_ICECHILI "icechili"
+#define PLANT_REISHI "reishi"
+#define PLANT_AMANITA "amanita"
+#define PLANT_DESTROYINGANGEL "destroyingangel"
+#define PLANT_LIBERTYCAP "libertycap"
+#define PLANT_MUSHROOMS "mushrooms"
+#define PLANT_TOWERCAP "towercap"
+#define PLANT_REDCAP "redcap"
+#define PLANT_GLOWSHROOM "glowshroom"
+#define PLANT_PLUMPHELMET "plumphelmet"
+#define PLANT_SPORESHROOM "sporeshroom"
+#define PLANT_NETTLE "nettle"
+#define PLANT_DEATHNETTLE "deathnettle"
+#define PLANT_WEEDS "weeds"
+#define PLANT_MOLD "mold"
+#define PLANT_POISONAPPLE "poisonapple"
+#define PLANT_GOLDAPPLE "goldapple"
+#define PLANT_AMBROSIADEUS "ambrosiadeus"
+#define PLANT_AMBROSIAGAIA "ambrosiagaia"
+#define PLANT_AMBROSIAINFERNUS "ambrosiainfernus"
+#define PLANT_POISONBERRIES "poisonberries"
+#define PLANT_DEATHBERRIES "deathberries"
+#define PLANT_GRASS "grass"
+#define PLANT_CARPET "carpet"
+#define PLANT_TOBACCO "tobacco"
+#define PLANT_KUDZU "kudzu"
+#define PLANT_JURLMAH "jurlmah"
+#define PLANT_AMAURI "amauri"
+#define PLANT_GELTHI "gelthi"
+#define PLANT_VALE "vale"
+#define PLANT_SURIK "surik"
+#define PLANT_TELRIIS "telriis"
+#define PLANT_THAADRA "thaadra"
+#define PLANT_WHITEWABBACK "whitewabback"
+#define PLANT_BLACKWABBACK "blackwabback"
+#define PLANT_WILDWABBACK "wildwabback"
+#define PLANT_SIFLETTUCE "siflettuce"
+#define PLANT_EGGPLANT "egg-plant"
+#define PLANT_PINEAPPLE "pineapple"
+#define PLANT_BLOODROSE "bloodrose"
+#define PLANT_GNOMES "gnomes"
+#define PLANT_SIFBULB "sifbulb"
+#define PLANT_WURMWOAD "wurmwoad"
+#define PLANT_MICROM "microm"
+
+
+
+
+
+#define PLANT_MEGAM "megam"
diff --git a/code/__defines/plants.dm b/code/__defines/plants.dm
index cd4dc9e701..910e6c4193 100644
--- a/code/__defines/plants.dm
+++ b/code/__defines/plants.dm
@@ -106,9 +106,9 @@ GLOBAL_LIST_INIT(plant_item_products, list(
))
GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list(
- "gnomes"
+ PLANT_GNOMES
))
GLOBAL_LIST_INIT(forbidden_plant_product_sprites, list(
- "gnomes"
- ))
\ No newline at end of file
+ PLANT_GNOMES
+ ))
diff --git a/code/global_vr.dm b/code/global_vr.dm
index 6293c2197f..65b574c805 100644
--- a/code/global_vr.dm
+++ b/code/global_vr.dm
@@ -6,44 +6,44 @@ var/list/eventdestinations = list() // List of scatter landmarks for VOREStation
var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals
var/global/list/acceptable_fruit_types= list(
- "ambrosia",
- "apple",
- "banana",
- "berries",
- "cabbage",
- "carrot",
- "celery",
- "cherry",
- "chili",
- "cocoa",
- "corn",
- "durian",
- "eggplant",
- "grapes",
- "greengrapes",
- "harebells",
- "lavender",
- "lemon",
- "lettuce",
- "lime",
- "onion",
- "orange",
- "peanut",
- "poppies",
- "potato",
- "pumpkin",
- "rice",
- "rose",
- "rhubarb",
- "soybean",
- "spineapple",
- "sugarcane",
- "sunflowers",
- "tomato",
- "vanilla",
- "watermelon",
- "wheat",
- "whitebeet")
+ PLANT_AMBROSIA,
+ PLANT_APPLE,
+ PLANT_BANANA,
+ PLANT_BERRIES,
+ PLANT_CABBAGE,
+ PLANT_CARROT,
+ PLANT_CELERY,
+ PLANT_CHERRY,
+ PLANT_CHILI,
+ PLANT_COCOA,
+ PLANT_CORN,
+ PLANT_DURIAN,
+ PLANT_EGGPLANT,
+ PLANT_GRAPES,
+ PLANT_GREENGRAPES,
+ PLANT_HAREBELLS,
+ PLANT_LAVENDER,
+ PLANT_LEMON,
+ PLANT_LETTUCE,
+ PLANT_LIME,
+ PLANT_ONION,
+ PLANT_ORANGE,
+ PLANT_PEANUT,
+ PLANT_POPPIES,
+ PLANT_POTATO,
+ PLANT_PUMPKIN,
+ PLANT_RICE,
+ PLANT_ROSE,
+ PLANT_ROSE,
+ PLANT_SOYBEAN,
+ PLANT_SPINEAPPLE,
+ PLANT_SUGARCANE,
+ PLANT_SUNFLOWERS,
+ PLANT_TOMATO,
+ PLANT_VANILLA,
+ PLANT_WATERMELON,
+ PLANT_WHEAT,
+ PLANT_WHITEBEET)
// Some "scary" sounds.
var/static/list/scawwySownds = list(
diff --git a/code/modules/clothing/head/flowercrowns.dm b/code/modules/clothing/head/flowercrowns.dm
index 53ee01141f..db795863e0 100644
--- a/code/modules/clothing/head/flowercrowns.dm
+++ b/code/modules/clothing/head/flowercrowns.dm
@@ -12,13 +12,13 @@
if(G.seed.kitchen_tag == "poppy")
to_chat(user, "You attach the poppy to the circlet and create a beautiful flower crown.")
complete = new /obj/item/clothing/head/poppy_crown(get_turf(user))
- else if(G.seed.kitchen_tag == "sunflower")
+ else if(G.seed.kitchen_tag == PLANT_SUNFLOWERS)
to_chat(user, "You attach the sunflower to the circlet and create a beautiful flower crown.")
complete = new /obj/item/clothing/head/sunflower_crown(get_turf(user))
- else if(G.seed.kitchen_tag == "lavender")
+ else if(G.seed.kitchen_tag == PLANT_LAVENDER)
to_chat(user, "You attach the lavender to the circlet and create a beautiful flower crown.")
complete = new /obj/item/clothing/head/lavender_crown(get_turf(user))
- else if(G.seed.kitchen_tag == "rose")
+ else if(G.seed.kitchen_tag == PLANT_ROSE)
to_chat(user, "You attach the rose to the circlet and create a beautiful flower crown.")
complete = new /obj/item/clothing/head/rose_crown(get_turf(user))
user.drop_from_inventory(W)
diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm
index aa6e0649ea..85e61c4052 100644
--- a/code/modules/clothing/spacesuits/breaches.dm
+++ b/code/modules/clothing/spacesuits/breaches.dm
@@ -183,7 +183,7 @@ var/global/list/breach_burn_descriptors = list(
switch(W.get_material_name())
if(MAT_STEEL)
repair_power = 2
- if("plastic")
+ if(MAT_PLASTIC)
repair_power = 1
if(!repair_power)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 817da5baf8..f741d6b888 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -17,7 +17,7 @@
attack_verb = list("whipped", "battered", "slapped", "fished", "hooked")
hitsound = 'sound/weapons/punchmiss.ogg'
applies_material_colour = TRUE
- default_material = "wood"
+ default_material = MAT_WOOD
can_dull = FALSE
var/strung = TRUE
var/line_break = TRUE
@@ -116,7 +116,7 @@
item_state = "fishing_rod"
reach = 4
attackspeed = 2 SECONDS
- default_material = "titanium"
+ default_material = MAT_TITANIUM
toolspeed = 0.75
@@ -126,6 +126,6 @@
/obj/item/material/fishing_rod/modern/cheap //A rod sold by the fishing vendor. Done so that the rod sold by mining reward vendors doesn't loose its value.
name = "cheap fishing rod"
desc = "Mass produced, but somewhat reliable."
- default_material = "plastic"
+ default_material = MAT_PLASTIC
toolspeed = 0.9
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 5b48d1d1e8..504093aef7 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -1063,7 +1063,7 @@
filling_color = "#DB0000"
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 3
- nutriment_desc = list("raw" = 2, "tomato" = 3)
+ nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3)
bitesize = 6
/obj/item/reagent_containers/food/snacks/bearmeat
@@ -1454,7 +1454,7 @@
filling_color = "#4D2F5E"
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 6
- nutriment_desc = list(REAGENT_ID_CHEESE = 3, "eggplant" = 3)
+ nutriment_desc = list(REAGENT_ID_CHEESE = 3, PLANT_EGGPLANT = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/soylentgreen
@@ -1701,7 +1701,7 @@
filling_color = "#FAA005"
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 3
- nutriment_desc = list("carrot" = 3, "salt" = 1)
+ nutriment_desc = list(PLANT_CARROT = 3, "salt" = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/carrotfries/Initialize()
@@ -1959,7 +1959,7 @@
filling_color = "#A36A1F"
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 2
- nutriment_desc = list("tortilla" = 3, "corn" = 3)
+ nutriment_desc = list("tortilla" = 3, PLANT_CORN = 3)
bitesize = 4
/obj/item/reagent_containers/food/snacks/enchiladas/Initialize()
@@ -2090,7 +2090,7 @@
trash = /obj/item/trash/plate
center_of_mass = list("x"=16, "y"=10)
nutriment_amt = 8
- nutriment_desc = list("soy" = 4, "tomato" = 4)
+ nutriment_desc = list("soy" = 4, PLANT_TOMATO = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/boiledspagetti
@@ -2149,7 +2149,7 @@
filling_color = "#DE4545"
center_of_mass = list("x"=16, "y"=10)
nutriment_amt = 6
- nutriment_desc = list("tomato" = 3, "noodles" = 3)
+ nutriment_desc = list(PLANT_TOMATO = 3, "noodles" = 3)
bitesize = 4
/obj/item/reagent_containers/food/snacks/pastatomato/Initialize()
@@ -2207,7 +2207,7 @@
filling_color = "#F21873"
center_of_mass = list("x"=15, "y"=13)
nutriment_amt = 3
- nutriment_desc = list("apple" = 3, "caramel" = 3, "sweetness" = 2)
+ nutriment_desc = list(PLANT_APPLE = 3, "caramel" = 3, "sweetness" = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/candiedapple
@@ -2218,7 +2218,7 @@
filling_color = "#F21873"
center_of_mass = list("x"=15, "y"=13)
nutriment_amt = 3
- nutriment_desc = list("apple" = 3, "sweetness" = 2)
+ nutriment_desc = list(PLANT_APPLE = 3, "sweetness" = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/applepie
@@ -2228,7 +2228,7 @@
filling_color = "#E0EDC5"
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 4
- nutriment_desc = list("sweetness" = 2, "apple" = 2, "pie" = 2)
+ nutriment_desc = list("sweetness" = 2, PLANT_APPLE = 2, "pie" = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/cherrypie
@@ -2238,7 +2238,7 @@
filling_color = "#FF525A"
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 4
- nutriment_desc = list("sweetness" = 2, "cherry" = 2, "pie" = 2)
+ nutriment_desc = list("sweetness" = 2, PLANT_CHERRY = 2, "pie" = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/twobread
@@ -2381,7 +2381,7 @@
filling_color = "#76B87F"
center_of_mass = list("x"=17, "y"=11)
nutriment_amt = 8
- nutriment_desc = list("salad" = 2, "tomato" = 2, "carrot" = 2, "apple" = 2)
+ nutriment_desc = list("salad" = 2, PLANT_TOMATO = 2, PLANT_CARROT = 2, PLANT_APPLE = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/validsalad
@@ -2407,7 +2407,7 @@
filling_color = "#FFFF00"
center_of_mass = list("x"=16, "y"=18)
nutriment_amt = 8
- nutriment_desc = list("apple" = 8)
+ nutriment_desc = list(PLANT_APPLE = 8)
bitesize = 3
/obj/item/reagent_containers/food/snacks/appletart/Initialize()
@@ -2484,7 +2484,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#AFC4B5"
center_of_mass = list("x"=16, "y"=8)
- nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2)
+ nutriment_desc = list(PLANT_CARROT = 2, PLANT_CORN = 2, PLANT_EGGPLANT = 2, PLANT_POTATO = 2)
bitesize = 5
eating_sound = 'sound/items/drink.ogg'
@@ -2500,7 +2500,7 @@
filling_color = "#AFC4B5"
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 8
- nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, "potato" = 2)
+ nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, PLANT_POTATO = 2)
bitesize = 5
eating_sound = 'sound/items/drink.ogg'
@@ -2653,7 +2653,7 @@
filling_color = "#9E673A"
center_of_mass = list("x"=16, "y"=5)
nutriment_amt = 6
- nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2)
+ nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, "mushroom" = 2)
drop_sound = 'sound/items/drop/shovel.ogg'
pickup_sound = 'sound/items/pickup/shovel.ogg'
bitesize = 10
@@ -2944,7 +2944,7 @@
slices_num = 5
filling_color = "#FFD675"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_CARROT = 15)
nutriment_amt = 25
bitesize = 2
@@ -3085,7 +3085,7 @@
slices_num = 5
filling_color = "#FADA8E"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_ORANGE = 15)
nutriment_amt = 20
/obj/item/reagent_containers/food/snacks/slice/orangecake
@@ -3109,7 +3109,7 @@
slices_num = 5
filling_color = "#CBFA8E"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_LIME = 15)
nutriment_amt = 20
/obj/item/reagent_containers/food/snacks/slice/limecake
@@ -3133,7 +3133,7 @@
slices_num = 5
filling_color = "#FAFA8E"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_LEMON = 15)
nutriment_amt = 20
@@ -3255,7 +3255,7 @@
slices_num = 5
filling_color = "#EBF5B8"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("cake" = 10, "sweetness" = 10, "apple" = 15)
+ nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_APPLE = 15)
nutriment_amt = 15
/obj/item/reagent_containers/food/snacks/slice/applecake
@@ -3279,7 +3279,7 @@
slices_num = 5
filling_color = "#F5B951"
center_of_mass = list("x"=16, "y"=10)
- nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, "pumpkin" = 5)
+ nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, PLANT_PUMPKIN = 5)
nutriment_amt = 15
/obj/item/reagent_containers/food/snacks/slice/pumpkinpie
@@ -3331,7 +3331,7 @@
slices_num = 5
filling_color = "#F5B951"
nutriment_amt = 16
- nutriment_desc = list("lime" = 12, "graham crackers" = 4)
+ nutriment_desc = list(PLANT_LIME = 12, "graham crackers" = 4)
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize()
@@ -3345,7 +3345,7 @@
trash = /obj/item/trash/plate
filling_color = "#F5B951"
bitesize = 3
- nutriment_desc = list("lime" = 1)
+ nutriment_desc = list(PLANT_LIME = 1)
center_of_mass = list("x"=16, "y"=12)
/obj/item/reagent_containers/food/snacks/keylimepieslice/filled
@@ -3463,7 +3463,7 @@
icon = 'icons/obj/food.dmi'
icon_state = "lasagna"
nutriment_amt = 5
- nutriment_desc = list("tomato" = 4, "meat" = 2)
+ nutriment_desc = list(PLANT_TOMATO = 4, "meat" = 2)
/obj/item/reagent_containers/food/snacks/lasagna/Initialize()
. = ..()
@@ -3656,7 +3656,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/margherita
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15)
+ nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 15)
nutriment_amt = 35
bitesize = 2
@@ -3684,7 +3684,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10)
+ nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, "ham" = 10)
nutriment_amt = 30
bitesize = 2
@@ -3703,7 +3703,7 @@
center_of_mass = list("x"=18, "y"=13)
/obj/item/reagent_containers/food/snacks/pineappleslice/filled
- nutriment_desc = list("pizza crust" = 5, "tomato" = 5)
+ nutriment_desc = list("pizza crust" = 5, PLANT_TOMATO = 5)
nutriment_amt = 5
/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
@@ -3713,7 +3713,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/meatpizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15, "meat" = 10)
+ nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 15, "meat" = 10)
nutriment_amt = 10
bitesize = 2
@@ -3741,7 +3741,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10)
+ nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10)
nutriment_amt = 35
bitesize = 2
@@ -3768,7 +3768,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/vegetablepizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)
+ nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, PLANT_EGGPLANT = 5, PLANT_CARROT = 5, PLANT_CORN = 5)
nutriment_amt = 25
bitesize = 2
@@ -4233,11 +4233,11 @@
// potato + knife = raw sticks
/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/W, mob/user)
- if(seed && seed.kitchen_tag && seed.kitchen_tag == "potato" && istype(W,/obj/item/material/knife))
+ if(seed && seed.kitchen_tag && seed.kitchen_tag == PLANT_POTATO && istype(W,/obj/item/material/knife))
new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src))
to_chat(user, span_notice("You cut the potato."))
qdel(src)
- else if(seed && seed.kitchen_tag && seed.kitchen_tag == "sunflower" && istype(W,/obj/item/material/knife))
+ else if(seed && seed.kitchen_tag && seed.kitchen_tag == PLANT_SUNFLOWERS && istype(W,/obj/item/material/knife))
new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src))
to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them."))
qdel(src)
@@ -4497,7 +4497,7 @@
filling_color = "#E0CF9B"
center_of_mass = list("x"=17, "y"=4)
nutriment_amt = 6
- nutriment_desc = list("sweetness" = 2, "muffin" = 2, "berries" = 2)
+ nutriment_desc = list("sweetness" = 2, "muffin" = 2, PLANT_BERRIES = 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize()
@@ -4515,7 +4515,7 @@
filling_color = "#799ACE"
center_of_mass = list("x"=17, "y"=4)
nutriment_amt = 6
- nutriment_desc = list("spookiness" = 4, "muffin" = 1, "berries" = 1)
+ nutriment_desc = list("spookiness" = 4, "muffin" = 1, PLANT_BERRIES = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize()
@@ -4533,7 +4533,7 @@
filling_color = "#799ACE"
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 8
- nutriment_desc = list(REAGENT_ID_EGG = 4, "chili" = 4)
+ nutriment_desc = list(REAGENT_ID_EGG = 4, PLANT_CHILI = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/devilledegg/Initialize()
@@ -6259,7 +6259,7 @@
icon_state = "fruitbar"
trash = /obj/item/trash/candy/fruitbar
nutriment_amt = 13
- nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
+ nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, PLANT_APPLE = 2)
bitesize = 6
/obj/item/reagent_containers/food/snacks/fruitbar/Initialize()
@@ -6718,7 +6718,7 @@
trash = /obj/item/trash/saturno
filling_color = "#dca319"
center_of_mass = list("x"=15, "y"=9)
- nutriment_desc = list("salt" = 4, "peanut" = 2, "wood?" = 1)
+ nutriment_desc = list("salt" = 4, PLANT_PEANUT = 2, "wood?" = 1)
nutriment_amt = 5
bitesize = 2
@@ -6754,7 +6754,7 @@
trash = /obj/item/trash/mars
filling_color = "#d2c63f"
center_of_mass = list("x"=15, "y"=9)
- nutriment_desc = list("eggs" = 4, "potato" = 4, REAGENT_ID_MUSTARD = 2)
+ nutriment_desc = list("eggs" = 4, PLANT_POTATO = 4, REAGENT_ID_MUSTARD = 2)
nutriment_amt = 8
bitesize = 2
@@ -7102,7 +7102,7 @@
canned_open_state = "appleberry-open"
filling_color = "#FFFFFF"
center_of_mass = list("x"=15, "y"=9)
- nutriment_desc = list("apple" = 1, "sweetness" = 1)
+ nutriment_desc = list(PLANT_APPLE = 1, "sweetness" = 1)
bitesize = 2
/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize()
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index 485b4ab093..ed846dd21b 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -89,7 +89,7 @@
filling_color = "#DB0000"
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 3
- nutriment_desc = list("raw" = 2, "tomato" = 3)
+ nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3)
bitesize = 6
/obj/item/reagent_containers/food/snacks/bearmeat
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 17cc46f6a9..3437b29ee9 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -256,7 +256,7 @@
icon_state = "lobster_cooked"
trash = /obj/item/trash/plate
nutriment_amt = 20
- nutriment_desc = list("lemon" = 2, "lobster" = 5, "salad" = 2)
+ nutriment_desc = list(PLANT_LEMON = 2, "lobster" = 5, "salad" = 2)
/obj/item/reagent_containers/food/snacks/lobstercooked/Initialize()
. = ..()
@@ -639,7 +639,7 @@
icon = 'icons/obj/food_vr.dmi'
icon_state = "grub_pink"
nutriment_amt = 5
- nutriment_desc = list("cherry" = 4, "goo" = 1)
+ nutriment_desc = list(PLANT_CHERRY = 4, "goo" = 1)
/obj/item/reagent_containers/food/snacks/grub_pink/Initialize()
. = ..()
@@ -953,7 +953,7 @@
icon_state = "jaffacake"
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "orange" = 4, "cake" = 3)
+ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, PLANT_ORANGE = 4, "cake" = 3)
/obj/item/reagent_containers/food/snacks/bourbon/Initialize()
. = ..()
@@ -986,7 +986,7 @@
/obj/item/reagent_containers/food/snacks/winegum/orange
icon_state = "winegum_orange"
- nutriment_desc = list(REAGENT_ID_SUGAR = 5, "orange" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_ORANGE = 2)
/obj/item/reagent_containers/food/snacks/winegum/black
icon_state = "winegum_black"
@@ -994,11 +994,11 @@
/obj/item/reagent_containers/food/snacks/winegum/green
icon_state = "winegum_green"
- nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lime" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_LIME = 2)
/obj/item/reagent_containers/food/snacks/winegum/yellow
icon_state = "winegum_yellow"
- nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lemon" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_LEMON = 2)
/obj/item/reagent_containers/food/snacks/winegum/white
icon_state = "winegum_white"
@@ -1030,7 +1030,7 @@
package_trash = /obj/item/trash/pasty
package_open_state = "pasty_open"
nutriment_amt = 4
- nutriment_desc = list("pastry" = 5, "meat" = 5, "onion" = 2, "potato" = 3)
+ nutriment_desc = list("pastry" = 5, "meat" = 5, PLANT_ONION = 2, PLANT_POTATO = 3)
/obj/item/reagent_containers/food/snacks/packaged/pasty/Initialize()
. = ..()
@@ -1184,7 +1184,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
- nutriment_desc = list(REAGENT_ID_SUGAR = 5, "rhubarb" = 2, "custard" = 2)
+ nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_ROSE = 2, "custard" = 2)
var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2")
/obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize()
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 696a13581a..ed06f1a4ab 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -2,7 +2,7 @@
/datum/recipe/chaoscake_layerone
reagents = list(REAGENT_ID_FLOUR = 30,REAGENT_ID_MILK = 20, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 9)
- fruit = list("poisonberries" = 2, "cherries" = 2)
+ fruit = list(PLANT_POISONBERRIES = 2, "cherries" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meat/,
/obj/item/reagent_containers/food/snacks/meat/,
@@ -24,7 +24,7 @@
/datum/recipe/chaoscake_layerthree
reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_DEATHBELL = 10)
- fruit = list("grapes" = 3)
+ fruit = list(PLANT_GRAPES = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -34,7 +34,7 @@
/datum/recipe/chaoscake_layerfour
reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_MILKSHAKE = 30)
- fruit = list("rice" = 3)
+ fruit = list(PLANT_RICE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -44,13 +44,13 @@
/datum/recipe/chaoscake_layerfive
reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_BLOOD = 30)
- fruit = list("tomato" = 2)
+ fruit = list(PLANT_TOMATO = 2)
items = list() //supposed to be made with lobster, still has to be ported.
result = /obj/item/chaoscake_layer/five
/datum/recipe/chaoscake_layersix
reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_SPRINKLES = 5)
- fruit = list("apple" = 2)
+ fruit = list(PLANT_APPLE = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -63,7 +63,7 @@
/datum/recipe/chaoscake_layerseven
reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_DEVILSKISS = 20)
- fruit = list("potato" = 1)
+ fruit = list(PLANT_POTATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -73,7 +73,7 @@
/datum/recipe/chaoscake_layereight
reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_CREAM = 20)
- fruit = list("lemon" = 1)
+ fruit = list(PLANT_LEMON = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -83,7 +83,7 @@
/datum/recipe/chaoscake_layernine
reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_BLOOD = 10)
- fruit = list("goldapple" = 1)
+ fruit = list(PLANT_GOLDAPPLE = 1)
items = list()
result = /obj/item/chaoscake_layer/nine
@@ -334,7 +334,7 @@
icon_state = "big_veggie_slice"
/datum/recipe/theonepizza
- fruit = list("tomato" = 5, "mushroom" = 5, "eggplant" = 1, "carrot" = 1, "corn" = 1)
+ fruit = list(PLANT_TOMATO = 5, "mushroom" = 5, PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm
index f137dd6c78..22f5b7fa30 100644
--- a/code/modules/food/recipes_fryer.dm
+++ b/code/modules/food/recipes_fryer.dm
@@ -15,7 +15,7 @@
/datum/recipe/jpoppers
appliance = FRYER
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
coating = /datum/reagent/nutriment/coating/batter
result = /obj/item/reagent_containers/food/snacks/jalapeno_poppers
result_quantity = 2
@@ -40,7 +40,7 @@
/datum/recipe/onionrings
appliance = FRYER
coating = /datum/reagent/nutriment/coating/batter
- fruit = list("onion" = 1)
+ fruit = list(PLANT_ONION = 1)
result = /obj/item/reagent_containers/food/snacks/onionrings
result_quantity = 2
@@ -48,7 +48,7 @@
//====================
/datum/recipe/cubancarp
appliance = FRYER
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/carpmeat
@@ -92,7 +92,7 @@
/datum/recipe/friedmushroom
appliance = FRYER
- fruit = list("plumphelmet" = 1)
+ fruit = list(PLANT_PLUMPHELMET = 1)
coating = /datum/reagent/nutriment/coating/beerbatter
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/friedmushroom
@@ -110,7 +110,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/sausage
)
- fruit = list("corn" = 1)
+ fruit = list(PLANT_CORN = 1)
coating = /datum/reagent/nutriment/coating/batter
result = /obj/item/reagent_containers/food/snacks/corn_dog
@@ -177,7 +177,7 @@
/datum/recipe/pisanggoreng
appliance = FRYER
- fruit = list("banana" = 2)
+ fruit = list(PLANT_BANANA = 2)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/pisanggoreng
coating = /datum/reagent/nutriment/coating/batter
diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm
index 9598c6732f..1bac99f603 100644
--- a/code/modules/food/recipes_grill.dm
+++ b/code/modules/food/recipes_grill.dm
@@ -185,7 +185,7 @@
/datum/recipe/superbiteburger
appliance = GRILL
- fruit = list("tomato" = 1)
+ fruit = list(PLANT_TOMATO = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, REAGENT_ID_BLACKPEPPER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bigbiteburger,
@@ -281,7 +281,7 @@
/obj/item/reagent_containers/food/snacks/carpmeat
)
reagents = list(REAGENT_ID_SPACESPICE = 1)
- fruit = list("lettuce" = 1, "lime" = 1)
+ fruit = list(PLANT_LETTUCE = 1, PLANT_LIME = 1)
result = /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp
/datum/recipe/grilledcheese
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 635745047d..36170d2360 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -35,7 +35,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/boiledegg
/datum/recipe/devilledegg
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_MAYO = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
@@ -76,7 +76,7 @@ I said no!
result_quantity = 2
/datum/recipe/eggplantparm
- fruit = list("eggplant" = 1)
+ fruit = list(PLANT_EGGPLANT = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -99,14 +99,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/soylentgreen
/datum/recipe/berryclafoutis
- fruit = list("berries" = 1)
+ fruit = list(PLANT_BERRIES = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/reagent_containers/food/snacks/berryclafoutis/berry
/datum/recipe/poisonberryclafoutis
- fruit = list("poisonberries" = 1)
+ fruit = list(PLANT_POISONBERRIES = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -120,7 +120,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/wingfangchu
/datum/recipe/loadedbakedpotato
- fruit = list("potato" = 1)
+ fruit = list(PLANT_POTATO = 1)
items = list(/obj/item/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
@@ -153,7 +153,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/blackpudding
/datum/recipe/popcorn
- fruit = list("corn" = 1)
+ fruit = list(PLANT_CORN = 1)
result = /obj/item/reagent_containers/food/snacks/popcorn
/datum/recipe/fortunecookie
@@ -183,18 +183,18 @@ I said no!
being_cooked.reagents.del_reagent(REAGENT_ID_AMATOXIN)
/datum/recipe/meatballsoup
- fruit = list("carrot" = 1, "potato" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_POTATO = 1)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meatball)
result = /obj/item/reagent_containers/food/snacks/meatballsoup
/datum/recipe/vegetablesoup
- fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_POTATO = 1, PLANT_CORN = 1, PLANT_EGGPLANT = 1)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/vegetablesoup
/datum/recipe/nettlesoup
- fruit = list("nettle" = 1, "potato" = 1)
+ fruit = list(PLANT_NETTLE = 1, PLANT_POTATO = 1)
reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_EGG = 3)
result = /obj/item/reagent_containers/food/snacks/nettlesoup
@@ -203,12 +203,12 @@ I said no!
result= /obj/item/reagent_containers/food/snacks/wishsoup
/datum/recipe/hotchili
- fruit = list("chili" = 1, "tomato" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/hotchili
/datum/recipe/coldchili
- fruit = list("icechili" = 1, "tomato" = 1)
+ fruit = list(PLANT_ICECHILI = 1, PLANT_TOMATO = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/coldchili
@@ -245,11 +245,11 @@ I said no!
/obj/item/reagent_containers/food/snacks/bacon,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
- fruit = list("tomato" = 1, "lettuce" = 1)
+ fruit = list(PLANT_TOMATO = 1, PLANT_LETTUCE = 1)
result = /obj/item/reagent_containers/food/snacks/clubsandwich
/datum/recipe/tomatosoup
- fruit = list("tomato" = 2)
+ fruit = list(PLANT_TOMATO = 2)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/tomatosoup
@@ -263,7 +263,7 @@ I said no!
result_quantity = 2
/datum/recipe/stew
- fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
+ fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/stew
@@ -293,7 +293,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/milosoup
/datum/recipe/stewedsoymeat
- fruit = list("carrot" = 1, "tomato" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/soydope,
/obj/item/reagent_containers/food/snacks/soydope
@@ -316,7 +316,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/ricepudding
/datum/recipe/pastatomato
- fruit = list("tomato" = 2)
+ fruit = list(PLANT_TOMATO = 2)
reagents = list(REAGENT_ID_WATER = 5)
items = list(/obj/item/reagent_containers/food/snacks/spagetti)
result = /obj/item/reagent_containers/food/snacks/pastatomato
@@ -342,12 +342,12 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/spesslaw
/datum/recipe/candiedapple
- fruit = list("apple" = 1)
+ fruit = list(PLANT_APPLE = 1)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SUGAR = 5) //Makes sense seeing as how it's just syrup on the exterior
result = /obj/item/reagent_containers/food/snacks/candiedapple
/datum/recipe/caramelapple
- fruit = list("apple" = 1)
+ fruit = list(PLANT_APPLE = 1)
reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate
result = /obj/item/reagent_containers/food/snacks/caramelapple
@@ -407,7 +407,7 @@ I said no!
result_quantity = 2
/datum/recipe/kudzudonburi
- fruit = list("kudzu" = 1)
+ fruit = list(PLANT_KUDZU = 1)
reagents = list(REAGENT_ID_RICE = 10)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
@@ -425,7 +425,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/mysterysoup
/datum/recipe/plumphelmetbiscuit
- fruit = list("plumphelmet" = 1)
+ fruit = list(PLANT_PLUMPHELMET = 1)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_FLOUR = 5)
result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
result_quantity = 2
@@ -442,12 +442,12 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
- fruit = list("whitebeet" = 1, "cabbage" = 1)
+ fruit = list(PLANT_WHITEBEET = 1, PLANT_CABBAGE = 1)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/beetsoup
/datum/recipe/tossedsalad
- fruit = list("lettuce" = 2, "tomato" = 1, "carrot" = 1, "apple" = 1)
+ fruit = list(PLANT_LETTUCE = 2, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_APPLE = 1)
result = /obj/item/reagent_containers/food/snacks/tossedsalad
/datum/recipe/flowersalad
@@ -458,23 +458,23 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/flowerchildsalad
/datum/recipe/rosesalad
- fruit = list("harebell" = 1, "rose" = 1)
+ fruit = list("harebell" = 1, PLANT_ROSE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/roastedsunflower
)
result = /obj/item/reagent_containers/food/snacks/rosesalad
/datum/recipe/aesirsalad
- fruit = list("goldapple" = 1, "ambrosiadeus" = 1)
+ fruit = list(PLANT_GOLDAPPLE = 1, PLANT_AMBROSIADEUS = 1)
result = /obj/item/reagent_containers/food/snacks/aesirsalad
/datum/recipe/validsalad
- fruit = list("potato" = 1, "ambrosia" = 3)
+ fruit = list(PLANT_POTATO = 1, PLANT_AMBROSIA = 3)
items = list(/obj/item/reagent_containers/food/snacks/meatball)
result = /obj/item/reagent_containers/food/snacks/validsalad
/datum/recipe/dankpocket
- fruit = list("ambrosia" = 2)
+ fruit = list(PLANT_AMBROSIA = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/doughslice
@@ -498,7 +498,7 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/spreads
)
- fruit = list("potato" = 1)
+ fruit = list(PLANT_POTATO = 1)
result = /obj/item/reagent_containers/food/snacks/mashedpotato
/datum/recipe/icecreamsandwich
@@ -509,7 +509,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/icecreamsandwich
/datum/recipe/onionsoup
- fruit = list("onion" = 1)
+ fruit = list(PLANT_ONION = 1)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/soup/onion
@@ -563,19 +563,19 @@ I said no!
result_quantity = 2
/datum/recipe/roastedpeanuts
- fruit = list("peanut" = 2)
+ fruit = list(PLANT_PEANUT = 2)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_COOKINGOIL = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutscorn
- fruit = list("peanut" = 2)
+ fruit = list(PLANT_PEANUT = 2)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_CORNOIL = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutspeanut
- fruit = list("peanut" = 2)
+ fruit = list(PLANT_PEANUT = 2)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_PEANUTOIL = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
@@ -617,7 +617,7 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
- fruit = list("berries" = 1)
+ fruit = list(PLANT_BERRIES = 1)
result = /obj/item/reagent_containers/food/snacks/berrymuffin/berry
result_quantity = 2
@@ -626,7 +626,7 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
- fruit = list("poisonberries" = 1)
+ fruit = list(PLANT_POISONBERRIES = 1)
result = /obj/item/reagent_containers/food/snacks/berrymuffin/poison
result_quantity = 2
@@ -636,7 +636,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
)
- fruit = list("berries" = 1)
+ fruit = list(PLANT_BERRIES = 1)
result = /obj/item/reagent_containers/food/snacks/ghostmuffin/berry
result_quantity = 2
@@ -646,7 +646,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
)
- fruit = list("poisonberries" = 1)
+ fruit = list(PLANT_POISONBERRIES = 1)
result = /obj/item/reagent_containers/food/snacks/ghostmuffin/poison
result_quantity = 2
@@ -655,11 +655,11 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/friedegg
)
- fruit = list("cabbage" = 1)
+ fruit = list(PLANT_CABBAGE = 1)
result = /obj/item/reagent_containers/food/snacks/eggroll
/datum/recipe/fruitsalad
- fruit = list("orange" = 1, "apple" = 1, "grapes" = 1, "watermelon" = 1)
+ fruit = list(PLANT_ORANGE = 1, PLANT_APPLE = 1, PLANT_GRAPES = 1, PLANT_WATERMELON = 1)
result = /obj/item/reagent_containers/food/snacks/fruitsalad
/datum/recipe/eggbowl
@@ -674,7 +674,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/porkbowl
/datum/recipe/cubannachos
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
reagents = list(REAGENT_ID_KETCHUP = 5)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
@@ -682,7 +682,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cubannachos
/datum/recipe/curryrice
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
reagents = list(REAGENT_ID_RICE = 10)
result = /obj/item/reagent_containers/food/snacks/curryrice
@@ -764,7 +764,7 @@ I said no!
/datum/recipe/greencurry
reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5)
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu
@@ -774,25 +774,25 @@ I said no!
/datum/recipe/yellowcurry
reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5)
- fruit = list("peanut" = 2, "potato" = 1)
+ fruit = list(PLANT_PEANUT = 2, PLANT_POTATO = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/yellowcurry
/datum/recipe/bearchili
- fruit = list("chili" = 1, "tomato" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1)
items = list(/obj/item/reagent_containers/food/snacks/bearmeat)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bearchili
/datum/recipe/bearstew
- fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
+ fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/bearmeat)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bearstew
/datum/recipe/bibimbap
- fruit = list("carrot" = 1, "cabbage" = 1, "mushroom" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1, "mushroom" = 1)
reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_SPACESPICE = 2)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
@@ -803,13 +803,13 @@ I said no!
/datum/recipe/friedrice
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SOYSAUCE = 5)
- fruit = list("carrot" = 1, "cabbage" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/friedrice
/datum/recipe/lomein
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5)
- fruit = list("carrot" = 1, "cabbage" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti
)
@@ -817,7 +817,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/lomein
/datum/recipe/chickennoodlesoup
- fruit = list("carrot" = 1)
+ fruit = list(PLANT_CARROT = 1)
reagents = list(REAGENT_ID_WATER = 10)
items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/rawcutlet)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
@@ -888,13 +888,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/chipplate/nachos
/datum/recipe/salsa
- fruit = list("chili" = 1, "tomato" = 1, "lime" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1, PLANT_LIME = 1)
reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/dip/salsa
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/guac
- fruit = list("chili" = 1, "lime" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_LIME = 1)
reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
@@ -903,7 +903,7 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/cheesesauce
- fruit = list("chili" = 1, "tomato" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1)
reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -937,7 +937,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/burrito_cheese
/datum/recipe/burrito_cheese_spicy
- fruit = list("chili" = 2, "soybeans" = 1)
+ fruit = list(PLANT_CHILI = 2, "soybeans" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla,
/obj/item/reagent_containers/food/snacks/cheesewedge,
@@ -946,7 +946,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy
/datum/recipe/burrito_hell
- fruit = list("soybeans" = 1, "chili" = 10)
+ fruit = list("soybeans" = 1, PLANT_CHILI = 10)
reagents = list(REAGENT_ID_SPACESPICE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla,
@@ -976,7 +976,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cheeseburrito
/datum/recipe/fuegoburrito
- fruit = list("soybeans" = 1, "chili" = 2)
+ fruit = list("soybeans" = 1, PLANT_CHILI = 2)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
)
@@ -1053,7 +1053,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
- fruit = list("cabbage" = 1)
+ fruit = list(PLANT_CABBAGE = 1)
result = /obj/item/reagent_containers/food/snacks/stuffed_meatball
result_quantity = 2
@@ -1090,7 +1090,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/nt_muffin
/datum/recipe/fish_taco
- fruit = list("chili" = 1, "lemon" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_LEMON = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat,
/obj/item/reagent_containers/food/snacks/tortilla
@@ -1098,7 +1098,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fish_taco
/datum/recipe/blt
- fruit = list("tomato" = 1, "lettuce" = 1)
+ fruit = list(PLANT_TOMATO = 1, PLANT_LETTUCE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm
index a8bd085784..1105994087 100644
--- a/code/modules/food/recipes_microwave_vr.dm
+++ b/code/modules/food/recipes_microwave_vr.dm
@@ -11,7 +11,7 @@
// All of this shit needs to be gone through and reorganized into different recipes per machine - Rykka 7/16/2020
/datum/recipe/sushi
- fruit = list("cabbage" = 1)
+ fruit = list(PLANT_CABBAGE = 1)
reagents = list(REAGENT_ID_RICE = 20)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
@@ -21,7 +21,7 @@
result = /obj/item/reagent_containers/food/snacks/sliceable/sushi
/datum/recipe/goulash
- fruit = list("tomato" = 1)
+ fruit = list(PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet,
/obj/item/reagent_containers/food/snacks/spagetti
@@ -29,7 +29,7 @@
result = /obj/item/reagent_containers/food/snacks/goulash
/datum/recipe/donerkebab
- fruit = list("tomato" = 1, "cabbage" = 1)
+ fruit = list(PLANT_TOMATO = 1, PLANT_CABBAGE = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meatsteak,
@@ -39,7 +39,7 @@
/datum/recipe/roastbeef
- fruit = list("carrot" = 2, "potato" = 2)
+ fruit = list(PLANT_CARROT = 2, PLANT_POTATO = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meat
)
@@ -53,7 +53,7 @@
result = /obj/item/reagent_containers/food/snacks/reishicup
/datum/recipe/hotandsoursoup
- fruit = list("cabbage" = 1, "mushroom" = 1)
+ fruit = list(PLANT_CABBAGE = 1, "mushroom" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_BLACKPEPPER = 2, REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
@@ -76,7 +76,7 @@
result = /obj/item/reagent_containers/food/snacks/bugball
/datum/recipe/mammi
- fruit = list("orange" = 1)
+ fruit = list(PLANT_ORANGE = 1)
reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_FLOUR = 10, REAGENT_ID_MILK = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/mammi
@@ -91,7 +91,7 @@
result = /obj/item/reagent_containers/food/snacks/makaroni
/datum/recipe/carpsushi
- fruit = list("cabbage" = 1)
+ fruit = list(PLANT_CABBAGE = 1)
reagents = list(REAGENT_ID_RICE = 20)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat,
@@ -101,7 +101,7 @@
result = /obj/item/reagent_containers/food/snacks/sliceable/sushi
/datum/recipe/lobster
- fruit = list("lemon" = 1, "lettuce" = 1)
+ fruit = list(PLANT_LEMON = 1, PLANT_LETTUCE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/lobster
)
@@ -114,7 +114,7 @@
result = /obj/item/reagent_containers/food/snacks/cuttlefishcooked
/datum/recipe/monkfish
- fruit = list("chili" = 1, "onion" = 1)
+ fruit = list(PLANT_CHILI = 1, PLANT_ONION = 1)
items = list(
/obj/item/reagent_containers/food/snacks/monkfishfillet
)
@@ -129,7 +129,7 @@
/datum/recipe/sharkdip
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
- fruit = list("chili" = 1)
+ fruit = list(PLANT_CHILI = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
@@ -137,7 +137,7 @@
/datum/recipe/sharkcubes
reagents = list(REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
- fruit = list("potato" = 1)
+ fruit = list(PLANT_POTATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
@@ -151,7 +151,7 @@
result = /obj/item/storage/box/wings/tray
/datum/recipe/bucket
- fruit = list("durian" = 1)
+ fruit = list(PLANT_DURIAN = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
@@ -168,14 +168,14 @@
result = /obj/item/reagent_containers/food/snacks/grub_pink
/datum/recipe/grub_blue
- fruit = list("berries" = 1)
+ fruit = list(PLANT_BERRIES = 1)
items = list(
/obj/item/reagent_containers/food/snacks/grub
)
result = /obj/item/reagent_containers/food/snacks/grub_blue
/datum/recipe/grub_purple
- fruit = list("grapes" = 1)
+ fruit = list(PLANT_GRAPES = 1)
items = list(
/obj/item/reagent_containers/food/snacks/grub
)
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index e5c84673c0..01268e6ff9 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -10,7 +10,7 @@
/datum/recipe/dionaroast
appliance = OVEN
- fruit = list("apple" = 1)
+ fruit = list(PLANT_APPLE = 1)
reagents = list(REAGENT_ID_PACID = 5) //It dissolves the carapace. Still poisonous, though.
items = list(/obj/item/holder/diona)
result = /obj/item/reagent_containers/food/snacks/dionaroast
@@ -18,7 +18,7 @@
/datum/recipe/monkeysdelight
appliance = OVEN
- fruit = list("banana" = 1)
+ fruit = list(PLANT_BANANA = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_FLOUR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/monkeycube
@@ -46,7 +46,7 @@
/datum/recipe/turkey
appliance = OVEN
- fruit = list("potato" = 1)
+ fruit = list(PLANT_POTATO = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawturkey,
@@ -66,7 +66,7 @@
/datum/recipe/zestfish
appliance = OVEN
- fruit = list("lemon" = 1)
+ fruit = list(PLANT_LEMON = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
@@ -75,7 +75,7 @@
/datum/recipe/limezestfish
appliance = OVEN
- fruit = list("lime" = 1)
+ fruit = list(PLANT_LIME = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
@@ -181,7 +181,7 @@
/datum/recipe/bananabread
appliance = OVEN
- fruit = list("banana" = 1)
+ fruit = list(PLANT_BANANA = 1)
reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -227,7 +227,7 @@
/datum/recipe/pie
appliance = OVEN
- fruit = list("banana" = 1)
+ fruit = list(PLANT_BANANA = 1)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/pie
@@ -249,26 +249,26 @@
/datum/recipe/plump_pie
appliance = OVEN
- fruit = list("plumphelmet" = 1)
+ fruit = list(PLANT_PLUMPHELMET = 1)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/plump_pie
/datum/recipe/applepie
appliance = OVEN
- fruit = list("apple" = 1)
+ fruit = list(PLANT_APPLE = 1)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/applepie
/datum/recipe/pumpkinpie
appliance = OVEN
- fruit = list("pumpkin" = 1)
+ fruit = list(PLANT_PUMPKIN = 1)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
/datum/recipe/appletart
appliance = OVEN
- fruit = list("goldapple" = 1)
+ fruit = list(PLANT_GOLDAPPLE = 1)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/appletart
@@ -277,7 +277,7 @@
/datum/recipe/keylimepie
appliance = OVEN
- fruit = list("lime" = 2)
+ fruit = list(PLANT_LIME = 2)
reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10)
result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie
reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise
@@ -336,13 +336,13 @@
/datum/recipe/cosmicbrownies
appliance = OVEN
reagents = list(REAGENT_ID_BROWNIEMIX = 10, REAGENT_ID_EGG = 3)
- fruit = list("ambrosia" = 1)
+ fruit = list(PLANT_AMBROSIA = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe
result = /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies
/datum/recipe/buchedenoel
appliance = OVEN
- fruit = list("berries" = 2)
+ fruit = list(PLANT_BERRIES = 2)
reagents = list(REAGENT_ID_CAKEBATTER = 20, REAGENT_ID_CREAM = 10, REAGENT_ID_COCO = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel
@@ -357,7 +357,7 @@
/datum/recipe/jaffacake
appliance = OVEN
- fruit = list("orange" = 1)
+ fruit = list(PLANT_ORANGE = 1)
reagents = list(REAGENT_ID_CAKEBATTER = 15, REAGENT_ID_COCO = 10)
result = /obj/item/reagent_containers/food/snacks/jaffacake
result_quantity = 6
@@ -366,7 +366,7 @@
//=========================
/datum/recipe/pizzamargherita
appliance = OVEN
- fruit = list("tomato" = 1)
+ fruit = list(PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge,
@@ -378,7 +378,7 @@
/datum/recipe/meatpizza
appliance = OVEN
- fruit = list("tomato" = 1)
+ fruit = list(PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/meat,
@@ -390,7 +390,7 @@
/datum/recipe/syntipizza
appliance = OVEN
- fruit = list("tomato" = 1)
+ fruit = list(PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/meat/syntiflesh,
@@ -402,7 +402,7 @@
/datum/recipe/mushroompizza
appliance = OVEN
- fruit = list("mushroom" = 5, "tomato" = 1)
+ fruit = list("mushroom" = 5, PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -413,7 +413,7 @@
/datum/recipe/vegetablepizza
appliance = OVEN
- fruit = list("eggplant" = 1, "carrot" = 1, "corn" = 1, "tomato" = 1)
+ fruit = list(PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1, PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -422,7 +422,7 @@
/datum/recipe/pineapplepizza
appliance = OVEN
- fruit = list("tomato" = 1)
+ fruit = list(PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge,
@@ -436,7 +436,7 @@
/datum/recipe/enchiladas
appliance = OVEN
- fruit = list("chili" = 2)
+ fruit = list(PLANT_CHILI = 2)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet,
/obj/item/reagent_containers/food/snacks/tortilla
@@ -454,7 +454,7 @@
/datum/recipe/cake/carrot
appliance = OVEN
- fruit = list("carrot" = 3)
+ fruit = list(PLANT_CARROT = 3)
reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake
@@ -468,25 +468,25 @@
result = /obj/item/reagent_containers/food/snacks/sliceable/cheesecake
/datum/recipe/cake/peanut
- fruit = list("peanut" = 1)
+ fruit = list(PLANT_PEANUT = 1)
reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_PEANUTBUTTER = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/peanutcake
/datum/recipe/cake/orange
appliance = OVEN
- fruit = list("orange" = 2)
+ fruit = list(PLANT_ORANGE = 2)
reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/orangecake
/datum/recipe/cake/lime
appliance = OVEN
- fruit = list("lime" = 2)
+ fruit = list(PLANT_LIME = 2)
reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/limecake
/datum/recipe/cake/lemon
appliance = OVEN
- fruit = list("lemon" = 2)
+ fruit = list(PLANT_LEMON = 2)
reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake
@@ -503,7 +503,7 @@
/datum/recipe/cake/apple
appliance = OVEN
- fruit = list("apple" = 2)
+ fruit = list(PLANT_APPLE = 2)
reagents = list(REAGENT_ID_CAKEBATTER = 30)
result = /obj/item/reagent_containers/food/snacks/sliceable/applecake
@@ -525,7 +525,7 @@
/datum/recipe/pancakes/berry
appliance = OVEN
- fruit = list("berries" = 2)
+ fruit = list(PLANT_BERRIES = 2)
reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
@@ -536,7 +536,7 @@
/datum/recipe/lasagna
appliance = OVEN
- fruit = list("tomato" = 2, "eggplant" = 1)
+ fruit = list(PLANT_TOMATO = 2, PLANT_EGGPLANT = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
@@ -582,7 +582,7 @@
/datum/recipe/bacon_flatbread
appliance = OVEN
- fruit = list("tomato" = 2)
+ fruit = list(PLANT_TOMATO = 2)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge,
@@ -651,13 +651,13 @@
/datum/recipe/loadedbakedpotatooven
appliance = OVEN
- fruit = list("potato" = 1)
+ fruit = list(PLANT_POTATO = 1)
items = list(/obj/item/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
/datum/recipe/meatbun
appliance = OVEN
- fruit = list("cabbage" = 1)
+ fruit = list(PLANT_CABBAGE = 1)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meatball,
@@ -703,7 +703,7 @@
/datum/recipe/veggiemomo
appliance = OVEN
reagents = list(REAGENT_ID_SPACESPICE = 2, REAGENT_ID_WATER = 5)
- fruit = list("carrot" = 1, "cabbage" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/doughslice,
diff --git a/code/modules/hydroponics/fruit_spawner.dm b/code/modules/hydroponics/fruit_spawner.dm
index 4ebbff50d1..eaaa92f1be 100644
--- a/code/modules/hydroponics/fruit_spawner.dm
+++ b/code/modules/hydroponics/fruit_spawner.dm
@@ -17,312 +17,312 @@
/obj/fruitspawner/cabbage
name = "cabbage spawner"
- seedtype = "cabbage"
+ seedtype = PLANT_CABBAGE
icon_state = "cabbage"
/obj/fruitspawner/ambrosia
name = "ambrosia spawner"
- seedtype = "ambrosia"
+ seedtype = PLANT_AMBROSIA
icon_state = "ambrosia"
/obj/fruitspawner/apple
name = "apple spawner"
- seedtype = "apple"
+ seedtype = PLANT_APPLE
icon_state = "apple"
/obj/fruitspawner/banana
name = "banana spawner"
- seedtype = "banana"
+ seedtype = PLANT_BANANA
icon_state = "bananas"
/obj/fruitspawner/berry
name = "berry spawner"
- seedtype = "berries"
+ seedtype = PLANT_BERRIES
icon_state = "berry"
/obj/fruitspawner/carrot
name = "carrot spawner"
- seedtype = "carrot"
+ seedtype = PLANT_CARROT
icon_state = "carrot"
/obj/fruitspawner/celery
name = "celery spawner"
- seedtype = "celery"
+ seedtype = PLANT_CELERY
icon_state = "stalk"
/obj/fruitspawner/cherry
name = "cherry spawner"
- seedtype = "cherry"
+ seedtype = PLANT_CHERRY
icon_state = "cherry"
/obj/fruitspawner/chili
name = "chili spawner"
- seedtype = "chili"
+ seedtype = PLANT_CHILI
icon_state = "chili"
/obj/fruitspawner/icechili
name = "icechili spawner"
- seedtype = "icechili"
+ seedtype = PLANT_ICECHILI
icon_state = "chili"
/obj/fruitspawner/ghostchili
name = "ghost chili spawner"
- seedtype = "ghostchili"
+ seedtype = PLANT_GHOSTCHILI
icon_state = "chili"
/obj/fruitspawner/lime
name = "lime spawner"
- seedtype = "lime"
+ seedtype = PLANT_LIME
icon_state = "treefruit"
/obj/fruitspawner/lemon
name = "lemon spawner"
- seedtype = "lemon"
+ seedtype = PLANT_LEMON
icon_state = "lemon"
/obj/fruitspawner/orange
name = "orange spawner"
- seedtype = "orange"
+ seedtype = PLANT_ORANGE
icon_state = "treefruit"
/obj/fruitspawner/cocoa
name = "cocoa spawner"
- seedtype = "cocoa"
+ seedtype = PLANT_COCOA
icon_state = "treefruit"
/obj/fruitspawner/corn
name = "corn spawner"
- seedtype = "corn"
+ seedtype = PLANT_CORN
icon_state = "corn"
/obj/fruitspawner/diona
name = "diona spawner"
- seedtype = "diona"
+ seedtype = PLANT_DIONA
icon_state = "diona"
/obj/fruitspawner/durian
name = "durian spawner"
- seedtype = "durian"
+ seedtype = PLANT_DURIAN
icon_state = "spinefruit"
/obj/fruitspawner/eggplant
name = "eggplant spawner"
- seedtype = "eggplant"
+ seedtype = PLANT_EGGPLANT
icon_state = "eggplant"
/obj/fruitspawner/harebells
name = "harebells spawner"
- seedtype = "harebells"
+ seedtype = PLANT_HAREBELLS
icon_state = "flower5"
/obj/fruitspawner/poppies
name = "poppies spawner"
- seedtype = "poppies"
+ seedtype = PLANT_POPPIES
icon_state = "flower3"
/obj/fruitspawner/sunflowers
name = "sunflowers spawner"
- seedtype = "sunflowers"
+ seedtype = PLANT_SUNFLOWERS
icon_state = "flower2"
/obj/fruitspawner/lavender
name = "lavender spawner"
- seedtype = "lavender"
+ seedtype = PLANT_LAVENDER
icon_state = "flower6"
/obj/fruitspawner/rose
name = "rose spawner"
- seedtype = "rose"
+ seedtype = PLANT_ROSE
icon_state = "flowers"
/obj/fruitspawner/bloodrose
name = "bloodrose spawner"
- seedtype = "bloodrose"
+ seedtype = PLANT_BLOODROSE
icon_state = "flowers"
/obj/fruitspawner/gnomes
name = "gnomes spawner"
- seedtype = "gnomes"
+ seedtype = PLANT_GNOMES
icon_state = "gnomes"
/obj/fruitspawner/grapes
name = "grapes spawner"
- seedtype = "grapes"
+ seedtype = PLANT_GRAPES
icon_state = "grapes"
/obj/fruitspawner/greengrapes
name = "greengrapes spawner"
- seedtype = "greengrapes"
+ seedtype = PLANT_GREENGRAPES
icon_state = "grapes"
/obj/fruitspawner/grass
name = "grass spawner"
- seedtype = "grass"
+ seedtype = PLANT_GRASS
icon_state = "grass"
/obj/fruitspawner/carpet
name = "carpet spawner"
- seedtype = "carpet"
+ seedtype = PLANT_CARPET
icon_state = "grass"
/obj/fruitspawner/kudzu
name = "kudzu spawner"
- seedtype = "kudzu"
+ seedtype = PLANT_KUDZU
icon_state = "treefruit"
/obj/fruitspawner/lettuce
name = "lettuce spawner"
- seedtype = "lettuce"
+ seedtype = PLANT_LETTUCE
icon_state = "lettuce"
/obj/fruitspawner/siflettuce
name = "siflettuce spawner"
- seedtype = "siflettuce"
+ seedtype = PLANT_SIFLETTUCE
icon_state = "lettuce"
/obj/fruitspawner/mtear
name = "mtear spawner"
- seedtype = "mtear"
+ seedtype = PLANT_MTEAR
icon_state = "alien4"
/obj/fruitspawner/mushrooms
name = "chanterelle spawner"
- seedtype = "mushrooms"
+ seedtype = PLANT_MUSHROOMS
icon_state = "mushroom4"
/obj/fruitspawner/mold
name = "mold spawner"
- seedtype = "mold"
+ seedtype = PLANT_MOLD
icon_state = "mushroom5"
/obj/fruitspawner/plumphelmet
name = "plumphelmet spawner"
- seedtype = "plumphelmet"
+ seedtype = PLANT_PLUMPHELMET
icon_state = "mushroom10"
/obj/fruitspawner/reishi
name = "reishi spawner"
- seedtype = "reishi"
+ seedtype = PLANT_REISHI
icon_state = "mushroom11"
/obj/fruitspawner/libertycap
name = "libertycap spawner"
- seedtype = "libertycap"
+ seedtype = PLANT_LIBERTYCAP
icon_state = "mushroom8"
/obj/fruitspawner/amanita
name = "amanita spawner"
- seedtype = "amanita"
+ seedtype = PLANT_AMANITA
icon_state = "mushroom"
/obj/fruitspawner/destroyingangel
name = "destroyingangel spawner"
- seedtype = "destroyingangel"
+ seedtype = PLANT_DESTROYINGANGEL
icon_state = "mushroom3"
/obj/fruitspawner/towercap
name = "towercap spawner"
- seedtype = "towercap"
+ seedtype = PLANT_TOWERCAP
icon_state = "mushroom7"
/obj/fruitspawner/redcap
name = "redcap spawner"
- seedtype = "redcap"
+ seedtype = PLANT_REDCAP
icon_state = "mushroom7"
/obj/fruitspawner/glowshroom
name = "glowshroom spawner"
- seedtype = "glowshroom"
+ seedtype = PLANT_GLOWSHROOM
icon_state = "mushroom2"
/obj/fruitspawner/plastic
name = "plastic spawner"
- seedtype = "plastic"
+ seedtype = PLANT_PLASTIC
icon_state = "mushroom6"
/obj/fruitspawner/sporeshroom
name = "sporeshroom spawner"
- seedtype = "sporeshroom"
+ seedtype = PLANT_SPORESHROOM
icon_state = "mushroom5"
/obj/fruitspawner/nettle
name = "nettle spawner"
- seedtype = "nettle"
+ seedtype = PLANT_NETTLE
icon_state = "nettles"
/obj/fruitspawner/deathnettle
name = "deathnettle spawner"
- seedtype = "deathnettle"
+ seedtype = PLANT_DEATHNETTLE
icon_state = "nettles"
/obj/fruitspawner/onion
name = "onion spawner"
- seedtype = "onion"
+ seedtype = PLANT_ONION
icon_state = "onion"
/obj/fruitspawner/peanut
name = "peanut spawner"
- seedtype = "peanut"
+ seedtype = PLANT_PEANUT
icon_state = "nuts"
/obj/fruitspawner/pineapple
name = "pineapple spawner"
- seedtype = "pineapple"
+ seedtype = PLANT_PINEAPPLE
icon_state = "pineapple"
/obj/fruitspawner/spineapple
name = "spineapple spawner"
- seedtype = "spineapple"
+ seedtype = PLANT_SPINEAPPLE
icon_state = "pineapple"
/obj/fruitspawner/potato
name = "potato spawner"
- seedtype = "potato"
+ seedtype = PLANT_POTATO
icon_state = "potato"
/obj/fruitspawner/pumpkin
name = "pumpkin spawner"
- seedtype = "pumpkin"
+ seedtype = PLANT_PUMPKIN
icon_state = "vine2"
/obj/fruitspawner/rhubarb
name = "rhubarb spawner"
- seedtype = "rhubarb"
+ seedtype = PLANT_ROSE
icon_state = "stalk"
/obj/fruitspawner/rice
name = "rice spawner"
- seedtype = "rice"
+ seedtype = PLANT_RICE
icon_state = "rice"
/obj/fruitspawner/shand
name = "selems hand spawner"
- seedtype = "shand"
+ seedtype = PLANT_SHAND
icon_state = "alien3"
/obj/fruitspawner/soybean
name = "soybean spawner"
- seedtype = "soybean"
+ seedtype = PLANT_SOYBEAN
icon_state = "bean"
/obj/fruitspawner/sugarcane
name = "sugarcane spawner"
- seedtype = "sugarcane"
+ seedtype = PLANT_SUGARCANE
icon_state = "stalk"
/obj/fruitspawner/telriis
name = "telriis spawner"
- seedtype = "telriis"
+ seedtype = PLANT_TELRIIS
icon_state = "ambrosia"
/obj/fruitspawner/thaadra
name = "thaadra spawner"
- seedtype = "thaadra"
+ seedtype = PLANT_THAADRA
icon_state = "grass"
/obj/fruitspawner/tobacco
name = "tobacco spawner"
- seedtype = "tobacco"
+ seedtype = PLANT_TOBACCO
icon_state = "leafy"
/obj/fruitspawner/stimbush
@@ -332,65 +332,65 @@
/obj/fruitspawner/tomato
name = "tomato spawner"
- seedtype = "tomato"
+ seedtype = PLANT_TOMATO
icon_state = "tomato"
/obj/fruitspawner/bloodtomato
name = "bloodtomato spawner"
- seedtype = "bloodtomato"
+ seedtype = PLANT_BLOODTOMATO
icon_state = "tomato"
/obj/fruitspawner/bluetomato
name = "bluetomato spawner"
- seedtype = "bluetomato"
+ seedtype = PLANT_BLUETOMATO
icon_state = "tomato"
/obj/fruitspawner/bluespacetomato
name = "bluespacetomato spawner"
- seedtype = "bluespacetomato"
+ seedtype = PLANT_BLUESPACETOMATO
icon_state = "tomato"
/obj/fruitspawner/vanilla
name = "vanilla spawner"
- seedtype = "vanilla"
+ seedtype = PLANT_VANILLA
icon_state = "chili"
/obj/fruitspawner/whitewabback
name = "whitewabback spawner"
- seedtype = "whitewabback"
+ seedtype = PLANT_WHITEWABBACK
icon_state = "carrot2"
/obj/fruitspawner/blackwabback
name = "blackwabback spawner"
- seedtype = "blackwabback"
+ seedtype = PLANT_BLACKWABBACK
icon_state = "carrot2"
/obj/fruitspawner/wildwabback
name = "wildwabback spawner"
- seedtype = "wildwabback"
+ seedtype = PLANT_WILDWABBACK
icon_state = "carrot2"
/obj/fruitspawner/watermelon
name = "watermelon spawner"
- seedtype = "watermelon"
+ seedtype = PLANT_WATERMELON
icon_state = "vine"
/obj/fruitspawner/weeds
name = "weeds spawner"
- seedtype = "weeds"
+ seedtype = PLANT_WEEDS
icon_state = "flower4"
/obj/fruitspawner/wheat
name = "wheat spawner"
- seedtype = "wheat"
+ seedtype = PLANT_WHEAT
icon_state = "wheat"
/obj/fruitspawner/whitebeet
name = "whitebeet spawner"
- seedtype = "whitebeet"
+ seedtype = PLANT_WHITEBEET
icon_state = "carrot2"
/obj/fruitspawner/wurmwoad
name = "wurmwoad spawner"
- seedtype = "wurmwoad"
+ seedtype = PLANT_WURMWOAD
icon_state = "eyepod"
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 01d1c0c9b8..7e7629b0da 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -188,7 +188,7 @@
if(W.sharp)
- if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful.
+ if(seed.kitchen_tag == PLANT_PUMPKIN) // Ugggh these checks are awful.
user.show_message(span_notice("You carve a face into [src]!"), 1)
new /obj/item/clothing/head/pumpkinhead (user.loc)
qdel(src)
@@ -214,13 +214,13 @@
qdel(src)
return
- if(seed.kitchen_tag == "sunflower")
+ if(seed.kitchen_tag == PLANT_SUNFLOWERS)
new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src))
to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them."))
qdel(src)
return
- if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"]))
+ if(seed.kitchen_tag == PLANT_POTATO || !isnull(seed.chems[REAGENT_ID_POTATOJUICE]))
to_chat(user, span_filter_notice("You slice \the [src] into sticks."))
new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src))
qdel(src)
@@ -289,7 +289,7 @@
if(src) qdel(src)
return
- if(seed.kitchen_tag == "grass")
+ if(seed.kitchen_tag == PLANT_GRASS)
user.show_message(span_notice("You make a grass tile out of \the [src]!"), 1)
var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)
if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR)
@@ -306,7 +306,7 @@
qdel(src)
return
- if(seed.kitchen_tag == "carpet")
+ if(seed.kitchen_tag == PLANT_CARPET)
user.show_message(span_notice("You shape some carpet squares out of \the [src] fibers!"), 1)
for(var/i=0,i<2,i++)
var/obj/item/stack/tile/carpet/G = new (user.loc)
@@ -330,13 +330,13 @@
/*
if(seed.kitchen_tag)
switch(seed.kitchen_tag)
- if("shand")
+ if(PLANT_SHAND)
var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
poultice.heal_brute = potency
to_chat(user, span_notice("You mash the leaves into a poultice."))
qdel(src)
return
- if("mtear")
+ if(PLANT_MTEAR)
var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
poultice.heal_burn = potency
to_chat(user, span_notice("You mash the petals into a poultice."))
@@ -362,10 +362,10 @@
// Predefined types for placing on the map.
/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
- plantname = "libertycap"
+ plantname = PLANT_LIBERTYCAP
/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris
- plantname = "ambrosia"
+ plantname = PLANT_AMBROSIA
/obj/item/reagent_containers/food/snacks/fruit_slice
name = "fruit slice"
diff --git a/code/modules/hydroponics/grown_predefined.dm b/code/modules/hydroponics/grown_predefined.dm
index 196f72c667..66e1f8ee33 100644
--- a/code/modules/hydroponics/grown_predefined.dm
+++ b/code/modules/hydroponics/grown_predefined.dm
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris
- plantname = "ambrosia"
+ plantname = PLANT_AMBROSIA
/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus
- plantname = "ambrosiadeus"
+ plantname = PLANT_AMBROSIADEUS
diff --git a/code/modules/hydroponics/grown_sif.dm b/code/modules/hydroponics/grown_sif.dm
index c55600c756..60541ddc00 100644
--- a/code/modules/hydroponics/grown_sif.dm
+++ b/code/modules/hydroponics/grown_sif.dm
@@ -21,16 +21,16 @@
. = ..()
/obj/item/reagent_containers/food/snacks/grown/sif/sifpod
- plantname = "sifbulb"
+ plantname = PLANT_SIFBULB
/obj/item/reagent_containers/food/snacks/grown/sif/wabback
plantname = "wabback"
/obj/item/reagent_containers/food/snacks/grown/sif/blackwabback
- plantname = "blackwabback"
+ plantname = PLANT_BLACKWABBACK
/obj/item/reagent_containers/food/snacks/grown/sif/wildwabback
- plantname = "wildwabback"
+ plantname = PLANT_WILDWABBACK
/obj/item/reagent_containers/food/snacks/grown/sif/eyebulbs
plantname = "eyebulbs"
diff --git a/code/modules/hydroponics/seed_datums_vr.dm b/code/modules/hydroponics/seed_datums_vr.dm
index 02c1c9b370..a6b50a0308 100644
--- a/code/modules/hydroponics/seed_datums_vr.dm
+++ b/code/modules/hydroponics/seed_datums_vr.dm
@@ -2,11 +2,11 @@
//Vore Originals
/datum/seed/size
- name = "microm"
+ name = PLANT_MICROM
seed_name = "Shrinking Mushroom"
display_name = "Shrinking mushroom trees"
- mutants = list("megam")
- kitchen_tag = "microm"
+ mutants = list(PLANT_MEGAM)
+ kitchen_tag = PLANT_MICROM
chems = list(REAGENT_ID_MICROCILLIN = list(1,20))
/datum/seed/size/New()
@@ -22,11 +22,11 @@
/datum/seed/size/megam
- name = "megam"
+ name = PLANT_MEGAM
seed_name = "Mega Mushroom"
display_name = "Mega mushroom trees"
- mutants = list("microm")
- kitchen_tag = "megam"
+ mutants = list(PLANT_MICROM)
+ kitchen_tag = PLANT_MEGAM
chems = list(REAGENT_ID_MACROCILLIN = list(1,20))
/datum/seed/size/megam/New()
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 1574365617..fec080d8dc 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -83,277 +83,283 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
. = ..()
/obj/item/seeds/replicapod
- seed_type = "diona"
+ seed_type = PLANT_DIONA
/obj/item/seeds/chiliseed
- seed_type = "chili"
+ seed_type = PLANT_CHILI
/obj/item/seeds/ghostchiliseed
- seed_type = "ghostchili"
+ seed_type = PLANT_GHOSTCHILI
/obj/item/seeds/plastiseed
- seed_type = "plastic"
+ seed_type = PLANT_PLASTIC
/obj/item/seeds/grapeseed
- seed_type = "grapes"
+ seed_type = PLANT_GRAPES
/obj/item/seeds/greengrapeseed
- seed_type = "greengrapes"
+ seed_type = PLANT_GREENGRAPES
/obj/item/seeds/peanutseed
- seed_type = "peanut"
+ seed_type = PLANT_PEANUT
/obj/item/seeds/cabbageseed
- seed_type = "cabbage"
+ seed_type = PLANT_CABBAGE
/obj/item/seeds/shandseed
- seed_type = "shand"
+ seed_type = PLANT_SHAND
/obj/item/seeds/mtearseed
- seed_type = "mtear"
+ seed_type = PLANT_MTEAR
/obj/item/seeds/berryseed
- seed_type = "berries"
+ seed_type = PLANT_BERRIES
/obj/item/seeds/glowberryseed
- seed_type = "glowberries"
+ seed_type = PLANT_GLOWBERRIES
/obj/item/seeds/peppercornseed
- seed_type = "peppercorns"
+ seed_type = PLANT_PEPPERCORNS
/obj/item/seeds/bananaseed
- seed_type = "banana"
+ seed_type = PLANT_BANANA
/obj/item/seeds/eggplantseed
- seed_type = "eggplant"
+ seed_type = PLANT_EGGPLANT
/obj/item/seeds/bloodtomatoseed
- seed_type = "bloodtomato"
+ seed_type = PLANT_BLOODTOMATO
/obj/item/seeds/tomatoseed
- seed_type = "tomato"
+ seed_type = PLANT_TOMATO
/obj/item/seeds/killertomatoseed
- seed_type = "killertomato"
+ seed_type = PLANT_KILLERTOMATO
/obj/item/seeds/bluetomatoseed
- seed_type = "bluetomato"
+ seed_type = PLANT_BLUETOMATO
/obj/item/seeds/bluespacetomatoseed
- seed_type = "bluespacetomato"
+ seed_type = PLANT_BLUESPACETOMATO
/obj/item/seeds/cornseed
- seed_type = "corn"
+ seed_type = PLANT_CORN
/obj/item/seeds/poppyseed
- seed_type = "poppies"
+ seed_type = PLANT_POPPIES
/obj/item/seeds/potatoseed
- seed_type = "potato"
+ seed_type = PLANT_POTATO
/obj/item/seeds/icepepperseed
- seed_type = "icechili"
+ seed_type = PLANT_ICECHILI
/obj/item/seeds/soyaseed
- seed_type = "soybean"
+ seed_type = PLANT_SOYBEAN
/obj/item/seeds/wheatseed
- seed_type = "wheat"
+ seed_type = PLANT_WHEAT
/obj/item/seeds/riceseed
- seed_type = "rice"
+ seed_type = PLANT_RICE
/obj/item/seeds/carrotseed
- seed_type = "carrot"
+ seed_type = PLANT_CARROT
/obj/item/seeds/reishimycelium
- seed_type = "reishi"
+ seed_type = PLANT_REISHI
/obj/item/seeds/amanitamycelium
- seed_type = "amanita"
+ seed_type = PLANT_AMANITA
/obj/item/seeds/angelmycelium
- seed_type = "destroyingangel"
+ seed_type = PLANT_DESTROYINGANGEL
/obj/item/seeds/libertymycelium
- seed_type = "libertycap"
+ seed_type = PLANT_LIBERTYCAP
/obj/item/seeds/chantermycelium
- seed_type = "mushrooms"
+ seed_type = PLANT_MUSHROOMS
/obj/item/seeds/towermycelium
- seed_type = "towercap"
+ seed_type = PLANT_TOWERCAP
/obj/item/seeds/redtowermycelium
- seed_type = "redcap"
+ seed_type = PLANT_REDCAP
/obj/item/seeds/glowshroom
- seed_type = "glowshroom"
+ seed_type = PLANT_GLOWSHROOM
/obj/item/seeds/plumpmycelium
- seed_type = "plumphelmet"
+ seed_type = PLANT_PLUMPHELMET
/obj/item/seeds/plastellmycelium
- seed_type = "plastic"
+ seed_type = PLANT_PLASTIC
/obj/item/seeds/sporemycelium
- seed_type = "sporeshroom"
+ seed_type = PLANT_SPORESHROOM
/obj/item/seeds/nettleseed
- seed_type = "nettle"
+ seed_type = PLANT_NETTLE
/obj/item/seeds/deathnettleseed
- seed_type = "deathnettle"
+ seed_type = PLANT_DEATHNETTLE
/obj/item/seeds/weeds
- seed_type = "weeds"
+ seed_type = PLANT_WEEDS
/obj/item/seeds/harebell
- seed_type = "harebells"
+ seed_type = PLANT_HAREBELLS
/obj/item/seeds/sunflowerseed
- seed_type = "sunflowers"
+ seed_type = PLANT_SUNFLOWERS
/obj/item/seeds/lavenderseed
- seed_type = "lavender"
+ seed_type = PLANT_LAVENDER
/obj/item/seeds/brownmold
- seed_type = "mold"
+ seed_type = PLANT_MOLD
/obj/item/seeds/appleseed
- seed_type = "apple"
+ seed_type = PLANT_APPLE
/obj/item/seeds/poisonedappleseed
- seed_type = "poisonapple"
+ seed_type = PLANT_POISONAPPLE
/obj/item/seeds/goldappleseed
- seed_type = "goldapple"
+ seed_type = PLANT_GOLDAPPLE
/obj/item/seeds/ambrosiavulgarisseed
- seed_type = "ambrosia"
+ seed_type = PLANT_AMBROSIA
/obj/item/seeds/ambrosiadeusseed
- seed_type = "ambrosiadeus"
+ seed_type = PLANT_AMBROSIADEUS
/obj/item/seeds/ambrosiagaiaseed
- seed_type = "ambrosiagaia"
+ seed_type = PLANT_AMBROSIAGAIA
/obj/item/seeds/ambrosiainfernusseed
- seed_type = "ambrosiainfernus"
+ seed_type = PLANT_AMBROSIAINFERNUS
/obj/item/seeds/whitebeetseed
- seed_type = "whitebeet"
+ seed_type = PLANT_WHITEBEET
/obj/item/seeds/sugarcaneseed
- seed_type = "sugarcane"
+ seed_type = PLANT_SUGARCANE
/obj/item/seeds/watermelonseed
- seed_type = "watermelon"
+ seed_type = PLANT_WATERMELON
/obj/item/seeds/pumpkinseed
- seed_type = "pumpkin"
+ seed_type = PLANT_PUMPKIN
/obj/item/seeds/limeseed
- seed_type = "lime"
+ seed_type = PLANT_LIME
/obj/item/seeds/lemonseed
- seed_type = "lemon"
+ seed_type = PLANT_LEMON
/obj/item/seeds/onionseed
- seed_type = "onion"
+ seed_type = PLANT_ONION
/obj/item/seeds/orangeseed
- seed_type = "orange"
+ seed_type = PLANT_ORANGE
/obj/item/seeds/poisonberryseed
- seed_type = "poisonberries"
+ seed_type = PLANT_POISONBERRIES
/obj/item/seeds/deathberryseed
- seed_type = "deathberries"
+ seed_type = PLANT_DEATHBERRIES
/obj/item/seeds/grassseed
- seed_type = "grass"
+ seed_type = PLANT_GRASS
/obj/item/seeds/carpetseed
- seed_type = "carpet"
+ seed_type = PLANT_CARPET
/obj/item/seeds/cocoapodseed
- seed_type = "cocoa"
+ seed_type = PLANT_COCOA
/obj/item/seeds/cherryseed
- seed_type = "cherry"
+ seed_type = PLANT_CHERRY
/obj/item/seeds/tobaccoseed
- seed_type = "tobacco"
+ seed_type = PLANT_TOBACCO
/obj/item/seeds/kudzuseed
- seed_type = "kudzu"
+ seed_type = PLANT_KUDZU
/obj/item/seeds/jurlmah
- seed_type = "jurlmah"
+ seed_type = PLANT_JURLMAH
/obj/item/seeds/amauri
- seed_type = "amauri"
+ seed_type = PLANT_AMAURI
/obj/item/seeds/gelthi
- seed_type = "gelthi"
+ seed_type = PLANT_GELTHI
/obj/item/seeds/vale
- seed_type = "vale"
+ seed_type = PLANT_VALE
/obj/item/seeds/surik
- seed_type = "surik"
+ seed_type = PLANT_SURIK
/obj/item/seeds/telriis
- seed_type = "telriis"
+ seed_type = PLANT_TELRIIS
/obj/item/seeds/thaadra
- seed_type = "thaadra"
+ seed_type = PLANT_THAADRA
/obj/item/seeds/celery
- seed_type = "celery"
+ seed_type = PLANT_CELERY
/obj/item/seeds/rhubarb
- seed_type = "rhubarb"
+ seed_type = PLANT_ROSE
/obj/item/seeds/wabback
- seed_type = "whitewabback"
+ seed_type = PLANT_WHITEWABBACK
/obj/item/seeds/blackwabback
- seed_type = "blackwabback"
+ seed_type = PLANT_BLACKWABBACK
/obj/item/seeds/wildwabback
- seed_type = "wildwabback"
+ seed_type = PLANT_WILDWABBACK
/obj/item/seeds/lettuce
- seed_type = "lettuce"
+ seed_type = PLANT_LETTUCE
/obj/item/seeds/siflettuce
- seed_type = "siflettuce"
+ seed_type = PLANT_SIFLETTUCE
/obj/item/seeds/eggyplant
- seed_type = "egg-plant"
+ seed_type = PLANT_EGGPLANT
/obj/item/seeds/pineapple
- seed_type = "pineapple"
+ seed_type = PLANT_PINEAPPLE
/obj/item/seeds/durian
- seed_type = "durian"
+ seed_type = PLANT_DURIAN
/obj/item/seeds/vanilla
- seed_type = "vanilla"
+ seed_type = PLANT_VANILLA
/obj/item/seeds/rose
- seed_type = "rose"
+ seed_type = PLANT_ROSE
/obj/item/seeds/rose/blood
- seed_type = "bloodrose"
+ seed_type = PLANT_BLOODROSE
/obj/item/seeds/gnomes
- seed_type = "gnomes"
+ seed_type = PLANT_GNOMES
/obj/item/seeds/sifbulb
- seed_type = "sifbulb"
+ seed_type = PLANT_SIFBULB
/obj/item/seeds/wurmwoad
- seed_type = "wurmwoad"
+ seed_type = PLANT_WURMWOAD
+
+/obj/item/seeds/shrinkshroom
+ seed_type = PLANT_MICROM
+
+/obj/item/seeds/megashroom
+ seed_type = PLANT_MEGAM
diff --git a/code/modules/hydroponics/seed_packets_vr.dm b/code/modules/hydroponics/seed_packets_vr.dm
deleted file mode 100644
index 82eaaf5d38..0000000000
--- a/code/modules/hydroponics/seed_packets_vr.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/obj/item/seeds/shrinkshroom
- seed_type = "microm"
-
-/obj/item/seeds/megashroom
- seed_type = "megam"
diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm
index c3d5e89311..c6cb81c3bc 100644
--- a/code/modules/hydroponics/seedtypes/amauri.dm
+++ b/code/modules/hydroponics/seedtypes/amauri.dm
@@ -1,8 +1,8 @@
/datum/seed/amauri
- name = "amauri"
- seed_name = "amauri"
+ name = PLANT_AMAURI
+ seed_name = PLANT_AMAURI
display_name = "amauri plant"
- kitchen_tag = "amauri"
+ kitchen_tag = PLANT_AMAURI
chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),REAGENT_ID_CONDENSEDCAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm
index b7b83ff848..c548bd442c 100644
--- a/code/modules/hydroponics/seedtypes/ambrosia.dm
+++ b/code/modules/hydroponics/seedtypes/ambrosia.dm
@@ -1,10 +1,10 @@
//Ambrosia/varieties.
/datum/seed/ambrosia
- name = "ambrosia"
+ name = PLANT_AMBROSIA
seed_name = "ambrosia vulgaris"
display_name = "ambrosia vulgaris"
- kitchen_tag = "ambrosia"
- mutants = list("ambrosiadeus")
+ kitchen_tag = PLANT_AMBROSIA
+ mutants = list(PLANT_AMBROSIADEUS)
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), REAGENT_ID_KELOTANE = list(1,8,1), REAGENT_ID_BICARIDINE = list(1,10,1))
/datum/seed/ambrosia/New()
@@ -20,11 +20,11 @@
set_trait(TRAIT_IDEAL_LIGHT, 6)
/datum/seed/ambrosia/deus
- name = "ambrosiadeus"
+ name = PLANT_AMBROSIADEUS
seed_name = "ambrosia deus"
display_name = "ambrosia deus"
- kitchen_tag = "ambrosiadeus"
- mutants = list("ambrosiainfernus", "ambrosiagaia")
+ kitchen_tag = PLANT_AMBROSIADEUS
+ mutants = list(PLANT_AMBROSIAINFERNUS, PLANT_AMBROSIAGAIA)
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_BICARIDINE = list(1,8), REAGENT_ID_SYNAPTIZINE = list(1,8,1), REAGENT_ID_HYPERZINE = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
@@ -33,10 +33,10 @@
set_trait(TRAIT_PLANT_COLOUR,"#2A9C61")
/datum/seed/ambrosia/infernus
- name = "ambrosiainfernus"
+ name = PLANT_AMBROSIAINFERNUS
seed_name = "ambrosia infernus"
display_name = "ambrosia infernus"
- kitchen_tag = "ambrosiainfernus"
+ kitchen_tag = PLANT_AMBROSIAINFERNUS
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,3), REAGENT_ID_OXYCODONE = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
@@ -46,10 +46,10 @@
set_trait(TRAIT_PLANT_COLOUR,"#b22222")
/datum/seed/ambrosia/gaia
- name = "ambrosiagaia"
+ name = PLANT_AMBROSIAGAIA
seed_name = "ambrosia gaia"
display_name = "ambrosia gaia"
- kitchen_tag = "ambrosiagaia"
+ kitchen_tag = PLANT_AMBROSIAGAIA
mutants = null
chems = list (REAGENT_ID_EARTHSBLOOD = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm
index 09f3075249..25a4af5c00 100644
--- a/code/modules/hydroponics/seedtypes/apples.dm
+++ b/code/modules/hydroponics/seedtypes/apples.dm
@@ -1,10 +1,10 @@
//Apples/varieties.
/datum/seed/apple
- name = "apple"
- seed_name = "apple"
+ name = PLANT_APPLE
+ seed_name = PLANT_APPLE
display_name = "apple tree"
- kitchen_tag = "apple"
- mutants = list("poisonapple","goldapple")
+ kitchen_tag = PLANT_APPLE
+ mutants = list(PLANT_POISONAPPLE,PLANT_GOLDAPPLE)
chems = list(REAGENT_ID_NUTRIMENT = list(1,10),REAGENT_ID_APPLEJUICE = list(10,20))
/datum/seed/apple/New()
@@ -21,15 +21,15 @@
set_trait(TRAIT_IDEAL_LIGHT, 4)
/datum/seed/apple/poison
- name = "poisonapple"
+ name = PLANT_POISONAPPLE
mutants = null
chems = list(REAGENT_ID_CYANIDE = list(1,5))
/datum/seed/apple/gold
- name = "goldapple"
+ name = PLANT_GOLDAPPLE
seed_name = "golden apple"
display_name = "gold apple tree"
- kitchen_tag = "goldapple"
+ kitchen_tag = PLANT_GOLDAPPLE
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_GOLD = list(1,5))
@@ -42,10 +42,10 @@
set_trait(TRAIT_PLANT_COLOUR,"#D6B44D")
/datum/seed/apple/sif
- name = "sifbulb"
+ name = PLANT_SIFBULB
seed_name = "sivian pod"
display_name = "sivian pod"
- kitchen_tag = "apple"
+ kitchen_tag = PLANT_APPLE
chems = list(REAGENT_ID_NUTRIMENT = list(1,5),REAGENT_ID_SIFSAP = list(10,20))
/datum/seed/apple/sif/New()
diff --git a/code/modules/hydroponics/seedtypes/banana.dm b/code/modules/hydroponics/seedtypes/banana.dm
index ab6f8ef771..47dcc1486c 100644
--- a/code/modules/hydroponics/seedtypes/banana.dm
+++ b/code/modules/hydroponics/seedtypes/banana.dm
@@ -1,8 +1,8 @@
/datum/seed/banana
- name = "banana"
- seed_name = "banana"
+ name = PLANT_BANANA
+ seed_name = PLANT_BANANA
display_name = "banana tree"
- kitchen_tag = "banana"
+ kitchen_tag = PLANT_BANANA
chems = list(REAGENT_ID_BANANA = list(10,10))
trash_type = /obj/item/bananapeel
diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm
index dcef36a1ff..d4263e2a6f 100644
--- a/code/modules/hydroponics/seedtypes/berries.dm
+++ b/code/modules/hydroponics/seedtypes/berries.dm
@@ -1,10 +1,10 @@
// Berry plants/variants.
/datum/seed/berry
- name = "berries"
+ name = PLANT_BERRIES
seed_name = "berry"
display_name = "berry bush"
- kitchen_tag = "berries"
- mutants = list("glowberries","poisonberries")
+ kitchen_tag = PLANT_BERRIES
+ mutants = list(PLANT_GLOWBERRIES,PLANT_POISONBERRIES)
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BERRYJUICE = list(10,10))
/datum/seed/berry/New()
@@ -22,7 +22,7 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/berry/glow
- name = "glowberries"
+ name = PLANT_GLOWBERRIES
seed_name = "glowberry"
display_name = "glowberry bush"
mutants = null
@@ -42,11 +42,11 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25)
/datum/seed/berry/poison
- name = "poisonberries"
+ name = PLANT_POISONBERRIES
seed_name = "poison berry"
- kitchen_tag = "poisonberries"
+ kitchen_tag = PLANT_POISONBERRIES
display_name = "poison berry bush"
- mutants = list("deathberries")
+ mutants = list(PLANT_DEATHBERRIES)
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), REAGENT_ID_POISONBERRYJUICE = list(10,5))
/datum/seed/berry/poison/New()
@@ -56,7 +56,7 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25)
/datum/seed/berry/poison/death
- name = "deathberries"
+ name = PLANT_DEATHBERRIES
seed_name = "death berry"
display_name = "death berry bush"
mutants = null
@@ -70,9 +70,9 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35)
/datum/seed/berry/peppercorn
- name = "peppercorns"
+ name = PLANT_PEPPERCORNS
seed_name = "peppercorn berry"
- kitchen_tag = "peppercorns"
+ kitchen_tag = PLANT_PEPPERCORNS
display_name = "peppercorn bush"
chems = list(REAGENT_ID_BLACKPEPPER = list(5,10))
diff --git a/code/modules/hydroponics/seedtypes/cabbage.dm b/code/modules/hydroponics/seedtypes/cabbage.dm
index bf6b1a51a8..f116f7b42c 100644
--- a/code/modules/hydroponics/seedtypes/cabbage.dm
+++ b/code/modules/hydroponics/seedtypes/cabbage.dm
@@ -1,8 +1,8 @@
/datum/seed/cabbage
- name = "cabbage"
- seed_name = "cabbage"
+ name = PLANT_CABBAGE
+ seed_name = PLANT_CABBAGE
display_name = "cabbages"
- kitchen_tag = "cabbage"
+ kitchen_tag = PLANT_CABBAGE
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/cabbage/New()
diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm
index 5012ac1aa5..25b49ee3a2 100644
--- a/code/modules/hydroponics/seedtypes/carrots.dm
+++ b/code/modules/hydroponics/seedtypes/carrots.dm
@@ -1,8 +1,8 @@
/datum/seed/carrots
- name = "carrot"
- seed_name = "carrot"
+ name = PLANT_CARROT
+ seed_name = PLANT_CARROT
display_name = "carrots"
- kitchen_tag = "carrot"
+ kitchen_tag = PLANT_CARROT
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), REAGENT_ID_CARROTJUICE = list(10,20))
/datum/seed/carrots/New()
diff --git a/code/modules/hydroponics/seedtypes/celery.dm b/code/modules/hydroponics/seedtypes/celery.dm
index 3f478dc769..a0d783cba6 100644
--- a/code/modules/hydroponics/seedtypes/celery.dm
+++ b/code/modules/hydroponics/seedtypes/celery.dm
@@ -1,8 +1,8 @@
/datum/seed/celery
- name = "celery"
- seed_name = "celery"
- display_name = "celery"
- kitchen_tag = "celery"
+ name = PLANT_CELERY
+ seed_name = PLANT_CELERY
+ display_name = PLANT_CELERY
+ kitchen_tag = PLANT_CELERY
chems = list(REAGENT_ID_NUTRIMENT = list(5,20))
/datum/seed/celery/New()
diff --git a/code/modules/hydroponics/seedtypes/cherries.dm b/code/modules/hydroponics/seedtypes/cherries.dm
index 2f5896f59c..07df778a03 100644
--- a/code/modules/hydroponics/seedtypes/cherries.dm
+++ b/code/modules/hydroponics/seedtypes/cherries.dm
@@ -1,6 +1,6 @@
/datum/seed/cherries
- name = "cherry"
- seed_name = "cherry"
+ name = PLANT_CHERRY
+ seed_name = PLANT_CHERRY
seed_noun = "pits"
display_name = "cherry tree"
kitchen_tag = "cherries"
diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm
index b667cfa156..b7fcc13298 100644
--- a/code/modules/hydroponics/seedtypes/chili.dm
+++ b/code/modules/hydroponics/seedtypes/chili.dm
@@ -1,11 +1,11 @@
// Chili plants/variants.
/datum/seed/chili
- name = "chili"
- seed_name = "chili"
+ name = PLANT_CHILI
+ seed_name = PLANT_CHILI
display_name = "chili plants"
- kitchen_tag = "chili"
+ kitchen_tag = PLANT_CHILI
chems = list(REAGENT_ID_CAPSAICIN = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
- mutants = list("icechili", "ghostchili")
+ mutants = list(PLANT_ICECHILI, PLANT_GHOSTCHILI)
/datum/seed/chili/New()
..()
@@ -21,10 +21,10 @@
set_trait(TRAIT_IDEAL_LIGHT, 7)
/datum/seed/chili/ice
- name = "icechili"
+ name = PLANT_ICECHILI
seed_name = "ice pepper"
display_name = "ice-pepper plants"
- kitchen_tag = "icechili"
+ kitchen_tag = PLANT_ICECHILI
mutants = null
chems = list(REAGENT_ID_FROSTOIL = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
@@ -35,10 +35,10 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#00EDC6")
/datum/seed/chili/ghost
- name = "ghostchili"
+ name = PLANT_GHOSTCHILI
seed_name = "ghost chili"
display_name = "ghost chili plants"
- kitchen_tag = "ghostchili"
+ kitchen_tag = PLANT_GHOSTCHILI
mutants = null
chems = list(REAGENT_ID_CONDENSEDCAPSAICIN = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
diff --git a/code/modules/hydroponics/seedtypes/citrus.dm b/code/modules/hydroponics/seedtypes/citrus.dm
index ad701a74de..190cce1af0 100644
--- a/code/modules/hydroponics/seedtypes/citrus.dm
+++ b/code/modules/hydroponics/seedtypes/citrus.dm
@@ -1,8 +1,8 @@
/datum/seed/citrus
- name = "lime"
- seed_name = "lime"
+ name = PLANT_LIME
+ seed_name = PLANT_LIME
display_name = "lime trees"
- kitchen_tag = "lime"
+ kitchen_tag = PLANT_LIME
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LIMEJUICE = list(10,20))
/datum/seed/citrus/New()
@@ -19,10 +19,10 @@
set_trait(TRAIT_FLESH_COLOUR,"#3AF026")
/datum/seed/citrus/lemon
- name = "lemon"
- seed_name = "lemon"
+ name = PLANT_LEMON
+ seed_name = PLANT_LEMON
display_name = "lemon trees"
- kitchen_tag = "lemon"
+ kitchen_tag = PLANT_LEMON
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LEMONJUICE = list(10,20))
/datum/seed/citrus/lemon/New()
@@ -34,10 +34,10 @@
set_trait(TRAIT_IDEAL_LIGHT, 6)
/datum/seed/citrus/orange
- name = "orange"
- seed_name = "orange"
+ name = PLANT_ORANGE
+ seed_name = PLANT_ORANGE
display_name = "orange trees"
- kitchen_tag = "orange"
+ kitchen_tag = PLANT_ORANGE
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_ORANGEJUICE = list(10,20))
/datum/seed/citrus/orange/New()
diff --git a/code/modules/hydroponics/seedtypes/cocoa.dm b/code/modules/hydroponics/seedtypes/cocoa.dm
index 7233db5d69..a3e55af687 100644
--- a/code/modules/hydroponics/seedtypes/cocoa.dm
+++ b/code/modules/hydroponics/seedtypes/cocoa.dm
@@ -1,8 +1,8 @@
/datum/seed/cocoa
- name = "cocoa"
+ name = PLANT_COCOA
seed_name = "cacao"
display_name = "cacao tree"
- kitchen_tag = "cocoa"
+ kitchen_tag = PLANT_COCOA
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_COCO = list(4,5))
/datum/seed/cocoa/New()
diff --git a/code/modules/hydroponics/seedtypes/corn.dm b/code/modules/hydroponics/seedtypes/corn.dm
index 67fca53d8f..11d64a8e16 100644
--- a/code/modules/hydroponics/seedtypes/corn.dm
+++ b/code/modules/hydroponics/seedtypes/corn.dm
@@ -1,8 +1,8 @@
/datum/seed/corn
- name = "corn"
- seed_name = "corn"
+ name = PLANT_CORN
+ seed_name = PLANT_CORN
display_name = "ears of corn"
- kitchen_tag = "corn"
+ kitchen_tag = PLANT_CORN
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_CORNOIL = list(3,15))
trash_type = /obj/item/corncob
diff --git a/code/modules/hydroponics/seedtypes/diona.dm b/code/modules/hydroponics/seedtypes/diona.dm
index be3b80b6bf..f1d56c0f24 100644
--- a/code/modules/hydroponics/seedtypes/diona.dm
+++ b/code/modules/hydroponics/seedtypes/diona.dm
@@ -1,6 +1,6 @@
/datum/seed/diona
- name = "diona"
- seed_name = "diona"
+ name = PLANT_DIONA
+ seed_name = PLANT_DIONA
seed_noun = "nodes"
display_name = "replicant pods"
can_self_harvest = 1
@@ -18,4 +18,4 @@
set_trait(TRAIT_PRODUCT_ICON,"diona")
set_trait(TRAIT_PRODUCT_COLOUR,"#799957")
set_trait(TRAIT_PLANT_COLOUR,"#66804B")
- set_trait(TRAIT_PLANT_ICON,"alien4")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_ICON,"alien4")
diff --git a/code/modules/hydroponics/seedtypes/durian.dm b/code/modules/hydroponics/seedtypes/durian.dm
index f282855464..b11b24f2b6 100644
--- a/code/modules/hydroponics/seedtypes/durian.dm
+++ b/code/modules/hydroponics/seedtypes/durian.dm
@@ -1,9 +1,9 @@
/datum/seed/durian
- name = "durian"
- seed_name = "durian"
+ name = PLANT_DURIAN
+ seed_name = PLANT_DURIAN
seed_noun = "pits"
- display_name = "durian"
- kitchen_tag = "durian"
+ display_name = PLANT_DURIAN
+ kitchen_tag = PLANT_DURIAN
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_DURIANPASTE = list(1, 20))
/datum/seed/durian/New()
diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm
index 4bcee3db25..2fc7dc7ae0 100644
--- a/code/modules/hydroponics/seedtypes/eggplant.dm
+++ b/code/modules/hydroponics/seedtypes/eggplant.dm
@@ -1,10 +1,10 @@
//Eggplants/varieties.
/datum/seed/eggplant
- name = "eggplant"
- seed_name = "eggplant"
+ name = PLANT_EGGPLANT
+ seed_name = PLANT_EGGPLANT
display_name = "eggplants"
- kitchen_tag = "eggplant"
- mutants = list("egg-plant")
+ kitchen_tag = PLANT_EGGPLANT
+ mutants = list(PLANT_EGGPLANT)
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/eggplant/New()
@@ -22,10 +22,10 @@
// Return of Eggy. Just makes purple eggs. If the reagents are separated from the egg production by xenobotany or RNG, it's still an Egg plant.
/datum/seed/eggplant/egg
- name = "egg-plant"
- seed_name = "egg-plant"
+ name = PLANT_EGGPLANT
+ seed_name = PLANT_EGGPLANT
display_name = "egg-plants"
- kitchen_tag = "egg-plant"
+ kitchen_tag = PLANT_EGGPLANT
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_EGG = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm
index e50b396c3b..f32bcab65d 100644
--- a/code/modules/hydroponics/seedtypes/flowers.dm
+++ b/code/modules/hydroponics/seedtypes/flowers.dm
@@ -1,8 +1,8 @@
//Flowers/varieties
/datum/seed/flower
- name = "harebells"
+ name = PLANT_HAREBELLS
seed_name = "harebell"
- display_name = "harebells"
+ display_name = PLANT_HAREBELLS
kitchen_tag = "harebell"
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
@@ -18,9 +18,9 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/flower/poppy
- name = "poppies"
+ name = PLANT_POPPIES
seed_name = "poppy"
- display_name = "poppies"
+ display_name = PLANT_POPPIES
kitchen_tag = "poppy"
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10))
@@ -38,10 +38,10 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/flower/sunflower
- name = "sunflowers"
- seed_name = "sunflower"
- display_name = "sunflowers"
- kitchen_tag = "sunflower"
+ name = PLANT_SUNFLOWERS
+ seed_name = PLANT_SUNFLOWERS
+ display_name = PLANT_SUNFLOWERS
+ kitchen_tag = PLANT_SUNFLOWERS
/datum/seed/flower/sunflower/New()
..()
@@ -54,10 +54,10 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/flower/lavender
- name = "lavender"
- seed_name = "lavender"
- display_name = "lavender"
- kitchen_tag = "lavender"
+ name = PLANT_LAVENDER
+ seed_name = PLANT_LAVENDER
+ display_name = PLANT_LAVENDER
+ kitchen_tag = PLANT_LAVENDER
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10))
/datum/seed/flower/lavender/New()
@@ -74,11 +74,11 @@
set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
/datum/seed/flower/rose
- name = "rose"
- seed_name = "rose"
- display_name = "rose"
- kitchen_tag = "rose"
- mutants = list("bloodrose")
+ name = PLANT_ROSE
+ seed_name = PLANT_ROSE
+ display_name = PLANT_ROSE
+ kitchen_tag = PLANT_ROSE
+ mutants = list(PLANT_BLOODROSE)
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(0,2))
/datum/seed/flower/rose/New()
@@ -96,7 +96,7 @@
set_trait(TRAIT_STINGS,1)
/datum/seed/flower/rose/blood
- name = "bloodrose"
+ name = PLANT_BLOODROSE
display_name = "bleeding rose"
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(1,5), REAGENT_ID_BLOOD = list(0,2))
diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm
index 3121c2a478..b81e993d44 100644
--- a/code/modules/hydroponics/seedtypes/gelthi.dm
+++ b/code/modules/hydroponics/seedtypes/gelthi.dm
@@ -1,8 +1,8 @@
/datum/seed/gelthi
- name = "gelthi"
- seed_name = "gelthi"
+ name = PLANT_GELTHI
+ seed_name = PLANT_GELTHI
display_name = "gelthi plant"
- kitchen_tag = "gelthi"
+ kitchen_tag = PLANT_GELTHI
chems = list(REAGENT_ID_STOXIN = list(1,5),REAGENT_ID_CAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/gelthi/New()
diff --git a/code/modules/hydroponics/seedtypes/gnomes.dm b/code/modules/hydroponics/seedtypes/gnomes.dm
index 0b6170f72e..0b9efd92cc 100644
--- a/code/modules/hydroponics/seedtypes/gnomes.dm
+++ b/code/modules/hydroponics/seedtypes/gnomes.dm
@@ -1,8 +1,8 @@
// Gnomes
/datum/seed/gnomes
- name = "gnomes"
- seed_name = "gnomes"
- display_name = "gnomes"
+ name = PLANT_GNOMES
+ seed_name = PLANT_GNOMES
+ display_name = PLANT_GNOMES
force_layer = 3
chems = list(REAGENT_ID_MAGICDUST = list(5,20))
diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm
index 73a7853221..4e968fc811 100644
--- a/code/modules/hydroponics/seedtypes/grapes.dm
+++ b/code/modules/hydroponics/seedtypes/grapes.dm
@@ -1,10 +1,10 @@
//Grapes/varieties
/datum/seed/grapes
- name = "grapes"
+ name = PLANT_GRAPES
seed_name = "grape"
display_name = "grapevines"
- kitchen_tag = "grapes"
- mutants = list("greengrapes")
+ kitchen_tag = PLANT_GRAPES
+ mutants = list(PLANT_GREENGRAPES)
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), REAGENT_ID_GRAPEJUICE = list(10,10))
/datum/seed/grapes/New()
@@ -22,7 +22,7 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/grapes/green
- name = "greengrapes"
+ name = PLANT_GREENGRAPES
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm
index 76135a9e1f..9f0c29ad3a 100644
--- a/code/modules/hydroponics/seedtypes/grass.dm
+++ b/code/modules/hydroponics/seedtypes/grass.dm
@@ -1,9 +1,9 @@
/datum/seed/grass
- name = "grass"
- seed_name = "grass"
- display_name = "grass"
- kitchen_tag = "grass"
- mutants = list("carpet")
+ name = PLANT_GRASS
+ seed_name = PLANT_GRASS
+ display_name = PLANT_GRASS
+ kitchen_tag = PLANT_GRASS
+ mutants = list(PLANT_CARPET)
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/grass/New()
@@ -20,10 +20,10 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/grass/carpet
- name = "carpet"
- seed_name = "carpet"
- display_name = "carpet"
- kitchen_tag = "carpet"
+ name = PLANT_CARPET
+ seed_name = PLANT_CARPET
+ display_name = PLANT_CARPET
+ kitchen_tag = PLANT_CARPET
mutants = null
chems = list(REAGENT_ID_LIQUIDCARPET = list(5,10))
diff --git a/code/modules/hydroponics/seedtypes/jurlmah.dm b/code/modules/hydroponics/seedtypes/jurlmah.dm
index 7eee154904..3945259cc5 100644
--- a/code/modules/hydroponics/seedtypes/jurlmah.dm
+++ b/code/modules/hydroponics/seedtypes/jurlmah.dm
@@ -1,8 +1,8 @@
/datum/seed/jurlmah
- name = "jurlmah"
+ name = PLANT_JURLMAH
seed_name = "jurl'mah"
display_name = "jurl'mah reeds"
- kitchen_tag = "jurlmah"
+ kitchen_tag = PLANT_JURLMAH
chems = list(REAGENT_ID_SEROTROTIUM = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/jurlmah/New()
diff --git a/code/modules/hydroponics/seedtypes/kudzu.dm b/code/modules/hydroponics/seedtypes/kudzu.dm
index 182466a297..2c003a6d3b 100644
--- a/code/modules/hydroponics/seedtypes/kudzu.dm
+++ b/code/modules/hydroponics/seedtypes/kudzu.dm
@@ -1,8 +1,8 @@
/datum/seed/kudzu
- name = "kudzu"
- seed_name = "kudzu"
+ name = PLANT_KUDZU
+ seed_name = PLANT_KUDZU
display_name = "kudzu vines"
- kitchen_tag = "kudzu"
+ kitchen_tag = PLANT_KUDZU
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_ANTITOXIN = list(1,25))
/datum/seed/kudzu/New()
diff --git a/code/modules/hydroponics/seedtypes/lettuce.dm b/code/modules/hydroponics/seedtypes/lettuce.dm
index a8bb68b40f..94a8aaeab0 100644
--- a/code/modules/hydroponics/seedtypes/lettuce.dm
+++ b/code/modules/hydroponics/seedtypes/lettuce.dm
@@ -1,9 +1,9 @@
// Lettuce/varieties.
/datum/seed/lettuce
- name = "lettuce"
- seed_name = "lettuce"
- display_name = "lettuce"
- kitchen_tag = "lettuce"
+ name = PLANT_LETTUCE
+ seed_name = PLANT_LETTUCE
+ display_name = PLANT_LETTUCE
+ kitchen_tag = PLANT_LETTUCE
chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/lettuce/New()
@@ -22,7 +22,7 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.13)
/datum/seed/lettuce/ice
- name = "siflettuce"
+ name = PLANT_SIFLETTUCE
seed_name = "glacial lettuce"
display_name = "glacial lettuce"
kitchen_tag = "icelettuce"
diff --git a/code/modules/hydroponics/seedtypes/malanitear.dm b/code/modules/hydroponics/seedtypes/malanitear.dm
index f4878ca003..2a765a4766 100644
--- a/code/modules/hydroponics/seedtypes/malanitear.dm
+++ b/code/modules/hydroponics/seedtypes/malanitear.dm
@@ -1,8 +1,8 @@
/datum/seed/mtear
- name = "mtear"
+ name = PLANT_MTEAR
seed_name = "Malani's tear"
display_name = "Malani's tear leaves"
- kitchen_tag = "mtear"
+ kitchen_tag = PLANT_MTEAR
chems = list(REAGENT_ID_HONEY = list(1,10), REAGENT_ID_KELOTANE = list(3,5))
/datum/seed/mtear/New()
diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm
index 147c5712bb..8866b1bbe3 100644
--- a/code/modules/hydroponics/seedtypes/mushrooms.dm
+++ b/code/modules/hydroponics/seedtypes/mushrooms.dm
@@ -1,10 +1,10 @@
//Mushrooms/varieties.
/datum/seed/mushroom
- name = "mushrooms"
+ name = PLANT_MUSHROOMS
seed_name = "chanterelle"
seed_noun = "spores"
display_name = "chanterelle mushrooms"
- mutants = list("reishi","amanita","plumphelmet")
+ mutants = list(PLANT_REISHI,PLANT_AMANITA,PLANT_PLUMPHELMET)
chems = list(REAGENT_ID_NUTRIMENT = list(1,25))
splat_type = /obj/effect/plant
kitchen_tag = "mushroom"
@@ -24,7 +24,7 @@
set_trait(TRAIT_LIGHT_TOLERANCE, 6)
/datum/seed/mushroom/mold
- name = "mold"
+ name = PLANT_MOLD
seed_name = "brown mold"
display_name = "brown mold"
mutants = null
@@ -40,12 +40,12 @@
set_trait(TRAIT_PLANT_ICON,"mushroom9")
/datum/seed/mushroom/plump
- name = "plumphelmet"
+ name = PLANT_PLUMPHELMET
seed_name = "plump helmet"
display_name = "plump helmet mushrooms"
- mutants = list("walkingmushroom","towercap")
+ mutants = list("walkingmushroom",PLANT_TOWERCAP)
chems = list(REAGENT_ID_NUTRIMENT = list(2,10))
- kitchen_tag = "plumphelmet"
+ kitchen_tag = PLANT_PLUMPHELMET
/datum/seed/mushroom/plump/New()
..()
@@ -58,10 +58,10 @@
set_trait(TRAIT_PLANT_ICON,"mushroom2")
/datum/seed/mushroom/hallucinogenic
- name = "reishi"
- seed_name = "reishi"
- display_name = "reishi"
- mutants = list("libertycap","glowshroom")
+ name = PLANT_REISHI
+ seed_name = PLANT_REISHI
+ display_name = PLANT_REISHI
+ mutants = list(PLANT_LIBERTYCAP,PLANT_GLOWSHROOM)
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PSILOCYBIN = list(3,5))
/datum/seed/mushroom/hallucinogenic/New()
@@ -76,7 +76,7 @@
set_trait(TRAIT_PLANT_ICON,"mushroom6")
/datum/seed/mushroom/hallucinogenic/strong
- name = "libertycap"
+ name = PLANT_LIBERTYCAP
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
mutants = null
@@ -92,10 +92,10 @@
set_trait(TRAIT_PLANT_ICON,"mushroom3")
/datum/seed/mushroom/poison
- name = "amanita"
+ name = PLANT_AMANITA
seed_name = "fly amanita"
display_name = "fly amanita mushrooms"
- mutants = list("destroyingangel","plastic")
+ mutants = list(PLANT_DESTROYINGANGEL,PLANT_PLASTIC)
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMATOXIN = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/New()
@@ -110,7 +110,7 @@
set_trait(TRAIT_PLANT_ICON,"mushroom4")
/datum/seed/mushroom/poison/death
- name = "destroyingangel"
+ name = PLANT_DESTROYINGANGEL
seed_name = "destroying angel"
display_name = "destroying angel mushrooms"
mutants = null
@@ -127,11 +127,11 @@
set_trait(TRAIT_PLANT_ICON,"mushroom5")
/datum/seed/mushroom/towercap
- name = "towercap"
+ name = PLANT_TOWERCAP
seed_name = "tower cap"
display_name = "tower caps"
chems = list(REAGENT_ID_WOODPULP = list(10,1))
- mutants = list("redcap")
+ mutants = list(PLANT_REDCAP)
has_item_product = /obj/item/stack/material/log
/datum/seed/mushroom/towercap/New()
@@ -143,7 +143,7 @@
set_trait(TRAIT_PLANT_ICON,"mushroom8")
/datum/seed/mushroom/towercap/red
- name = "redcap"
+ name = PLANT_REDCAP
seed_name = "red cap"
display_name = "red caps"
chems = list(REAGENT_ID_WOODPULP = list(10,1), REAGENT_ID_TANNIN = list(1,10))
@@ -155,8 +155,8 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#b81414")
/datum/seed/mushroom/glowshroom
- name = "glowshroom"
- seed_name = "glowshroom"
+ name = PLANT_GLOWSHROOM
+ seed_name = PLANT_GLOWSHROOM
display_name = "glowshrooms"
mutants = null
chems = list(REAGENT_ID_RADIUM = list(1,20))
@@ -175,7 +175,7 @@
set_trait(TRAIT_PLANT_ICON,"mushroom7")
/datum/seed/mushroom/plastic
- name = "plastic"
+ name = PLANT_PLASTIC
seed_name = "plastellium"
display_name = "plastellium"
mutants = null
@@ -193,7 +193,7 @@
set_trait(TRAIT_PLANT_ICON,"mushroom10")
/datum/seed/mushroom/spore
- name = "sporeshroom"
+ name = PLANT_SPORESHROOM
seed_name = "corpellian"
display_name = "corpellian"
mutants = null
diff --git a/code/modules/hydroponics/seedtypes/nettles.dm b/code/modules/hydroponics/seedtypes/nettles.dm
index 81f05cb323..2d2d27e7b0 100644
--- a/code/modules/hydroponics/seedtypes/nettles.dm
+++ b/code/modules/hydroponics/seedtypes/nettles.dm
@@ -1,11 +1,11 @@
// Nettles/variants.
/datum/seed/nettle
- name = "nettle"
- seed_name = "nettle"
+ name = PLANT_NETTLE
+ seed_name = PLANT_NETTLE
display_name = "nettles"
- mutants = list("deathnettle")
+ mutants = list(PLANT_DEATHNETTLE)
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_SACID = list(0,1))
- kitchen_tag = "nettle"
+ kitchen_tag = PLANT_NETTLE
/datum/seed/nettle/New()
..()
@@ -20,10 +20,10 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#728A54")
/datum/seed/nettle/death
- name = "deathnettle"
+ name = PLANT_DEATHNETTLE
seed_name = "death nettle"
display_name = "death nettles"
- kitchen_tag = "deathnettle"
+ kitchen_tag = PLANT_DEATHNETTLE
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PACID = list(0,1))
diff --git a/code/modules/hydroponics/seedtypes/onion.dm b/code/modules/hydroponics/seedtypes/onion.dm
index 3bd214261e..1a2e6e4283 100644
--- a/code/modules/hydroponics/seedtypes/onion.dm
+++ b/code/modules/hydroponics/seedtypes/onion.dm
@@ -1,8 +1,8 @@
/datum/seed/onion
- name = "onion"
- seed_name = "onion"
+ name = PLANT_ONION
+ seed_name = PLANT_ONION
display_name = "onions"
- kitchen_tag = "onion"
+ kitchen_tag = PLANT_ONION
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/onion/New()
diff --git a/code/modules/hydroponics/seedtypes/peanuts.dm b/code/modules/hydroponics/seedtypes/peanuts.dm
index db0a3c0f36..4e5e2a3b53 100644
--- a/code/modules/hydroponics/seedtypes/peanuts.dm
+++ b/code/modules/hydroponics/seedtypes/peanuts.dm
@@ -1,9 +1,9 @@
//Everything else
/datum/seed/peanuts
- name = "peanut"
- seed_name = "peanut"
+ name = PLANT_PEANUT
+ seed_name = PLANT_PEANUT
display_name = "peanut vines"
- kitchen_tag = "peanut"
+ kitchen_tag = PLANT_PEANUT
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PEANUTOIL = list(3,10))
/datum/seed/peanuts/New()
diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm
index 3ac1d79e8d..536479ab8b 100644
--- a/code/modules/hydroponics/seedtypes/pineapple.dm
+++ b/code/modules/hydroponics/seedtypes/pineapple.dm
@@ -1,11 +1,11 @@
//pineapple and variants
/datum/seed/pineapple
- name = "pineapple"
- seed_name = "pineapple"
- display_name = "pineapple"
- kitchen_tag = "pineapple"
- mutants = list("spineapple")
+ name = PLANT_PINEAPPLE
+ seed_name = PLANT_PINEAPPLE
+ display_name = PLANT_PINEAPPLE
+ kitchen_tag = PLANT_PINEAPPLE
+ mutants = list(PLANT_SPINEAPPLE)
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20))
/datum/seed/pineapple/New()
@@ -26,10 +26,10 @@
//A pineapple that stings and produces enzymes.
/datum/seed/spineapple
- name = "spineapple"
- seed_name = "spineapple"
- display_name = "spineapple"
- kitchen_tag = "spineapple"
+ name = PLANT_SPINEAPPLE
+ seed_name = PLANT_SPINEAPPLE
+ display_name = PLANT_SPINEAPPLE
+ kitchen_tag = PLANT_SPINEAPPLE
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_ENZYME = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20))
/datum/seed/spineapple/New()
diff --git a/code/modules/hydroponics/seedtypes/potato.dm b/code/modules/hydroponics/seedtypes/potato.dm
index 59aebee0c6..db695a49d9 100644
--- a/code/modules/hydroponics/seedtypes/potato.dm
+++ b/code/modules/hydroponics/seedtypes/potato.dm
@@ -1,8 +1,8 @@
/datum/seed/potato
- name = "potato"
- seed_name = "potato"
+ name = PLANT_POTATO
+ seed_name = PLANT_POTATO
display_name = "potatoes"
- kitchen_tag = "potato"
+ kitchen_tag = PLANT_POTATO
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_POTATOJUICE = list(10,10))
/datum/seed/potato/New()
diff --git a/code/modules/hydroponics/seedtypes/pumpkin.dm b/code/modules/hydroponics/seedtypes/pumpkin.dm
index ed1392993d..bb583f2000 100644
--- a/code/modules/hydroponics/seedtypes/pumpkin.dm
+++ b/code/modules/hydroponics/seedtypes/pumpkin.dm
@@ -1,8 +1,8 @@
/datum/seed/pumpkin
- name = "pumpkin"
- seed_name = "pumpkin"
+ name = PLANT_PUMPKIN
+ seed_name = PLANT_PUMPKIN
display_name = "pumpkin vine"
- kitchen_tag = "pumpkin"
+ kitchen_tag = PLANT_PUMPKIN
chems = list(REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/pumpkin/New()
diff --git a/code/modules/hydroponics/seedtypes/rhubarb.dm b/code/modules/hydroponics/seedtypes/rhubarb.dm
index 8534c9727e..69bbed5ef3 100644
--- a/code/modules/hydroponics/seedtypes/rhubarb.dm
+++ b/code/modules/hydroponics/seedtypes/rhubarb.dm
@@ -1,8 +1,8 @@
/datum/seed/rhubarb
- name = "rhubarb"
- seed_name = "rhubarb"
- display_name = "rhubarb"
- kitchen_tag = "rhubarb"
+ name = PLANT_ROSE
+ seed_name = PLANT_ROSE
+ display_name = PLANT_ROSE
+ kitchen_tag = PLANT_ROSE
chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/rhubarb/New()
diff --git a/code/modules/hydroponics/seedtypes/rice.dm b/code/modules/hydroponics/seedtypes/rice.dm
index f52154c98b..f0904b43a9 100644
--- a/code/modules/hydroponics/seedtypes/rice.dm
+++ b/code/modules/hydroponics/seedtypes/rice.dm
@@ -1,8 +1,8 @@
/datum/seed/rice
- name = "rice"
- seed_name = "rice"
+ name = PLANT_RICE
+ seed_name = PLANT_RICE
display_name = "rice stalks"
- kitchen_tag = "rice"
+ kitchen_tag = PLANT_RICE
chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_RICE = list(10,15))
/datum/seed/rice/New()
diff --git a/code/modules/hydroponics/seedtypes/selemhand.dm b/code/modules/hydroponics/seedtypes/selemhand.dm
index f9e451a627..81986c0305 100644
--- a/code/modules/hydroponics/seedtypes/selemhand.dm
+++ b/code/modules/hydroponics/seedtypes/selemhand.dm
@@ -1,8 +1,8 @@
/datum/seed/shand
- name = "shand"
+ name = PLANT_SHAND
seed_name = "Selem's hand"
display_name = "Selem's hand leaves"
- kitchen_tag = "shand"
+ kitchen_tag = PLANT_SHAND
chems = list(REAGENT_ID_BICARIDINE = list(0,10))
/datum/seed/shand/New()
diff --git a/code/modules/hydroponics/seedtypes/soybean.dm b/code/modules/hydroponics/seedtypes/soybean.dm
index 081949bde7..c644618b67 100644
--- a/code/modules/hydroponics/seedtypes/soybean.dm
+++ b/code/modules/hydroponics/seedtypes/soybean.dm
@@ -1,6 +1,6 @@
/datum/seed/soybean
- name = "soybean"
- seed_name = "soybean"
+ name = PLANT_SOYBEAN
+ seed_name = PLANT_SOYBEAN
display_name = "soybeans"
kitchen_tag = "soybeans"
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SOYMILK = list(10,20))
diff --git a/code/modules/hydroponics/seedtypes/sugarcane.dm b/code/modules/hydroponics/seedtypes/sugarcane.dm
index 6abdf841c1..90037fb5eb 100644
--- a/code/modules/hydroponics/seedtypes/sugarcane.dm
+++ b/code/modules/hydroponics/seedtypes/sugarcane.dm
@@ -1,6 +1,6 @@
/datum/seed/sugarcane
- name = "sugarcane"
- seed_name = "sugarcane"
+ name = PLANT_SUGARCANE
+ seed_name = PLANT_SUGARCANE
display_name = "sugarcanes"
kitchen_tag = "sugarcanes"
chems = list(REAGENT_ID_SUGAR = list(4,5))
diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm
index a571a0f35f..430560c828 100644
--- a/code/modules/hydroponics/seedtypes/surik.dm
+++ b/code/modules/hydroponics/seedtypes/surik.dm
@@ -1,8 +1,8 @@
/datum/seed/surik
- name = "surik"
- seed_name = "surik"
+ name = PLANT_SURIK
+ seed_name = PLANT_SURIK
display_name = "surik vine"
- kitchen_tag = "surik"
+ kitchen_tag = PLANT_SURIK
chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),REAGENT_ID_SYNAPTIZINE = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
diff --git a/code/modules/hydroponics/seedtypes/telriis.dm b/code/modules/hydroponics/seedtypes/telriis.dm
index 127f496f26..a85d394a56 100644
--- a/code/modules/hydroponics/seedtypes/telriis.dm
+++ b/code/modules/hydroponics/seedtypes/telriis.dm
@@ -1,8 +1,8 @@
/datum/seed/telriis
- name = "telriis"
- seed_name = "telriis"
+ name = PLANT_TELRIIS
+ seed_name = PLANT_TELRIIS
display_name = "telriis grass"
- kitchen_tag = "telriis"
+ kitchen_tag = PLANT_TELRIIS
chems = list(REAGENT_ID_PWINE = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/telriis/New()
diff --git a/code/modules/hydroponics/seedtypes/thaadra.dm b/code/modules/hydroponics/seedtypes/thaadra.dm
index c7ccb40f7d..0bb3eab1f1 100644
--- a/code/modules/hydroponics/seedtypes/thaadra.dm
+++ b/code/modules/hydroponics/seedtypes/thaadra.dm
@@ -1,8 +1,8 @@
/datum/seed/thaadra
- name = "thaadra"
+ name = PLANT_THAADRA
seed_name = "thaa'dra"
display_name = "thaa'dra lichen"
- kitchen_tag = "thaadra"
+ kitchen_tag = PLANT_THAADRA
chems = list(REAGENT_ID_FROSTOIL = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/thaadra/New()
diff --git a/code/modules/hydroponics/seedtypes/tobacco.dm b/code/modules/hydroponics/seedtypes/tobacco.dm
index 0e11bacfa0..074b041131 100644
--- a/code/modules/hydroponics/seedtypes/tobacco.dm
+++ b/code/modules/hydroponics/seedtypes/tobacco.dm
@@ -1,9 +1,9 @@
//Tobacco/varieties.
/datum/seed/tobacco
- name = "tobacco"
- seed_name = "tobacco"
- display_name = "tobacco"
- kitchen_tag = "tobacco"
+ name = PLANT_TOBACCO
+ seed_name = PLANT_TOBACCO
+ display_name = PLANT_TOBACCO
+ kitchen_tag = PLANT_TOBACCO
mutants = list("stimbush")
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_NICOTINE = list(1,20))
diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm
index 26a712677c..670cb3c39f 100644
--- a/code/modules/hydroponics/seedtypes/tomatoes.dm
+++ b/code/modules/hydroponics/seedtypes/tomatoes.dm
@@ -1,11 +1,11 @@
//Tomatoes/variants.
/datum/seed/tomato
- name = "tomato"
- seed_name = "tomato"
+ name = PLANT_TOMATO
+ seed_name = PLANT_TOMATO
display_name = "tomato plant"
- mutants = list("bluetomato","bloodtomato")
+ mutants = list(PLANT_BLUETOMATO,PLANT_BLOODTOMATO)
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_TOMATOJUICE = list(10,10))
- kitchen_tag = "tomato"
+ kitchen_tag = PLANT_TOMATO
/datum/seed/tomato/New()
..()
@@ -23,10 +23,10 @@
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25)
/datum/seed/tomato/blood
- name = "bloodtomato"
+ name = PLANT_BLOODTOMATO
seed_name = "blood tomato"
display_name = "blood tomato plant"
- mutants = list("killertomato")
+ mutants = list(PLANT_KILLERTOMATO)
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BLOOD = list(1,5))
splat_type = /obj/effect/decal/cleanable/blood/splatter
@@ -36,7 +36,7 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#FF0000")
/datum/seed/tomato/killer
- name = "killertomato"
+ name = PLANT_KILLERTOMATO
seed_name = "killer tomato"
display_name = "killer tomato plant"
mutants = null
@@ -49,10 +49,10 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#A86747")
/datum/seed/tomato/blue
- name = "bluetomato"
+ name = PLANT_BLUETOMATO
seed_name = "blue tomato"
display_name = "blue tomato plant"
- mutants = list("bluespacetomato")
+ mutants = list(PLANT_BLUESPACETOMATO)
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LUBE = list(1,5))
/datum/seed/tomato/blue/New()
@@ -61,7 +61,7 @@
set_trait(TRAIT_PLANT_COLOUR,"#070AAD")
/datum/seed/tomato/blue/teleport
- name = "bluespacetomato"
+ name = PLANT_BLUESPACETOMATO
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
mutants = null
diff --git a/code/modules/hydroponics/seedtypes/vale.dm b/code/modules/hydroponics/seedtypes/vale.dm
index fcfac20d87..e20c30537f 100644
--- a/code/modules/hydroponics/seedtypes/vale.dm
+++ b/code/modules/hydroponics/seedtypes/vale.dm
@@ -1,8 +1,8 @@
/datum/seed/vale
- name = "vale"
- seed_name = "vale"
+ name = PLANT_VALE
+ seed_name = PLANT_VALE
display_name = "vale bush"
- kitchen_tag = "vale"
+ kitchen_tag = PLANT_VALE
chems = list(REAGENT_ID_PARACETAMOL = list(1,5),REAGENT_ID_DEXALIN = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
/datum/seed/vale/New()
diff --git a/code/modules/hydroponics/seedtypes/vanilla.dm b/code/modules/hydroponics/seedtypes/vanilla.dm
index a9b57d14e0..adff9e30e4 100644
--- a/code/modules/hydroponics/seedtypes/vanilla.dm
+++ b/code/modules/hydroponics/seedtypes/vanilla.dm
@@ -1,8 +1,8 @@
/datum/seed/vanilla
- name = "vanilla"
- seed_name = "vanilla"
- display_name = "vanilla"
- kitchen_tag = "vanilla"
+ name = PLANT_VANILLA
+ seed_name = PLANT_VANILLA
+ display_name = PLANT_VANILLA
+ kitchen_tag = PLANT_VANILLA
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_VANILLA = list(2,8), REAGENT_ID_SUGAR = list(1, 4))
/datum/seed/vanilla/New()
diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm
index 253dccae16..ffc5dfe64e 100644
--- a/code/modules/hydroponics/seedtypes/wabback.dm
+++ b/code/modules/hydroponics/seedtypes/wabback.dm
@@ -1,12 +1,12 @@
//Wabback / varieties.
/datum/seed/wabback
- name = "whitewabback"
+ name = PLANT_WHITEWABBACK
seed_name = "white wabback"
seed_noun = "nodes"
display_name = "white wabback"
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PROTEIN = list(1,5), REAGENT_ID_ENZYME = list(0,3))
kitchen_tag = "wabback"
- mutants = list("blackwabback","wildwabback")
+ mutants = list(PLANT_BLACKWABBACK,PLANT_WILDWABBACK)
has_item_product = /obj/item/stack/material/cloth
/datum/seed/wabback/New()
@@ -27,7 +27,7 @@
set_trait(TRAIT_SPREAD,1)
/datum/seed/wabback/vine
- name = "blackwabback"
+ name = PLANT_BLACKWABBACK
seed_name = "black wabback"
display_name = "black wabback"
mutants = null
@@ -39,10 +39,10 @@
set_trait(TRAIT_CARNIVOROUS,2)
/datum/seed/wabback/wild
- name = "wildwabback"
+ name = PLANT_WILDWABBACK
seed_name = "wild wabback"
display_name = "wild wabback"
- mutants = list("whitewabback")
+ mutants = list(PLANT_WHITEWABBACK)
has_item_product = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_PROTEIN = list(0,2), REAGENT_ID_ENZYME = list(0,1))
diff --git a/code/modules/hydroponics/seedtypes/watermelon.dm b/code/modules/hydroponics/seedtypes/watermelon.dm
index 32d98d3f82..3fba78c4db 100644
--- a/code/modules/hydroponics/seedtypes/watermelon.dm
+++ b/code/modules/hydroponics/seedtypes/watermelon.dm
@@ -1,8 +1,8 @@
/datum/seed/watermelon
- name = "watermelon"
- seed_name = "watermelon"
+ name = PLANT_WATERMELON
+ seed_name = PLANT_WATERMELON
display_name = "watermelon vine"
- kitchen_tag = "watermelon"
+ kitchen_tag = PLANT_WATERMELON
chems = list(REAGENT_ID_NUTRIMENT = list(1,6), REAGENT_ID_WATERMELONJUICE = list(10,6))
/datum/seed/watermelon/New()
diff --git a/code/modules/hydroponics/seedtypes/weeds.dm b/code/modules/hydroponics/seedtypes/weeds.dm
index 9a867174b8..264bfd7b74 100644
--- a/code/modules/hydroponics/seedtypes/weeds.dm
+++ b/code/modules/hydroponics/seedtypes/weeds.dm
@@ -1,7 +1,7 @@
/datum/seed/weeds
- name = "weeds"
+ name = PLANT_WEEDS
seed_name = "weed"
- display_name = "weeds"
+ display_name = PLANT_WEEDS
/datum/seed/weeds/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_PRODUCT_ICON,"flower4")
set_trait(TRAIT_PRODUCT_COLOUR,"#FCEB2B")
set_trait(TRAIT_PLANT_COLOUR,"#59945A")
- set_trait(TRAIT_PLANT_ICON,"bush6")
\ No newline at end of file
+ set_trait(TRAIT_PLANT_ICON,"bush6")
diff --git a/code/modules/hydroponics/seedtypes/wheat.dm b/code/modules/hydroponics/seedtypes/wheat.dm
index 293d5cc047..60f1f82277 100644
--- a/code/modules/hydroponics/seedtypes/wheat.dm
+++ b/code/modules/hydroponics/seedtypes/wheat.dm
@@ -1,8 +1,8 @@
/datum/seed/wheat
- name = "wheat"
- seed_name = "wheat"
+ name = PLANT_WHEAT
+ seed_name = PLANT_WHEAT
display_name = "wheat stalks"
- kitchen_tag = "wheat"
+ kitchen_tag = PLANT_WHEAT
chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_FLOUR = list(10,30))
/datum/seed/wheat/New()
diff --git a/code/modules/hydroponics/seedtypes/whitebeets.dm b/code/modules/hydroponics/seedtypes/whitebeets.dm
index 04dfca254f..fff02afa55 100644
--- a/code/modules/hydroponics/seedtypes/whitebeets.dm
+++ b/code/modules/hydroponics/seedtypes/whitebeets.dm
@@ -1,8 +1,8 @@
/datum/seed/whitebeets
- name = "whitebeet"
+ name = PLANT_WHITEBEET
seed_name = "white-beet"
display_name = "white-beets"
- kitchen_tag = "whitebeet"
+ kitchen_tag = PLANT_WHITEBEET
chems = list(REAGENT_ID_NUTRIMENT = list(0,20), REAGENT_ID_SUGAR = list(1,5))
/datum/seed/whitebeets/New()
diff --git a/code/modules/hydroponics/seedtypes/wurmwoad.dm b/code/modules/hydroponics/seedtypes/wurmwoad.dm
index f677ec8993..fe575ad061 100644
--- a/code/modules/hydroponics/seedtypes/wurmwoad.dm
+++ b/code/modules/hydroponics/seedtypes/wurmwoad.dm
@@ -1,11 +1,11 @@
// Wurmwoad, the Space Spice maker. Totally is actually, 100% literal worms.
/datum/seed/wurmwoad
- name = "wurmwoad"
- seed_name = "wurmwoad"
+ name = PLANT_WURMWOAD
+ seed_name = PLANT_WURMWOAD
display_name = "wurmwoad growth"
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SPACESPICE = list(5,15))
- kitchen_tag = "wurmwoad"
+ kitchen_tag = PLANT_WURMWOAD
/datum/seed/wurmwoad/New()
..()
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index 0dce8d616d..c3ca8e77a1 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -1,4 +1,4 @@
-#define DEFAULT_SEED "glowshroom"
+#define DEFAULT_SEED PLANT_GLOWSHROOM
#define VINE_GROWTH_STAGES 5
/proc/spacevine_infestation(var/potency_min=70, var/potency_max=100, var/maturation_min=5, var/maturation_max=15)
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index c2da430b5f..7afaa3f6b6 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -380,7 +380,7 @@
if(seed)
previous_plant = seed.display_name
seed = null
- seed = SSplants.seeds[pick(list("reishi","nettle","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
+ seed = SSplants.seeds[pick(list(PLANT_REISHI,PLANT_NETTLE,PLANT_AMANITA,PLANT_MUSHROOMS,PLANT_PLUMPHELMET,PLANT_TOWERCAP,PLANT_HAREBELLS,PLANT_WEEDS))]
if(!seed) return //Weed does not exist, someone fucked up.
dead = 0
diff --git a/code/modules/materials/materials/plastic.dm b/code/modules/materials/materials/plastic.dm
index cbea431e73..397317a473 100644
--- a/code/modules/materials/materials/plastic.dm
+++ b/code/modules/materials/materials/plastic.dm
@@ -1,5 +1,5 @@
/datum/material/plastic
- name = "plastic"
+ name = MAT_PLASTIC
stack_type = /obj/item/stack/material/plastic
flags = MATERIAL_BRITTLE
icon_base = "solid"
diff --git a/code/modules/materials/sheets/plastic.dm b/code/modules/materials/sheets/plastic.dm
index 41415af606..6310cd7226 100644
--- a/code/modules/materials/sheets/plastic.dm
+++ b/code/modules/materials/sheets/plastic.dm
@@ -1,7 +1,7 @@
/obj/item/stack/material/plastic
- name = "plastic"
+ name = MAT_PLASTIC
icon_state = "sheet-plastic"
- default_type = "plastic"
+ default_type = MAT_PLASTIC
no_variants = FALSE
/obj/item/stack/material/cardboard
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index fd1148d8db..bbf28108d0 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -348,7 +348,7 @@
var/self_verb_descriptor = list("grab", "snatch", "pick")
var/short_emote_descriptor = list("picks", "grabs")
var/self_emote_descriptor = list("grab", "pick", "snatch")
- var/fruit_type = "apple"
+ var/fruit_type = PLANT_APPLE
var/mob/living/organ_owner = null
var/gen_cost = 0.5
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index f5d67bf50b..1778cdc92a 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -660,12 +660,12 @@
total_material *= stack.get_amount()
if(material == MAT_STEEL && metal)
metal.add_charge(total_material)
- if(material == "glass" && glass)
+ if(material == MAT_GLASS && glass)
glass.add_charge(total_material)
if(decompiler)
- if(material == "plastic" && plastic)
+ if(material == MAT_PLASTIC && plastic)
plastic.add_charge(total_material)
- if(material == "wood" && wood)
+ if(material == MAT_WOOD && wood)
wood.add_charge(total_material)
drain(-50 * digested)
else if(istype(target,/obj/effect/decal/remains))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
index 48d8a17f39..6438e28c19 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
@@ -50,7 +50,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
/mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens
var/obj/item/reagent_containers/food/snacks/grown/G = O
- if(G.seed && G.seed.kitchen_tag == "wheat")
+ if(G.seed && G.seed.kitchen_tag == PLANT_WHEAT)
if(!stat && eggsleft < 8)
user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."),span_blue("You feed [O] to [name]! It clucks happily."))
user.drop_item()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
index 5b3b1c7ebc..f8b2b6bec2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
@@ -96,7 +96,7 @@
if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/G = O
- if(G.seed && G.seed.kitchen_tag == "berries")
+ if(G.seed && G.seed.kitchen_tag == PLANT_BERRIES)
return TRUE
return FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
index eb08ce7bc0..732d4c170f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
@@ -1,5 +1,5 @@
/mob/living/simple_mob/tomato
- name = "tomato"
+ name = PLANT_TOMATO
desc = "It's a horrifyingly enormous beef tomato, and it's packing extra beef!"
tt_desc = "X Solanum abominable"
icon_state = "tomato"
diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm
index 3d320e3742..7534e1e4a2 100644
--- a/code/modules/organs/subtypes/diona.dm
+++ b/code/modules/organs/subtypes/diona.dm
@@ -3,7 +3,7 @@
return 0
//This is a terrible hack and I should be ashamed.
- var/datum/seed/diona = SSplants.seeds["diona"]
+ var/datum/seed/diona = SSplants.seeds[PLANT_DIONA]
if(!diona)
return 0
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 2c50e021e2..0b0e22ce55 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -264,7 +264,7 @@
else
to_chat(user, span_notice("You need at least five segments of cable coil to complete this task."))
return
- else if(istype(W,/obj/item/stack/material) && W.get_material_name() == "plastic")
+ else if(istype(W,/obj/item/stack/material) && W.get_material_name() == MAT_PLASTIC)
if(buildstate == 3)
var/obj/item/stack/material/P = W
if(P.use(3))
diff --git a/vorestation.dme b/vorestation.dme
index 0b3fd1d5fe..1badf9a8ca 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -22,6 +22,7 @@
#include "code\__defines\__globals.dm"
#include "code\__defines\_click.dm"
#include "code\__defines\_compile_options.dm"
+#include "code\__defines\_fruits.dm"
#include "code\__defines\_helpers.dm"
#include "code\__defines\_init.dm"
#include "code\__defines\_lists.dm"
@@ -2623,7 +2624,6 @@
#include "code\modules\hydroponics\seed_machines.dm"
#include "code\modules\hydroponics\seed_mobs.dm"
#include "code\modules\hydroponics\seed_packets.dm"
-#include "code\modules\hydroponics\seed_packets_vr.dm"
#include "code\modules\hydroponics\seed_storage.dm"
#include "code\modules\hydroponics\seed_storage_vr.dm"
#include "code\modules\hydroponics\beekeeping\beehive.dm"
From cf224b6d124db92ffefa27ab3160c625f380ad06 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 05:51:39 +0100
Subject: [PATCH 14/29] .
---
code/__defines/_fruits.dm | 47 ++++++++++++++++---
code/global_vr.dm | 40 ----------------
code/modules/food/food/snacks.dm | 20 ++++----
code/modules/food/food/snacks/meat.dm | 2 +-
code/modules/food/food/superfoods.dm | 2 +-
code/modules/food/recipes_microwave.dm | 12 ++---
code/modules/food/recipes_microwave_vr.dm | 2 +-
code/modules/food/recipes_oven.dm | 2 +-
code/modules/hydroponics/seed_packets.dm | 2 +-
.../modules/hydroponics/seedtypes/eggplant.dm | 6 +--
.../hydroponics/seedtypes/mushrooms.dm | 2 +-
.../carbon/human/species/station/alraune.dm | 2 +-
12 files changed, 67 insertions(+), 72 deletions(-)
diff --git a/code/__defines/_fruits.dm b/code/__defines/_fruits.dm
index f8d36bab40..a217af7cf3 100644
--- a/code/__defines/_fruits.dm
+++ b/code/__defines/_fruits.dm
@@ -84,16 +84,51 @@
#define PLANT_BLACKWABBACK "blackwabback"
#define PLANT_WILDWABBACK "wildwabback"
#define PLANT_SIFLETTUCE "siflettuce"
-#define PLANT_EGGPLANT "egg-plant"
+#define PLANT_EGG_PLANT "egg-plant"
#define PLANT_PINEAPPLE "pineapple"
#define PLANT_BLOODROSE "bloodrose"
#define PLANT_GNOMES "gnomes"
#define PLANT_SIFBULB "sifbulb"
#define PLANT_WURMWOAD "wurmwoad"
#define PLANT_MICROM "microm"
-
-
-
-
-
#define PLANT_MEGAM "megam"
+
+GLOBAL_LIST_INIT(acceptable_fruit_types, list(
+ PLANT_AMBROSIA,
+ PLANT_APPLE,
+ PLANT_BANANA,
+ PLANT_BERRIES,
+ PLANT_CABBAGE,
+ PLANT_CARROT,
+ PLANT_CELERY,
+ PLANT_CHERRY,
+ PLANT_CHILI,
+ PLANT_COCOA,
+ PLANT_CORN,
+ PLANT_DURIAN,
+ PLANT_EGGPLANT,
+ PLANT_GRAPES,
+ PLANT_GREENGRAPES,
+ PLANT_HAREBELLS,
+ PLANT_LAVENDER,
+ PLANT_LEMON,
+ PLANT_LETTUCE,
+ PLANT_LIME,
+ PLANT_ONION,
+ PLANT_ORANGE,
+ PLANT_PEANUT,
+ PLANT_POPPIES,
+ PLANT_POTATO,
+ PLANT_PUMPKIN,
+ PLANT_RICE,
+ PLANT_ROSE,
+ PLANT_ROSE,
+ PLANT_SOYBEAN,
+ PLANT_SPINEAPPLE,
+ PLANT_SUGARCANE,
+ PLANT_SUNFLOWERS,
+ PLANT_TOMATO,
+ PLANT_VANILLA,
+ PLANT_WATERMELON,
+ PLANT_WHEAT,
+ PLANT_WHITEBEET))
diff --git a/code/global_vr.dm b/code/global_vr.dm
index 65b574c805..78ed7e756e 100644
--- a/code/global_vr.dm
+++ b/code/global_vr.dm
@@ -5,46 +5,6 @@ var/list/awayabductors = list() // List of scatter landmarks for Abductors in Ga
var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals
var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals
-var/global/list/acceptable_fruit_types= list(
- PLANT_AMBROSIA,
- PLANT_APPLE,
- PLANT_BANANA,
- PLANT_BERRIES,
- PLANT_CABBAGE,
- PLANT_CARROT,
- PLANT_CELERY,
- PLANT_CHERRY,
- PLANT_CHILI,
- PLANT_COCOA,
- PLANT_CORN,
- PLANT_DURIAN,
- PLANT_EGGPLANT,
- PLANT_GRAPES,
- PLANT_GREENGRAPES,
- PLANT_HAREBELLS,
- PLANT_LAVENDER,
- PLANT_LEMON,
- PLANT_LETTUCE,
- PLANT_LIME,
- PLANT_ONION,
- PLANT_ORANGE,
- PLANT_PEANUT,
- PLANT_POPPIES,
- PLANT_POTATO,
- PLANT_PUMPKIN,
- PLANT_RICE,
- PLANT_ROSE,
- PLANT_ROSE,
- PLANT_SOYBEAN,
- PLANT_SPINEAPPLE,
- PLANT_SUGARCANE,
- PLANT_SUNFLOWERS,
- PLANT_TOMATO,
- PLANT_VANILLA,
- PLANT_WATERMELON,
- PLANT_WHEAT,
- PLANT_WHITEBEET)
-
// Some "scary" sounds.
var/static/list/scawwySownds = list(
'sound/voice/ScawwySownds/a scawey sownd.ogg',
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 504093aef7..73f6fa12fa 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -1049,7 +1049,7 @@
filling_color = "#E0D7C5"
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 3
- nutriment_desc = list("raw" = 2, "mushroom" = 2)
+ nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2)
bitesize = 6
/obj/item/reagent_containers/food/snacks/mushroomslice/Initialize()
@@ -1512,7 +1512,7 @@
filling_color = "#FFCCCC"
center_of_mass = list("x"=17, "y"=9)
nutriment_amt = 5
- nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2)
+ nutriment_desc = list("sweetness" = 3, PLANT_MUSHROOMS = 3, "pie" = 2)
bitesize = 3
/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize()
@@ -1527,7 +1527,7 @@
filling_color = "#B8279B"
center_of_mass = list("x"=17, "y"=9)
nutriment_amt = 8
- nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3)
+ nutriment_desc = list("heartiness" = 2, PLANT_MUSHROOMS = 3, "pie" = 3)
bitesize = 2
/obj/item/reagent_containers/food/snacks/plump_pie/Initialize()
@@ -1811,7 +1811,7 @@
filling_color = "#42B873"
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 6
- nutriment_desc = list("mushroom" = 6)
+ nutriment_desc = list(PLANT_MUSHROOMS = 6)
bitesize = 3
/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize()
@@ -1826,7 +1826,7 @@
filling_color = "#ED0758"
center_of_mass = list("x"=16, "y"=5)
nutriment_amt = 6
- nutriment_desc = list("jelly" = 3, "mushroom" = 3)
+ nutriment_desc = list("jelly" = 3, PLANT_MUSHROOMS = 3)
bitesize = 3
/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize()
@@ -2350,7 +2350,7 @@
filling_color = "#CFB4C4"
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 5
- nutriment_desc = list("mushroom" = 4)
+ nutriment_desc = list(PLANT_MUSHROOMS = 4)
bitesize = 2
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
@@ -2653,7 +2653,7 @@
filling_color = "#9E673A"
center_of_mass = list("x"=16, "y"=5)
nutriment_amt = 6
- nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, "mushroom" = 2)
+ nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, PLANT_MUSHROOMS = 2)
drop_sound = 'sound/items/drop/shovel.ogg'
pickup_sound = 'sound/items/pickup/shovel.ogg'
bitesize = 10
@@ -3741,7 +3741,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10)
+ nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, PLANT_MUSHROOMS = 10)
nutriment_amt = 35
bitesize = 2
@@ -4405,7 +4405,7 @@
filling_color = "#A66829"
center_of_mass = list("x"=15, "y"=12)
nutriment_amt = 10
- nutriment_desc = list("mushroom" = 5, "salt" = 5)
+ nutriment_desc = list(PLANT_MUSHROOMS = 5, "salt" = 5)
bitesize = 3
/obj/item/reagent_containers/food/snacks/unajerky
@@ -6503,7 +6503,7 @@
filling_color = "#A66829"
center_of_mass = list("x"=15, "y"=12)
nutriment_amt = 10
- nutriment_desc = list("mushroom" = 5, "salt" = 5)
+ nutriment_desc = list(PLANT_MUSHROOMS = 5, "salt" = 5)
bitesize = 3
/obj/item/reagent_containers/food/snacks/sosjerky
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index ed846dd21b..79a3da6d8b 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -75,7 +75,7 @@
filling_color = "#E0D7C5"
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 3
- nutriment_desc = list("raw" = 2, "mushroom" = 2)
+ nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2)
bitesize = 6
/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize()
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index ed06f1a4ab..b8f3b41f1f 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -334,7 +334,7 @@
icon_state = "big_veggie_slice"
/datum/recipe/theonepizza
- fruit = list(PLANT_TOMATO = 5, "mushroom" = 5, PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1)
+ fruit = list(PLANT_TOMATO = 5, PLANT_MUSHROOMS = 5, PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 36170d2360..aed91592f1 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -263,7 +263,7 @@ I said no!
result_quantity = 2
/datum/recipe/stew
- fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1)
+ fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, PLANT_MUSHROOMS = 1)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/stew
@@ -431,13 +431,13 @@ I said no!
result_quantity = 2
/datum/recipe/mushroomsoup
- fruit = list("mushroom" = 1)
+ fruit = list(PLANT_MUSHROOMS = 1)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_MILK = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/mushroomsoup
/datum/recipe/chawanmushi
- fruit = list("mushroom" = 1)
+ fruit = list(PLANT_MUSHROOMS = 1)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_EGG = 6)
result = /obj/item/reagent_containers/food/snacks/chawanmushi
@@ -785,14 +785,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bearchili
/datum/recipe/bearstew
- fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1)
+ fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, PLANT_MUSHROOMS = 1)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/bearmeat)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bearstew
/datum/recipe/bibimbap
- fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1, "mushroom" = 1)
+ fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1, PLANT_MUSHROOMS = 1)
reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_SPACESPICE = 2)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
@@ -834,7 +834,7 @@ I said no!
/datum/recipe/risotto
reagents = list(REAGENT_ID_REDWINE = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1)
- fruit = list("mushroom" = 1)
+ fruit = list(PLANT_MUSHROOMS = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here
result = /obj/item/reagent_containers/food/snacks/risotto
diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm
index 1105994087..4a43086ac9 100644
--- a/code/modules/food/recipes_microwave_vr.dm
+++ b/code/modules/food/recipes_microwave_vr.dm
@@ -53,7 +53,7 @@
result = /obj/item/reagent_containers/food/snacks/reishicup
/datum/recipe/hotandsoursoup
- fruit = list(PLANT_CABBAGE = 1, "mushroom" = 1)
+ fruit = list(PLANT_CABBAGE = 1, PLANT_MUSHROOMS = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_BLACKPEPPER = 2, REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index 01268e6ff9..59cc6f9445 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -402,7 +402,7 @@
/datum/recipe/mushroompizza
appliance = OVEN
- fruit = list("mushroom" = 5, PLANT_TOMATO = 1)
+ fruit = list(PLANT_MUSHROOMS = 5, PLANT_TOMATO = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index fec080d8dc..baae35d32e 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -332,7 +332,7 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
seed_type = PLANT_SIFLETTUCE
/obj/item/seeds/eggyplant
- seed_type = PLANT_EGGPLANT
+ seed_type = PLANT_EGG_PLANT
/obj/item/seeds/pineapple
seed_type = PLANT_PINEAPPLE
diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm
index 2fc7dc7ae0..fc1e2c8838 100644
--- a/code/modules/hydroponics/seedtypes/eggplant.dm
+++ b/code/modules/hydroponics/seedtypes/eggplant.dm
@@ -22,10 +22,10 @@
// Return of Eggy. Just makes purple eggs. If the reagents are separated from the egg production by xenobotany or RNG, it's still an Egg plant.
/datum/seed/eggplant/egg
- name = PLANT_EGGPLANT
- seed_name = PLANT_EGGPLANT
+ name = PLANT_EGG_PLANT
+ seed_name = PLANT_EGG_PLANT
display_name = "egg-plants"
- kitchen_tag = PLANT_EGGPLANT
+ kitchen_tag = PLANT_EGG_PLANT
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_EGG = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm
index 8866b1bbe3..19d738c3c0 100644
--- a/code/modules/hydroponics/seedtypes/mushrooms.dm
+++ b/code/modules/hydroponics/seedtypes/mushrooms.dm
@@ -7,7 +7,7 @@
mutants = list(PLANT_REISHI,PLANT_AMANITA,PLANT_PLUMPHELMET)
chems = list(REAGENT_ID_NUTRIMENT = list(1,25))
splat_type = /obj/effect/plant
- kitchen_tag = "mushroom"
+ kitchen_tag = PLANT_MUSHROOMS
/datum/seed/mushroom/New()
..()
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index bbf28108d0..65673e19b6 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -390,7 +390,7 @@
break
if(fruit_gland)
- var/selection = tgui_input_list(src, "Choose your character's fruit type. Choosing nothing will result in a default of apples.", "Fruit Type", acceptable_fruit_types)
+ var/selection = tgui_input_list(src, "Choose your character's fruit type. Choosing nothing will result in a default of apples.", "Fruit Type", GLOB.acceptable_fruit_types)
if(selection)
fruit_gland.fruit_type = selection
add_verb(src, /mob/living/carbon/human/proc/alraune_fruit_pick)
From 076e0448a03942ed0e1ca9fc7ea606b3d43a9e3d Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 06:06:55 +0100
Subject: [PATCH 15/29] .
---
code/modules/power/apc.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 16199e4b8c..a3d04e5bed 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -684,7 +684,6 @@ GLOBAL_LIST_EMPTY(apcs)
to_chat(user, span_notice("The [name] looks too sturdy to bash open with \the [W.name]."))
// attack with hand - remove cell (if cover open) or interact with the APC
-
/obj/machinery/power/apc/proc/togglelock(mob/user)
if(emagged)
to_chat(user, "The panel is unresponsive.")
From 3073c62ecce8b7076ebab6da0842fc7942114344 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 13:37:39 +0100
Subject: [PATCH 16/29] fix that
---
code/modules/tgui/modules/appearance_changer.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm
index 5e410b9e6c..3ffd787f42 100644
--- a/code/modules/tgui/modules/appearance_changer.dm
+++ b/code/modules/tgui/modules/appearance_changer.dm
@@ -122,7 +122,7 @@
var/g_skin = hex2num(copytext(new_skin, 4, 6))
var/b_skin = hex2num(copytext(new_skin, 6, 8))
if(owner.change_skin_color(r_skin, g_skin, b_skin))
- update_dna(ui.user, owner)
+ update_dna(owner)
changed_hook(APPEARANCECHANGER_CHANGED_SKINCOLOR)
return 1
if("hair")
From b6174bccea3a6bab7cebd28e38de512cd2125e0a Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 15:38:35 +0100
Subject: [PATCH 17/29] some flag cleanup
---
maps/southern_cross/southern_cross_areas.dm | 8 ++--
maps/tether/tether_areas.dm | 46 ++++-----------------
2 files changed, 11 insertions(+), 43 deletions(-)
diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm
index 857f13134e..8d937c2769 100644
--- a/maps/southern_cross/southern_cross_areas.dm
+++ b/maps/southern_cross/southern_cross_areas.dm
@@ -758,20 +758,20 @@
/area/crew_quarters/heads/sc/
name = "\improper Command - Head Office"
icon_state = "head_quarters"
- flags = RAD_SHIELDED
+ flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
sound_env = MEDIUM_SOFTFLOOR
/area/crew_quarters/heads/sc/hop
name = "\improper Command - HoP's Office"
icon_state = "head_quarters"
holomap_color = HOLOMAP_AREACOLOR_COMMAND
- flags = AREA_FLAG_IS_NOT_PERSISTENT
+ flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_FLAG_IS_NOT_PERSISTENT
/area/crew_quarters/heads/sc/hor
name = "\improper Research - RD's Office"
icon_state = "head_quarters"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
- flags = AREA_FLAG_IS_NOT_PERSISTENT
+ flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_FLAG_IS_NOT_PERSISTENT
/area/crew_quarters/heads/sc/chief
name = "\improper Engineering - CE's Office"
@@ -787,7 +787,7 @@
name = "\improper Medbay - CMO's Office"
icon_state = "head_quarters"
holomap_color = HOLOMAP_AREACOLOR_MEDICAL
- flags = AREA_FLAG_IS_NOT_PERSISTENT
+ flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_FLAG_IS_NOT_PERSISTENT
/area/engineering/engineer_eva
name = "\improper Engineering EVA"
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index 3087f997c5..b94fab9a9c 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -997,91 +997,68 @@
icon_state = "recreation_area_restroom"
sound_env = SMALL_ENCLOSED
+/area/crew_quarters/sleep
+ flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
+
/area/crew_quarters/sleep/maintDorm1
name = "\improper Construction Dorm 1"
icon_state = "Sleep"
- flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/maintDorm2
name = "\improper Construction Dorm 2"
icon_state = "Sleep"
- flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/maintDorm3
name = "\improper Construction Dorm 3"
icon_state = "Sleep"
- flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/maintDorm4
name = "\improper Construction Dorm 4"
icon_state = "Sleep"
- flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_1
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_2
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_3
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_4
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_5
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_6
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_7
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_8
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_9
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_10
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_11
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_12
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_1
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_2
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_3
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_4
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_5
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_6
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_7
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_8
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_9
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_10
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/Dorm_1/holo
name = "\improper Dorm 1 Holodeck"
@@ -1103,61 +1080,52 @@
name = "\improper Visitor Lodging 1"
icon_state = "dk_yellow"
lightswitch = 0
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/spacedorm2
name = "\improper Visitor Lodging 2"
icon_state = "dk_yellow"
lightswitch = 0
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/spacedorm3
name = "\improper Visitor Lodging 3"
icon_state = "dk_yellow"
lightswitch = 0
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/spacedorm4
name = "\improper Visitor Lodging 4"
icon_state = "dk_yellow"
lightswitch = 0
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
+
+/area/holodeck/holodorm
+ flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
+
/area/holodeck/holodorm/source_basic
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_desert
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_seating
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_beach
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_garden
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_boxing
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_snow
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_space
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/holodeck/holodorm/source_off
name = "\improper Holodeck Source"
- flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/ai_core_foyer
name = "\improper AI Core Access"
From 1b8096798bfe4ad82478c68ca166bba303921805 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 8 Dec 2024 17:08:00 +0100
Subject: [PATCH 18/29] fix those 2 too
---
code/modules/client/preferences.dm | 2 ++
icons/mob/spacesuit.dmi | Bin 16083 -> 209673 bytes
2 files changed, 2 insertions(+)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 915d230779..b817e79689 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -659,6 +659,8 @@ var/list/preferences_datums = list()
character.flavor_texts["feet"] = flavor_texts["feet"]
if (copy_ooc_notes)
character.ooc_notes = metadata
+ character.ooc_notes_dislikes = metadata_dislikes
+ character.ooc_notes_likes = metadata_likes
character.weight = weight_vr
character.weight_gain = weight_gain
diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi
index 7fb16ee9cc2045e9b4e703dce8e56a3ed85df586..6432c617f045f9e9d9fe96dad0acbfd7eff094d3 100644
GIT binary patch
literal 209673
zcmbrlby!qU`!)(9t$@;kq#z+F-Jo=LgOsFn*C0rDgOo^#lt?#73IYPs-Q5g5GiS{&
zzV|!Vb^bdu7c;ZhthM*B*0Y|t?|Vn8smMOYd4_|6g7R2i?yUw23K|XgL&3rTEei{1
zCg336S4+?Rt(BXFtF5!Ut&<}Pig$KS23P#N(4+qC4NbB`U-sMa{fwf1z@hLXwix?=GAKO4MD`qyE^eAd=-23Yh~P+5-@$_hmk}H?0fwFQfAH`Q!7%I7l&n
zHaSfVr%$?$(Km^81QtFb&+<4oqyFuAy}UzD57A?PeJhR4
z`&V2SLbEZgWQnEHLA+c|j3N6ur#8_ohRguBT(D61o;3SWvOPn(2lZ~)j!V;zoz@GpO1NF^sFv__kkt_sFy&GL8Ipc!CPUK6HEFOf=`6p{@a|}{
z)NM*|{L~&xLaiE8P?ocS!)P_6sLYdCi816nk{Bl9#_rgaQ-sX|*syMtmHXde_o`5Z
z5T~#(PG6opaPWJ_I#RW!&=B<_y0&-jd2%v5qUy&j?U&4qGxZ<+!KV^kOIzCSzMN3-
zL{=I?YJB=EB5MBX;J9uZl4bY%)WA}Al>+gSLG=K3+`=u2AiLeYGj
zt*Ax|-L*KY<#?w9S=WUdr*b^!lJrtr7S5AGMv7R`mjP{YgNDEJJjxVNyB9s!Tm8g`HfH=-$v%7NjIm9{K@9J6IM!r$TDu*zZa@*n(TIH
zBIuYRJ-0Qm__IC=e~-YI{sGs%HDfzumZPUhT-ES<7T+1iH|mAUPuJfkdF)^-_rJ&>
zNC{g}n~o0=L|{`E>>;k%%Zt^t36@HvXLd<_;kQ>%t<{Xi7(OhD@B`;6ILcY#WZG
z15hX(Z&^cv?^B|6{gGt1;DkSWkBh{nDC+guDAtD8sGj3-Q5N0u1V4%Ssk+zLM&1<~
z@8a**bxFi6z!QTx7McwuqqMz1<3yjmUwIo5c7{&SV3^eNUBWW?@_}3!r=p(A>SlgOblPG_lmNy$Y?@w{R9SIg>
z3hdr4;(mi?NXp7XZv|03Om8xNI?k!lG}KaO9e3n@F3B4mLZIe0`7P*n*3zP&(4fe_
zmDKXiKFIO$CxXHdd0Ccj4snY{4o8GfBT%`XR$_V61gjDA^l~g&k2#4-+-VY()$4rM
zIVl;d<|XwtRa1y2~kZdp%LsQ|xu-
zw4Zp@!NE4%rhI5m{r`H9KWZKEKwd072bW2O1ew=5xH2B`n{aGrlS
z5mEo=G5954M?&jA4~)lk55E5A!EJM$y^r#rueAc<3-^nn!PmZ<1n5PhBgprGxMa^`3gj#=7+`7>=qG?L^f37dMoKeT8t5@%!zkC{OWVV<+
zX{`+xI>Z^UQ1xfHAKpiGY=i2!3q9w{QWh$i*!8|2sQDF69XP-iH|?`}Q)b2SDAzt9
zah}SM@vTqEx$O!<_$Yfkbmcns3d;y#+kt*UF=tx16qtc;qW4Aak#Ci5Xy;24VJmop
zID$r}|IN>S=Spaiz;|j=xd_I!t7A$p#~&<`u$$%Uf1+yo;k-xjQN5fE=Xp~5%~z3J
zdp=&{uJYSQ!(KRbjI3QXj@yI?Q>IFMXXqbhja%J){-?xWivrG+qjr~X4r70v*;3ng
z-UJ%fSfl-IJ_=}WHX9Z!y*GjFLZwd1=TWgn5K3n~ygGvFF!2sp2LfMx+-VTKdM(d$p@*-b!|>cgP5HFFerLbIMHer~CM
z*P$?nsHm}T!1amQl|3Pq<^^QslztRvy)V|n^ZX*O7cpm@Z;C7Id9V_1tIGOJ^|a8g
z1k*mhwzhWJt(&huNBvQWHmc7-WYwoCx;)g^L?k5KZd*!IRi+#{d4g_?p`oED{=_$r
zL_X43GjwW0pnH=WTU$Q^VZO|9nXj#X`a?HiUPK{n#iVF1_Q^N^)|ZQ9kMcuqGv
z1fj_-7K|RtRp)^bRCTlC=`9^{)Ib}h06#pM>terS$cMo^L%dlrqqZWZO-2-~h^p?r
z`mNMAUVX4s<^BD=UW;did*Dd6pu2~Mx{glRqT}|`G4<0WD#Uj>6Oq6TeY1fC+LYAPQ~k5)
zUzNr!*KhXBhu39uiBl?38v9QAYfE@l(?njzkiQQ5`I9^B5qWSD*B^r{)*n;)Q-<{p
ztkA5MXHs&W!h*?OBGVwMO^5Au
zC-tN5IfoICZ~mjsu`4_p7aWh@>Cm{PGhd4P3xzdu&%m!pqZi=OsrW&Q!d_1a2qX**
zDI#55Vx9}9^)w31&COw9VZFQ984IdOe|x}1&UEDnkt5@^BYG2##~>(3UZJCCVL=aU
zKPB)P1;vHaPCRE^a#I&3!
zL&?X!=5lx;Y0oQ_R7VmL5*b-p%*@Qphl{OG_l0eDjs>OW2eX)&m}qEdf{Ke7cb)9>
zSjn9~9K5|n8AH7KdPLfdN;E;53AwUa9r~uzPx9GU2^31lMn=McZjI}zG2>K6#q_W{{-kBSj)!U*Pv+Ym-#
zPV{i9f-&y}55{Ed*mUBcJy*ht*%~Wyy!F!MMVrlOuSNd_4@jUB14{c7UwtTQ?)7Ql
zDro()sM`7#cu{QNL|MG+_2wd!<+^Qn%(*j(oX`WB*W!b}X>0oQu*FRs%+^-=<$2{n
zK8bfUByDrtmL1$w-9iFyj`gpdvd>SjVexwV4v8EhQ#vnX?ORI%7mM6fb|4q{_EyuF
zUWjBoCzmpBqPc8Qn(beRu+%C_Qbix%I0yLXa+3s^c%TS5IXR_}dqi7{m!^S%f`S4L
z@#N$ygW3oN#k2%6(*C1DjO%-$qvkTr=D@ql!&X7hS^a(*9kF8NEJj`lK3?9_xm%cs
zfEy7lEv?Aa6+&)W+-;}`Meh{}pTmrVo7-zw=%+>d=Ki{>>Ch;mt_*4QvKQP*AY2u+Uk1ctf+#d5~7GJ6sso`}y_p3FWA;+%qsT0;_kvJwAB^MSJi7YtV?)A>R+g}@*!ODGke)=L2(rqblxyD{%XEm>=mTa+?XAt8%QyRfE4=c#3
zh8hgwhbQdhi$!EY_wKwkoJ=?Z-cadBT|K95|5ITXgx#0!_dK5)AkhNs)Y;uqcFH<>
zS7Hk%xU*2%l4s1N<-1pNZ48X&b3#^=q)&K_*PmE?=iN*`SzrNUShJQQnYc}YZ0~tk
zNJrfi)0b)#%U!?R9&h+xEZ3ZL(28N6o!_y2N-x=#Xmw*sGwRO2ouD3$Twcb=gc`d{
zzN&>jzF|=v%@+~RBiA+*7{|H4bP?Q88A!x8p`{}`TX&-o#l*X6TZWs98ZHs)V1w;z
zX=zFD?3sd^8bP{J<}U`#;uC3g{%Mni$DMW4CPN)%0Zpu}S;ez;M5I~2fB&YXrw;*<
z9XZy^b}OeEGyZv?4A$evR&%wsDJdyGEc)@rCnjzz(|;c}V_L^OSgC{FF~54XakAR|
z_U&5&YHE(f?a&Kr%PIn}dMnNX9S3fVs*JLZACozqOqQ*eSDn?=)mQmm%BXlAFFlrU
zcjuXJaC*r#roUz9=$KZC{rGY3J5JE0>-u!v*3t1jurVWI-kX#waa;5k7l~x3*`X5E
zCneMSMRVWuP=3xj>_B}>6EZR~N=vJo9v{^0Hhy{FOrqB7
zE(j*jPC6+s55E(g)F?=$nH5NFmfIN@%#z0q@0t^`P4yks|%*lyO
zluJ0dFQE9bM-BCl%P{<5~0X
z07;r!Ztk0nVf^)ga^fW$o~O3l>VXIMVHcD?Yic4XfA}J93rALuajCwTol=t}2?iIS
zhrSiNdJ$H(Jy6N9wuPwnUs_p(Sa|aNR!-&qeyMuKvGtcMO@ePkgc;abwitpwu^%x$
zt`YW_LdM31>9_+ShC*uW{-gt8E5O{6x3;{Il!%I`ye#@~Wd~Pg*X;>4|V4C(Xd%D{~oHaG&idRMKNA>cwcHa4aa
z$ivUCsi!yasy^3MY(RcHsIa*BDTqzLit0vFZGb8K-E~h%OVa=@E8+=#;j~arTwENU
zT^{Qg5i#)-(9>>D|9(3stUY4p0Up!WV};JHw|G<{Op8}5T_K?Qc>*G{vGH>T28JYc
z1v5@EGA{Fn;Nainq&)gr2qwOQkH^W1WP?9BR>>Knoi2K>BN~zNd-}{@YS0d27*a4c
zP|>i2LsN0_+SBOS&CQL*YPThKVqV_pjEk+~^rG*61q^ReKochDw$->e%`Y{Y8-RW<
zRGFOhy<=nACFfvv`v6sVZi?BM-+Ck)bwB!5-evXsQ)<&UtsI>v7kVJ62`lLzpVMH?
zn%aHG^UU@`sYi4dZ+$Ps|FNKsqz26E>+Nzn;`R6Xi+x1QcQ(gq=1pW&;xZBq$LxO7
zSX~(g-Z+g!WuFD|>cL+=Uy>SMW&87OPO4{4m-AVyP4`pFF=6t#9}i<>=%3h|n#oL(
zFyl?nY@95+=~c}-6jxNlraV`D;_kwJ{xg`9f67hTh+mR)d%WHcij7cFX>MsbJ-zH3
z8q#+U@SX~N)w)GzqTis}%*f51G&7?Y92{J@zai0@ZZC-#NTg4>!7Bmw2aKUa3rqJw
zbnmYk>f=JtGUy-fwlVNzH=8Uu`u|nz>`qtj4xY8p$hz-7pkk1>M)A7+NH(x&XTML33pTZ#2a#hOH
z>@)%|!VHpAR}#pg@TT8!XR4e{pMjKvNyuoOBxHB4U0dGB;yKoLL_l^toV2wzqN;Mp
zRdJpmZ=wo8v9^er@9$wug3iJA><7F!>n_aY?b7{^!t>8fq45P4KEn%iy$qKbC=Sg&
zXW*LH-W!s;9$+aWT5rq-C){kZ*JEsdz?KP)|B?6=_T2F2R_C&T;6g-7s%dP@7JG2L
z7R}M<+m}kYct?8Kdd<@P6z%4&*(-zO6is)uF^Qx7`d2A6frN(#@8skpNFMW)whC`~
zd3pc+`^V{b>F@vz4fO;H?WMgKb_x6d3j}M8PwnJ{0@|&{u6pifU|xrFy`ZeHv9UqP
z7Jc=hMVAnmPDc}?CP_u|X_h^A5l-Gr%f#QmG`*Y8_9dzfDnR^sS9kfijre6&OD^Hd
zlDvasl^$DNiN1S}Bm%HGrGjhHj_1%GBqStANJyYqz=h-!Q&B{qITnkAMGrE@Z((&T
z`_S9;-T8k>t-N>-Bx6zIze&GAD!b}vpQky{Pb^~Rac@)=PQJPJ49TXJuEL$DkP6cC3
zb*<6eN#JC?=Z1K%p=(;dbY2PU2B?ruBE&{y5wEHBgRcS{AK9Ih`iVZbtUDGDQXQ;`#+9=pYzVLhtogP2?4kdG4G}ub
z-(#CCZYpK)OdtBIsNjJfTDrP<&|DhDFqqE7!h({HP8!es_tsX*HWSrsGg7?pklb9V
zKvDW+fo}HPR<7`~GuPP*Q5ONqae^vrLPqDS950YVbpOck%?-HJk2`|lBK-f}G#P5$
z3(q1jd;H+%UFb+VLVg?8`)>mDUG!S|{Rx}U#?J0*e!k@AEN-=O9agZ1dF`h-ZF_kn
ztEM$|w~a3SPuF_K@sWPlw=GwmwHVuesyq>Xsg+&(Ktn@AN>h{21yo9uyV>v9RIZ^8
zsH79Jag_2#MwH6R$|GjXXcGVOIL(3!P4#E_N5<=lbd{(DT?;MyB%sFn^@q5_M*9T2
z?SzaC_6Iy%e#1>t_o#Jltl#9x_*L8HE3Em?u3`YSo0L3sA%OGnF!w7zc-j
ziei_0NSs}+L&t2~?NK{?w}_C99okZ+8wHK_h0_W$qs@5I@
z9}DxXK|2ixNBrGUOMH=HdalNLikrmR+8WvG_m8-^xOjMZ6Eib^&s2~6<^x$j$XEK}
zo-4k8&j=Q_r>BSW{U0*W*)kK2hUDTc?9-=*@*Nvd59P&aX(h)=ajjfOP*JRh&VYq2
zn4kTL&&VLt=QWOuj1*)aHC{dj&6bBSHJI17|GBuhcpk9lBuy!ws|sEe4P2g;%P)iz
z%K`R}e>3N&q^DC)Yp|3A+DVnqJ26~{$}2}OfD!li{vg_N`~I=96&QRsii)!RH+{@P
z=Cw#02RoPeh6Hpu=X@AJPu(iz<0EKs>CaviDN0c3;$0j+doH-Sxk-5gFvYWt@v93{
z>;P3G*fh0krI<%0j5;3;md_S-jsJIPtP2ji6ZE}cLixR1xyErR_w^j_6qeTgcKbQ<
zD5=Ba5{F9EHwAWgHL)~CTP7xw+1~AU+}7{Wgv&|xX#8|Xze>%}5SOM59x0%w
z$Hb;gk>eH7&}JSnBK)b>JaK%}awv@r6o>q5T(B=vZxC5oSw(q|Dfra%_2sRs7^orl
zTr1f`_$R0R)Qa0ZoAJGQnl6I@5=S%s9R!4g-AEr}PEvw{ii$eEr%Sh1Er5OfJ8ApV
z+?;`q(z9!!jctSF)PLfZI4H?4RT&u>!{Wu^Gi+%|FL8;C(fr4wY(JZIhuQKuF4%;(
zUj?kk@@p6x4uMkEGXB3|U9U}}yJPbHch``sE#Xk(7R8yn6Pe+~tYe}=?F6HC=U$R7
z0IzwyWSfo&w2I=~TGQH?No^8G!Z|i8QrqAI$2m7zJyi2Iy{i!Zin=6>CLT
zVw=TTRqJI?3e*LIPnd4hDAhp$0Cn}RJ#(XK+DGQ~L-h#sZ}1jZv0DzjyPN%F=;u2G
z0Ygg3cJ^Ncz;z1udpgvmOfL|GPU2g0EiVwMf4vxV&vQAamwLSv1799u;cqWNTu5(+
zNMUKJtuQ^d1%_p~t}rQwHe7$K5E?99yh#l>M<7JUQ796!HZdj;!#A;DcT
zHa1rJ%oCYNFMGBRzfHRoP&n5_}90$F)!F+
zDV{wWOfu_8We7t$SCp*dYaRM_G4jgk5AEyo$l@I*g4G5@S@#;QR>omfNJZF39%1uNJ+UfUm07d*y$=Ng6XqHMH6t?!&ms
z6?^T4HWFm<2jDjZtVoQ^hUXbD;XaVX-c01ddq5#AucV|^enxwyzcVc*EsYL{6p`DV
z0^~|Kb-+j@37lh9M+Va)1n@WB>Qzile0Ohj9gM|N?Ri(>yAip+M4!9+9LKBWV@(2i
zjes_RR~N>%hMNMZzckAyRlYsBQ2yAFd!MK_P%y5gFM%?f{%dv@Ezt%f|dCn!1*>}1%WA!;4%)Gm&mtyMUHWLnQF;9>rcGGrf+(X`Zp1ThZw;Vm`iy`mM
zgI~N1ycsg({xHYWqY&9qRYjMIFYy`Ebtl2?Tjr#lG(ZA4$p!`n1j_t!$GBTTVyj{A
z1Yk-ART7&XsXUdEPTVBDy&M0rh>{)5)eVX1`5Z>=K@gAX5lDt$
zBowjMj66IF0Pvd+EaHmioRxo8KQpjU=pIMh0sQf
zk|KI@AB_%%H~!Lcap7WPV~e2@edgrkH0vw=7CAAt$91o-rslC8J$fN33hGcifZS3a
z?Cj8hqs~r=ttDRyV>TV@sz{|b2}V9v7r38+v1w{)_4FNgY!8i!r?XI(v>b<00*n?p
zL%_st&dx_?uVGi9mgVxlb~Yi01^*NcYH9*tkzCtzkXXgUJaTn&8{G>mF-9eCawvE9
z=zeXqc=E>uT`Wf>+*_qIcqTF|Cn91uM4P~U@v({jaY$$he#jUFm+P!v{#jzyH~)>|
zKp5$0PCPvNIN-<0h1n0k0;7%#jJs$EU=aY=(Xwl8ZH;dyDd9f~5WpxU0TJVRhgm5V
zm60zbQox$P6XAcp?7&AzN-8TOgV7!KIGK-(Cu{f-1z!yKeITF<_+ES~PsM-YGQ0R(
z*c0XN($Yv?O0+;icb-QE1U7EHl#6CY3~{oRK?4E;nv^pvh5@N&DnC}awa
z(JoVokr}VeM4ZWQEZe5!s%8-t9^)&qcNkvUaMiJR_j}~GG=wmrOCM!o*L^%pFyx~>
ztv}~d3u~?~7_O$jeJ?oS#(nArg@8s1D&LUJj^CDR-T30}St!ixsLaKz6&;?31`V_{
zYx{Nf(|B|5-+@{_>Q$Y0J;;a#+SfE8-{ADN-{EC&gb~>zMEE1}UuT;`rRC+80Iq#R
z&iz(lxjjHQH8u5>X}gg^dRA>MkJxo*Q`c4+o1vVdV)A&e!U`s}KTQ#9C=C{HC5)<{
z-#R%})#A@I(a_R#EuUlxBneVJ_$~f0Lu>ImKJt2bvDo5O1Kiu|_HElyRHRpy
zaWEbk989YJsH&v&f{iU!)DO;X?A529T@3%^#ZEdtJ{}Pl_a5+hN$?bA&2MF8>%e0<
zv}_Ca+JCM53?P+qQ^b{p^~Nm9p4LI6>)vp-pk|chAN(SLR75#krCEg;mREr&n-*4m
z6bE}jIkew(LA`PpyXq
z{s%za4Ufx{fv@?DD9>&zhnx!pTQ836SKTLqY)bQXLbXKubB;*|D#>4r`{X?G!G1W?rSJ#4|Y$MPrt*|Y>dGDlmgEQ>;H>8$B4uBXu^Q!~-
zY$H7AP-$fCp2*q_3?X
zj0{G2=PX1F%?nfFff>v0XM3rl`!u}!V?{y8>3YAWuCA<}UdGR07>!*VwK$cbEGAw!
z8b{UZJyii#5mxFF1#x0)A{QMU62OnVm6dHNl9iQB&dl7cH;d5#$C>~-P18|VcQH~@
zsBu}B`C3p=T2@BS%4(1HI>qmQwE%y0Bp&>=;V}V)T8P2*L*QgaiV%SQ{FjZ3KyAMZ
z#Q#vww+BD9MnS&JIeY+9ohvyO&$YK3022#77e}KJK)m)f?NFV2;>$@;cXc$U7+n-=
zFj4B|pPB{m2NFdJKd(cNXn9*L#HbTOd&IP|dG9-F4mDO?U7eB7X6g$Dh9`uC^oKX<
zhK7ntN{{5_<&n)A%}Jn20B{g+uOMGvU3Z(Z7tG-m6B7eRPpGKadtZ}XG<4tW9{Da&
z1GkfTGO{TJ0Ai4b6Zty$Yv}38nVTcQJ0oK}NGIJmgX92{Q4x+W$n
zfG5-}R#I15CY;vsVp#TqJjB2d0@Ebux`E~4;h~htE$yN_3Go6m@|84X7x95&8@HtCoKHAt2=}pR4ESL!<{fvdD
zo!#-Q#m9qPUtOuZuU(LTzLf2+^nY5axl1F5>ix9D7R57V#^VxC`KJYw9T%a7AtvXP
zl}wr<2ePQQ`e{eBodPM7BtfnA+Gmq7u+B62D;!~W$T;rkmvOf9h#v-Cz-K-60A0|p
zYa?}})uv;kS#pB-$@y1U(te>p&%Ii3y#F+oS$_V%sec5Nln3>vIaO60n7FvuczDJ2
z#bH1Gs)?N$)7zWeSNfI$02H`PCcyK83ccZ6R8(~4&@+xoG^*Ep)oW6b82YQfKm6M_
zCg55#_?@W0LcMzB4JQ7ia1DX>RmIy|0PsHa?Cf!%PcN(F=rjjm8i(n~T5ohFzf*24
z-4vjAkprViIo{u#Z36c7Am(hPmW9TAwF>Y@(EVv7OQoUl6b0A>Kv$6r5Kx8?F+WrR
zYf8(^EI)qv%2^q#QWWyw^w$@%pS
z2f3c9h`;IoyP&wF?8rI=NrMg03RQje9njYi6^yS$Ls!AkiFhg5!dO*D9D$X7<_UbM2SiEAUNr6F=8vri5t51
zPZHW8AbxDU4si+0HHUXhz&c2iT+e?#6Zhx~L;
zpFLyA85$lIEl?P+)y@LMvR=oM;D|Bhd-@SnCJv7D@ymnRH?u`WGcCvXJ4JNeyH$9^!Z+AaJn
z*=2h)Z&Z7t|H+e&DIEJ#6`BtBH80JnIKZ-(S*zq%SI6C)Z`T~=9utjeB5U_c#E78o
zk5$vyx8g+mdR%b$TebI6n;IGd5G;Ino7Rm+uRDOQGQjUtC)L>v}sGzASv%;_;sw5PX%3A`>+gSUxzQFGfBN6EFeK-~eo+wWVrBJ+WcgU!2
zY)LsDKYugc7i&ble-B)`gIRh*LwV>bvZwwV^OGrWE|G=kh$X5eE)Rw6W3JnYor0o)
zgHCpV88@w_U)RC17U%_HltEe*)WX8Tdbdg+--G!IP9jDbB})VIdY)y?9a;@XO}TJK
zefRS-vCr~2~
z3lunZc6Np5)z#G?3W03_RuAYuda3&U>r`0II)NTS$XX;g^yc#_hsg`38}t?OH)Du9
z_2e7Z`Y+S_)w2#L?(XhPXYJaEMGJM9E)4U(CLV#LMRmPfNi%e$6%@=2#U;hr-zrc0;M$>g)9B#eYL__`l%b-qZf1Q%#OYHf`Re#_?!@Y
zVrw*REK|v@Mx)NJ>T4T;`J+?P`1fuJxh{UVanaI83K7>QAQy5`1av3?&oiE22_TG;
zlapI+N+X%2lKL9x-B>fey}5Zm?J008LlCK4^W1oVd9~DN9=7Q{@jaON#115CS3pGy=9UH8`iOCVx(d{(pbZ&uP!E
zL%>R1ROiu}!54QUmWX_d+OuO}G5q$ek`XawsPA1ws_%5=Tv!@e`-Ah>!_~%oeYCOB
zau&BT8%v$kL?i9hG{)kgqGR%C`%MeQ%vfID!#{j`oIB9_6^c%>7Gs@ZxH*|c!+D4k
z3PxM*tju$JySZ77_w-;%6oZAh_PVX2yP&HUbq2Q8df%8>3wq7F#>b`n{DjleNP^vk
zzPI2saYIo+#s2Bjr2qTiHo+@)&(k_HT!9vQ$6;8Q9Yv$f55CTCP#v-2`K3R
z`T@*e4tZ%19KRM7p#xAEcs)))7Yx6@@D&AGoQDq|4v>T(8O84i(;oH{WzIuDA%7VMZJ;!V?m*vW7y6ibSCQG?ntiVAku1i`@yIz0wlz
zAGIk93r0tv&+U!4GE8#>6$BN26p%|hEVt+M^t>%STfLqC{}NvOSvs|)=>sfJ4EWdI
zaSl|v2t_oLM2CVc)G)KLauwf$Wk#bdmiygd^-A1dMcNAYep}p%v{3pF8G&s~+Ot(*S*}R&7j4Z;WN_=%$
zuR>>Tejdo+(5A$R-`9{=vo1L{0JQUELl5@p`MFy?$^(E_gLNqlm1EaJEOM!bV>~tq
z;x}>6I(&g%h_bzec(e7uzq_q^y%QDdQR{vF?XimSqGcym;g_)`~*lsB4U(rjlU;N8zy1M<@
zf^NuM@Lku(m!GWY^TgNhul_+cQ+03eP3v%$0<$P3-`%k_NT?CSP%__$dmSyH?o;=_
z%)4l7U&Xk@d4S3+9zTj$l8%;}p!AEbYTLROg-@c|W^?2rk}rdh>Pw(}(PnwK5A_8#
z66yjA^-B4dh_1*t$vr;wu0K8YbxIq6Y=Qu2DBRs^w~Zc26Vw67pTW4AZtYn*C66sn
zA?5y-f#$@B4d7}$ef$VvXVC{|myBGrJ%?oPY8&`lTHEAtap`+kzsS3J<^`z2(x|pE
zD`~_sE8ZkAMW`|ogwJzHD8?I;zzEgVXX)D5Z5>f=&o;si^7`ZCxFJY=b*G#M|21
ze(qddT%e4wPl2?H5)aeF!~}E#MbFQjJgjMKr;3US3DaCa56N+{egq=`kK}m6*0(}F
zFHyQ%@pY=>^Yi;~SaF;621MSFYm=7Y->t6Zgx?xQ$m=n2Ld51@@h5ocui#BL#|fi>
z-@h|zX!FJ^XHi)mFI~Jo>u3~+URw**(jG4OZuj-ot@T<5MAx
z1k~H}%q&Bw!BNuyQ&PYy1=*v_9-Rq@a!H;5Q~GzT{?a4+Vt3p1x5&C=Y7`24=i
zJ3+ZHZ}nWftRf?nw)f9@mHC>!7(^60x^WI+ye&CEOEPQCKLeFjM6bDE89#&$l-xxRAfVW$mx)Q(f<$!Zr}WhQ}z4w-z-
zF2h9H&5_2wT2yCxHZaa`GU(R-oK;ydy|brabG%yMq5Xcsi{82q7~(d;Y*u{CAG~B=
zcIY*K>iDqKrx>{VC^A}0se=vnV2g)`)AF3pQNQ`qVpZF#972nq_Y20U8=FG?+NN-~;)P^68F-2GSgrZ3l^kE
zD5vE_>DQLEwY0LeB}xe6uYK2gA~lX76!3zl|TC3uZQrPENLTZiUD!sIBD=*VYG
z+7@hGF~>C@ED6@@JMU9m@{9QBmjn7^3uW;^BY6J7QrLF(j2+)m18X7-3y&urA7uvu
z@~qFtjF6*H;JJdG0Qi>>~gYFX%tRfEfMCc~E+MxVVjI54g*Q
z$5Ucs;!$q@*B~#rJ>kq0`h2`7L@;CJ+2kMqa;(M-ZvROR7tERfLKSo;__=H{CLvotsu$>*UY>8jQP#-~0$cXa8V}>&qN73wKUZRJst#un+a*3FP
zRYQ%$t(pug`swfS(KqB3j@z4muL?zH!tvZNv%bb|`aU>0vyO-C**cfdr7xBZAVIY4!U>c@Bm{D+M9yO+EL9B^(|N1qf{#n-5
z^(Rp}h!6%9X@GqJ+O(oZjNrWv;r~v~kgo`1cwX&;pYFRFM=i%b
z>d2B6@O;R$R$ZMID)uLX3s}DhvLDbr`0^dYJ{>Hz-F@N$ka;ptE-))&zyFhg998pv
zIBDq^ByqoohSuSC$J;<=o#H_!B%$_>X7$OFp8j6clg;isJ&ewS0`d$WwfU>jE6b@sMZyNZ~ej(Lf;mU5QIw8`PVtb
z;K*)s_i4u1?;H;!`=!5*@eco#KtRn=#wQ`=FS0~S+nQ}=2~Pe9);7zAfs)f9PEqhH
z@?>(bxNOo6c&~A8zw^H7*J4nGKaWR_ma+Rj#Hh9VUEg6(S(h0Qu)VD
z?;N%m^gi#~e)y0YCtR^PE}#Z}14xU1G%2+cdY~}&ADa8`rPk`PfTZkY4wF|s5aiYx
zu(72n^p%+W-e@#-W*dfhqx|5o*&4
zDBT56zaZZow|ka>j3gn9`M0!<%{L;#POwd0wDE%qhr+2f5sWzLd5&v2NsQbSnPLG#
zK+jN}GBrN_3&5J7I0b@1Ta~En3<`>B56`Fg4u;=W+df_CY3XA*_VZ1lXirW$hPpRh
zXnvH5&isIjc6U)nbvxzh|K<@GVKsRi53-Oyv9Ud9c_PmSWL=J3Tt2YHE{bZ+ZRT9#
zsOf9>CR~!lhy33xh(nIEeHhcCa9*t`v3Ab8ld
zUy>Ji<~jKY8+)~^s@)v)C^u?K(k|2aUEHv)D{kYElQSbEoT+CN(@1ffAh-Q?AHpNJ
z5Z6C*sPu|m=059r$E}%!&+2!MrDg4^a#={W7)@3?YwY3(`@m%!9+*@x!%qPDCDY>^
zP?$rTm>A;_p3hZ%klmqviTIdv&Tkji*TemD@g}e;zVN_gcu|FCKmtjZp^fC*J0$h
zfSl^^@DM9l0u;zVFAZ8sv+6f~KZrG|;Qrda=-59!tvf!w>khQnid9*kKO+^NLqm!>
z0Z%wMI37HB0PbA+Qc@C*1W*+_Ju=@lrNca=TfJ0O@qrBP_H6&~u&AU&Hfq$(t@tCj
zY2xjFc0U3Vjj+zv1bP<(R~<_D#^+)lbB4E;AO%v&7I?zoCnjA`%ZiMNN$Cq>=|VA0Hr20e9Q}nx0MvNiYE2ei&3-TwV^&
z?Qi{#GlhNGJ@jCQ%}q_o0CgBR3lOq{0Vii?bl|Q*G+fW`@S&Lhm&3I-LVfbm)UZOQ
zVK8W1apkhVCz9~@@bGi@MZhj&qjcPFaxAjYDpbR7Re3k_0>V~@IP^C)Zd{Gc>{2JA
zz>y%g*#j?!X4Qlmf>vZFS|9O~sjIxz=VdR4N1M=~$9b+(eQQ}W8eA(Dr6Xo!fi-@6lH8a6Z;fv0Id5haW1Jc2
zTG}fe)#LoGOGQ~*n;3u?KzGKx=n)zT-ho&O1a}uFW0rv%0ujK67Z(+U0*7B~Q1NfG
z`8faZnX_k?U7dl{n>Rqn8UwlG)`v=a-tS=o(1Nwh86|3X|>8y~j
za1k$}mxMFCJ74b6cZ3R3>+#>uoO}Ljh)#fXZfdNX`VGMoFLQC-IRz(?twCt@$8ix{
z)xMcSkbuk0)qjX03ifNwzJm}^IUga+>V+2qNvW6$Kn2}{7EV-wbzv7EH`A27Qq@6s
zy{>7;r>YuHhc5|)L_m^@
zp|;ldX3eQ)7NkaB8XD3MuL7&SkuEMS_OqR{O}oaIgp{R`^}loI`F0y$SbBRL_g~A8
zSov}bPy}lubD^;?2-tR)0pcpX0QtKM994h6Sw^@UMU2mdQIuJRZw@L83un9*1$@^_
zsX|QjA7vFGT%O2cqsYC9T$=w_$KW?={p=jMbVEw}Fos}fOR5gDG4uW2Gn7UesUb;C
z`~pgnL2ON}^S73QuP6_WHXjtEg%q0zkYqgtoVW#dCP2}W_})HPi0eI90KkqMP$B|6
z0O@2ZXe#^Hd>E?d4}mmdHvki$YR#*wnLz$cvl#$jgG)jlyn&DZjd>!@#}EkEGNP!p
zHM_9z#V&s*xB+7?Ef5I0n7=}X*cyPy@i$WXP+tCmmbQxxz;u#ARWE>a1;z2^WIbM-
z<@+o(;M|Se$D|#7s$L)}@(`~pgR;LhtQ$dt8`*n>^&$+H3}2;5W}#5;Z$6ept$nb&
zb}BzkJm%#-@g3isXz}P4R>&%^6rs8PpunwSmka}eEB7zO9P6~WUb=~cX1cC71l;$q
zPFTcRN=-&KQ`K(YoD}hFty|}acUu)xT{EU@bX2uoC0my0f3*OUs<&^Th-*Eh>8;+M
zAWq7v#vL0b+z%Ru<|)!%379o&+^#*idrozmyQ|>h4YdnyZM6}aLRomoGjsT5;nE4_
z%EJ*ax(wmy{Y#5gD@e%+*OtD38;XOaN8PRZAwEMKTnYp3P5f}FJ-Fax|d!XT4K1Bg}SFSU({9#ZRBgvoF
zi0E5BF2|I<-|5-2Rx@Wh6C2JeoIm4tE8!v3htKR(Vb*ALEG$uAj~#fn7^XWpJ9C1%
z@A~d;sQoHVPFI%{kYd2AQ{shRSj|sPhUVo_1HcC)kG9iV45wFDF9BjCNnqpPK>5!s
zf$mvs7zpBYbaX%|QCnZnVt`UwoD#$Y@fGrWa`52Nu_fi``9W--VaU{Sc-VU@G03K|
z_!G*af{D4%6@nen%X{YITWo4^4jz+d_t3z9ldLV65`>ShZ|qMWPX*Jwvp@KiukLuZ
zA89ki^X`zVAo>I?HtcAMs<}DE=kme*#e~}Zz4`9phc^Vi&H@e^&FSfQu`}_xCX~4zfgJq+FRX*VjE?CS@MrH8&3uJhU>OFQxL2Ta&rW
zkBoo|BnS5sgUJW?0RWX*VaAd&QNq)r{36XSLwFU70lQsYE8CB0;m;JZtd<{A1!Wqe
zTT0u0`-yWQ&^bPt?s$S$LE5v=dr&I=8a7cGguF*v51?T_K0cqq!W7&%kkt>klNHoV
zfCfw5*5x4le`tFPzo??NU3icZX^@aEK^l~<0qF)Mr9nZE?jDft?rx+*I))T!0V(P3
z?wFZx^PKa%@A(J5&HUK4_Fgk9_PW=7UH7%KLqFwy4eR>o1jPM|7*)4d{f^>a-Ua<0
z9o;fQ+>@A?n1qi>d%*WJkh&K4Xh^XQ4Dli_D(~;#>&8%m(GTC}&K$3HP5tO098dn8
zOp@;#)~mv4JP|Cex)QRSk4>9j5=0P^#VE1rk#;3|HuF^u*J=f#XGN5kQL{M6
z{ek;#7UU-VSKj64nUv#-eG{y5NVA>8+oc^ewuJy9*nmf=JGCC_=>4aXb{1ZWt|nv5T|wpQ$OpT3}ko!?M@v92y!Tt>sY!y?Gp^
zl7^AEc>DOstEePT_G`)~uJ&jTV4?-D&ThD6A}|ak_x5(XflQW@4If{ggTKF_6QbKC
zXtjTi(;9=_5Xneo)J?+KjS0m8lX;O5U4bLzu*i_rCDg|PjmN?e>YWa@@Y$wmGl?{H
z5J{(yVQBa>FtlgmQB{$(sAMM<(a{m^12;3HrOSU}_5*$CFDO1ygM%Hqx1+6MR!|2g
zk7C3M=E%?Q8{Phyn8b_Qia0y#WMCrqvjPEgaUyb5Ixz?)rs!kNdS-}cCc-Pp1CDrD
zLAYKZ!X8L!04f{_0tWQKO+qpC5rlFEUo8aT3t%6GKLKk*##)4b9MSWBC-_f1VqAFb#WGaCNbFfy%f*m(3
z9Au<>^-xf?Ft#7Aa?O8L1N{+#9x2wI^3|ff*r1H&O?L;UK27B8&kMu+EZ{^u97wm{
zn)J#y3HIyr6Ost@uI~W>MOv=4JIaS=yZifqTRXK`z@q!jL)2j1WCv$V|y(n1Scr^YD;&bt@2;~gBFh2Ki
zoo)wgzDCACV?f-e1ju$_90o2ANOXBygdKAtiHTK
zn)vg-ivZD2kd);AEE_-bP-)2icPYVU2mL?E1#G?|g$Do6^2<^ZQ~ZDL&7(s82?WGI
z{daNr_vaZN_WvwVQ^CZ30AlptC6h0*bRG6Zq_x?=?d?FK>7Jb;YSm+0s{59#5*vj;V*&Zw81@!<
z517)it`>{;50q`gysELmb9i}C&o|1_561*og@!*Ky3>M;VtNfq~E$niB(UlIMRq
zl#cD!&36dv)>@j6Q6>RgexXuyAgKa%O)}c2G6nd(AY^PXbVU`2Y67m)VUv-U$DrXu
zlgx|Fca8M<9ImFL6RJ`|&%}ft(A`yQHn6z?aA+>CuJB(30p2FSTQp5(mX6>>AUeNqozPSVusM}1e^+x)o4c530uQI7<=ZgTtm<~RY
zk5$<|)l|tb{QBy$Z(|u98N`i*M!O9v%XoiTRHQQk+;5PY+S=xvEob>oM|B2}MXouB
zYc4p7#CC>V=bd&b=}z&E4xV3C6_uv%P3ph^X0*te-SYO!1ISNy|H?(BpX?F>lwAgU
z#1{c3J@C@}s5S1G7?KxDce~C))-A4B=AuU-LR%X}1>t*&g<)uPrm&mqvKdn9i(B_@
zTattCq66V8B%f~(^Tp)AA&F6taSisv$-g4<8>56Ek(30vH)!Gv1nOIEEAnR?CzMgDjr;m)-8B9D@&op^+hBfQu_!oC6_Hez4MdvDlSi8z>%Hw>z|9oD7J
zb4s_)rjZ9uK7l&is7wZ;DGR9(1dyB3SyCv_uKpMkfn!Dkc(d$Rpp6GlZKw1V2&-{z
zqW`Eh=h5v4S2gMNH5f8a@^Qxv(8fqIcF{zRP5Fr8*WZ-g{Ee7+#q-m9a|Nqnq*YuO
z{ELP+WP$%_Li)TfIwWFx4ZknPOD=Tso}ZludlYWa_Qc^#`dA9-;r<{%k#7{h?0bNU
zjw@I1Ja4nTOQ?dUl?Q&DpwI%*@rnWD`>kKvGEE>FUDZm_}6d->7X6AX)r2$9nTET2Y!S>|dPw(hNrmY8W
zv3~OIc=mLJ^jjE|t1j!`2@*8e=$*0)Le-ebX9MMyRDc|-&E@d(v)nr)ON3&#?1l$n
z{rQyL)*rskuyX^8i9`g_RzuNwZ6p0rI4W(t@0D%=l3Zd~lui8ra}NEM{2jY8IuY)7
z2EFj`7d1Iql3$cjWiw*%?*sx{ic&KjWYTd?J~WWLuUo5VJqvU#k<)OavWS?J2z}|D
zsF7^GHSq5P1BLpC2|4^HiN&%X_&Yq;R3fy{X!RJfX>$ZU8F(wBs)r6I!JC@eIMNb%
z9&ZiI>*g?zHn#;aZUdxR>32A*z4Y$2Y
z^sD9-Oz~Y`e!C+L6-W&`wpOa(tFiL$xSvdV`P|D_pLHfRh231EX&wc|TBm|%1|1R3
z97i5I|2JPV=cT|3Z@qEPPaj=0Ug2Ii*x{f`Ba0G<8c_9r$CHQVOL=z@@r5GA7E~*W
z$qpr)$GH4tq54nrcu}(x-D98;-c+6?w~B{4h=X5pm01P
z1%NX{oJJf7op9(?Pn5EXM16(?cr*YC4nU7uy|@FoH}w4cBpIW{sn}^zs=zZTw<%@2
zHw5GIdXoG(9!|&}Hp=hX1wpcvUg-iig6AkeQ|kZ96FnELcr-_+0EOZwebRnfpo#oX7lxOFhA#JWT{5+XY1}N%fxN
zW(ahz+mmpcpOls*?Ts&;qR#+!5B-E{B5M7!C@J08uf8;_szcfeK$WC*%g#3PrE52R
z;D-hSkxQO#GR)RBtYw0U*g@E?z#f1lme~4YkCyB0{hN^i8s>Gq(;F5RwUOYFRr*z2
zf^Ujz^V8B5>_IChOk`LQqIsVDiEd}dS+W@S0Rk79q{_h?!RAp?)Zc`J|I`%AlYgA|
zfZZwV;WoZzz1=JCEY-{Tv<((49x>2?%wvV_Nt=9V%DezSk)I$LP{gXqFu+vaQ&}P
zmpe=Zfrj}aeCSWc(E#=+S(xvfS|ZWcKy2y2z{Ls?W+UdOd{L>FeVlphihr8F1^gd<
zKIpZrWg(RwlTPB>Yk4T7s2X`2s$%}ijp`s^I5Vl$3BC%D`QC4uS6z(@0$}*@orD}b
z*8ZnqGg78t@m2)T_5e)UR5s%GanEH6bew@G^+Tk*@6Z#c)iVlE7f`Sf{Q?iQdp!dy
z3p|H%&NaSvcAS924KVi!eFsi%2ysHV)0F6E5Io*u)RStNh$y&GUA@NbI*G{y9c5+Z
z!(9yGw_qM3MhtuGTi%Jssk?~x-S7j_?mj_vy>riL&Tp(4$m7{RB*e+f@if@?u3&N(
z$4}>o*-qEbefI;kXf;SJ;#70jXDw%lMy9+xq*G)hninG!X}>bDcV28$6i|3u8(wp>
z1%K|0Vf;sHB*H25BZ={o!zRh;6+Opw#~nA@_e{rkd3Lsy%YR}kzNyX}v+`4OR>rYlQH;O0!=XN-(C;Q}(
z)b$Q`2GeSVh9=kt0?fb6kqn*6NrH4=7^YyOp
zfX9AeUfDLT4()N1zvz9Z2hDBshKu|8`AV%M2&c;I6T(BAY1u!3>xf1v^P2zI-C(5J
zr6(@eJ?p`i3J!CtftOWsIh17lu%M)N_M5w?Et1c~{gC<25vID)fKywGdm1!G^yo7)
zRpXmA`Bu^~ss=~MpI{<*R%rD@5HDGFhau1k9ZwzXFUq-&0I4I2Rxcz)QBYPg;HB|j
z=H#-|#a}Mg_P^i~USjxe_>_L`W|Snv03L89xx6IsV))OFs>qt#WQXu`H?Q4#;wa#!
z?h4dVTfUje`^-G22;L%>e0Qi>Bl7CPAVA`5Pw&mk{My<$Aif)z9x%Uhd<*!KfJl8y
zYiov=F9!KWdV47=*49t?I5zMuPQ8bc#Ii0v>9tffBni({tX0@7*bDU|1SajUgWd~J
zL|5?mP3?W&hr_(>5WZF4Y_{5Gw4^VAFnk)ET6qS7!YRv3PaiEZnlvSrd~m7<6>bWp
zP+$K-qr*Tt@5qI_7#M!z-fT8X#y(tRy6`?@yqtyyVc0F4v9#%l^>vfR6RFyhSRfR9ku;C!b4&`q5puJH3!gRkM
z%FL6b?qnjV<)O%j)o4>#81G|BPjyOlwf>uge8B{g=up6fe=S=pNU3WHlI_f@0f)aE
z59_yOOgj811y0(%F;h}CQu9lt>QK)~LX&&_A$&I{^s9X?5*}8liyBKnema3Q<3L!a
zkf}8zx-{==-7WTcuDQmzNv~s5D?6VTzKPo&Q>J5kkU#CC=#ZQ%o&|3%2PIds)l9lM
zK3nd0Ig9U)Dpe-f8Cd|#B-{fFI*N0P^%2EW)YE;Q_>l!ZK*NO*7Km_
zp6PAm8FvpAB@QGDNfYGH+-kEHItzzcPGX+H8ewnP|GC1(V@Xg*k@loe>OW@APEWL_
zQMkPZaT{T3kEV%_%)U2NQ3q;$z(5|@mQa6XUXtNVmmlg&$1&#Qc)IW+lYYW~nnPyhjzwn`kmSKT)uwoP$a&CVm*64FJ|a
z%pg5M*l$(ozg?!a_JDR0FlCu4QQZOfL+7A8OF*7w7vNQF_YYsBc~07Z-&aFw|nXcvX%dhh#?}UZJRl`tL<|Aw}(u8Nr-e_?_+wU4
zj1w|fsbVgS!u%(n?|-II9E;fNf3mrc_aV&`%7yGE@kVu*6>yeX=W;WA$H9Bxe%RFj!*(}rSduVJfp-CTGtTktoj`s+Wkc}
z;D+xXr&s#%73Yv;14dw8yD<&>Rq)TNQV#YDKs$0U2fQ2DR>FT#FUsp&4T&pWkIeu$L(0h0)hJy&gciKaHHF?jm
zjFl-g4Hi-r;&=jP+f>Ic+M|Dxea8+au`hztA+fQXCtO3ju_kn
zCXfJAWlJXX^79Am_j!20NDcTA0Dc+cd=+k_ruQERf;(fBA(GxMvbws;T(l;y3J1D^
zOG)W`2~}bw1bAopg@u8Dk8aR1tavcN@;yay;xre9e`j7BIUc0??*na|O34=pK;f3Y
zM8A;GoObY!=1#izzJ->BlnCsyZz#jhoTR_gg}aW~MxK
z+xS_np(Ev8B$==Rhh2br%%E}43E@G&pmnkhB}ULe%0wO2S7;V_!l}r*cR9Nryc%LVoh-Ne@ZnulilNU(6-D4A
zJ*9Hob5EivTxVY_ziygqPpoYBXo*K;?(~tDTA8Azux=eT(=3AbRGyN^dn)5dhMre`
z6oEWm3B9ey^0?guDE?A(5O^&x8)mn&-s%tuiMeMP*ot@_{qBmPIyF&wcj|ei3-gu
zHzib&Z0zEMOJ;^Yx}dOJzkM+0F3a$_P#e5!dy^ABX=gB=5_hpHpX+gz9y14ru
z)Ny2L-(+zmn<}bu*8r?_2a^6!D+!q}P+=3yn{^SD6|qhDbySl2z0y|QPSb`2Za7Yi
zy&50UUPMgtQl<=eY)?~jZ|o0(<`%-46?s-)OaqtEP+`ZbM2dixu9hlWQ^A99T-+(2
zKdM4(#08r6v0&Do(zAT1Y*aNpL<^;yrV%t{Lb-$vb3VL^-&M{z4_6AfLdu8ro_>(F
zS&uD;YnPR>A2bu(576$)F%tA4GqcUrl4tI2tczBADiKv~<2q=BM$zydKnr@_m)}X2
z4TP3I+uL9~L}Ma81X9O`1=4lU-1ycT+$cD*ML|e=vlbX@Wk@l*Y-cHw=N?6zqTH9?
z&2|xFSg3a674AB*RRD=gQX|J)OY$CxH_BU_fkBpkd40wVtK22;H;fA_L)Yx?$$OpxI3+H`+@>$5Jk_wh9+
zCvL)^RBlsHS^=l2;g+l}pWiJH4?)-)A=;VGZ%vvOw!XMlXUvZQm#rNTgg{1EbjN{h
z^(;=YyfI)lZre1B{h{dcwM<)Us>3yfr`JCWv;aq;Z7|(9vf2lu_fJ0QcM}L8p1f&6
zSu<&F)#Iq@h^=K)oeqN6)($Dw8;n<^`l3=P@K{_{_M&N_a!&1~ywSSljZm`w`J2`z
zujf?zNmDN0n&QH5z}(tuMm@=xJdbM#Cdvcz!ZtHY|K5b+q=j8E)rQ5z;zmZDq4=Jl@nfFJ)lOH#TAv@|q4!(?g5loo?&#RTMTQ3#Pip%Z
z(ZZ%RlbRQ$Hw6-35isv5Zu)jVmBLm?)=piKB@IleCQ%MyjQ;xSwF2d-)rziwHS&$t
zVATz7=$BKtKSpY$t5sR~%W1UIA5}fp4HlMP{()9&bln?H*c6D`ujZ}!0H^O84r1!Y
z_J=MLj%sMqWNP!jE~Dyu)u$arrtpVzfV!0c;889)8t;wPD-R(3TUSjV${{(%f9Olb
z-P*;4UM~kE{!QUpaQt&aHF&?mGJo|8AdNhw%DQLLs#jkoJo+rKB`fXY<0D0f4=}8%
zPsk*>nu!ty-@kp8lGDc$wsJCHUXMSmH`nUIik@laXFENR70}$R&XUygxiqq6>c3oo
zw`YK6((duHf=S+Oj2(>ut~1_ql$Wobz14Zr*ocyucc~~eQuY4VevtYDY@pDtO+m$A
zGg8d>9~U$;{Km6m-Hr^~2>dqtH|ub%5wn;MncQs8zSdJ1EA-B*!w{=w_2SAqzZ2rZ
zs`3rTu-eh!go!RrE>vjibUNl2pAtx&`BBb@~GBf%92IN~fkKG1DLCSasY
z5QZXVN7CR&>&7&k!nvbxp+dm@)mGblEkh|??^9YT^;(SyQ#G5>*wSm$yN7lIU5QY#
zTbS?qnSjo4TGJup)-<>*D(Qk7q=*FkkQ-B?=7A=949+2c}q#95s&%
zp)Z#QG^AaeIkw^J3Rp|kgzr+~b9iO732mkNQKrEq}3)PRcxn7SXi4l7nGT+8)-X3&!z>V6QLDf+gTa
zR^be2`2n)md&1}^5AIT1u|GHsz#mobJJRm`Oz+d4Kp#%aY-Tv(bjHnP;%g!Rhj9so
z{v>a`5c{tTxQ|g`MCY}^6@$7E7xMN+*Du23AknmUEFiSYHb`xGDhu<
z?1TK~W>UATp#4@BKHmq?ei-y@;bgDupv-<&SE{mwgN!jkls#T_a;5O|f!tsP#52SX
z$W3FVHRkGb5v2#;C5}YHJy-`!sYqFZyZ;yQS-(Or-~igz9NS(e0{F;XOM(_3^{4kC
zw!R#$CDQuQ?QFPiwYPZY_OKLdN@nWidjQamB8>i(R2~S#94DUxfq2@C$VQMqZ
zw&k33ODsi9HWVIM?7Q$$SL41Z&XM$?W7`U7WQ3
z?UykENAAa>+hiIaJ&HS>VM?O3OHP^pDYURsfp&i4h_#!CEt---S1ga$2~TqNhb%?S
zKQprw`Lcf=%cIkHcFe(S>*wVd6AFO}#s32k*tLC&7)5b|oR2=gl?Oo8#am!X2bekY
zo!uE1QGo!!UP12R*3=C55TKC3L+M%L0wf@S`9VtteAS2gAkmYBe(whG)bV9}@o8I9
z0r+8$Ep2V&04WTpKaHosB@`H4h7o}L%kaG{l}CT5tuG0HI>j?Qr@F|?Sdrc&DrhIa
z4{7Qw|G597y)Y+|iJ7bAv(Er2vaFl)I;mOg6{Zr$rA$ZuJ%OMvNu#GI@QITP1njo0
zA}xv?qIezKZZpyEV<&xc$rpPh!qSm8g1e6@A~W<1$$Ivg+HycL0G5rDlWOD~s9ww#
z4>*97@`ewxbKIp9--n|0rY@Rx0?p;q)rx7|@B0}M!j5Ioj7UO-9k=eESI%XBA(A;5
z->P1HtI`E9KTQ=!1t$!uP&}fZ=gdCWI7bSEQ}l(GQbAnZ$oRl1<_gE5E2FycKP8KJ
z6=xe{_4^3ioAEUd{|+d81}qPL8S>%64?d@_GyTHM3H?%W
z)Od!qoU^u@CuH~{qgezRrp6#6K(>?DUdh&~F)&SD^;zrW#UrW;ysS-4eMt#e;X(Wp
zbURp^J$sX$l1O^!VaRR-(s9psViyaBTh7ePnDcI49evv!%=r%fE6u{rp}3F$M)i3h
z^WeXvbn_|wXhoV|n4`e>yMg?RkAW?bs117mjW0~U4Zp*%y0lZOiZ*arH*8t=X?92z
zV^)gi1ZHdIt%1nLc0*184%cA|
zUO3X?*%yn$HmoKopAI*yetN000F5vBIS2
z0D5WN4Z5BSVe%MWFd+txtdagRUh
zoT~@*3p_8Xp>K-#%dDo_kCJ?b&ALsyoZ6UnzFS|U4@oOl?z_(4=-ajX)TgMH
zvs*r?`-JH&Lk)Hh4-2b>zPF9N&lwh9t;S>9rJG4M_8xtio$-)Z28V9J7J>{$^=gwd
z9Iju+J$&K1y+5UjHv3xpQD48J89NOKj0?^Mzd4aaG93?iH!eSk*(t~LgiL;d@weoa
zY~0ckqrUcF=)l{*xHz-X)A)gSm%@$*bSqEcxh!I5V&v}R=gel`r3B>FO}NR4tF@;8
zlc2R#m|Iwh^rLy^v}>R{b)0dgv(zE>hkwD+kd{xep0AG0P|1bjZt_62J0|AbkAda(
zN4nhw5er1sh_w4^N+EbAXB5E|6UC?Q_>9Eql-uoxCJf3f1AR-w;W?g{v%NRhV<{hcN*_ti4i`%_uMqqzP-Qt=j|4Qg@7ObfB7CmwS?I>qREF{+d4WnO=>{a
zp64Zhrncg4U_jn^xuuccmn#o#Rqa<7Se>16^xm{Xh83R5ocimM!=hk|CL#0gl7iEp
zu4{6DE!x?aVtAJhFq$Ms^uy;h!wpk#ZB8Z^QWW1#N=v#hR~y_7m{{Vlf{;iN7fvXE
zP+LqJR?z!CQ*I#8%arxlo9qcL2cA{{2SenLfgmharDXmJ7Nb#{w+{D|_!r5+#1x|T
zrf-?rdO8Y#&1s5Ej3;v^qjDX<8H|8_FpwNDg#l>vsWtKMg{1*h=&n8I{MiFQ4zrYn
z-{imTE5@_cFqV&=&AMi)gR|!sCjWss0E5d};%N_lD8Lsv$=SgufHz>(56GXYaW0#K
z?Z)*h+rIWb>o!OTancYAtD`Z9+1HpzIdZq?Ts>rt5AmT?ItCh6mvw#3HS0cF4uKQg
zu`@RG7tpR=*^uFe_Rp%Dw!meCg`>}bfvgAq=070!6XdNB(5#S5c4c=+
zNElS-(2qAocou?zUf}J$K)f`ss!BwmLVhiRt~2Eh#wq=TAV++wGgeC5GBJX?eYEMV60u?j_8!b+REeZjf{6pUY#YIYFTANzw*!OTQJwoGk(pv@;t+bcQg
z#RsxJ&APu|QC1L2KTf+|ua{|0M(-%vTFtVIf>FV)(h91aq{%_LC7nHdF7C8mjC=zEkG`&hI~CoW}_O))=XC2H8CsAwM)BrWb%LwomIYHa`|3R
zgH=)=3AntLI!QDqQc_P3%7eTm#i_1c<`!h%P6iErHrcW1#RU}TpgeJMpQDhGRrEH@
zYLY(>?9GK%7Zys{o?;|7W7bYx)*%tDNj}@9k#!a~Z1n^japW8qu
z>7MENy6ujrp+keHhl&isE2fFu)RUmKwCu`=X*cwRiT4@@@NtGIE@xM*(tlKB+Wjn?
z|6Zq2n%y>2kPEm~g2DQkLuW%75B#Gg_pQ5PrkApXzyqu@YyB*Ya({Q2G`G`iO-wP+W#O3=`{7yN{6<*8$qL?;#&=wSAkCWl`+GnW|NNsdAUnZE
zEKGESZ&p9QIXVcq7JYp7kI?kAw18K;gjBrdm3lWd>A(w6A^{U0cn1U^!}luHJvA;l
zx_mHgA93Q%)E7s;P+A#8FPqz_H3B`8iOCdmMB&h~q@N?V{aR2|6m@rzSA<%aq*C;_
zZ}ru3e*E!ne^+rNo1Fukp^Kx}R8}td@?(i-+S{OtI_-pdj*21=m-592;3Ydbpcbna
zr$+~QKy6;^YY7@zI?Bw?Ukm|^+V#blOm$a5#BQ_-MHJd~d!6c-cElSbXY-nvAzH^b
zezq@j;b>iw`Q)e+3TD(vikoVFZ;+;chL`t`J}+9vk+p@`$yEUe#drE~Myheml1G~s
zt$#S4HCwv7S7)yB)
zCa)xnFtxOK0Z-kQcTw$j($wTnVo6_Yz%l@KhVOti_vY-M$)8$4IoKHzT4lD
z>Hwwj7<-zql{kZ$nEWb%Y(b$~(D$uedOS99gmmq+U9hS5H`cXIv0Wor|HRZq*j?G4
zTUdfO1x&ag=Zz7&f{@VfiGx~sMIX-&0S)WhoY0|T+welBQ$tR537SL|$a#v4I6Om*
z9KBJTJr;_2I}>&>{f7z18)aG?K86I#JJ&SBZf5%pO<`BVd)8T+zm50u5CsQ!ZdKts
zXEa?~C$6-LIwIjjpxKJe@m}iAYJVrvR1P-c&CA^;h5hixVFJ}BuT>ORlGajzFV%pL
zKx``ol3XLFSpLHF4{ecZVs&vR`>ar*uX$&BYK1w-8rGfMoqt}iLmSKUnp{ci-C(LG
zlHApjU8t(B-(cv&WDTMZ$Rx+-8IZ>`fCLQ${8ah5^qBJl=H#4{#@~tJe
zUUCBQW17n2*5d;hGz{EC$tI0E5YtYwdpRMGE!}&`t@5yWHY))N)1T%1+u7$0!IXXg
zsHnrLA(W@;M`^e#Xp?1!oLPOL78@95%eA}u74N!?1OobF+(f8QB=_Q3T;wm?xWPdA
z68eF!o2d#CYR%O#Xl+^1?wJ~pPeX2`Sfu_05kWpBCfK+79ocjVVLbK%RI(+)FbD{U
z$10^!v#8BQZ;hANM8>NM`BC7E^6c4}07?Mzou*2S4h_HdK%Qi{-7`$_6S`C(P1$ed
z;%_kk?m3`XY5Z0~Gbx%~@9#uP8oIPuULC>xz3~9fpK?Mc2;Kb!tqzEg>3cUwHs-rs
zb!$2{i6-8DBz{a`=nW2!tG?NJ&0N&xOFhel;xS}DHSNUU2$tQsB}F4T#sD
zH4W%1RWC>dgm8XngaabZ(i58Ks>FaS((J+35NmbcSDrdRiS9qY=YFqGQnZkeo1ivQ
z`s)kUiHu4e#}}tfKL}y3={jCct1`_wq&gdgOBHI5@h@CVkVgtA?(YiK$P>Yo*lFEfCU9iBl|WS7)7~1&iU@3
z^$(d$623!aVcB(P3mez~AZ(A3hq!;AJnp9Hi7|nxq617xNI@ZVXNQoT2xj-pQw$TK
ztr=&e9pXG}X=hi`q%Dp381W?*VTT}Yzntvbcto&joPrx3FLLJLh?|AAY6vC$!^-3d
z0?bm8Gnmf%Gk
z%enN`GMTYC{6aCJ(1q~|=qNsD2I5dz22XKzF8br%ODYIZIkRX!}tY$Cp~v%v$ZWHe_v})K^t|u$(bOABvC?79G#$4_;Qvy
z63`HK%V^qJuw2;4Gue|uGG2+NEW0S^?E>tSI(da3GH3
zRTs%WZm`=c^n7FD)c_O<>~3Pb~hg#
zPtSYltC0WW7Vk%-P&Lb?I@-`jY5!d#%aZM5+IPPWR~27y4M)zU?-Zz-@Zd32A1M4r
z-g4O`{d6-Uhv?@0L@|ctx`0mOnYKhD2bJ3VdrADOUjmKyr0@XWM|9XmPACsL?>3HKNiL<7e}S2m$KYR;O@Xq`7qRm8D_#ukE7)%?$V>IhulUM6>FU5V7AGrWW53K*%w^5lLII5%D6
z?L`3}HIdfP{U1ql=ar6rxoFsmOfMR}S*Jg;GE*5a9Jn=Im(Dz#O#-xM*oD#}FJ&>Y
zgdU>sgcp|KQ!PZ(*%Z{j;ieq&z{&HJ=INJ0EIU%8F9+sjJ?mDA9u*IOZV_IvbUNT7
z?@EPlro#TriqO7oow-;?SqMFQmM-lK*h4i2g
zqXCYeEdJnI4O4B;EiDF2Z55iS;vTBIiu^P7@pGqXtDXLL*uCdS=YsBa^J9we4ZbKb
z<10l%0kZB)i|+==1M%EfeECYhK3rlj;&i%7jVazf@ONog-X_sJ|4B`i`lWm-LKHtu
z>KQ&8A7=M4o|_Y=8?+O<9j3P
zsg`I~Aoe=NP$Y6MR=dnCCe;KQp2hNxbb_Cer{T+rd(Ik$L}+nSGk*ANU5sMUz{(8>iKB3
za!l{(R7O_9CgPDPl4FYEdmoTVuf_h~I0mwkp}ic@!v97lfyD^ZYJ>7(!VhOacY=<=41h2
z!cWUDgmpHgMZ?{9@Q+PSkfK76>IZM&pvco7i2Qk(ts-LIlkyLHl_ZAmIVY73UX@;h
zoIB^l8|c$UZ1j&GoM%fBFMj_`F)WcJC;jlyMnY6t)wX&3!o;ULqi2)J+#EJDs5{D(eX#d
zpPj49Yg@PVJq5U`8cW2Z2)ZZu<{O+^`~qPyuy>B2T!1UPFV)5#g<>y{n2mEX6ET9S
zg^3*p8X+J1apVys<;F|IwmrexohYnTP5ovFgwX(vQMvSvT0MM2>7h^X~!+(+{_XZh>(n{~D~u@|aa={djF
z!6W!&935GEGbOhJ$!X7nRPIu%gn##crZ?cNxa`}ZYX}w~e
z!-Rf%$8zBQrPg1$cA>>~nr`ier1OWutEWVd`A&_Ul)%u&4V-$ysNohH3N$EEPlaj&^H?7uRK2D5q>^>i!5
zl!AxJ5@I?+vnZ+55l=-poorV&BYoc$7lK;VkxU75t?((6xUK4pH7aaNtN*-Wxt9*a
zvxwKjuBpQt^}Q;szTl=KUOzo%W*@8XfY&Skr?5-Q%AOfpKn%?{yu2Xrxw^MyWo6CV
zcKk0O@b!!E`M4j5Rts8cqHrOCYA<3(5BJw!SoRb}NR6IT;R0eMUG?^~oE7?m*RP9u
z3L~9t^~;V=EAoa!?bhA{_jwXR#;uD5<8F8gAttX)Ua28QG~XM1LG|ef+2c+!9;Xay
zD}8CFEgaWH`(0G@4P_wP%JQ4P{NXunPT0KBFMX2THaCKAQF%h5A`cLI5dDWe}ru@#7(mB!%#=vlvf9lUxbl5WLb9B{KXDIqvO?dNU0nG3rcy`mgd
zh&o)n;i5YG*C`=iNok#8f}Tb?7Bt$Kl``O;k1tRhBN
zTDdLjfFA$O-Taf#Nw$~U8}nX^${b7CrJLjY{GTX(4d7;eMTB%)mW^B40ph7wFjS7L
zu;u--LsSeS>SxA(N&>hyg|2
zIv=KI5*kf({!g>6X)OzTz==;tkhC2AER@c_adq4akn=^|5*G>IW*+zwoV+Fr8eOs!
zxBje1x=!+&GYsG|V9Uo}7Om2^ZX$_e361HVv8>$YlR`S7=I`2Cg7tPNKWKmxIwGin
z_h*^`1zFIEKW1}ToAGUPB}SFWxz=4YQuizM
zOO(S_ruh(}=%cTJV2Q4nxw}2H6O{*PQETsO*cEqq1=8;v^pe?uitv4l$?Xe=+u8x$
zhXAj;qXj#Qy_K6!OgH*&fsZq+8VAXvb{+4VcUtKefumff8AhpI%m-##T81u|HexyX
z>FEgc+X@&WYEhOK0U7(xM#DV>?EwK7*1#J*&n+4*(VZ^5kuL(uRdtB1obnxWsP#ujFR*(%
zmzlA<_Z#{DWCgNx>8gnj#KD@EuuB|&sBT86D&t#`jTL*WAi?DVG3xt+eLX84nw@5k
zuHL#W^T3-qM%P4L4fo4;N*;=zL)v@}m}LVc_aM&GL^bQ0Y&X7`e!U?vwI!_V5LtOx
z!d6yO%3uzs!6iat+VeQcVr!g4|EIt~>ejLyKE%Bx-*bzD#0QrRDHrJ8jzH19`bfDd
zT*JMkxY1Mo0bqzfj8+p_D^xrq#=5@h)
zDxLgPxUpU#M8F1e`|jX1cH8;~NyqtHLHkolLG~p7BV362-}5hv*ZW^PAFptvdBKB-
zl&G9u5?pv@(LweA{zKqHUWqliImHZ0`P-3vi52-tmQhDbXc*U}FvF
z8?J%=?E8Dj-hri}wu{YE`8k8F$_^YHQ~nmbC$)Y+Z0;^DiZ}(w_2wo*qiECv7%T{X
zU8l4SY~)o`V8smdKCW7Ea46Q=CV*0dT}Dl={F)CL%gTzKrZX}6yxBpQ&Nz?VcajFZ
z1Yq5Lvi_>hn^|k~{aZ7Q7@PI*>W1Id`?bnSl#oc^@R*PhHtfAN?b<`jajQN9a#tP
z)Gx!W9fsD5Ne4)A*>nKo4hMWKP+!6A>QRl>mvO{#GF_O{8K*l#8ba-rnWVi$w?Zm=
z|I(_a^P(t4>~M3xKB;G;%1$wHcBYsq!mg2@ZoL5EcD7&>(gY6FN_Qa
zwrbdE(D7`6I{4kQ%Y-`~1Qe)|ws!4{tO&#D$Ca3LIJNiD_$0#a@DpY(00aGfs$67X
zO9D6%qZL1O1o?4eA`3{k>pV{h>8HspD^u|GPX*UPo?S-UzT69n)yf+B3&sz)Dmsag
zg1j+TZNgIwPsyUz&zh!B5ag7`emhJa8-VMl^TGJqdAO!pumV)bpe_4#{K6V>YV$-Z
zg-2`MrOvkDg3J`|$X9_rlKtsVp&rl7V6p+x&qL7&ZG_G!E*vae4X;g4?y#u+qKz8y
zOUT1YBH{RyYKsbEOmvp%0NMGWb#HgKxK?hw)CeqV7N--qBz9JXwboV_b$M|0ariuD=^5+vxu1d^?%shVJpJ3FhN@s}W
zoX+BD1Y!%0UVDSoC(7sQjEjPV3p-B%J>KR~Bb&mbkNrCYX5K7fa_dmng&1ScAPSAY
zFg$K|h*dDw25hWAOH+_RcemfFf6$MJ>ne`mR+&c&WB5%MZt$O6VLznzl6{{(RQ|BR
zVLaJF0?e=M!b!N&YIT$@J)=XJ(kgY>dJlpH@i)dWxEm%0F6qt~Pq&wI=aAq23h70P
zngV$T_TusOxjSj2&T99Nn3udE-|CGcC#w~EX@7O-UxF3HamJ}=q)#t)#98HE)%&vb
z#TLybX8p%kE7~{ZnJPf2`UYm23-aJYu(A4Y1urrF`e
zBHZt~X@;@tF(M;FmBPE1u3YHu^J{)OkvXkK=8wGg$5OZU1HRd<*I%r%e;Ed~2J_|7=z$BXX(rC=JU8*n|W8mN{mICVJX
zk~nR}$sVUpmY>C1|N0-MhRfhTA&0a&lG!EC%nq4NO*3+g9_hy@_}fXS1v)!RLeBQ(
z0#y7E%|<}z8`IXxE5#R)wIyF8u&R$BljX+BIzp0vgjt!v58m(D=tKGsR~plwb%!h*
zF{UX^&d
zfy~_f_E{zvW2&8`?gKmyg_*k@PnvFr_aUd1tONMMn``})qWWO<#Q^&4^lmp6Ncnzd
zf)Q1Re9e8ICN+c2LFwCMXkA7%TXX7d@9^C+XH@uH&8pXz9_81jb~7-1WbKgN#5VnN
z27zzO&Zcl>(Br0J|Ia(`_Cx#AScAwu$O68}m09-3M(N3w9Jvb#)yP3l(JhWy3~dR^
zi@UjG6(>XgByMw9=oNbX(M!
zOO1uWUz-@$Bplv=vBu3uA
ztER#5GhAP-)-cMY^%hWqdBllA6);|`*uLCG*LHI6AoW*zmdbt%rW-{%a~CPCMd89?
zlU@Axk7e9rknN;ZmvPyNgEScq(1cl-nY*p{o;Y$Tvnxa7vyUVoKtJSM5YVyoIl&)k
z%uMJwl)r%WZ_F)bCGYt0sC-*Ds=ApFsFcq}K6jlGKh5J|eCX20CEZ1uAesHVrMUCM
zp9dX~gnzZu^X=C&`!!y(uoiPXUTZ{QHS7DoHCd_OWRe?8K4NtzWh2KAM*U(~n6v~Q
zIgt;Z>?hv5DNP)<>si&?Z;uZe0MqQLSPQs+gu^{hwagKld8!o1A`eWs4u<|$3I88e
zZyiuo(De%w(jrJmmkNlKfPmCF2#O#b(k0#9-QC^YbqMJ=($d}C-F=AjZSMO$@4e3-
zGJDUS8F25l*8En?S}YuIQ5`Kam9)3YD_B(Eb~MIfa5r{Y-E&%_r@#>)r;-YA=zByP
zZhED40pC0I+}@W02eaw{u*qz(LDu8y^71tHRtP~;uyHD@4uU*Q0RaPBHq)c^Mo%9s
zrj@k}U+d>{{&dsF_Fk#36Myd*{<2-
zp`O6JdT^UNmWIxv2iaK`R*6bC)g%8?vD)teDx3J$@3=RN(lg_2gl8szzCHUc|7CbPKng*W$Qq*kv*aD6xUvg
z-bc;+#NU$-;J-UVa7IYe_X{}5p=bG%>66j~T&`1ben-eR;eORYdk~-!q-J>O`mof6B1QS!|a=?LTR$5)rc3m
zRsTF95iuY-{ssumdX7IQOia*qh?kR*5!CE^|I?&5DB$i92nN()JBws{{mbCEbHwm)
zM&Pcam;d>nvq$W)%ty(s2OG2N+-EY4hLdGmtKxIr%YNKRwEYmj-FK0?c@k!KJMlcv
z*)9EC=3}W;njN&!m@zfAZrp7E>5jwe*Nn@eqlhLZ^5>OmFUNYg?mu10jqOo@-o+Ye
zjMJvSO*HTbQ@T3dgN@qsy>(RKVAmZAs_(Uc*&Po(??wbq&YK#80rx$1E6LXixfcXX
z)JiCa6o;CX8nVW3zR4;G3gUjv!$72o62!#7qmGYS=JWHrdt^)Qvq0zM2!)=c-yGCJ
zmeS|aM{I{<2Qzl~3lBBo3i%WqGKBSa=9)i9(=!KuFaHhJ)zC#GCW6fFDDtm<
zn8V%}W$1mlLKVY5jhnO-GekpMzWO87^wgZ87&d>&yzz9!nwz(Rh?fB>yB}Ljvj+10
z^RO6fE9a60;&~X?p8_1>@~3C}&&iBcD%+(hQ?fDq1m
z?23-XvGthdUcCKeB>_2*W9}9-Ti>aEu|~>pTISm?u{R{$;R=}#84kQ^Wk{$KeLM)J
zu_i6#d_{O}2Uk(CS+$=SC>4YO!$%_wql
zIW-h#q8=TN6Qa4I?~ncRn01}H7)WR>L8C&Ta!}5`*B{V4Y~9B;v#KOAm&bq9M>mDS
zz2`%*Cq3Z4ZW85Zz2$pg88z{vZdA&ma?TV`5Vw;%UmoQb-N)Nq)4he!x%RL2WdE_#
z08$oS06(di>%(Ow#zmz_5pkgi!zY7N{7kt)mzAeVxdP5GkCgVo{+-xo>)$))Zb+f}
zIpzrmTl?bR)+QX|?mS+Sas(g!p2>8*D;q&vssP`dFG;&jCVUn&G4h<=@p|=lVF-D`!Cqu6
z;j`qz)bIIH=wb|>#PXfr!yF_^O|D~)
zC}Q76{O7;SM@+gCx18JC4bPOeHVT+-R%wA0XGjI;mwX}Vtae!S%03J_1%o*}NBTm5
zoHlTH44n2=&sVpJ46?KQe_-sC1BN0(#oyV{*XfC41
zC-PRZJ|f+ZvyNte`?F`zknJw`J|<(f7)zO7*{GLRYCG6f6J6*Blf;x7B4$=~1BK(u
zD`aX%!|Wat?ZH)HE!%OfEk{@j={T{rQi}X&It96v
z#uF&Ks2*tm{9SA1Rpw4c`_eCU{HL8{cmTZ3gupzwBwsvO{f-cU=MJTESAL4q(*AM9
z#ND0mKOdOt$?*ZF(vI7&uDUOi&DTrDl?`Fc6Y|6^5g^(gSmjIQ9y21SO@`LGsDSWx
zqKZRE_|=;?$CHzrG80)Au9Nd;`-sD}!;INla*CdF)_Y0e{V--uv{#rLbySLRXmcr6BM1D^Qx*8*-?;xo)sdbIU3(H4
zo7(BN@@xwNM@*$~4sjI^mRG>lfSgo;|6|SKgu_|ys8UEL_<^Pa%(m#wU+Za?S#t*8a?x!U@OtGMh{~8K^2MAQO(A_|hedl!!I2%Doxh
zM_CEgbRl#*3d>o*E9Eq8*yy|oTShMVKe>+pF>(&TL6I@@;HpO)9br%7(154*FQ2BV
z^L&+dOW{LZ{o1dmQIpGs!#dlPr|33qSz`v6FOvTiF_Ogtd{u2fyy0Qi3
zgtV7vAWs9QazGpN+7#}u-%^(}m}jqGqfrY$iRmM1Oe`Z^BSr6=H1eA+Sn14d3G;px
z0RNePlLyu}SL__OX{5GqRax2>ND1|)OZK!dN~MNHX8aCHacIvx3Ij(+sYPIQb#?3Q
zpwk%->*ld@8@5~bwnr?XZ8Ca72-budEQ2+`)(*y1gEQ?|;)^NX;nJns4-;s8Vabg{ekidO2!i#t
zF7YQ-6(;V-)~K0~+6vtQ`=e4hPCiMaLE0y~T^Upy%COMTP`8cv53H=c-QE7}zGxgk
zzeoj1p^=6YbV3-Y2UGO0F+obSe_&l%Z@4>}eI6N~@`vdH$jyId07IIxUy;zFeyB4i
zQ@RKoH+q7S55b52M-0N@02^X~VpRDLGCiME^cRGfeIpt7#3Aw1mSO|!(x$uxbu7Cm
zRDX^m$+iO6sj-O;j6KD&s2>F{s<758c8EwPu>{#KhOK92rSIGiIF$HV^}khIH>TzT
z6pZYurJ*H+{dh1o_}QlbRDb2s{$cAm)e0>)w~~jYuCB0s?X4qF#xf#292+QZM-OBe
zC3FW)JL>4@yo{Keo&7iBL;bXp3AOSDD%3MEF)36Dum99%VUY*JwbT`-OTd#4ug4!O
zgZ@{BKyKlx*h|ws2>Dl#nj3c6gnY
zDObh+&0RKnoB8d(@{fi6cY-nE|4v@^iS)m+ll}huUzyK3js7dOS-@CBb~rj5!;Gcn
z+#>SkODUA_aa%~KotT%q^9IP@gGT?vVLmZBdJ9iY<~t!&jF`9Uz8|O^u8;rCc#j3j
zU{RQvmQ|2rpmMaS>=|DS3p+%5N^=%%h8qLv&mKJgV(SZX5jA0^&eT#ONZgJ7YEZSx
zdXb8y;g3eew$uJ&5aas!3XOVJ$&FYTJX%;>rc@ND*1m0D(GiEE;jekEgKJZI1f*uW
zg?2s&2>7G5*%Go>V}LS7yLdEa7l6CM}Y8Vaod-%gR$0
z_g7};OZqy3@+&&d9;&ybtb8^~OMnK(^l+l3F
znjF;s5zeWF$)whU4$BtGYTEL&w(0y3o$(b&6z{Abv=OOk7BbS_c4llpf1hJ17C)y1
zq*FJexOMw6x&L>5w-(wy*FhQUUScE0+TG}f?~h)dYa4qu
zb34H6R%Wl~>y;OuC0CP{70Z8X|90YAID$6paU_u?QC7C%OHW-
zdPk_+!{DWFeHR>t*c+AY`z66TX5CL>7?hk9B4Fv!tP)hKD*0_kNAqOGEzG5(~Ncvop4a
zJ?rXpapfrc61o(p6g&Z?fKH03li{7%h^p7XupJCXlsXve%)STe0h%_}bt)kiKG!fppED)6J
zR7r&+O%Yn7MD&2v!PB6do27@F1)(A%lLVer1sey9RE@P<_M82>q(B%D4t%-)0d
zOd3zFpQNrDniYqAadS!VhSe>kaNE6iTiG;5UguMzvb2bU?eqQK@%(bJBW7_j>tN
z2uv&UiVjXVJ~7cKqbWQi!g^Wrsv>;*Pbn)MPz?U6^@&l!#O*7myV=lOy(5^Y-*nTK
z!koGC+(GV_R?ZiiSPG0}QE&9mXh^N*%*w7eQokO-TlKOXRRz^JB)sTex+L^-RmROJ
z)epA=Dr*@(xW=Dk*v1+o217HM@4+-P(LuxAVMowtDo+f2O5&C8XS_zmR1R-5hKHv&
z-zegx9|V%Ye)L<2OYqO3h;n<$#FQZ~n8l@szOeRYOg9lB|G3ebubew4+AiTCJ(2|*;90!Yk3W-u2tdvyV}ZH
z4yWn*ACk*13`z*Vg9$Nxi{GKcy%YXXkw`2I#bkKe;@yq!n^16&QwA6X-m3vux$Ek9
zG>COd&1pI?FWJj%=O;w3P~X`0nyLr*WNu&L9n_zhmr9x_p!^UL1kdF#7oCTO)7m!c
zPPcjQN|3=E2wflPvG)dB3VS~piy8u=Z>+wQVJw*|sn$}vZ}Is3(Ta#&fn@5{j9YDz
z=F=-w7=nA|&s=EZ?Mvd_n{!9)A*IlTGDswWo5bUd{3hq^`7)X1`Fz~)`$9r_1-an-
zMiQx4(?vWFrcW6eK5>r>AB*4flqby;*lh#VQ{F?`6N}*bEc!r(%
zzH>H!>4u$J7k;ck2MRQ;Z{QQmpgC>dmI`@V8v3L&CvlZ!5(k;h4?p>$85^4TIJ%-q
zl)E`ut>||6-c!n}Yc*9A$Kxy?Q5YGTbO2)jYUb<4NR}X*j?^~9g1Pct44x?wPQlL-
zYdXv~c93zmEyV#Ly*->JviUE2Fr6nHpm4vt(3{1Do{^nit>Kaqs`Z_Yc5=t*UN!4a
zz3I5%v$ht{@=ro{44&J{SG{^&A9(rH@V6~PRhBS-WejlRirZUm=bD_)YWy2H3OP}z
z>g*iqdVq0FYJnT6&=f};Y{kg{t^FR77gViifwHFyZ-07vWUy?j#63Omqd=K+ZdN}r
zrTRqa{?NV4w^+2-fTtk-D>YnxZD8*!-F6!++>2)o5H{KJcqh98Im~WX`7J_CQ}BwZ
z+L+qRNFQt52yOb$cr9@l*mAkN=t=+DO|cv1dDNz(Q8X04@BRpNxY#%R6>=~%e-k8=
zWdFwNPn`1IttVJT!rGV<{-{^wCc&$fWS^jNPbr)C1j*Afsp?150@V72f!rUz|;WWusEGOGC<2JGWy=1*bezX)LD$NS!ELg@%^ctA=!@!8R%?mg))8tQGWidLr2xeE_4rw#Orb4R6~o8XSKua;9H)vSxR;sIkt?Ci_n;Kv!qm_B>Iu82_Q^u5BuPJCg|
zu>GdpcXGhq^>ROVxU5i}YX9vUh9k3A_67pj`)Z5S&~rYu
zx#b>oHsIo7;ZhiX4S?pRAIq%ZMUC{nKGv?D?f{;V!2nNgcWFe`eYHlH{vDsD`vJ(*
zI5Z66lSzm1$-~eIPP|__hPu-*UG2TiqW7Q&aR$v#%FP<*`4v3XlUMfWy@(n>$;tfhTT9&fDelc|}jx6lkK%
zgB`=elzgsi8+<1<-7QxW(u4OBhX^$_^_|1R8Iv7Mbthl4ia>uUI1K(l5)Z#f6wCbm
zBQ`PyjU;N*9Nyds&SmRo1S08aH2A=*I9jZRu$wcT`MjMEgqX_J8&;)tb@9rjQ{Q%Y
z@e);ss~?Yo0oqE{x~_De(L|^_nIGVW9zNrA{rd&{L{%xfig#6trN73|st_yS2p>KW
z@cG6~Cq~&_9!3Ab8)wOkEkYIG(2Uoj&m&Yf2vji0_sRBNiNMoz`R9vl+AAwB@7o&4
zU5}lKB$&ve@x}T4y+%_|uA~JS2*nlWx%l;$N(XXQfz9^6mOnIVnBArjHg{|*d`{5^
zGdNP89`9|>Vo*jv7oQLSjB}2>8h)d-vrdZzyEz#-)e#Il4B3Cy@%Z`enE>=X08k`0X(NDVsJYm}
z0iyfYn>Ql5Vl2+JT8_ha0O0PZE26e~Vjn#ILm4hW@evx?izEz+nO71XZm{2eEo4p
zK)mV8OxC>w{hDOG>ci`r%SGWiK#l?fIiy_4L)9qQB^F9D=)=_%oDLSuP
z#t+TDb|2fK+y=})d0X!^1y@BHj~=@$&n1i7M(xSbRI9Og0Z
z18~3H^UZUoGu;!gH$1b}IjP&$ONF2f9{zfU3qw|Ya0dBOWQQsTuiQ(o^jP}6yMoO)
zmFNu1ko4GDhS_KxmMQM@&0UWWy|3>dudKxo@(K&(6+arJ6M-HHESEgNKvh>vFQB^p
z_(XTu46Nb(_nJ@C27*k3%t`eo_<(@dQ&7euBt!}FZV!M-X~YN5^`l
zcVE%!hl18Gob{GB^nxSryhc9HM4Z`a$0YpMFdcm
z<8ymj*Bsk!sR&#!5f8O|EI#N2S!a}fs!=bn&D=v{v5)m*>wJDiXar|(pD0gzI>*hY
zy=%E^VQA1Sk#eXh98Zc(!F^Lj19Kil7Unu^%
zRI_>8>iw>nZ1YAAf%;6W(0w0$LVc#(m}+k6Z}4S6f|fA{sJ$JbjQG6#c&%91c`tsB
zN$rmp&&W_OfZl<|a4rYsSu>@~;7uSDZks|JbhZFh?CCGg?b^t5dv}g-YuZS%>JHmp
zAo`i({HTq+)W39r(LT;M_|m}~7)4?ep6pLZfb#b8y*dYrb6HZ8-%KtScpbNa-_~g8
zM0_k4J9Rm6l)ae;<(34oXD1ML52*ay}|c_i`>rq
zshZ;L+b5meTkx5CPj}-9Q-+O2^lsg8#9CoF
z+qcXQ>rYkgcbmCH4W4FNIno4Y6Vt@N!)UTqSI@^_06qazt>vFQO$_}$U25InuW8U6
zus-PU^)VPLaB`uvE_4-^hyYsjxbkhcg9;c>e6!(A@PaE=T{68y$8|v)Y&FN;e}TOb
zyP;~jCFF6%;RL6RoCWL--?Z*-r>OGNpV?fa&r3gp%5&i
zs4C(y%_c>$A`CSBKL?ziCa8*v%iH@Gf@%3)T>ujZ#v&u7v(k$(ayvT3mV8_KL$f{~a`d83X95D4k_}#)8
zm-z4E1NW2-gMrTctt()}n#qh8FuYa$A(`Nfp0=qP2EakbgT@HwKc#I^IisQ!1=V%f
zqu&MMB_>G-sUiY>#BLVA0D#3lR)GHs1U7W(f%qHa7G{{XI%CBF)MW@TVA52&jDpsB
zs;sF!q?Pq4U2F#X%$6p{mJOKy>94>Kw(ssQ<7}a8|TD=0*!E*q9*>x_=(p@>p|cCRq32w~Kq?%twlTbmb}M>~223
z&VWgh>m*orDy2M*Xq$90IAzyRP_cZje_O!XOIgXrogoepantz~^>rO&o_3jC)j&}3
z$iy&;rua+Z7QVQ%o)Qwh&fN
z$u&I}wuFrAbHj)7>SB{WbZ2w#l#>4KJjJh3X9Ua!{0lq%r%4eP%(2@@V$$r!Jf?>UWR$1J0f`DJ~`{0<^8C}uA
znLZsF~lZ3b$l%!ViYz#cn`@$w?(vM2Ba_yR0EhEFI
z`{--k!>JE8{ZGjx&~}e+Whp8(h@Oj`#qiy8vn8xVLw`@8<$3oS0Vn{2BY1kjig0?B
zNEIFH9x`;Gj*^ML?r4Hz-tyb`k|YKiO>-9jgIX?qFa+hTiRKf=KeXAup$9#)Woz&i77@f+|pxDarBFBRBe%$t-cHW|sOw9rOv$V!?)Zbxvr1h-kNj5h
ziRA->j_t-$i}l)8>bUzx$AFndOX|bA5W>)DWk>;n_xEi7(=)!(NblBs`s(hw
zy1M!|t4&fonm2X*h=v8(mAWwi7+D#&ojV%N}OegZ@~UNZ%dA(a=P_t)vhzQEFobn)LV?Q#;KzWbrLm*;W4@0Y9<_h35yKBtxs20?(}Vsc5ae-%
zJv$dn0RpyxFR3$CdcD8hTGL4C?UHp;#@&3Hxg>A}2fYXggS`Vk9~KuCi4J>-X3CpT
z3Yo&ZzM_7EH;lvZgo&i7Z8l{RDjvRq-i$RS-MehE8Or#kA