Merge pull request #10939 from Baystation12/master

Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-08-30 10:20:32 +02:00
3 changed files with 13 additions and 6 deletions
@@ -61,7 +61,7 @@
return ..()
/obj/item/weapon/material/shard/Crossed(AM as mob|obj)
if(ismob(AM))
if(isliving(AM))
var/mob/M = AM
M << "<span class='danger'>You step on \the [src]!</span>"
playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds