Merge pull request #10012 from mwerezak/guntweak

Shooting and machine/structure penetration tweaks
This commit is contained in:
PsiOmegaDelta
2015-07-05 22:26:05 +02:00
2 changed files with 2 additions and 7 deletions

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)

View File

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