diff --git a/code/__HELPERS/path.dm b/code/__HELPERS/path.dm index ea51d02aded..1000febefbe 100644 --- a/code/__HELPERS/path.dm +++ b/code/__HELPERS/path.dm @@ -143,8 +143,8 @@ if(!start || !end) stack_trace("Invalid A* start or destination") return - // if(start.z != end.z || start == end ) //no pathfinding between z levels - // return //NSV13 we DO want pathfinding between z levels. + if(start == end) //no pathfinding between z levels //NSV13 we DO want pathfinding between z levels. removed "start.z != end.z || " from the check + return if(max_distance && (max_distance < get_dist(start, end))) //if start turf is farther than max_distance from end turf, no need to do anything return diff --git a/nsv13/code/modules/overmap/knpc.dm b/nsv13/code/modules/overmap/knpc.dm index 9bab9889da2..f16187f0eaa 100644 --- a/nsv13/code/modules/overmap/knpc.dm +++ b/nsv13/code/modules/overmap/knpc.dm @@ -159,16 +159,16 @@ GLOBAL_LIST_EMPTY(knpcs) for(var/obj/machinery/door/firedoor/blocking_firelock in next_turf) if((blocking_firelock.flags_1 & ON_BORDER_1) && !(blocking_firelock.dir in dir_to_cardinal_dirs(reverse_dir))) //Here, only firelocks on the border matter since fulltile firelocks let you exit. continue - if(!blocking_firelock.density || blocking_firelock.operating) + if(!blocking_firelock.density || blocking_firelock.powered()) continue if((blocking_firelock.welded)) break //If at least one firedoor in our way is welded shut, welp! blocking_firelock.open() //Open one firelock per tile per try. break - for(var/obj/machinery/door/firedoor/blocking_firelock as() in this_turf) + for(var/obj/machinery/door/firedoor/blocking_firelock in this_turf) if(!((blocking_firelock.flags_1 & ON_BORDER_1) && (blocking_firelock.dir in dir_to_cardinal_dirs(move_dir)))) continue - if(!blocking_firelock.density || blocking_firelock.operating) + if(!blocking_firelock.density || blocking_firelock.powered()) continue if(blocking_firelock.welded) break //If at least one firedoor in our way is welded shut, welp!