From 02abdd4eefcea0eaeaa71a2bf6eec8d451408306 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 30 Sep 2021 23:22:45 -0500 Subject: [PATCH] oh i forgot to commit this before i made the pr --- code/modules/projectiles/guns/ballistic/shotgun.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 6b3e0ce213..8eac09c8a5 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -25,7 +25,8 @@ playsound(user, 'sound/weapons/shotguninsert.ogg', 60, 1) A.update_icon() update_icon() - user.SetNextAction(clip_delay) + if(istype(A, /obj/item/ammo_box)) + user.SetNextAction(clip_delay) /obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0) return ..() //changed argument value