Removes most hard-coded z level checks

This commit is contained in:
Crazylemon64
2016-07-31 21:29:03 -07:00
parent f54de64a73
commit bf2bcbce67
122 changed files with 325 additions and 410 deletions
+1 -2
View File
@@ -181,8 +181,7 @@
//proc/camera_list(var/datum/file/camnet_key/key)
get_machines(var/datum/file/camnet_key/key)
// TODO: Tie into space manager
if(!computer || computer.z > ZLEVEL_DERELICT)
if(!computer || !is_away_level(computer.z))
return null
var/list/L = list()
@@ -59,8 +59,7 @@
Topic(var/href, var/list/href_list)
if(!interactable() || !computer.radio || ..(href,href_list) )
return
// TODO: Tie into space manager
if(!(computer.z in config.station_levels))
if(!is_station_level(computer.z))
to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
return
+1 -2
View File
@@ -24,8 +24,7 @@
attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
// TODO: Tie into space manager
if(user.z > ZLEVEL_DERELICT)
if(is_away_level(user.z))
to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
return
if(istype(module, /obj/item/weapon/aiModule))
+1 -2
View File
@@ -49,8 +49,7 @@
scan = computer.cardslot.reader
if(!interactable())
return
// TODO: Tie into space manager
if(computer.z > ZLEVEL_DERELICT)
if(is_away_level(computer.z))
to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
return
var/dat
+1 -2
View File
@@ -43,8 +43,7 @@
if(!T.implanted) continue
var/loc_display = "Unknown"
var/mob/living/carbon/M = T.imp_in
// TODO: Tie into space manager
if(M.z == ZLEVEL_STATION && !istype(M.loc, /turf/space))
if(is_station_level(M.z) && !istype(M.loc, /turf/space))
var/turf/mob_loc = get_turf(M)
loc_display = mob_loc.loc
dat += "ID: [T.id] | Location: [loc_display]<BR>"
+1 -2
View File
@@ -31,8 +31,7 @@
interact()
// TODO: Tie into space manager
if(!interactable() || computer.z > ZLEVEL_DERELICT)
if(!interactable() || is_away_level(computer.z))
return
var/dat
if(src.temp)
+1 -2
View File
@@ -57,8 +57,7 @@
if(!interactable())
return
// TODO: Tie into space manager
if(computer.z > ZLEVEL_DERELICT)
if(is_away_level(computer.z))
to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
return
var/dat