Merge pull request Baystation12#14532 from Kearel/voxFixOverlays

Fixes Vox overlays
Gartley · Nov 7, 2016 · 451225d · 451225d
2 parents 3a43dba + d42d7a0
commit 451225d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -695,15 +695,15 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 			mob_state = "[mob_state]_l"
 		if(slot == 	slot_r_hand_str || slot == slot_r_ear_str)
 			mob_state = "[mob_state]_r"
-	else if(sprite_sheets && sprite_sheets[bodytype] && !(slot == slot_r_hand_str || slot == slot_l_hand_str))
+	else if(sprite_sheets && sprite_sheets[bodytype] && (mob_state in icon_states(sprite_sheets[bodytype])) && !(slot == slot_r_hand_str || slot == slot_l_hand_str))
 		if(slot == slot_l_ear)
 			mob_state = "[mob_state]_l"
 		if(slot == slot_r_ear)
 			mob_state = "[mob_state]_r"
+
 		mob_icon = sprite_sheets[bodytype]
 	else if(item_icons && item_icons[slot])
 		mob_icon = item_icons[slot]
 	else
 		mob_icon = default_onmob_icons[slot]
-
 	return overlay_image(mob_icon,mob_state,color,RESET_COLOR)