From dbcc4a63f593c26a3a4979e259a92c6b68cc5dd4 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 13 May 2023 20:32:37 -0400 Subject: [PATCH] FIXES RUNTIME CAUSING GUNS WITHOUT A MAGAZINE INSERTED TO NOT FIRE (#75407) Caused by #75058 :cl: ShizCalev fix: Guns without magazines inserted can now fire again! /:cl: --- code/modules/projectiles/guns/ballistic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index db976c1d9a7..1e8d20df85d 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -402,7 +402,7 @@ if (sawn_off) bonus_spread += SAWN_OFF_ACC_PENALTY - if(!chambered.is_cased_ammo) + if(magazine && !chambered.is_cased_ammo) magazine.stored_ammo -= chambered return ..()