diff --git a/code/__defines/flags.dm b/code/__defines/flags.dm
index 78f7cd020d..cc5092b31e 100644
--- a/code/__defines/flags.dm
+++ b/code/__defines/flags.dm
@@ -32,12 +32,6 @@
 /// This atom is queued for an overlay update.
 #define ATOM_AWAITING_OVERLAY_UPDATE (1<<5)
 
-/// This atom is a shuttle landmark that should create its own landing point.
-#define LANDMARK_CREATES_SAFE_SITE (1<<6)
-
-/// This atom is a shuttle landmark that causes arriving shuttles to have no gravity.
-#define LANDMARK_REMOVES_GRAVITY (1<<7)
-
 
 /* -- /turf/var/turf_flags -- */
 
@@ -73,3 +67,12 @@
 #define PASSGRILLE				(1<<2)
 #define PASSBLOB				(1<<3)
 #define PASSMOB					(1<<4)
+
+
+/* -- /obj/effect/shuttle_landmark/var/landmark_flags -- */
+
+/// This atom is a shuttle landmark that should create its own landing point.
+#define LANDMARK_CREATES_SAFE_SITE (1<<0)
+
+/// This atom is a shuttle landmark that causes arriving shuttles to have no gravity.
+#define LANDMARK_REMOVES_GRAVITY (1<<1)
diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm
index b24b4e7c5e..5db6073b4a 100644
--- a/code/modules/overmap/ships/landable.dm
+++ b/code/modules/overmap/ships/landable.dm
@@ -84,7 +84,7 @@
 /obj/effect/shuttle_landmark/ship
 	name = "Open Space"
 	landmark_tag = "ship"
-	atom_flags = LANDMARK_REMOVES_GRAVITY // *Not* AUTOSET, these must be world.turf and world.area for lazy loading to work.
+	landmark_flags = LANDMARK_REMOVES_GRAVITY // *Not* AUTOSET, these must be world.turf and world.area for lazy loading to work.
 	var/shuttle_name
 	var/list/visitors // landmark -> visiting shuttle stationed there
 
@@ -117,7 +117,7 @@
 //
 
 /obj/effect/shuttle_landmark/visiting_shuttle
-	atom_flags = LANDMARK_CREATES_SAFE_SITE | LANDMARK_REMOVES_GRAVITY
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE | LANDMARK_REMOVES_GRAVITY
 	var/obj/effect/shuttle_landmark/ship/core_landmark
 
 /obj/effect/shuttle_landmark/visiting_shuttle/Initialize(mapload, obj/effect/shuttle_landmark/ship/master, _name)
diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm
index 35d8eef402..ab828466c5 100644
--- a/code/modules/shuttles/landmarks.dm
+++ b/code/modules/shuttles/landmarks.dm
@@ -7,7 +7,8 @@
 	unacidable = 1
 	simulated = 0
 	invisibility = 101
-	atom_flags = LANDMARK_CREATES_SAFE_SITE // We generally want to use current area/turf as base.
+
+	var/landmark_flags = LANDMARK_CREATES_SAFE_SITE // We generally want to use current area/turf as base.
 
 	//ID of the landmark
 	var/landmark_tag
@@ -30,7 +31,7 @@
 		. = INITIALIZE_HINT_LATELOAD
 
 	// Even if this flag is set, hardcoded values take precedence.
-	if(atom_flags & LANDMARK_CREATES_SAFE_SITE)
+	if(landmark_flags & LANDMARK_CREATES_SAFE_SITE)
 		if(ispath(base_area))
 			var/area/A = locate(base_area)
 			if(!istype(A))
@@ -123,7 +124,7 @@
 /obj/effect/shuttle_landmark/automatic
 	name = "Navpoint"
 	landmark_tag = "navpoint"
-	atom_flags = LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE
 
 /obj/effect/shuttle_landmark/automatic/Initialize()
 	landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]"
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 66f4dcebcb..f73da3f852 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -290,7 +290,7 @@
 	// If shuttle has no internal gravity, update our gravity with destination gravity
 	if((flags & SHUTTLE_FLAGS_ZERO_G))
 		var/new_grav = 1
