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

[MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location (#3596)

Browse Source 
* Shuttle navigation computers ignore the shuttle when placing a new location (#31722)

* Fixed the shuttle navigation computer allowing you to move stationary docking ports

* Made the shuttle navigation computer ignore the shuttle it controls when determining valid turfs

* Removed a redundant list

* Moved a var from stationary docking ports to mobile docking ports

* Removed a sanity check

* Shuttle navigation computers ignore the shuttle when placing a new location
This commit is contained in:
CitadelStationBot
2017-10-25 20:03:11 -05:00
committed by Poojawa
parent 2f74805a46
commit f6331eedf8
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/navigation_computer.dm
+13 -14
View File
@@ -8,8 +8,9 @@
var/shuttlePortId = "" var/shuttlePortId = ""
var/shuttlePortName = "" var/shuttlePortName = ""
var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes
var/list/blacklisted_turfs var/list/blacklisted_turfs //turfs we cannot go on, by default, any turf covered by a docking port that we did not place and cannot jump to
var/obj/docking_port/stationary/my_port var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
var/view_range = 7 var/view_range = 7
var/x_offset = 0 var/x_offset = 0
var/y_offset = 0 var/y_offset = 0
@@ -31,21 +32,19 @@
actions += place_action actions += place_action
/obj/machinery/computer/camera_advanced/shuttle_docker/CreateEye() /obj/machinery/computer/camera_advanced/shuttle_docker/CreateEye()
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) shuttle_port = SSshuttle.getShuttle(shuttleId)
if(QDELETED(M)) if(QDELETED(shuttle_port))
shuttle_port = null
return return
eyeobj = new /mob/camera/aiEye/remote/shuttle_docker() eyeobj = new /mob/camera/aiEye/remote/shuttle_docker()
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
the_eye.origin = src the_eye.origin = src
the_eye.dir = M.dir the_eye.dir = shuttle_port.dir
var/turf/origin = locate(shuttle_port.x + x_offset, shuttle_port.y + y_offset, shuttle_port.z)
var/turf/origin = locate(M.x + x_offset, M.y + y_offset, M.z) for(var/V in shuttle_port.shuttle_areas)
var/area/A = V
for(var/i in M.shuttle_areas) for(var/turf/T in A)
var/area/place = i
if(QDELETED(place))
continue
for(var/turf/T in place)
if(T.z != origin.z) if(T.z != origin.z)
continue continue
var/image/I = image('icons/effects/alphacolors.dmi', origin, "red") var/image/I = image('icons/effects/alphacolors.dmi', origin, "red")
@@ -127,7 +126,7 @@
checkLandingSpot() checkLandingSpot()
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/checkLandingTurf(turf/T) /obj/machinery/computer/camera_advanced/shuttle_docker/proc/checkLandingTurf(turf/T)
return T && (!blacklisted_turfs || !blacklisted_turfs[T]) && (!space_turfs_only || isspaceturf(T)) && (T.x > 1 && T.y > 1 && T.x < world.maxx && T.y < world.maxy) return T && (shuttle_port.shuttle_areas[T.loc] || (!blacklisted_turfs || !blacklisted_turfs[T]) && (!space_turfs_only || isspaceturf(T)) ) && (T.x > 1 && T.y > 1 && T.x < world.maxx && T.y < world.maxy)
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/generateBlacklistedTurfs() /obj/machinery/computer/camera_advanced/shuttle_docker/proc/generateBlacklistedTurfs()
blacklisted_turfs = list() blacklisted_turfs = list()