shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34777 from ShizCalev/process-fire

Browse Source 
Corrects invalid process_fire args
This commit is contained in:
Leo
2018-01-24 15:55:33 -02:00
committed by CitadelStationBot
parent f4a817be01
commit 18d193d3ee
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+4 -4
View File
@@ -159,7 +159,7 @@
if (user.has_disability(DISABILITY_CLUMSY) && prob(40))
to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with [src]!</span>")
var/shot_leg = pick("l_leg", "r_leg")
process_fire(user,user,0,params, zone_override = shot_leg)
process_fire(user, user, FALSE, params, shot_leg)
user.dropItemToGround(src, TRUE)
return
@@ -178,9 +178,9 @@
else if(G.can_trigger_gun(user))
bonus_spread += 24 * G.weapon_weight
loop_counter++
addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, 1, params, null, bonus_spread), loop_counter)
addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter)
process_fire(target,user,1,params, null, bonus_spread)
process_fire(target, user, TRUE, params, null, bonus_spread)
@@ -437,7 +437,7 @@
if(chambered && chambered.BB)
chambered.BB.damage *= 5
process_fire(target, user, 1, params)
process_fire(target, user, TRUE, params)
/obj/item/gun/proc/unlock() //used in summon guns and as a convience for admins
if(pin)