shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3403 from Citadel-Station-13/upstream-merge-31661

Browse Source 
[MIRROR] Fixes custom shuttle docker display
This commit is contained in:
LetterJay
2017-10-15 10:23:07 -04:00
committed by GitHub
parent b6f69c88ea 355a76547e
commit 6a288fec29
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/navigation_computer.dm
+17 -14
View File
@@ -38,22 +38,25 @@
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
the_eye.origin = src
the_eye.dir = M.dir
var/area/A = get_area(M)
if(QDELETED(A))
return
var/turf/origin = locate(M.x + x_offset, M.y + y_offset, M.z)
for(var/turf/T in A)
if(T.z != origin.z)
for(var/i in M.shuttle_areas)
var/area/place = i
if(QDELETED(place))
continue
var/image/I = image('icons/effects/alphacolors.dmi', origin, "red")
I.layer = ABOVE_NORMAL_TURF_LAYER
I.plane = 0
I.mouse_opacity = 0
var/x_off = T.x - origin.x
var/y_off = T.y - origin.y
I.pixel_x = x_off * 32
I.pixel_y = y_off * 32
the_eye.placement_images[I] = list(x_off, y_off)
for(var/turf/T in place)
if(T.z != origin.z)
continue
var/image/I = image('icons/effects/alphacolors.dmi', origin, "red")
I.layer = ABOVE_NORMAL_TURF_LAYER
I.plane = 0
I.mouse_opacity = 0
var/x_off = T.x - origin.x
var/y_off = T.y - origin.y
I.pixel_x = x_off * 32
I.pixel_y = y_off * 32
the_eye.placement_images[I] = list(x_off, y_off)
generateBlacklistedTurfs()
/obj/machinery/computer/camera_advanced/shuttle_docker/give_eye_control(mob/user)