From 799ae80b8a86a2baa68db23beadd9a85519f9f6c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 11 Sep 2017 16:43:24 -0400 Subject: [PATCH 1/3] Missed some parentheses in multi Z --- code/modules/mining/aux_base.dm | 4 ++++ .../modular_computers/file_system/programs/sm_monitor.dm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index fbe5a1fb30..3d2772b20c 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -86,7 +86,11 @@ interface with the mining shuttle at the landing site if a mobile beacon is also return if(href_list["move"]) +<<<<<<< HEAD if(z != ZLEVEL_STATION && shuttleId == "colony_drop") +======= + if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop") +>>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing) to_chat(usr, "You can't move the base again!") return var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1) diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index c12c83aaed..76c36b1bf4 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -44,7 +44,11 @@ //var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels) for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines) // Delaminating, not within coverage, not on a tile. +<<<<<<< HEAD if(!(S.z == ZLEVEL_STATION || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/)) +======= + if(!(S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !istype(S.loc, /turf/)) +>>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing) continue supermatters.Add(S) From 804a59ad49623debe430f7e8294ee6ed16859a6d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 11 Sep 2017 15:45:11 -0500 Subject: [PATCH 2/3] Update aux_base.dm --- code/modules/mining/aux_base.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 3d2772b20c..4ecdf25253 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -86,11 +86,8 @@ interface with the mining shuttle at the landing site if a mobile beacon is also return if(href_list["move"]) -<<<<<<< HEAD if(z != ZLEVEL_STATION && shuttleId == "colony_drop") -======= if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop") ->>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing) to_chat(usr, "You can't move the base again!") return var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1) @@ -349,4 +346,4 @@ obj/docking_port/stationary/public_mining_dock #undef BAD_ZLEVEL #undef BAD_AREA #undef BAD_COORDS -#undef ZONE_SET \ No newline at end of file +#undef ZONE_SET From 05efdd9ad3fa81f71c3d8400f8f25f901dfddb7a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 11 Sep 2017 15:45:34 -0500 Subject: [PATCH 3/3] Update sm_monitor.dm --- .../modular_computers/file_system/programs/sm_monitor.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index 76c36b1bf4..748d63461b 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -44,11 +44,8 @@ //var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels) for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines) // Delaminating, not within coverage, not on a tile. -<<<<<<< HEAD if(!(S.z == ZLEVEL_STATION || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/)) -======= if(!(S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !istype(S.loc, /turf/)) ->>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing) continue supermatters.Add(S)