From 5fe59a1f2a1a56a8b83ababdaf4fb36770105f94 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 13 Oct 2018 01:36:26 -0400 Subject: [PATCH] Critical maploader fix Definitely do not update the server without this change. And a gateway tweak thing because that was my original intent with this branch. --- code/modules/awaymissions/gateway.dm | 8 ++++---- code/modules/maps/tg/reader.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 4f92884dfb7..558dc668b0c 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -39,17 +39,17 @@ wait = world.time + config.gateway_delay //+ thirty minutes default awaygate = locate(/obj/machinery/gateway/centeraway) . = ..() + density = 1 //VOREStation Add /obj/machinery/gateway/centerstation/update_icon() if(active) icon_state = "oncenter" return icon_state = "offcenter" - +/* VOREStation Removal - Doesn't do anything /obj/machinery/gateway/centerstation/New() density = 1 - - +*/ //VOREStation Removal End obj/machinery/gateway/centerstation/process() if(stat & (NOPOWER)) @@ -90,7 +90,7 @@ obj/machinery/gateway/centerstation/process() if(world.time < wait) user << "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes." return - if(!awaygate.calibrated && LAZYLEN(awaydestinations)) + if(!awaygate.calibrated && !LAZYLEN(awaydestinations)) //VOREStation Edit user << "Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update." return diff --git a/code/modules/maps/tg/reader.dm b/code/modules/maps/tg/reader.dm index ff66d4bdd2b..30de8067dc6 100644 --- a/code/modules/maps/tg/reader.dm +++ b/code/modules/maps/tg/reader.dm @@ -157,7 +157,7 @@ var/global/use_preloader = FALSE ++turfsSkipped #endif CHECK_TICK - maxx = max(maxx, ++xcrd) + maxx = max(maxx, xcrd++) key_list[++key_list.len] = line_keys // Rotate the list according to orientation