cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict resolution

Browse Source
This commit is contained in:
Heroman
2022-02-20 09:12:49 +10:00
parent 891dc7ecb3
commit 920e917e7b
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/spacetravel.dm
+3 -16
View File
@@ -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)