From 6ca139974dc945c5bd5ea5050a68441f298bc589 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Wed, 15 Mar 2017 19:39:54 +0400 Subject: [PATCH 1/2] glass shards now deal brute to your hand if not wearing gloves --- code/game/objects/items/weapons/shards.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 4e5de260926..9a3f20219c7 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -35,6 +35,22 @@ else ..() +/obj/item/weapon/shard/afterattack(atom/movable/AM, mob/user, proximity) + if(!proximity || !(src in user)) + return + if(isturf(AM)) + return + if(istype(AM, /obj/item/weapon/storage)) + return + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(!H.gloves) + var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") + to_chat(H, "[src] cuts into your hand!") + if(affecting.take_damage(force*0.5)) + H.UpdateDamageIcon() + H.updatehealth() + /obj/item/weapon/shard/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = I From b686cad0cebfce57ae83342c97824f7875493677 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Thu, 16 Mar 2017 16:20:46 +0400 Subject: [PATCH 2/2] robo hands aren't affected by shard cutting into hand --- code/game/objects/items/weapons/shards.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 9a3f20219c7..0ba245af4e6 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -46,6 +46,8 @@ var/mob/living/carbon/human/H = user if(!H.gloves) var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") + if(affecting.status & ORGAN_ROBOT) + return to_chat(H, "[src] cuts into your hand!") if(affecting.take_damage(force*0.5)) H.UpdateDamageIcon()