From 57daae04593ee10cef10628e53d5f7bb37692eef Mon Sep 17 00:00:00 2001 From: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Date: Sat, 26 Aug 2023 18:48:38 -0700 Subject: [PATCH] Fixes tram deleting its own landmarks on reset_lift_contents() (#77921) ## About The Pull Request Excludes tram landmarks from being deleted when reset_lift_contents() is called. ## Why It's Good For The Game Fixes https://github.com/tgstation/tgstation/issues/77782 ## Changelog :cl: LT3 fix: Tram will no longer fly off into space when admins try to reset the contents /:cl: --- code/modules/industrial_lift/industrial_lift.dm | 2 +- code/modules/industrial_lift/tram/tram_lift_master.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/industrial_lift/industrial_lift.dm b/code/modules/industrial_lift/industrial_lift.dm index e658528dd80..dd1b3f9604a 100644 --- a/code/modules/industrial_lift/industrial_lift.dm +++ b/code/modules/industrial_lift/industrial_lift.dm @@ -552,7 +552,7 @@ GLOBAL_LIST_INIT(all_radial_directions, list( var/list/atom/movable/foreign_contents_in_loc = list() for(var/atom/movable/foreign_movable as anything in (turf_loc.contents - original_contents)) - if(foreign_objects && ismovable(foreign_movable) && !ismob(foreign_movable)) + if(foreign_objects && ismovable(foreign_movable) && !ismob(foreign_movable) && !istype(foreign_movable, /obj/effect/landmark/tram)) foreign_contents_in_loc += foreign_movable continue diff --git a/code/modules/industrial_lift/tram/tram_lift_master.dm b/code/modules/industrial_lift/tram/tram_lift_master.dm index 0a60eedfb43..e2d044dc5b2 100644 --- a/code/modules/industrial_lift/tram/tram_lift_master.dm +++ b/code/modules/industrial_lift/tram/tram_lift_master.dm @@ -67,7 +67,7 @@ if(initial_destination) idle_platform = initial_destination - if(initial_destination) + if(beacon) nav_beacon = beacon /datum/lift_master/tram/proc/check_starting_landmark()