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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

Browse Source 
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
This commit is contained in:
Neerti
2016-04-20 05:41:36 -04:00
parent 75c0c5cc38 c6f2b0f76d
commit 3c92193bf5
222 changed files with 4002 additions and 3123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@
PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at.
return
if(user && user.a_intent == I_HELP) //regardless of what happens, refuse to shoot if help intent is on
if(user && user.a_intent == I_HELP && user.is_preference_enabled(/datum/client_preference/safefiring)) //regardless of what happens, refuse to shoot if help intent is on
user << "<span class='warning'>You refrain from firing your [src] as your intent is set to help.</span>"
else
Fire(A,user,params) //Otherwise, fire normally.
@@ -164,6 +164,8 @@
add_fingerprint(user)
user.break_cloak()
if(!special_check(user))
return