From 5b99524e82fd4178a9a44f6fa78c735aaaaba7ec Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Wed, 1 Jan 2020 20:44:48 -0600 Subject: [PATCH] Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" --- .../machinery/components/binary_devices/circulator.dm | 2 -- code/modules/power/generator.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 07ee17a1bd..6bafba9abc 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -61,8 +61,6 @@ //Actually transfer the gas var/datum/gas_mixture/removed = air2.remove(transfer_moles) - removed.react(src) - update_parents() return removed diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index fcc2c6c144..8e121dc809 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.00025 + (hot_air.reaction_results["fire"]*0.01) + var/efficiency = 0.45 var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)