From 22262507b9a5c3712f3ea16458ea71e23562895a Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 29 Aug 2015 10:03:58 +0200 Subject: [PATCH] Only living mobs now trigger shrapnel. Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all. On dev this issue is expanded further as all known movements means use forceMove. --- code/game/objects/items/weapons/material/shards.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 2f395f2ed0f..b4c12f5ad1b 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -61,9 +61,9 @@ return ..() /obj/item/weapon/material/shard/Crossed(AM as mob|obj) - if(ismob(AM)) + if(isliving(AM)) var/mob/M = AM - M << "\red You step on \the [src]!" + M << "You step on \the [src]!" playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M