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.
This commit is contained in:
Arokha Sieyes
2018-10-13 01:36:26 -04:00
parent 5f10bf5444
commit 5fe59a1f2a
2 changed files with 5 additions and 5 deletions

View File

@@ -39,17 +39,17 @@
wait = world.time + config.gateway_delay //+ thirty minutes default wait = world.time + config.gateway_delay //+ thirty minutes default
awaygate = locate(/obj/machinery/gateway/centeraway) awaygate = locate(/obj/machinery/gateway/centeraway)
. = ..() . = ..()
density = 1 //VOREStation Add
/obj/machinery/gateway/centerstation/update_icon() /obj/machinery/gateway/centerstation/update_icon()
if(active) if(active)
icon_state = "oncenter" icon_state = "oncenter"
return return
icon_state = "offcenter" icon_state = "offcenter"
/* VOREStation Removal - Doesn't do anything
/obj/machinery/gateway/centerstation/New() /obj/machinery/gateway/centerstation/New()
density = 1 density = 1
*/ //VOREStation Removal End
obj/machinery/gateway/centerstation/process() obj/machinery/gateway/centerstation/process()
if(stat & (NOPOWER)) if(stat & (NOPOWER))
@@ -90,7 +90,7 @@ obj/machinery/gateway/centerstation/process()
if(world.time < wait) if(world.time < wait)
user << "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>" user << "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>"
return return
if(!awaygate.calibrated && LAZYLEN(awaydestinations)) if(!awaygate.calibrated && !LAZYLEN(awaydestinations)) //VOREStation Edit
user << "<span class='notice'>Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update.</span>" user << "<span class='notice'>Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update.</span>"
return return

View File

@@ -157,7 +157,7 @@ var/global/use_preloader = FALSE
++turfsSkipped ++turfsSkipped
#endif #endif
CHECK_TICK CHECK_TICK
maxx = max(maxx, ++xcrd) maxx = max(maxx, xcrd++)
key_list[++key_list.len] = line_keys key_list[++key_list.len] = line_keys
// Rotate the list according to orientation // Rotate the list according to orientation