Merge pull request #11705 from PsiOmegaDelta/151218-PolarDev

Misc. fixes.

code/game/area/Space Station 13 areas.dm

@@ -158,7 +158,6 @@ area/space/atmosalert()
 /area/shuttle/escape
 	name = "\improper Emergency Shuttle"
 	flags = RAD_SHIELDED
-	music = "music/escape.ogg"
 
 /area/shuttle/escape/station
 	name = "\improper Emergency Shuttle Station"
@@ -174,7 +173,6 @@ area/space/atmosalert()
 
 /area/shuttle/escape_pod1
 	name = "\improper Escape Pod One"
-	music = "music/escape.ogg"
 	flags = RAD_SHIELDED
 
 /area/shuttle/escape_pod1/station
@@ -188,7 +186,6 @@ area/space/atmosalert()
 
 /area/shuttle/escape_pod2
 	name = "\improper Escape Pod Two"
-	music = "music/escape.ogg"
 	flags = RAD_SHIELDED
 
 /area/shuttle/escape_pod2/station
@@ -202,7 +199,6 @@ area/space/atmosalert()
 
 /area/shuttle/escape_pod3
 	name = "\improper Escape Pod Three"
-	music = "music/escape.ogg"
 	flags = RAD_SHIELDED
 
 /area/shuttle/escape_pod3/station
@@ -216,7 +212,6 @@ area/space/atmosalert()
 
 /area/shuttle/escape_pod5 //Pod 4 was lost to meteors
 	name = "\improper Escape Pod Five"
-	music = "music/escape.ogg"
 	flags = RAD_SHIELDED
 
 /area/shuttle/escape_pod5/station

code/modules/blob/blob.dm

@@ -54,7 +54,7 @@
 	update_icon()
 
 /obj/effect/blob/proc/expand(var/turf/T)
-	if(istype(T, /turf/unsimulated/) || istype(T, /turf/space))
+	if(istype(T, /turf/unsimulated/) || istype(T, /turf/space) || (istype(T, /turf/simulated/mineral) && T.density))
 		return
 	if(istype(T, /turf/simulated/wall))
 		var/turf/simulated/wall/SW = T

code/modules/mob/living/carbon/human/update_icons.dm

@@ -491,7 +491,7 @@ var/global/list/damage_icon_parts = list()
 
 		//need to append _s to the icon state for legacy compatibility
 		var/image/standing = image(icon = under_icon, icon_state = "[under_state]_s")
-		standing.color = under.color
+		standing.color = w_uniform.color
 
 		//apply blood overlay
 		if(w_uniform.blood_DNA)