Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2012-01-16 20:27:36 -05:00
16 changed files with 8566 additions and 8542 deletions
@@ -880,7 +880,7 @@
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
if (wear_id)
if(wear_id.over)
if(wear_id.over_jumpsuit)
overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER)
if (client)