cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

some moire

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+21 -21
View File
@@ -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
code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
+2 -2
View File
@@ -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"
osteodaxon spawn_reagent = "osteodaxon"
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+7 -7
View File
@@ -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"
)
code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
+3 -3
View File
@@ -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."
desc = "A mysterious machine which can fabricate many chemicals."
code/modules/reagents/machinery/dispenser/reagent_tank.dm
+9 -9
View File
@@ -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))
code/modules/reagents/machinery/grinder.dm
+35 -35
View File
@@ -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
code/modules/reagents/machinery/pump.dm
+3 -3
View File
@@ -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)
. = ..()