From 8a147d5a3abf04bc9fdb81d8eadd3bd1f4c9a06a Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Thu, 25 Jan 2018 16:36:03 -0500
Subject: [PATCH] POLARIS: Move these defines elsewhere

---
 code/game/objects/effects/step_triggers.dm | 2 --
 code/modules/shuttles/shuttle.dm           | 6 +++++-
 code/modules/shuttles/shuttle_arrivals.dm  | 4 ----
 maps/southern_cross/turfs/outdoors.dm      | 6 +++++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 18f66e70f5d..8bc0b19a453 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -146,8 +146,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
 /* //VOREStation Removal
-/obj/effect/step_trigger/teleporter/planetary_fall/sif/initialize()
-	planet = planet_sif
 */ //VOREStation Removal end
 /obj/effect/step_trigger/teleporter/planetary_fall/Trigger(var/atom/movable/A)
 	if(planet)
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index cdd1b7879bf..713ac06f4bd 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -255,4 +255,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 b284d2d72f5..5b9f656f20f 100644
--- a/maps/southern_cross/turfs/outdoors.dm
+++ b/maps/southern_cross/turfs/outdoors.dm
@@ -152,4 +152,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