Merge pull request #34777 from ShizCalev/process-fire

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
@@ -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("<span class='warning'>[user] somehow manages to shoot [user.p_them()]self in the face!</span>", "<span class='userdanger'>You somehow shoot yourself in the face! How the hell?!</span>")
user.emote("scream")
user.drop_all_held_items()
@@ -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)