mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
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:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user