From 18d193d3eee1866116a5d8cbbdc3e52ec941dc6c Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 24 Jan 2018 15:55:33 -0200 Subject: [PATCH 1/2] Merge pull request #34777 from ShizCalev/process-fire Corrects invalid process_fire args --- code/modules/projectiles/gun.dm | 8 ++++---- code/modules/projectiles/guns/ballistic.dm | 4 ++-- code/modules/projectiles/guns/ballistic/revolver.dm | 2 +- code/modules/projectiles/guns/ballistic/shotgun.dm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 8efb7ce9e1..8f52f26936 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -159,7 +159,7 @@ if (user.has_disability(DISABILITY_CLUMSY) && prob(40)) to_chat(user, "You shoot yourself in the foot with [src]!") 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) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 786486eea9..c16c5f0fc0 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -159,7 +159,7 @@ sleep(25) if(user.is_holding(src)) var/turf/T = get_turf(user) - process_fire(user, user, 0, zone_override = "head") + process_fire(user, user, FALSE, null, "head") user.visible_message("[user] blows [user.p_their()] brain[user.p_s()] out with [src]!") var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE) B.Remove(user) @@ -215,7 +215,7 @@ . = 0 for(var/obj/item/ammo_casing/AC in magazine.stored_ammo) if(AC.BB) - process_fire(user, user,0) + process_fire(user, user, FALSE) . = 1 diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index aefa7826a0..4e9da3b22d 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -351,7 +351,7 @@ /obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user) if((user.has_disability(DISABILITY_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown")) return ..() - if(process_fire(user, user, 0, zone_override = "head")) + if(process_fire(user, user, FALSE, null, "head")) user.visible_message("[user] somehow manages to shoot [user.p_them()]self in the face!", "You somehow shoot yourself in the face! How the hell?!") user.emote("scream") user.drop_all_held_items() diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index e74b90922d..6382b231a8 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -44,7 +44,7 @@ /obj/item/gun/ballistic/shotgun/blow_up(mob/user) . = 0 if(chambered && chambered.BB) - process_fire(user, user,0) + process_fire(user, user, FALSE) . = 1 /obj/item/gun/ballistic/shotgun/proc/pump(mob/M)