From 9f53cb36731346a9f778e7d099532ad6f5b7540e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 13 Sep 2014 20:41:12 -0400 Subject: [PATCH] Removes pump heating --- code/ATMOSPHERICS/_atmospherics_helpers.dm | 20 -------------------- code/controllers/configuration.dm | 5 ----- 2 files changed, 25 deletions(-) diff --git a/code/ATMOSPHERICS/_atmospherics_helpers.dm b/code/ATMOSPHERICS/_atmospherics_helpers.dm index f8b0c2fdc0b..07ce3121f6e 100644 --- a/code/ATMOSPHERICS/_atmospherics_helpers.dm +++ b/code/ATMOSPHERICS/_atmospherics_helpers.dm @@ -63,11 +63,7 @@ if (!removed) //Just in case return -1 - //world << "[src]: [(transfer_moles/source.total_moles)]" - var/power_draw = specific_power*transfer_moles - if (power_draw > 0) - removed.add_thermal_energy(transfer_moles/source_moles_initial * power_draw * config.atmos_machine_heat) sink.merge(removed) @@ -142,11 +138,6 @@ sink.update_values() source.update_values() - //world << "[src]: [(total_transfer_moles/source.total_moles)]" - - if (power_draw > 0) - sink.add_thermal_energy(total_transfer_moles/source_moles_initial * power_draw * config.atmos_machine_heat) - return power_draw //Generalized gas filtering proc. @@ -225,13 +216,6 @@ sink_filtered.update_values() removed.update_values() - //world << "[src]: [(removed.total_moles / source.total_moles)] + [a] = [(removed.total_moles / source.total_moles) + a]" - - if (filtered_power_used > 0) - sink_filtered.add_thermal_energy(filtered_heat * config.atmos_machine_heat) - if (unfiltered_power_used > 0) - sink_clean.add_thermal_energy(unfiltered_power_used * (removed.total_moles / source_moles_initial) * config.atmos_machine_heat) - sink_clean.merge(removed) return filtered_power_used + unfiltered_power_used @@ -312,9 +296,6 @@ var/power_draw = unfiltered_power_used for (var/datum/gas_mixture/sink_filtered in filtered_power_used) power_draw += filtered_power_used[sink_filtered] - sink_filtered.add_thermal_energy(filtered_heat[sink_filtered] * config.atmos_machine_heat) - if (unfiltered_power_used > 0) - sink_clean.add_thermal_energy(unfiltered_power_used * (removed.total_moles / source_moles_initial) * config.atmos_machine_heat) sink_clean.merge(removed) @@ -383,7 +364,6 @@ var/datum/gas_mixture/removed = source.remove(transfer_moles) var/power_draw = transfer_moles * source_specific_power[source] - removed.add_thermal_energy(power_draw * (total_transfer_moles/total_input_moles) * config.atmos_machine_heat) total_power_draw += power_draw sink.merge(removed) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 2ac8ca7a6a4..96fd82852b3 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -98,8 +98,6 @@ //game_options.txt configs - var/atmos_machine_heat = 1.0 - var/health_threshold_softcrit = 0 var/health_threshold_crit = 0 var/health_threshold_dead = -100 @@ -534,9 +532,6 @@ if("limbs_can_break") config.limbs_can_break = value - if("atmos_machine_heat") - config.atmos_machine_heat = value - if("run_speed") config.run_speed = value if("walk_speed")