From b2a1fbeecd08e5bd7d098d67d841d8cfaeaba42b Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Wed, 14 Dec 2022 08:07:47 +1000
Subject: [PATCH] Merge pull request #14198 from
 VOREStation/upstream-merge-8853

[MIRROR] Fixes shards having unlimited afterattack range
---
 code/game/objects/items/weapons/material/shards.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index 64d2c0d9cb..59cc5f3edd 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -55,7 +55,9 @@
 			return
 	return ..()
 
-/obj/item/weapon/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob)
+/obj/item/weapon/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob, proximity)
+	if(!proximity)
+		return
 	var/active_hand //hand the shard is in
 	var/will_break = FALSE
 	var/protected_hands = FALSE //this is a fucking mess