Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00
parent eeba86e27e 03d67c753e
commit 1f6b3ce629
285 changed files with 56239 additions and 56588 deletions
@@ -112,7 +112,6 @@
 	if(!environment)
 		return

-	//var/environment_heat_capacity = environment.heat_capacity()
 	var/loc_temp = get_temperature(environment)

 	bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1)