cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-22 04:28:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts gas, mat and reagent strings to defines

Browse Source
This commit is contained in:
Kashargul
2024-12-06 17:26:00 +01:00
parent 780c07439b
commit 80edcd2c3d
155 changed files with 1183 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+2 -2
View File
@@ -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
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+1 -1
View File
@@ -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"
code/modules/reagents/machinery/grinder.dm
+11 -11
View File
@@ -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
code/modules/reagents/reactions/distilling/distilling.dm
+3 -3
View File
@@ -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)
code/modules/reagents/reactions/instant/drinks.dm
+3 -3
View File
@@ -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
code/modules/reagents/reactions/instant/drinks_vr.dm
+2 -2
View File
@@ -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
code/modules/reagents/reactions/instant/instant.dm
+52 -52
View File
@@ -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.
code/modules/reagents/reactions/instant/instant_vr.dm
+8 -8
View File
@@ -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
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
code/modules/reagents/reactions/instant/virology.dm
+2 -2
View File
@@ -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
code/modules/reagents/reagents/core.dm
+4 -4
View File
@@ -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)
code/modules/reagents/reagents/dispenser.dm
+4 -4
View File
@@ -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
code/modules/reagents/reagents/toxins.dm
+9 -9
View File
@@ -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