From c79fa799002afd4a1eb0f557c889ae5e80fb26a4 Mon Sep 17 00:00:00 2001 From: Krausus Date: Sun, 1 Jan 2017 02:16:27 -0500 Subject: [PATCH 1/3] Fixes landmarks not being moved by shuttles --- code/modules/shuttle/on_move.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 815541f36bc..87c1dae41df 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -13,6 +13,12 @@ return 0 . = ..() +/obj/effect/landmark/onShuttleMove() + // Drop invisibility juuust enough to get moved + invisibility = 100 + . = ..() + invisibility = 101 + /obj/machinery/door/onShuttleMove() . = ..() if(!.) From b7aa0f89081edd7924a1925862530a3af7db1d8c Mon Sep 17 00:00:00 2001 From: Krausus Date: Sun, 1 Jan 2017 02:51:53 -0500 Subject: [PATCH 2/3] Now doesn't break shuttle previewing --- code/modules/shuttle/on_move.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 87c1dae41df..20fb021496a 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -19,6 +19,10 @@ . = ..() invisibility = 101 +/obj/effect/landmark/shuttle_import/onShuttleMove() + // Unless you're THIS landmark + return 0 + /obj/machinery/door/onShuttleMove() . = ..() if(!.) From ce7cc94136e82a9079a617d1e6af49282864573d Mon Sep 17 00:00:00 2001 From: Krausus Date: Sun, 1 Jan 2017 13:10:46 -0500 Subject: [PATCH 3/3] Removes /obj/onShuttleMove invisibility check The two invisible objects that shouldn't move now have their own dedicated overrides --- code/modules/shuttle/on_move.dm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 20fb021496a..4d5e38d17ec 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -8,19 +8,12 @@ /atom/movable/lighting_overlay/onShuttleMove() return 0 -/obj/onShuttleMove() - if(invisibility >= 101) - return 0 - . = ..() - -/obj/effect/landmark/onShuttleMove() - // Drop invisibility juuust enough to get moved - invisibility = 100 - . = ..() - invisibility = 101 - /obj/effect/landmark/shuttle_import/onShuttleMove() - // Unless you're THIS landmark + // Used for marking where to preview/load shuttles + return 0 + +/obj/docking_port/onShuttleMove() + // Stationary ports shouldn't move, mobile ones move themselves return 0 /obj/machinery/door/onShuttleMove()