diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index a42df7f3e93..eb1ebcd2683 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -157,9 +157,6 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop /obj/effect/step_trigger/teleporter/planetary_fall var/datum/planet/planet = null -/obj/effect/step_trigger/teleporter/planetary_fall/sif/initialize() - planet = planet_sif - /obj/effect/step_trigger/teleporter/planetary_fall/Trigger(var/atom/movable/A) if(planet) if(!planet.planet_floors.len) diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 18795972d79..56fc64c0163 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -253,4 +253,8 @@ if(HYPERSPACE_END) sound_to_play = 'sound/effects/shuttles/hyperspace_end.ogg' for(var/obj/machinery/door/E in A) //dumb, I know, but playing it on the engines doesn't do it justice - playsound(E, sound_to_play, 50, FALSE) \ No newline at end of file + playsound(E, sound_to_play, 50, FALSE) + +/datum/shuttle/proc/message_passengers(area/A, var/message) + for(var/mob/M in A) + M.show_message(message, 2) diff --git a/code/modules/shuttles/shuttle_arrivals.dm b/code/modules/shuttles/shuttle_arrivals.dm index d0f71d54b16..115d4476d2b 100644 --- a/code/modules/shuttles/shuttle_arrivals.dm +++ b/code/modules/shuttles/shuttle_arrivals.dm @@ -57,10 +57,6 @@ ..() // Do everything else -/datum/shuttle/proc/message_passengers(area/A, var/message) - for(var/mob/M in A) - M.show_message(message, 2) - /* /datum/shuttle/ferry/arrivals/current_dock_target() if(location) // If we're off station. diff --git a/maps/southern_cross/turfs/outdoors.dm b/maps/southern_cross/turfs/outdoors.dm index 484aeceb701..443e2435184 100644 --- a/maps/southern_cross/turfs/outdoors.dm +++ b/maps/southern_cross/turfs/outdoors.dm @@ -158,4 +158,8 @@ /turf/simulated/mineral/floor/ignore_mapgen/vacuum oxygen = 0 nitrogen = 0 - temperature = TCMB \ No newline at end of file + temperature = TCMB + +// Step trigger to fall down to planet Sif +/obj/effect/step_trigger/teleporter/planetary_fall/sif/initialize() + planet = planet_sif \ No newline at end of file