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

Update shards.dm

Browse Source
This commit is contained in:
Heroman3003
2022-12-14 07:46:38 +10:00
committed by GitHub
parent f6f5a7e1f9
commit f3a28c1c3d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/shards.dm
+1 -5
View File
@@ -55,13 +55,9 @@
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)
/obj/item/weapon/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob, 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