cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 15:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

point blank aiming (#7090)

Browse Source
This commit is contained in:
Geeves
2019-10-05 17:49:45 +02:00
committed by Werner
parent bf041a4164
commit dfd3ee2c5d
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,6 +220,11 @@
/obj/item/weapon/gun/attack(atom/A, mob/living/user, def_zone)
if (A == user && user.zone_sel.selecting == "mouth" && !mouthshoot)
handle_suicide(user)
else if(user.a_intent != I_HURT && user.aiming && user.aiming.active) //if aim mode, don't pistol whip
if (user.aiming.aiming_at != A)
PreFire(A, user)
else
Fire(A, user, pointblank=1)
else if(user.a_intent == I_HURT) //point blank shooting
Fire(A, user, pointblank=1)
else if(bayonet)