From fa1f587939c264a03dadd3b40d2cf74195ef344c Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Fri, 11 Jul 2014 17:04:14 -0400
Subject: [PATCH] Fixes some compile errors

---
 code/game/machinery/spaceheater.dm                 | 14 +++++++-------
 code/game/machinery/telecomms/broadcaster.dm       |  4 ++--
 code/game/machinery/telecomms/presets.dm           | 14 +++++++-------
 code/game/machinery/telecomms/telecomunications.dm |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index ad3ef32709..c30b6b88f6 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -181,21 +181,21 @@
 							if(removed.temperature < set_temperature + T0C)	//heating air
 								// Added min(set_temperature + T0C, 1000) check to try and avoid wacky superheating issues in low gas scenarios
 								var/energy_used = min( removed.get_thermal_energy_change(min(set_temperature + T0C, 1000)) , heating_power )
-								
+
 								removed.add_thermal_energy(energy_used)
 								cell.use(energy_used*CELLRATE)
 							else	//cooling air
-								var/heat_transfer = min(abs(removed.get_thermal_energy_change(target_temperature)), heating_power)
-								
+								var/heat_transfer = min(abs(removed.get_thermal_energy_change(set_temperature + T0C)), heating_power)
+
 								//Assume the heat is being pumped into the hull which is fixed at 20 C
 								//none of this is really proper thermodynamics but whatever
-								
+
 								var/cop = removed.temperature/T20C	//coefficient of performance -> power used = heat_transfer/cop
-								
+
 								heat_transfer = min(heat_transfer, cop * heating_power)	//this ensures that we don't use more than MAX_ENERGY_CHANGE amount of power - the machine can only do so much cooling
-								
+
 								heat_transfer = -removed.add_thermal_energy(-heat_transfer)	//get the actual heat transfer
-								
+
 								cell.use(heat_transfer/cop*CELLRATE)
 
 						env.merge(removed)
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 830ff05a1c..d2bf939cc8 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -20,7 +20,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	use_power = 1
 	idle_power_usage = 25
 	machinetype = 5
-	heatgen = 0
+	operating_temperature = null
 	delay = 7
 	circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster"
 
@@ -120,7 +120,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	use_power = 0
 	idle_power_usage = 0
 	machinetype = 6
-	heatgen = 0
+	operating_temperature = null
 	var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel
 
 /obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
index 83f3a532b7..2ec08329eb 100644
--- a/code/game/machinery/telecomms/presets.dm
+++ b/code/game/machinery/telecomms/presets.dm
@@ -31,7 +31,7 @@
 	//anchored = 1
 	//use_power = 0
 	//idle_power_usage = 0
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("c_relay")
 
 //HUB
@@ -46,7 +46,7 @@
 /obj/machinery/telecomms/hub/preset_cent
 	id = "CentComm Hub"
 	network = "tcommsat"
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
 	 "centcomm", "receiverCent", "broadcasterCent")
 
@@ -78,7 +78,7 @@
 /obj/machinery/telecomms/receiver/preset_cent
 	id = "CentComm Receiver"
 	network = "tcommsat"
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("receiverCent")
 	freq_listening = list(1345, 1341)
 
@@ -118,7 +118,7 @@
 	id = "CentComm Bus"
 	network = "tcommsat"
 	freq_listening = list(1345, 1341)
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("processorCent", "centcomm")
 
 //Processors
@@ -146,7 +146,7 @@
 /obj/machinery/telecomms/processor/preset_cent
 	id = "CentComm Processor"
 	network = "tcommsat"
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("processorCent")
 
 //Servers
@@ -200,7 +200,7 @@
 /obj/machinery/telecomms/server/presets/centcomm
 	id = "CentComm Server"
 	freq_listening = list(1345, 1341)
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("centcomm")
 
 
@@ -223,5 +223,5 @@
 /obj/machinery/telecomms/broadcaster/preset_cent
 	id = "CentComm Broadcaster"
 	network = "tcommsat"
-	heatgen = 0
+	operating_temperature = null
 	autolinkers = list("broadcasterCent")
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index fc21003ab5..beb9cca975 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -29,7 +29,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 	var/toggled = 1 	// Is it toggled on
 	var/on = 1
 	var/integrity = 100 // basically HP, loses integrity by heat
-	var/operating_temperature = 20 + T0C // the temperature that the machine will raise the environment to, null for no heat production
+	var/operating_temperature = 20 + T0C // the temperature that the machine will raise the environment to, or null for no heat production
 	var/delay = 10 // how many process() ticks to delay per heat
 	var/long_range_link = 0	// Can you link it across Z levels or on the otherside of the map? (Relay & Hub)
 	var/circuitboard = null // string pointing to a circuitboard type