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/game/objects/items/devices/communicator/helper.dm
+4 -4
View File
@@ -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
code/game/objects/items/weapons/cigs_lighters.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/flamethrower.dm
+3 -3
View File
@@ -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)
code/game/objects/items/weapons/grenades/chem_grenade.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -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))
code/game/objects/items/weapons/tanks/jetpack.dm
+4 -4
View File
@@ -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"
code/game/objects/items/weapons/tanks/tank_types.dm
+17 -17
View File
@@ -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)
code/game/objects/items/weapons/tanks/tank_types_vr.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/tanks/tanks.dm
+2 -2
View File
@@ -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