|
416 | 416 | P.shoot_exhaust() |
417 | 417 | for(var/atom/A in linked_area.contents) |
418 | 418 | animate(A) |
419 | | - A.pixel_y = initial(A.pixel_y) |
420 | 419 | if(istype(A,/mob/living)) |
421 | 420 | var/mob/living/M = A |
422 | 421 | M << sound("sound/machines/hyperspace_progress.ogg", repeat = 0, wait = 1, channel = CHANNEL_AMBIENCE, volume = 75) |
|
483 | 482 | break |
484 | 483 | if(skip) |
485 | 484 | continue |
486 | | - var/base_y = initial(A.pixel_y) + 5 |
| 485 | + var/base_y = A.pixel_y + 5 |
487 | 486 | animate(A, pixel_y = base_y, time = 5, easing = SINE_EASING | EASE_OUT) |
488 | 487 | animate(pixel_y = base_y + variation, time = 10, easing = SINE_EASING, loop = -1) |
489 | 488 | animate(pixel_y = base_y - variation, time = 10, easing = SINE_EASING) |
| 489 | + A.pixel_y = base_y - 5 |
490 | 490 |
|
491 | 491 | /datum/shuttle/proc/animate_landing() |
492 | 492 | for(var/atom/A in linked_area.contents) |
|
502 | 502 | break |
503 | 503 | if(skip) |
504 | 504 | continue |
505 | | - A.pixel_y = 5 |
506 | | - animate(A, pixel_y = initial(A.pixel_y), time = 10, easing = SINE_EASING|EASE_OUT) |
| 505 | + A.pixel_y += 5 |
| 506 | + animate(A, pixel_y = A.pixel_y - 5, time = 10, easing = SINE_EASING|EASE_OUT) |
507 | 507 | spawn(15) |
508 | 508 | reset_visuals() |
509 | 509 |
|
|
513 | 513 | var/obj/structure/shuttle/engine/heater/H = A |
514 | 514 | H.deactivate() |
515 | 515 | animate(A) |
516 | | - A.pixel_y = initial(A.pixel_y) |
517 | 516 |
|
518 | 517 | //This is the proc you want to use to FORCE a shuttle to move. It always moves it, unless the shuttle or its area don't exist. Transit is skipped, after_flight() is called |
519 | 518 | /datum/shuttle/proc/move_to_dock(var/obj/docking_port/D, var/ignore_innacuracy = 0, var/rotate_after = 0) //A direct proc with no bullshit |
|
1405 | 1404 | var/y_min = bounds["y_min"] |
1406 | 1405 |
|
1407 | 1406 | // Create matrix with relative coordinates |
1408 | | - var/datum/turf_matrix[SECTOR_SIZE][SECTOR_SIZE] |
| 1407 | + var/turf_matrix[SECTOR_SIZE][SECTOR_SIZE] |
1409 | 1408 | for(var/turf/T in search_turfs) |
1410 | 1409 | var/rel_x = T.x - x_min + 1 |
1411 | 1410 | var/rel_y = T.y - y_min + 1 |
|
0 commit comments