cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update item_attack.dm

Browse Source
This commit is contained in:
Novacat
2020-02-18 21:39:01 -05:00
committed by GitHub
parent ee6f155892
commit d27f527a26
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/item_attack.dm
View File

@@ -46,10 +46,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
return 0
if(can_operate(src) && I.do_surgery(src,user))
return 1
<<<<<<< HEAD
if(attempt_vr(src,"vore_attackby",args)) return //VOREStation Add - The vore, of course.
=======
>>>>>>> 7825217... Merge pull request #6707 from Heroman3003/surgfix
return I.attack(src, user, user.zone_sel.selecting, attack_modifier)
// Used to get how fast a mob should attack, and influences click delay.
@@ -113,4 +110,4 @@ avoid code duplication. This includes items that may sometimes act as a standard
power *= attack_modifier
return target.hit_with_weapon(src, user, power, hit_zone)
return target.hit_with_weapon(src, user, power, hit_zone)