From c665ac0dcbaa4cdc50298155091a5697bab53fb4 Mon Sep 17 00:00:00 2001
From: Chompstation Bot <chompstation2bot@gmail.com>
Date: Wed, 27 Oct 2021 15:20:35 +0000
Subject: [PATCH 1/2] [MIRROR] Kills Doorstop

---
 maps/~map_system/maps.dm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index 9c3839f46c..e3384bc33a 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -219,6 +219,7 @@ var/list/all_maps = list()
 // Get a list of 'nearby' or 'connected' zlevels.
 // You should at least return a list with the given z if nothing else.
 /datum/map/proc/get_map_levels(var/srcz, var/long_range = FALSE, var/om_range = -1)
+<<<<<<< HEAD
 	//Overmap behavior
 	if(use_overmap)
 		//Get what sector we're in
@@ -227,6 +228,20 @@ var/list/all_maps = list()
 			//Not in a sector, just the passed zlevel
 			return list(srcz)
 
+||||||| parent of 263eae03f9... Merge pull request #11639 from VOREStation/upstream-merge-8279
+	//Overmap behavior
+	if(use_overmap)
+		//Get what sector we're in
+		var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
+		if(!istype(O))
+			//Anything in multiz then (or just themselves)
+			return GetConnectedZlevels(srcz)
+
+=======
+	//Get what sector we're in
+	var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
+	if(istype(O))
+>>>>>>> 263eae03f9... Merge pull request #11639 from VOREStation/upstream-merge-8279
 		//Just the sector we're in
 		if(om_range == -1)
 			return O.map_z.Copy()
@@ -239,7 +254,7 @@ var/list/all_maps = list()
 			connections += V.map_z // Adding list to list adds contents
 		return connections
 
-	//Traditional behavior
+	//Traditional behavior, if not in an overmap sector
 	else
 		//If long range, and they're at least in contact levels, return contact levels.
 		if (long_range && (srcz in contact_levels))

From 3e1386d5ea22ab38bb29f37b97a8c0ed2725e677 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 27 Oct 2021 18:26:46 -0400
Subject: [PATCH 2/2] powder that makes you say yes

---
 maps/~map_system/maps.dm | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index e3384bc33a..977ad2ffc8 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -219,29 +219,9 @@ var/list/all_maps = list()
 // Get a list of 'nearby' or 'connected' zlevels.
 // You should at least return a list with the given z if nothing else.
 /datum/map/proc/get_map_levels(var/srcz, var/long_range = FALSE, var/om_range = -1)
-<<<<<<< HEAD
-	//Overmap behavior
-	if(use_overmap)
-		//Get what sector we're in
-		var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
-		if(!istype(O))
-			//Not in a sector, just the passed zlevel
-			return list(srcz)
-
-||||||| parent of 263eae03f9... Merge pull request #11639 from VOREStation/upstream-merge-8279
-	//Overmap behavior
-	if(use_overmap)
-		//Get what sector we're in
-		var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
-		if(!istype(O))
-			//Anything in multiz then (or just themselves)
-			return GetConnectedZlevels(srcz)
-
-=======
 	//Get what sector we're in
 	var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
 	if(istype(O))
->>>>>>> 263eae03f9... Merge pull request #11639 from VOREStation/upstream-merge-8279
 		//Just the sector we're in
 		if(om_range == -1)
 			return O.map_z.Copy()