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

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

Browse Source 
[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
parent 813e54e5ae 301dbad665
commit f93733576e
52 changed files with 425 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/spacevine.dm
+8 -8
View File
@@ -167,9 +167,9 @@
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
if(!GM.gases["o2"])
if(!GM.gases[/datum/gas/oxygen])
return
GM.gases["o2"][MOLES] -= severity * holder.energy
GM.gases[/datum/gas/oxygen][MOLES] -= severity * holder.energy
GM.garbage_collect()
/datum/spacevine_mutation/nitro_eater
@@ -182,9 +182,9 @@
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
if(!GM.gases["n2"])
if(!GM.gases[/datum/gas/nitrogen])
return
GM.gases["n2"][MOLES] -= severity * holder.energy
GM.gases[/datum/gas/nitrogen][MOLES] -= severity * holder.energy
GM.garbage_collect()
/datum/spacevine_mutation/carbondioxide_eater
@@ -197,9 +197,9 @@
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
if(!GM.gases["co2"])
if(!GM.gases[/datum/gas/carbon_dioxide])
return
GM.gases["co2"][MOLES] -= severity * holder.energy
GM.gases[/datum/gas/carbon_dioxide][MOLES] -= severity * holder.energy
GM.garbage_collect()
/datum/spacevine_mutation/plasma_eater
@@ -212,9 +212,9 @@
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
if(!GM.gases["plasma"])
if(!GM.gases[/datum/gas/plasma])
return
GM.gases["plasma"][MOLES] -= severity * holder.energy
GM.gases[/datum/gas/plasma][MOLES] -= severity * holder.energy
GM.garbage_collect()
/datum/spacevine_mutation/thorns