-		if(destination.atom_flags & LANDMARK_REMOVES_GRAVITY)
+		if(destination.landmark_flags & LANDMARK_REMOVES_GRAVITY)
 			var/area/new_area = get_area(destination)
 			new_grav = new_area.has_gravity
 		for(var/area/our_area in shuttle_area)
diff --git a/code/modules/shuttles/shuttle_autodock.dm b/code/modules/shuttles/shuttle_autodock.dm
index 6b1af42ec0..96d561cc14 100644
--- a/code/modules/shuttles/shuttle_autodock.dm
+++ b/code/modules/shuttles/shuttle_autodock.dm
@@ -215,4 +215,4 @@
 	return	//do nothing for now
 
 /obj/effect/shuttle_landmark/transit
-	atom_flags = LANDMARK_REMOVES_GRAVITY|LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_REMOVES_GRAVITY | LANDMARK_CREATES_SAFE_SITE
diff --git a/maps/cynosure/cynosure_shuttles.dm b/maps/cynosure/cynosure_shuttles.dm
index 8303935f68..497a850325 100644
--- a/maps/cynosure/cynosure_shuttles.dm
+++ b/maps/cynosure/cynosure_shuttles.dm
@@ -316,7 +316,7 @@
 } \
 /obj/effect/shuttle_landmark/cynosure/escape_pod##NUMBER/transit { \
 	landmark_tag = "escape_pod_"+ #NUMBER +"_transit"; \
-	atom_flags = LANDMARK_CREATES_SAFE_SITE; \
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE; \
 }
 
 ESCAPE_POD(1)
@@ -349,7 +349,7 @@ ESCAPE_POD(1)
 
 /obj/effect/shuttle_landmark/cynosure/large_escape_pod1/transit
 	landmark_tag = "large_escape_pod1_transit"
-	atom_flags = LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE
 
 // Large Escape Pod 2
 /datum/shuttle/autodock/ferry/escape_pod/large_escape_pod2
@@ -377,7 +377,7 @@ ESCAPE_POD(1)
 
 /obj/effect/shuttle_landmark/cynosure/large_escape_pod2/transit
 	landmark_tag = "large_escape_pod2_transit"
-	atom_flags = LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE
 
 //Cynosure Station Docks
 
diff --git a/maps/southern_cross/southern_cross_shuttles.dm b/maps/southern_cross/southern_cross_shuttles.dm
index 6aa9b0b423..9f80e3fcbe 100644
--- a/maps/southern_cross/southern_cross_shuttles.dm
+++ b/maps/southern_cross/southern_cross_shuttles.dm
@@ -234,7 +234,7 @@
 } \
 /obj/effect/shuttle_landmark/southern_cross/escape_pod##NUMBER/transit { \
 	landmark_tag = "escape_pod_"+ #NUMBER +"_transit"; \
-	flags = LANDMARK_CREATES_SAFE_SITE; \
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE; \
 }
 
 ESCAPE_POD(1)
@@ -274,7 +274,7 @@ ESCAPE_POD(8)
 
 /obj/effect/shuttle_landmark/southern_cross/cryostorage_transit
 	landmark_tag = "cryostorage_transit"
-	flags = LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE
 
 // Large Escape Pod 1
 /datum/shuttle/autodock/ferry/escape_pod/large_escape_pod1
@@ -302,7 +302,7 @@ ESCAPE_POD(8)
 
 /obj/effect/shuttle_landmark/southern_cross/large_escape_pod1/transit
 	landmark_tag = "large_escape_pod1_transit"
-	flags = LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE
 
 // Large Escape Pod 2
 /datum/shuttle/autodock/ferry/escape_pod/large_escape_pod2
@@ -330,7 +330,7 @@ ESCAPE_POD(8)
 
 /obj/effect/shuttle_landmark/southern_cross/large_escape_pod2/transit
 	landmark_tag = "large_escape_pod2_transit"
-	flags = LANDMARK_CREATES_SAFE_SITE
+	landmark_flags = LANDMARK_CREATES_SAFE_SITE
 
 
 // Destination datums