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
2017-10-10 21:16:48 +13:00
parent eb9737912c
commit 472e68be9c
1 changed files with 4 additions and 1 deletions
@@ -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