Skip to content

Fixes mounted frames popping off the walls when shuttles depart/land #38860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwhitak merged 1 commit into from
Jan 12, 2026
Merged

Fixes mounted frames popping off the walls when shuttles depart/land #38860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions code/datums/shuttle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@
P.shoot_exhaust()
for(var/atom/A in linked_area.contents)
animate(A)
A.pixel_y = initial(A.pixel_y)
if(istype(A,/mob/living))
var/mob/living/M = A
M << sound("sound/machines/hyperspace_progress.ogg", repeat = 0, wait = 1, channel = CHANNEL_AMBIENCE, volume = 75)
Expand Down Expand Up @@ -483,10 +482,11 @@
break
if(skip)
continue
var/base_y = initial(A.pixel_y) + 5
var/base_y = A.pixel_y + 5
animate(A, pixel_y = base_y, time = 5, easing = SINE_EASING | EASE_OUT)
animate(pixel_y = base_y + variation, time = 10, easing = SINE_EASING, loop = -1)
animate(pixel_y = base_y - variation, time = 10, easing = SINE_EASING)
A.pixel_y = base_y - 5

/datum/shuttle/proc/animate_landing()
for(var/atom/A in linked_area.contents)
Expand All @@ -502,8 +502,8 @@
break
if(skip)
continue
A.pixel_y = 5
animate(A, pixel_y = initial(A.pixel_y), time = 10, easing = SINE_EASING|EASE_OUT)
A.pixel_y += 5
animate(A, pixel_y = A.pixel_y - 5, time = 10, easing = SINE_EASING|EASE_OUT)
spawn(15)
reset_visuals()

Expand All @@ -513,7 +513,6 @@
var/obj/structure/shuttle/engine/heater/H = A
H.deactivate()
animate(A)
A.pixel_y = initial(A.pixel_y)

//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
/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
Expand Down Expand Up @@ -1306,7 +1305,7 @@
var/y_min = bounds["y_min"]

// Create matrix with relative coordinates
var/datum/turf_matrix[SECTOR_SIZE][SECTOR_SIZE]
var/turf_matrix[SECTOR_SIZE][SECTOR_SIZE]
for(var/turf/T in search_turfs)
var/rel_x = T.x - x_min + 1
var/rel_y = T.y - y_min + 1
Expand Down
Loading