Merge polaris sync 01 17 2018

Planes, layers, human/update_icon()

code/game/objects/effects/decals/Cleanable/fuel.dm

@@ -6,7 +6,7 @@
 	anchored = 1
 	var/amount = 1
 
-/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=0)
+/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=1)
 	if(!nologs)
 		message_admins("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[newLoc.x];Y=[newLoc.y];Z=[newLoc.z]'>JMP</a>)")
 		log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")

code/game/objects/effects/misc.dm

@@ -7,6 +7,19 @@
 	density = 1
 	anchored = 0
 
+/obj/effect/temporary_effect
+	name = "self deleting effect"
+	desc = "How are you examining what which cannot be seen?"
+	icon = 'icons/effects/effects.dmi'
+	invisibility = 0
+	var/time_to_die = 10 SECONDS // Afer which, it will delete itself.
+
+/obj/effect/temporary_effect/New()
+	..()
+	if(time_to_die)
+		spawn(time_to_die)
+			qdel(src)
+
 // Shown really briefly when attacking with axes.
 /obj/effect/temporary_effect/cleave_attack
 	name = "cleaving attack"
@@ -16,12 +29,19 @@
 	layer = 6
 	time_to_die = 6
 	alpha = 140
-	invisibility = 0
 	mouse_opacity = 0
-	new_light_range = 0
-	new_light_power = 0
 	pixel_x = -32
 	pixel_y = -32
 
 /obj/effect/temporary_effect/cleave_attack/initialize() // Makes the slash fade smoothly. When completely transparent it should qdel itself.
 	animate(src, alpha = 0, time = time_to_die - 1)
+
+/obj/effect/temporary_effect/shuttle_landing
+	name = "shuttle landing"
+	desc = "You better move if you don't want to go splat!"
+	icon_state = "shuttle_warning_still"
+	time_to_die = 4.9 SECONDS
+
+/obj/effect/temporary_effect/shuttle_landing/initialize()
+	flick("shuttle_warning", src) // flick() forces the animation to always begin at the start.
+	..()

code/game/objects/effects/step_triggers.dm

@@ -158,7 +158,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
 		var/safety = 100 // Infinite loop protection.
 		while(!T && safety)
 			var/turf/simulated/candidate = pick(planet.planet_floors)
-			if(!istype(candidate) || istype(candidate, /turf/simulated/sky))
+			if(!istype(candidate) || istype(candidate, /turf/simulated/sky) || !T.outdoors)
 				safety--
 				continue
 			else