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

Update human_attackhand.dm

Browse Source
This commit is contained in:
Novacat
2019-08-31 22:18:06 -04:00
committed by GitHub
parent 725d42b10c
commit d1ec7415f5
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_attackhand.dm
-3
View File
@@ -1,5 +1,4 @@
/mob/living/carbon/human/proc/get_unarmed_attack(var/mob/living/carbon/human/target, var/hit_zone)
<<<<<<< HEAD
// VOREStation Edit - Begin
if(nif && nif.flag_check(NIF_C_HARDCLAWS,NIF_FLAGS_COMBAT)){return unarmed_hardclaws}
if(src.default_attack && src.default_attack.is_usable(src, target, hit_zone))
@@ -9,8 +8,6 @@
return soft_type
return src.default_attack
// VOREStation Edit - End
=======
>>>>>>> 49a8e3b... Merge pull request #6428 from Screemonster/icastfist
if(src.gloves)
var/obj/item/clothing/gloves/G = src.gloves
if(istype(G) && G.special_attack && G.special_attack.is_usable(src, target, hit_zone))