diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm
index b02b3509e7..d49de4adf2 100644
--- a/code/ATMOSPHERICS/components/unary/cold_sink.dm
+++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm
@@ -101,9 +101,9 @@
 	if(href_list["temp"])
 		var/amount = text2num(href_list["temp"])
 		if(amount > 0)
-			src.set_temperature = min(0, src.set_temperature+amount)
+			src.set_temperature = min(src.set_temperature+amount, 1000)
 		else
-			src.set_temperature = max(10000, src.set_temperature+amount)	//no need for a maximum, really
+			src.set_temperature = max(src.set_temperature+amount, 0)
 
 	src.add_fingerprint(usr)
 	return 1
diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm
index 98a66b48ac..f65de38945 100644
--- a/code/ATMOSPHERICS/components/unary/heat_source.dm
+++ b/code/ATMOSPHERICS/components/unary/heat_source.dm
@@ -8,7 +8,7 @@
 	anchored = 1.0
 
 	var/set_temperature = T20C	//thermostat
-	var/max_temperature = T20C + 980
+	var/max_temperature = T20C + 680
 	var/internal_volume = 600	//L
 
 	var/on = 0
@@ -145,7 +145,7 @@
 	bin_rating /= bin_count
 	
 	active_power_usage = initial(active_power_usage)*cap_rating
-	max_temperature = max(initial(max_temperature) - T20C, 0)*cap_rating + T20C
+	max_temperature = max(initial(max_temperature) - T20C, 0)*((bin_rating*2 + cap_rating)/3) + T20C
 	air_contents.volume = max(initial(internal_volume) - 200, 0) + 200*bin_rating
 
 //dismantling code. copied from autolathe