Merge branch 'master' into upstream-merge-34686

2018-01-21 22:38:47 +00:00
parent 6094f87105 130b0f8d0d
commit 84b02025c9
83 changed files with 882 additions and 1372 deletions
@@ -66,7 +66,7 @@
 	var/loc_temp = get_temperature(environment)

 	if(stat != DEAD)
-		natural_bodytemperature_stabilization()
+		bodytemperature += natural_bodytemperature_stabilization()

 	if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
 		if(loc_temp < bodytemperature)