Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:30:41 +00:00
parent 3e937fcecf 57d79640f4
commit 85aa297923
14 changed files with 71 additions and 69 deletions
@@ -44,7 +44,7 @@
 	return ..()

 /mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath)
-	if(abs(310.15 - breath.temperature) > 50)
+	if(abs(BODYTEMP_NORMAL - breath.temperature) > 50)
 		switch(breath.temperature)
 			if(-INFINITY to 120)
 				adjustFireLoss(3)