diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 887d8b31311..9ff0cee9892 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -289,4 +289,17 @@ if(affecting.take_damage(5, 0)) H.update_damage_overlays(0) H.updatehealth() - ..() \ No newline at end of file + ..() + +/obj/item/weapon/shard/afterattack(atom/A as mob|obj, mob/living/carbon/user as mob) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(!H.gloves) + H << "\The [src] cuts into your hand!" + var/organ = ((H.hand ? "l_":"r_") + "arm") + var/datum/limb/affecting = H.get_organ(organ) + if(affecting.take_damage(force/2)) + H.update_damage_overlays(0) + else + user << "\The [src] cuts into your hand!" + user.take_organ_damage(force/2) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index c2514a11241..dd3023413f4 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -159,6 +159,7 @@ //window placing end else if(istype(W, /obj/item/weapon/shard)) + playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) health -= W.force * 0.1 else if(!shock(user, 70)) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)