Merge pull request #4568 from VOREStation/pol-tweak

Tweak to fix two issues

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

@@ -174,7 +174,13 @@ Please contact me on #coderbus IRC. ~Carn x
 	//5: Set appearance once
 	appearance = ma_compiled
 
-/mob/living/carbon/human/update_transform(var/mutable_appearance/ma)
+/mob/living/carbon/human/update_transform(var/mutable_appearance/passed_ma)
+	var/mutable_appearance/ma
+	if(passed_ma)
+		ma = passed_ma
+	else
+		ma = new(src)
+
 	// First, get the correct size.
 	var/desired_scale = icon_scale
 
@@ -191,14 +197,17 @@ Please contact me on #coderbus IRC. ~Carn x
 		M.Scale(desired_scale)
 		M.Translate(1,-6)
 		ma.transform = M
-		ma.layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters
+		ma.layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters
 	else
 		var/matrix/M = matrix()
 		M.Scale(desired_scale)
 		M.Translate(0, 16*(desired_scale-1))
 		ma.transform = M
-		ma.layer = MOB_LAYER -0.1 // Fix for a byond bug where turf entry order no longer matters
-	
+		ma.layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters
+
+	if(!passed_ma)
+		appearance = ma
+
 //Update the layers from the defines above
 /mob/living/carbon/human/update_icons_layers(var/update_icons = 1)
 	list_layers.Cut()