Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485

Originally merged by @Giacomand
This commit is contained in:
Ikarrus
2013-05-23 20:19:04 -06:00
parent 7d0c5f1054
commit 6932c4e32d
2 changed files with 15 additions and 1 deletions
+14 -1
View File
@@ -289,4 +289,17 @@
if(affecting.take_damage(5, 0))
H.update_damage_overlays(0)
H.updatehealth()
..()
..()
/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 << "<span class='warning'>\The [src] cuts into your hand!</span>"
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 << "<span class='warning'>\The [src] cuts into your hand!</span>"
user.take_organ_damage(force/2)
+1
View File
@@ -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)