From babe5eb074a0300c5c9f56a4957d54441487bca7 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Mon, 27 Mar 2017 00:37:24 -0700 Subject: [PATCH] Away missions load cables, pipes, and templates OK now --- code/ATMOSPHERICS/atmospherics.dm | 2 ++ code/modules/awaymissions/map_rng.dm | 5 +++++ code/modules/power/cable.dm | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 0fe1a291b31..b4819294256 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -43,6 +43,8 @@ Pipelines + Other Objects -> Pipe network if(!pipe_color_check(pipe_color)) pipe_color = null + // No need for a tween worldstart roundstart handler - pipenet creation is + // handled there /obj/machinery/atmospherics/initialize() ..() diff --git a/code/modules/awaymissions/map_rng.dm b/code/modules/awaymissions/map_rng.dm index 147d41171c4..64350c99737 100644 --- a/code/modules/awaymissions/map_rng.dm +++ b/code/modules/awaymissions/map_rng.dm @@ -18,6 +18,11 @@ template_name = tname if(template_name) template = map_templates[template_name] + // Catches the interim-zone of worldstart and roundstart + // I want both the ticker to exist (so mapped-in maploaders don't trip this) + // but also not have started yet (since the zlevel system would handle this on its own otherwise) + if((ticker && ticker.current_state < GAME_STATE_PLAYING)) + attempt_init() /obj/effect/landmark/map_loader/initialize() ..() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 176ce72f005..835ccad5be1 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -74,6 +74,12 @@ By design, d1 is the smallest direction and d2 is the highest if(level==1) hide(T.intact) cable_list += src //add it to the global cable list + // Catches the interim-zone of worldstart and roundstart + // I want both the ticker to exist (so mapped-in cables don't trip this) + // but also not have started yet (since the zlevel system would handle this on its own otherwise) + if((ticker && ticker.current_state < GAME_STATE_PLAYING)) + attempt_init() + /obj/structure/cable/Destroy() // called when a cable is deleted if(powernet) @@ -807,4 +813,4 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( /obj/item/stack/cable_coil/cyborg/attack_self(mob/user) var/cablecolor = input(user,"Pick a cable color.","Cable Color") in list("red","yellow","green","blue","pink","orange","cyan","white") color = cablecolor - update_icon() \ No newline at end of file + update_icon()