From 6679f7b008cd497301ec88735eb332d0427afa91 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 13 Sep 2020 04:06:13 +0200
Subject: [PATCH] [MIRROR] Remove outdated shuttle import landmark (#780)

* Remove outdated shuttle import landmark (#53642)

Cleaning up after #44676

* Remove outdated shuttle import landmark

Co-authored-by: Tad Hardesty <tad@platymuus.com>
---
 _maps/map_files/generic/CentCom.dmm   | 6 +-----
 code/controllers/subsystem/shuttle.dm | 2 +-
 code/modules/shuttle/shuttle.dm       | 7 -------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 95fdb948980..8899e0b7bc5 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -19067,10 +19067,6 @@
 /obj/item/toy/seashell,
 /turf/open/floor/holofloor/beach,
 /area/holodeck/rec_center/beach)
-"VX" = (
-/obj/effect/landmark/shuttle_import,
-/turf/open/space/basic,
-/area/space)
 "Wc" = (
 /obj/machinery/door/airlock/centcom{
 	name = "CentCom Security";
@@ -42270,7 +42266,7 @@ aa
 aa
 aa
 aa
-VX
+aa
 aa
 aa
 aa
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 6281c98d190..41d3b87598a 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -708,7 +708,7 @@ SUBSYSTEM_DEF(shuttle)
 
 /datum/controller/subsystem/shuttle/proc/load_template(datum/map_template/shuttle/S)
 	. = FALSE
-	// load shuttle template, centred at shuttle import landmark,
+	// Load shuttle template to a fresh block reservation.
 	preview_reservation = SSmapping.RequestBlockReservation(S.width, S.height, SSmapping.transit.z_value, /datum/turf_reservation/transit)
 	if(!preview_reservation)
 		CRASH("failed to reserve an area for shuttle template loading")
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index e550749ad17..5c04decaf5a 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -549,13 +549,6 @@
 	else
 		. = null
 
-/obj/effect/landmark/shuttle_import
-	name = "Shuttle Import"
-
-// Never move the shuttle import landmark, otherwise things get WEIRD
-/obj/effect/landmark/shuttle_import/onShuttleMove()
-	return FALSE
-
 //used by shuttle subsystem to check timers
 /obj/docking_port/mobile/proc/check()
 	check_effects()