From 187f27983cc542c67b5d98fc04ba37838eed0ac4 Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 30 Apr 2018 10:20:01 +1200 Subject: [PATCH] Merge pull request #37535 from cyclowns/fusion-fix Fixes gas fusion power not being taken into account --- code/modules/atmospherics/gasmixtures/gas_types.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 00ab77882e..0f1a21e1ce 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, / gas_info[META_GAS_MOLES_VISIBLE] = initial(gas.moles_visible) if(initial(gas.moles_visible) != null) gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(gas.gas_overlay)) - gas_info[META_GAS_FUSION_POWER] = initial(gas.dangerous) + gas_info[META_GAS_FUSION_POWER] = initial(gas.fusion_power) gas_info[META_GAS_DANGER] = initial(gas.dangerous) gas_info[META_GAS_ID] = initial(gas.id) .[gas_path] = gas_info