coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

caches gases in more procs

Browse Source
This commit is contained in:
duncathan
2015-12-28 13:32:49 -06:00
parent b18cb5fca8
commit a64b68f76c
16 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_smoke.dm
+4 -3
View File
@@ -163,9 +163,10 @@
T.air_update_turf()
for(var/obj/effect/hotspot/H in T)
qdel(H)
if(G.gases[GAS_PL][MOLES])
G.gases[GAS_N2][MOLES] += (G.gases[GAS_PL][MOLES])
G.gases[GAS_PL][MOLES] = 0
var/list/G_gases = G.gases
if(G_gases[GAS_PL][MOLES])
G_gases[GAS_N2][MOLES] += (G_gases[GAS_PL][MOLES])
G_gases[GAS_PL][MOLES] = 0
for(var/obj/machinery/atmospherics/components/unary/U in T)
if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
U.welded = 1
code/game/objects/items/devices/scanners.dm
+5 -4
View File
@@ -268,10 +268,11 @@ MASS SPECTROMETER
else
user.show_message("<span class='alert'>Pressure: [round(pressure,0.1)] kPa</span>", 1)
if(total_moles)
var/o2_concentration = environment.gases[GAS_O2][MOLES]/total_moles
var/n2_concentration = environment.gases[GAS_N2][MOLES]/total_moles
var/co2_concentration = environment.gases[GAS_CO2][MOLES]/total_moles
var/plasma_concentration = environment.gases[GAS_PL][MOLES]/total_moles
var/list/env_gases = environment.gases
var/o2_concentration = env_gases[GAS_O2][MOLES]/total_moles
var/n2_concentration = env_gases[GAS_N2][MOLES]/total_moles
var/co2_concentration = env_gases[GAS_CO2][MOLES]/total_moles
var/plasma_concentration = env_gases[GAS_PL][MOLES]/total_moles
if(abs(n2_concentration - N2STANDARD) < 20)
user.show_message("<span class='info'>Nitrogen: [round(n2_concentration*100)] %</span>", 1)
code/game/objects/items/weapons/flamethrower.dm
+1 -1
View File
@@ -194,7 +194,7 @@
//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
air_transfer.gases[GAS_PL][MOLES] = air_transfer.gases[GAS_PL][MOLES] * 5
air_transfer.gases[GAS_PL][MOLES] *= 5
target.assume_air(air_transfer)
//Burn it based on transfered gas
target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500)