From 529bb908f7cbe2befc7e81fb85c2bf640977bfe7 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Tue, 19 Sep 2017 05:16:15 -0400 Subject: [PATCH 1/4] FIXES NEW TEMP SYSTEM WOOPS. --- code/modules/mob/living/living.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 31ed2a71269..b6eb69ed36a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -707,6 +707,8 @@ /mob/living/proc/get_temperature(datum/gas_mixture/environment) var/loc_temp = T0C + if(environment) + loc_temp = environment.temperature if(isobj(loc)) var/obj/oloc = loc var/obj_temp = oloc.return_temperature() @@ -715,8 +717,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) From 43797249fc1e8f95e8e37f73c99aec74ed66ff01 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Tue, 19 Sep 2017 06:40:41 -0400 Subject: [PATCH 2/4] Update living.dm --- code/modules/mob/living/living.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b6eb69ed36a..a90648f6806 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -706,9 +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 - if(environment) - loc_temp = environment.temperature + var/loc_temp = environment ? environment.temp : TC0 if(isobj(loc)) var/obj/oloc = loc var/obj_temp = oloc.return_temperature() From bcb086bba9cca4da58901e17324cb4f75f70f2b8 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Tue, 19 Sep 2017 06:41:01 -0400 Subject: [PATCH 3/4] Update living.dm --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a90648f6806..45e948d3f43 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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 = environment ? environment.temp : TC0 + var/loc_temp = environment ? environment.temp : T0C if(isobj(loc)) var/obj/oloc = loc var/obj_temp = oloc.return_temperature() From ae5eb795a4ebda566872d485037f432a40d7d4e4 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Tue, 19 Sep 2017 07:01:06 -0400 Subject: [PATCH 4/4] Update living.dm --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 45e948d3f43..2c2d3da0062 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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 = environment ? environment.temp : T0C + var/loc_temp = environment ? environment.temperature : T0C if(isobj(loc)) var/obj/oloc = loc var/obj_temp = oloc.return_temperature()