Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759

[MIRROR] Modified the starting locations of advanced camera console eyes
This commit is contained in:
deathride58
2017-12-28 02:54:18 +00:00
committed by GitHub
2 changed files with 21 additions and 7 deletions

View File

@@ -173,7 +173,10 @@
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
var/turf/eyeturf = get_turf(the_eye)
if(!eyeturf)
return
return SHUTTLE_DOCKER_BLOCKED
if(z_lock.len && !(eyeturf.z in z_lock))
return SHUTTLE_DOCKER_BLOCKED
. = SHUTTLE_DOCKER_LANDING_CLEAR
var/list/bounds = shuttle_port.return_coords(the_eye.x - x_offset, the_eye.y - y_offset, the_eye.dir)
var/list/overlappers = SSshuttle.get_dock_overlap(bounds[1], bounds[2], bounds[3], bounds[4], the_eye.z)