Makes the station Z level into a list instead of a single define
This commit is contained in:
committed by
CitadelStationBot
parent
8ee6fdb76a
commit
d05fdb0eb0
@@ -1,7 +1,7 @@
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker
|
||||
name = "navigation computer"
|
||||
desc = "Used to designate a precise transit location for a spacecraft."
|
||||
z_lock = ZLEVEL_STATION
|
||||
z_lock = ZLEVEL_STATION_PRIMARY
|
||||
jump_action = null
|
||||
var/datum/action/innate/shuttledocker_rotate/rotate_action = new
|
||||
var/datum/action/innate/shuttledocker_place/place_action = new
|
||||
|
||||
@@ -410,7 +410,7 @@
|
||||
mode = SHUTTLE_RECALL
|
||||
|
||||
/obj/docking_port/mobile/proc/enterTransit()
|
||||
if(SSshuttle.lockdown && z == ZLEVEL_STATION) //emp went off, no escape
|
||||
if(SSshuttle.lockdown && (z in GLOB.station_z_levels)) //emp went off, no escape
|
||||
return
|
||||
previous = null
|
||||
// if(!destination)
|
||||
@@ -574,7 +574,7 @@
|
||||
|
||||
if(move_mode & MOVE_AREA)
|
||||
areas_to_move[old_area] = TRUE
|
||||
|
||||
|
||||
old_turfs[place] = move_mode
|
||||
|
||||
/*******************************************All onShuttleMove procs******************************************/
|
||||
|
||||
@@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
||||
SSshuttle.supply = src
|
||||
|
||||
/obj/docking_port/mobile/supply/canMove()
|
||||
if(z == ZLEVEL_STATION)
|
||||
if(z in GLOB.station_z_levels)
|
||||
return check_blacklist(shuttle_areas)
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
desc = "Used to designate a precise transit location for the syndicate shuttle."
|
||||
icon_screen = "syndishuttle"
|
||||
icon_keyboard = "syndie_key"
|
||||
z_lock = ZLEVEL_STATION
|
||||
z_lock = ZLEVEL_STATION_PRIMARY
|
||||
shuttleId = "syndicate"
|
||||
shuttlePortId = "syndicate_custom"
|
||||
shuttlePortName = "custom location"
|
||||
|
||||
Reference in New Issue
Block a user