From d51828e88df61d9c3941ac92eff887a559022232 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 5 Aug 2018 16:08:18 -0500 Subject: [PATCH] I don't know how we keep breaking falling --- code/game/objects/effects/step_triggers.dm | 7 +++++++ maps/southern_cross/turfs/outdoors.dm | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index a58241ada25..febfff6d0f0 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -158,7 +158,14 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop /obj/effect/step_trigger/teleporter/planetary_fall var/datum/planet/planet = null +// First time setup, which planet are we aiming for? +/obj/effect/step_trigger/teleporter/planetary_fall/proc/find_planet() + return + /obj/effect/step_trigger/teleporter/planetary_fall/Trigger(var/atom/movable/A) + if(!planet) + find_planet() + if(planet) if(!planet.planet_floors.len) message_admins("ERROR: planetary_fall step trigger's list of outdoor floors was empty.") diff --git a/maps/southern_cross/turfs/outdoors.dm b/maps/southern_cross/turfs/outdoors.dm index 6c0e2b90350..167b1256f54 100644 --- a/maps/southern_cross/turfs/outdoors.dm +++ b/maps/southern_cross/turfs/outdoors.dm @@ -161,6 +161,5 @@ temperature = TCMB // Step trigger to fall down to planet Sif -/obj/effect/step_trigger/teleporter/planetary_fall/sif/initialize() - planet = planet_sif - . = ..() +/obj/effect/step_trigger/teleporter/planetary_fall/sif/find_planet() + planet = planet_sif \ No newline at end of file