Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528

[MIRROR] Minor refactor of how gas IDs are handled
This commit is contained in:
LetterJay
2017-10-12 07:19:30 -04:00
committed by GitHub
52 changed files with 425 additions and 412 deletions

View File

@@ -103,8 +103,8 @@
return
/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode
air_contents.assert_gases("plasma", "o2")
var/fuel_moles = air_contents.gases["plasma"][MOLES] + air_contents.gases["o2"][MOLES]/6
air_contents.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
var/fuel_moles = air_contents.gases[/datum/gas/plasma][MOLES] + air_contents.gases[/datum/gas/oxygen][MOLES]/6
air_contents.garbage_collect()
var/strength = 1
@@ -160,4 +160,4 @@
if(!T)
return
T.assume_air(removed)
air_update_turf()
air_update_turf()