Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

Conflicts:
	code/game/gamemodes/meteor/meteors.dm

code/game/objects/effects/landmarks.dm

@@ -11,16 +11,6 @@
 	invisibility = 101
 
 	switch(name)			//some of these are probably obsolete
-		if("shuttle")
-			shuttle_z = z
-			qdel(src)
-			return
-		if("airtunnel_stop")
-			airtunnel_stop = x
-		if("airtunnel_start")
-			airtunnel_start = x
-		if("airtunnel_bottom")
-			airtunnel_bottom = y
 		if("monkey")
 			monkeystart += loc
 			qdel(src)