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

Aim mode point blank targets on harm.

Browse Source
This commit is contained in:
LorenLuke
2017-04-26 11:26:31 -07:00
parent d89a3a4498
commit fb4a24fd38
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/gun.dm
View File

@@ -182,7 +182,11 @@
if (A == user && user.zone_sel.selecting == O_MOUTH && !mouthshoot)
handle_suicide(user)
else if(user.a_intent == I_HURT) //point blank shooting
Fire(A, user, pointblank=1)
if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A && A != user)
PreFire(A,user) //They're using the new gun system, locate what they're aiming at.
return
else
Fire(A, user, pointblank=1)
else
return ..() //Pistolwhippin'