merge commit fix

baystation12.dme

@@ -68,6 +68,7 @@
 #include "code\__defines\modifiers.dm"
 #include "code\__defines\movement.dm"
 #include "code\__defines\organs.dm"
+#include "code\__defines\path.dm"
 #include "code\__defines\preferences.dm"
 #include "code\__defines\proc_presets.dm"
 #include "code\__defines\process_scheduler.dm"
@@ -152,6 +153,7 @@
 #include "code\_helpers\game.dm"
 #include "code\_helpers\global_access.dm"
 #include "code\_helpers\global_lists.dm"
+#include "code\_helpers\heap.dm"
 #include "code\_helpers\holodeck.dm"
 #include "code\_helpers\icons.dm"
 #include "code\_helpers\input.dm"
@@ -185,6 +187,9 @@
 #include "code\_helpers\verbs.dm"
 #include "code\_helpers\warnings.dm"
 #include "code\_helpers\weakref.dm"
+#include "code\_helpers\paths\jps.dm"
+#include "code\_helpers\paths\path.dm"
+#include "code\_helpers\paths\sssp.dm"
 #include "code\_helpers\sorts\__main.dm"
 #include "code\_helpers\sorts\TimSort.dm"
 #include "code\_onclick\adjacent.dm"
@@ -256,6 +261,7 @@
 #include "code\controllers\subsystems\misc_late.dm"
 #include "code\controllers\subsystems\open_space.dm"
 #include "code\controllers\subsystems\overlays.dm"
+#include "code\controllers\subsystems\pathfinder.dm"
 #include "code\controllers\subsystems\plants.dm"
 #include "code\controllers\subsystems\points_of_interest.dm"
 #include "code\controllers\subsystems\prometheus.dm"

code/_helpers/paths/path.dm

@@ -312,7 +312,7 @@
 	/// Weakref to the caller used to generate this info
 	/// Should not use this almost ever, it's for context and to allow for proc chains that
 	/// Require a movable
-	var/datum/weakref/caller_ref = null
+	var/weakref/caller_ref = null
 
 /datum/can_pass_info/New(atom/movable/construct_from, list/access, no_id = FALSE, call_depth = 0)
 	// No infiniloops
@@ -325,7 +325,7 @@
 	if(isnull(construct_from))
 		return
 
-	src.caller_ref = weakref(construct_from)
+	src.caller_ref = construct_from.create_weakref()
 	src.pass_flags = construct_from.pass_flags
 	// src.movement_type = construct_from.movement_type
 	src.thrown = !!construct_from.throwing

code/game/atoms_movable.dm

@@ -86,6 +86,10 @@
 	..()
 	return
 
+/atom/movable/proc/has_gravity()
+	var/area/A = get_area(src)
+	return A?.has_gravity()
+
 /atom/movable/proc/get_selected_zone()
 	return
 

maps/example/example-3.dmm

@@ -5,12 +5,12 @@
 "e" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "f" = (/obj/structure/lattice,/turf/simulated/open,/area/maintenance/fsmaint2)
 "g" = (/turf/simulated/open,/area/maintenance/fsmaint2)
-"h" = (/obj/machinery/light_switch{on = 1; pixel_x = 25},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
+"h" = (/obj/machinery/light_switch{pixel_x = 25; on = 1},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "i" = (/obj/effect/shuttle_landmark/upper_level,/turf/space,/area/space)
 "j" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "k" = (/obj/effect/floor_decal/corner/blue/diagonal,/obj/structure/ladder,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "l" = (/turf/simulated/floor,/area/maintenance/fsmaint2)
-"m" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{id_tag = "upper_level_dock"; pixel_x = 8; pixel_y = -25},/turf/simulated/floor,/area/maintenance/fsmaint2)
+"m" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{pixel_x = 8; pixel_y = -25; id_tag = "upper_level_dock"},/turf/simulated/floor,/area/maintenance/fsmaint2)
 "n" = (/obj/machinery/door/airlock/external/bolted{frequency = 1379},/turf/simulated/floor,/area/maintenance/fsmaint2)
 "o" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "p" = (/obj/effect/floor_decal/corner/blue/diagonal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
@@ -19,16 +19,17 @@
 "s" = (/obj/machinery/atmospherics/portables_connector{icon_state = "map_connector"; dir = 8},/obj/machinery/portable_atmospherics/canister/air,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "t" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 6},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "u" = (/obj/machinery/atmospherics/portables_connector{icon_state = "map_connector"; dir = 8},/obj/machinery/portable_atmospherics/canister/empty,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
-"v" = (/obj/machinery/light_switch{on = 1; pixel_x = -25},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
+"v" = (/obj/machinery/light_switch{pixel_x = -25; on = 1},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "w" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 1},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "x" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
-"y" = (/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
-"z" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
+"y" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 0; d2 = 2},/obj/machinery/power/apc{name = "west bump"; dir = 8; pixel_x = -24},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
+"z" = (/obj/structure/cable{icon_state = "1-2"; pixel_y = 0; d1 = 1; d2 = 2},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "A" = (/obj/structure/cable,/obj/machinery/power/debug_items/infinite_generator,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "B" = (/obj/machinery/light,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "C" = (/obj/effect/floor_decal/corner/blue/diagonal,/obj/effect/floor_decal/industrial/hatch/blue,/turf/simulated/floor/tiled,/area/outpost/research/analysis{has_gravity = 0})
 "D" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/blue/diagonal,/obj/structure/window/reinforced/full,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "E" = (/obj/effect/floor_decal/corner/blue/diagonal,/obj/structure/window/reinforced/full,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
+"F" = (/mob/living/bot/secbot/beepsky,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "G" = (/obj/effect/floor_decal/corner/blue/diagonal,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/maintenance/fsmaint2)
 "H" = (/turf/simulated/wall/r_wall,/area/maintenance/fsmaint2)
 
@@ -51,7 +52,7 @@ aaaaaaaaaaaaaaaacHCCCEddddddodpHHHHaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaacHEGEEddddddqrsHcccaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaacHdddddddddddddHcaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaacHddddddddddtruHcaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaacHvdddddddddwddHcaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaacHvdddddddFdwddHcaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaacHjdddddddddddxHcaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaacHyddddddddddddHcaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaacHzddddddddddddHcaaaaaaaaaaaaaaa