From 472e68be9ce5e85a050afa3ea42af7898dda307e Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 10 Oct 2017 21:16:48 +1300 Subject: [PATCH 1/2] Merge pull request #31440 from kevinz000/patch-319 Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever --- code/__HELPERS/game.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index a16f91b317..caddfdf509 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -570,9 +570,12 @@ return hex2num(copytext(hexa, 6, 8)) /proc/lavaland_equipment_pressure_check(turf/T) + . = FALSE if(!istype(T)) return var/datum/gas_mixture/environment = T.return_air() + if(!istype(environment)) + return var/pressure = environment.return_pressure() if(pressure <= LAVALAND_EQUIPMENT_EFFECT_PRESSURE) - return TRUE + . = TRUE