From 061ddd3a29598ace440aab9bf3f8022af7512cb7 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 11 Oct 2017 16:45:07 -0400 Subject: [PATCH 1/2] Fixes init times --- code/modules/atmospherics/gasmixtures/gas_types.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 2135b9fbd0..ba5eaba7bb 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -12,7 +12,18 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou if(initial(gas.moles_visible) != null) gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(gas.gas_overlay)) gas_info[META_GAS_DANGER] = initial(gas.dangerous) +<<<<<<< HEAD .[initial(gas.id)] = gas_info +======= + gas_info[META_GAS_ID] = initial(gas.id) + .[gas_path] = gas_info + +/proc/gas_id2path(id) + var/list/meta_gas = GLOB.meta_gas_info + for(var/path in meta_gas) + if(meta_gas[path][META_GAS_ID] == id) + return path +>>>>>>> 7da4694... Fixes init times (#31580) /*||||||||||||||/----------\||||||||||||||*\ ||||||||||||||||[GAS DATUMS]|||||||||||||||| From 9050b8c7191f7662569b389db200dfda623a360a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 12 Oct 2017 02:56:56 -0500 Subject: [PATCH 2/2] Update gas_types.dm --- code/modules/atmospherics/gasmixtures/gas_types.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index ba5eaba7bb..a1c3db6e12 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -12,9 +12,6 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou if(initial(gas.moles_visible) != null) gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(gas.gas_overlay)) gas_info[META_GAS_DANGER] = initial(gas.dangerous) -<<<<<<< HEAD - .[initial(gas.id)] = gas_info -======= gas_info[META_GAS_ID] = initial(gas.id) .[gas_path] = gas_info @@ -23,7 +20,6 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou for(var/path in meta_gas) if(meta_gas[path][META_GAS_ID] == id) return path ->>>>>>> 7da4694... Fixes init times (#31580) /*||||||||||||||/----------\||||||||||||||*\ ||||||||||||||||[GAS DATUMS]||||||||||||||||