Merge remote-tracking branch 'upstream/master' into zombies

code/modules/shuttle/emergency.dm

@@ -358,7 +358,7 @@
 	dwidth = 1
 	width = 3
 	height = 4
-	var/target_area = /area/mine/dangerous/unexplored
+	var/target_area = /area/mine/unexplored
 
 /obj/docking_port/stationary/random/Initialize()
 	..()

code/modules/shuttle/shuttle.dm

@@ -912,4 +912,4 @@
 		T.color = color
 	if(T.dir != dir)
 		T.dir = dir
-	return T
+	return T

code/modules/shuttle/supply.dm

@@ -58,12 +58,10 @@
 
 		var/contcount
 		for(var/atom/A in T.contents)
-			if(istype(A,/atom/movable/lighting_object))
-				continue
-			if(istype(A,/obj/machinery/light))
-				continue //hacky but whatever, shuttles need three spots each for this shit
 			if(!A.simulated)
 				continue
+			if(istype(A, /obj/machinery/light))
+				continue //hacky but whatever, shuttles need three spots each for this shit
 			contcount++
 
 		if(contcount)