cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +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:21:44 -04:00
committed by GitHub
parent d1ec7415f5
commit c53a08d938
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_attackhand.dm
+1 -4
View File
@@ -126,13 +126,10 @@
H.do_attack_animation(src)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
<<<<<<< HEAD
//VORESTATION EDIT
visible_message("<span class='warning'>[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!</span>")
//VORESTATION END END
=======
visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")
>>>>>>> 49a8e3b... Merge pull request #6428 from Screemonster/icastfist
return TRUE
if(I_HURT)