Merge pull request #9439 from Baystation12/dev-freeze

Dev-freeze into dev.

code/modules/mob/living/carbon/human/say.dm

@@ -170,8 +170,9 @@
 /mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
 	switch(message_mode)
 		if("intercom")
-			for(var/obj/item/device/radio/intercom/I in view(1, null))
+			for(var/obj/item/device/radio/intercom/I in view(1))
 				I.talk_into(src, message, verb, speaking)
+				I.add_fingerprint(src)
 				used_radios += I
 		if("headset")
 			if(l_ear && istype(l_ear,/obj/item/device/radio))

code/modules/power/port_gen.dm

@@ -214,7 +214,11 @@
 	else if (temperature > upper_limit)
 		bias = max(round((temperature - average)/TEMPERATURE_DIVISOR, 1), -TEMPERATURE_CHANGE_MAX)
 
-	temperature += rand(-7 + bias, 7 + bias)
+	//limit temperature increase so that it cannot raise temperature above upper_limit,
+	//or if it is already above upper_limit, limit the increase to 0.
+	var/inc_limit = max(upper_limit - temperature, 0)
+	var/dec_limit = min(temperature - lower_limit, 0)
+	temperature += between(dec_limit, rand(-7 + bias, 7 + bias), inc_limit)
 
 	if (temperature > max_temperature)
 		overheat()