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

Shooting while on help intent no longer auto switches to hostage mode

Browse Source
This commit is contained in:
mwerezak
2015-07-04 10:47:56 -04:00
parent ef538f2a8c
commit 8d1e669588
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,12 +126,7 @@
//decide whether to aim or shoot normally
var/aiming = 0
if(user && user.client && !(A in aim_targets))
var/client/C = user.client
//If help intent is on and we have clicked on an eligible target, switch to aim mode automatically
if(user.a_intent == I_HELP && isliving(A) && !C.gun_mode)
C.ToggleGunMode()
if(C.gun_mode)
if(user.client.gun_mode)
aiming = PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at.
if (!aiming)