Skip to content

Commit eb8d897

Browse files
authored
fixes mounted frames popping off the walls when shuttles depart/land (#38860)
1 parent 0f06e93 commit eb8d897

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

code/datums/shuttle.dm

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@
416416
P.shoot_exhaust()
417417
for(var/atom/A in linked_area.contents)
418418
animate(A)
419-
A.pixel_y = initial(A.pixel_y)
420419
if(istype(A,/mob/living))
421420
var/mob/living/M = A
422421
M << sound("sound/machines/hyperspace_progress.ogg", repeat = 0, wait = 1, channel = CHANNEL_AMBIENCE, volume = 75)
@@ -483,10 +482,11 @@
483482
break
484483
if(skip)
485484
continue
486-
var/base_y = initial(A.pixel_y) + 5
485+
var/base_y = A.pixel_y + 5
487486
animate(A, pixel_y = base_y, time = 5, easing = SINE_EASING | EASE_OUT)
488487
animate(pixel_y = base_y + variation, time = 10, easing = SINE_EASING, loop = -1)
489488
animate(pixel_y = base_y - variation, time = 10, easing = SINE_EASING)
489+
A.pixel_y = base_y - 5
490490

491491
/datum/shuttle/proc/animate_landing()
492492
for(var/atom/A in linked_area.contents)
@@ -502,8 +502,8 @@
502502
break
503503
if(skip)
504504
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)
507507
spawn(15)
508508
reset_visuals()
509509

@@ -513,7 +513,6 @@
513513
var/obj/structure/shuttle/engine/heater/H = A
514514
H.deactivate()
515515
animate(A)
516-
A.pixel_y = initial(A.pixel_y)
517516

518517
//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
519518
/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,7 +1404,7 @@
14051404
var/y_min = bounds["y_min"]
14061405

14071406
// Create matrix with relative coordinates
1408-
var/datum/turf_matrix[SECTOR_SIZE][SECTOR_SIZE]
1407+
var/turf_matrix[SECTOR_SIZE][SECTOR_SIZE]
14091408
for(var/turf/T in search_turfs)
14101409
var/rel_x = T.x - x_min + 1
14111410
var/rel_y = T.y - y_min + 1

0 commit comments

Comments
 (0)