From f6f5a7e1f99dfa4073b0dbdd101b42c529e0daf6 Mon Sep 17 00:00:00 2001 From: Spookerton Date: Tue, 13 Dec 2022 21:24:29 +0000 Subject: [PATCH] Fixes shards having unlimited afterattack range --- code/game/objects/items/weapons/material/shards.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 64d2c0d9cbd..03bf86e557b 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -55,7 +55,13 @@ return return ..() +<<<<<<< HEAD /obj/item/weapon/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob) +======= +/obj/item/material/shard/afterattack(atom/target, mob/living/carbon/human/user, proximity) + if(!proximity) + return +>>>>>>> cd9166a70ae... Merge pull request #8853 from Verkister/patch-101 var/active_hand //hand the shard is in var/will_break = FALSE var/protected_hands = FALSE //this is a fucking mess