shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622

Browse Source 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
This commit is contained in:
deathride58
2017-12-21 03:28:14 +00:00
committed by GitHub
parent 58f5069180 0ce17f29ed
commit 17dda62a93
15 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/tools/other_tools.dm
+1 -1
View File
@@ -422,7 +422,7 @@
if(!istype(T))
return
var/datum/gas_mixture/GM = new
ADD_GAS(/datum/gas/plasma, GM.gases)
GM.add_gas(/datum/gas/plasma)
if(prob(10))
GM.gases[/datum/gas/plasma][MOLES] += 100
GM.temperature = 1500+T0C //should be enough to start a fire
code/game/objects/effects/effect_system/effects_smoke.dm
+1 -1
View File
@@ -169,7 +169,7 @@
qdel(H)
var/list/G_gases = G.gases
if(G_gases[/datum/gas/plasma])
ASSERT_GAS(/datum/gas/nitrogen, G)
G.assert_gas(/datum/gas/nitrogen)
G_gases[/datum/gas/nitrogen][MOLES] += (G_gases[/datum/gas/plasma][MOLES])
G_gases[/datum/gas/plasma][MOLES] = 0
G.garbage_collect()
code/game/objects/items/tanks/jetpack.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/tank/jetpack/New()
..()
if(gas_type)
ASSERT_GAS(gas_type,air_contents)
air_contents.assert_gas(gas_type)
air_contents.gases[gas_type][MOLES] = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
ion_trail = new
code/game/objects/items/tanks/tank_types.dm
+4 -4
View File
@@ -21,7 +21,7 @@
/obj/item/tank/internals/oxygen/New()
..()
ASSERT_GAS(/datum/gas/oxygen, air_contents)
air_contents.assert_gas(/datum/gas/oxygen)
air_contents.gases[/datum/gas/oxygen][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -87,7 +87,7 @@
/obj/item/tank/internals/plasma/New()
..()
ASSERT_GAS(/datum/gas/plasma, air_contents)
air_contents.assert_gas(/datum/gas/plasma)
air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -124,7 +124,7 @@
/obj/item/tank/internals/plasmaman/New()
..()
ASSERT_GAS(/datum/gas/plasma, air_contents)
air_contents.assert_gas(/datum/gas/plasma)
air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -166,7 +166,7 @@
/obj/item/tank/internals/emergency_oxygen/New()
..()
ASSERT_GAS(/datum/gas/oxygen, air_contents)
air_contents.assert_gas(/datum/gas/oxygen)
air_contents.gases[/datum/gas/oxygen][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
code/game/turfs/open.dm
+2 -2
View File
@@ -355,6 +355,6 @@
if (air.gases[/datum/gas/carbon_dioxide] && air.gases[/datum/gas/oxygen])
air.gases[/datum/gas/carbon_dioxide][MOLES]=max(air.gases[/datum/gas/carbon_dioxide][MOLES]-(pulse_strength/1000),0)
air.gases[/datum/gas/oxygen][MOLES]=max(air.gases[/datum/gas/oxygen][MOLES]-(pulse_strength/2000),0)
ASSERT_GAS(/datum/gas/pluoxium,air)
air.assert_gas(/datum/gas/pluoxium)
air.gases[/datum/gas/pluoxium][MOLES]+=(pulse_strength/4000)
air.garbage_collect()
air.garbage_collect()