cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes shards having unlimited afterattack range

Browse Source
This commit is contained in:
Spookerton
2022-12-13 16:25:49 -05:00
committed by VirgoBot
parent eec9973bed
commit f6f5a7e1f9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/shards.dm
+6
View File
@@ -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