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

Merge pull request #10012 from mwerezak/guntweak

Browse Source 
Shooting and machine/structure penetration tweaks
This commit is contained in:
PsiOmegaDelta
2015-07-05 22:26:05 +02:00
parent 69168b8b29 8d1e669588
commit f134ef55a1
2 changed files with 2 additions and 7 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 //decide whether to aim or shoot normally
var/aiming = 0 var/aiming = 0
if(user && user.client && !(A in aim_targets)) if(user && user.client && !(A in aim_targets))
var/client/C = user.client if(user.client.gun_mode)
//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)
aiming = PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at. aiming = PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at.
if (!aiming) if (!aiming)

2
code/modules/projectiles/projectile/bullets.dm
View File

@@ -53,7 +53,7 @@
else if(istype(A, /obj/structure/girder)) else if(istype(A, /obj/structure/girder))
chance = 100 chance = 100
else if(istype(A, /obj/machinery) || istype(A, /obj/structure)) else if(istype(A, /obj/machinery) || istype(A, /obj/structure))
chance = 25 chance = damage
if(prob(chance)) if(prob(chance))
if(A.opacity) if(A.opacity)