From 920e917e7b8252a3b6ed3fd2da73aea59a9f9c88 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 20 Feb 2022 09:12:49 +1000
Subject: [PATCH] Conflict resolution

---
 code/modules/overmap/spacetravel.dm | 19 +++----------------
 vorestation.dme                     |  2 +-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm
index 386d3be0b62..4d24fd7039f 100644
--- a/code/modules/overmap/spacetravel.dm
+++ b/code/modules/overmap/spacetravel.dm
@@ -14,19 +14,10 @@
 	// But pick an empty z level to use
 	map_z += global.using_map.get_empty_zlevel()
 	. = ..()
-<<<<<<< HEAD
-	testing("Temporary sector at [x],[y],[z] was created, corresponding zlevel is [english_list(map_z)].")
-=======
-	loc = locate(nx, ny, global.using_map.overmap_z)
-	x = nx
-	y = ny
 	if(!map_z[1])
-		log_and_message_admins("Could not create empty sector at [nx], [ny]. No available z levels to allocate.")
+		log_and_message_admins("Could not create empty sector at [x], [y]. No available z levels to allocate.")
 		return INITIALIZE_HINT_QDEL
-
-	map_sectors["[map_z[1]]"] = src
-	testing("Temporary sector at [x],[y] was created, corresponding zlevel is [map_z[1]].")
->>>>>>> 51f5290fa1a... Fixes temp sector initialization (#8325)
+	testing("Temporary sector at [x],[y],[z] was created, corresponding zlevel is [english_list(map_z)].")
 
 /obj/effect/overmap/visitable/sector/temporary/Destroy()
 	for(var/zlevel in map_z)
@@ -59,14 +50,10 @@
 	var/obj/effect/overmap/visitable/sector/temporary/res = locate() in overmap_turf
 	if(istype(res))
 		return res
-<<<<<<< HEAD
-	return new /obj/effect/overmap/visitable/sector/temporary(overmap_turf)
-=======
-	res = new /obj/effect/overmap/visitable/sector/temporary(x, y)
+	res = new /obj/effect/overmap/visitable/sector/temporary(overmap_turf)
 	if(QDELETED(res))
 		res = null
 	return res
->>>>>>> 51f5290fa1a... Fixes temp sector initialization (#8325)
 
 /atom/movable/proc/lost_in_space()
 	for(var/atom/movable/AM in contents)
diff --git a/vorestation.dme b/vorestation.dme
index a31711bb576..cb654dd5439 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4110,4 +4110,4 @@
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
 #include "maps\~map_system\maps.dm"
-// END_INCLUDE
\ No newline at end of file
+// END_INCLUDE