From 3e0af860e9f33c4047eb8aeab63e01d12558e909 Mon Sep 17 00:00:00 2001 From: ForFoxSake Date: Fri, 9 Dec 2016 13:22:04 +0000 Subject: [PATCH] Makes the shotgun go off if it's modified while loaded. --- code/modules/projectiles/guns/projectile/shotgun.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 90da6cac49..520333c242 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -90,10 +90,11 @@ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) user << "You begin to shorten the barrel of \the [src]." if(loaded.len) - for(var/i in 1 to max_shells) - afterattack(user, user) //will this work? //it will. we call it twice, for twice the FUN - playsound(user, fire_sound, 50, 1) + var/burstsetting = burst + burst = 2 user.visible_message("The shotgun goes off!", "The shotgun goes off in your face!") + Fire_userless(user) + burst = burstsetting return if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY icon_state = "sawnshotgun"