cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +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/projectiles/guns/magnetic/bore.dm
+1 -1
View File
@@ -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)
code/modules/projectiles/guns/magnetic/gasthrower.dm
+4 -4
View File
@@ -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
code/modules/projectiles/guns/magnetic/magnetic.dm
+4 -4
View File
@@ -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)