cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +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