Integrates the z level manager with the space transition system

This commit is contained in:
Crazylemon64
2016-07-29 19:11:36 -07:00
parent 94c0bbff6a
commit ae43de3652
124 changed files with 960 additions and 436 deletions
+2 -1
View File
@@ -181,7 +181,8 @@
//proc/camera_list(var/datum/file/camnet_key/key)
get_machines(var/datum/file/camnet_key/key)
if(!computer || computer.z > 6)
// TODO: Tie into space manager
if(!computer || computer.z > ZLEVEL_DERELICT)
return null
var/list/L = list()
@@ -59,6 +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))
to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
return
+2 -1
View File
@@ -24,7 +24,8 @@
attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
if(user.z > 6)
// TODO: Tie into space manager
if(user.z > ZLEVEL_DERELICT)
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))
+2 -1
View File
@@ -49,7 +49,8 @@
scan = computer.cardslot.reader
if(!interactable())
return
if(computer.z > 6)
// TODO: Tie into space manager
if(computer.z > ZLEVEL_DERELICT)
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,6 +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))
var/turf/mob_loc = get_turf(M)
loc_display = mob_loc.loc
@@ -98,5 +99,3 @@
interact()
return
+2 -4
View File
@@ -31,7 +31,8 @@
interact()
if(!interactable() || computer.z > 6)
// TODO: Tie into space manager
if(!interactable() || computer.z > ZLEVEL_DERELICT)
return
var/dat
if(src.temp)
@@ -206,6 +207,3 @@
interact()
return
+2 -1
View File
@@ -57,7 +57,8 @@
if(!interactable())
return
if(computer.z > 6)
// TODO: Tie into space manager
if(computer.z > ZLEVEL_DERELICT)
to_chat(usr, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
return
var/dat