Merge pull request #30881 from MoreRobustThanYou/patch-4

FIXES NEW TEMP SYSTEM
This commit is contained in:
Jordan Brown
2017-09-19 08:44:15 -04:00
committed by GitHub
+1 -3
View File
@@ -706,7 +706,7 @@
floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life().
/mob/living/proc/get_temperature(datum/gas_mixture/environment)
var/loc_temp = T0C
var/loc_temp = environment ? environment.temperature : T0C
if(isobj(loc))
var/obj/oloc = loc
var/obj_temp = oloc.return_temperature()
@@ -715,8 +715,6 @@
else if(isspaceturf(get_turf(src)))
var/turf/heat_turf = get_turf(src)
loc_temp = heat_turf.temperature
else
loc_temp = environment.temperature
return loc_temp
/mob/living/proc/get_standard_pixel_x_offset(lying = 0)