From 2a0c4ed5260883f400166d0da0943994156be6f5 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 27 Feb 2019 02:58:59 -0500 Subject: [PATCH 1/2] Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe --- code/modules/power/generator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 8e121dc809..fcc2c6c144 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -65,7 +65,7 @@ if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0) - var/efficiency = 0.45 + var/efficiency = 0.00025 + (hot_air.reaction_results["fire"]*0.01) var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity) From 417676f438fcc3951a01ef7498de87fbb3e2eeee Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 27 Feb 2019 03:13:11 -0500 Subject: [PATCH 2/2] makes sure the gas actually fucking reacts so that it has a reaction list when it's being passed through the teg --- .../machinery/components/binary_devices/circulator.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 6bafba9abc..07ee17a1bd 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -61,6 +61,8 @@ //Actually transfer the gas var/datum/gas_mixture/removed = air2.remove(transfer_moles) + removed.react(src) + update_parents() return removed