cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrects invalid process_fire args

Browse Source
This commit is contained in:
ShizCalev
2018-01-22 04:22:04 -05:00
parent 6c8ee68bf0
commit 665d6bd39d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/gun.dm
View File

@@ -159,7 +159,7 @@
if (user.has_disability(DISABILITY_CLUMSY) && prob(40)) if (user.has_disability(DISABILITY_CLUMSY) && prob(40))
to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with [src]!</span>") to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with [src]!</span>")
var/shot_leg = pick("l_leg", "r_leg") 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) user.dropItemToGround(src, TRUE)
return return
@@ -178,9 +178,9 @@
else if(G.can_trigger_gun(user)) else if(G.can_trigger_gun(user))
bonus_spread += 24 * G.weapon_weight bonus_spread += 24 * G.weapon_weight
loop_counter++ 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) if(chambered && chambered.BB)
chambered.BB.damage *= 5 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 /obj/item/gun/proc/unlock() //used in summon guns and as a convience for admins
if(pin) if(pin)

4
code/modules/projectiles/guns/ballistic.dm
View File

@@ -159,7 +159,7 @@
sleep(25) sleep(25)
if(user.is_holding(src)) if(user.is_holding(src))
var/turf/T = get_turf(user) var/turf/T = get_turf(user)
process_fire(user, user, 0, zone_override = "head") process_fire(user, user, FALSE, null, "head")
user.visible_message("<span class='suicide'>[user] blows [user.p_their()] brain[user.p_s()] out with [src]!</span>") user.visible_message("<span class='suicide'>[user] blows [user.p_their()] brain[user.p_s()] out with [src]!</span>")
var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE) var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE)
B.Remove(user) B.Remove(user)
@@ -215,7 +215,7 @@
. = 0 . = 0
for(var/obj/item/ammo_casing/AC in magazine.stored_ammo) for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
if(AC.BB) if(AC.BB)
process_fire(user, user,0) process_fire(user, user, FALSE)
. = 1 . = 1

2
code/modules/projectiles/guns/ballistic/revolver.dm
View File

@@ -351,7 +351,7 @@
/obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user) /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")) if((user.has_disability(DISABILITY_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown"))
return ..() 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.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.emote("scream")
user.drop_all_held_items() user.drop_all_held_items()

2
code/modules/projectiles/guns/ballistic/shotgun.dm
View File

@@ -44,7 +44,7 @@
/obj/item/gun/ballistic/shotgun/blow_up(mob/user) /obj/item/gun/ballistic/shotgun/blow_up(mob/user)
. = 0 . = 0
if(chambered && chambered.BB) if(chambered && chambered.BB)
process_fire(user, user,0) process_fire(user, user, FALSE)
. = 1 . = 1
/obj/item/gun/ballistic/shotgun/proc/pump(mob/M) /obj/item/gun/ballistic/shotgun/proc/pump(mob/M)